修改定时任务

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataPushTask.java

@@ -5,12 +5,20 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.modules.dm.user.service.DmUserService;
+import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
+import me.zhengjie.modules.dm.user.service.dto.DmUserQueryCriteria;
+import me.zhengjie.modules.system.service.DeptService;
+import me.zhengjie.modules.system.service.dto.DeptDto;
+import me.zhengjie.modules.system.service.dto.DeptQueryNoAuthCriteria;
 import me.zhengjie.utils.SecurityUtils;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -19,6 +27,10 @@ import java.util.Map;
 public class ZkDataPushTask {
 
     private final String key = "DMERPYT!@#$QWER2021+{:>";
+    private final String fpApi = "http://10.208.128.14:8069/";
+
+    private final DmUserService dmUserService;
+    private final DeptService deptService;
 
     public void run() {
         log.info("pushAttendanceData 执行开始");
@@ -53,4 +65,80 @@ public class ZkDataPushTask {
             log.info("res is null.");
         }
     }
+
+
+    private void pushFeiPuDeptData() throws Exception {
+        String api = "openapi/deptOperate";
+        List<DeptDto> deptDtoList = deptService.queryAll(new DeptQueryNoAuthCriteria());
+        if(!ObjectUtils.isEmpty(deptDtoList)){
+            for(DeptDto deptDto: deptDtoList){
+                JSONObject param = new JSONObject();
+                param.put("deptId",deptDto.getId());
+                param.put("deptName",deptDto.getName());
+                param.put("pDeptId",deptDto.getPid());
+                param.put("sort",deptDto.getDeptSort());
+                Integer operateType;
+                if(isNow(new Date(deptDto.getCreateTime().getTime()))){
+                    operateType = 1;
+                } else {
+                    operateType = 2;
+                }
+                param.put("operateType",operateType);
+                String res = HttpRequest.post(fpApi+api)
+                        .form("person",param.toJSONString()).execute().body();
+                log.info("res:"+res);
+            }
+        }
+    }
+
+    private void pushFeiPuUserData(){
+        String api = "openapi/personOperate";
+        List<DmUserDto> dmUserDtoList = dmUserService.queryAll(new DmUserQueryCriteria());
+        if(!ObjectUtils.isEmpty(dmUserDtoList)){
+            for(DmUserDto dmUserDto: dmUserDtoList){
+                JSONObject param = new JSONObject();
+                param.put("userId",dmUserDto.getId());
+                param.put("userName",dmUserDto.getName());
+                param.put("deptId",dmUserDto.getDept().getId());
+                Integer sex = null;
+                if(StringUtils.isNotBlank(dmUserDto.getSex())){
+                    if(StringUtils.equals("男",dmUserDto.getSex())){
+                        sex = 2;
+                    } else if(StringUtils.equals("女",dmUserDto.getSex())) {
+                        sex = 1;
+                    }
+                }
+                param.put("sex",sex);
+                param.put("cardId",dmUserDto.getCardid());
+                Integer operateType;
+
+                if(isNow(new Date(dmUserDto.getCreateTime().getTime()))){
+                    operateType = 1;
+                } else {
+                    operateType = 2;
+                }
+                param.put("operateType",operateType);
+                String res = HttpRequest.post(fpApi+api)
+                        .form("person",param.toJSONString()).execute().body();
+                log.info("res:"+res);
+            }
+        }
+    }
+
+    /**
+     * 判断时间是不是今天
+     * @param date
+     * @return    是返回true，不是返回false
+     */
+    private static boolean isNow(Date date) {
+        //当前时间
+        Date now = new Date();
+        SimpleDateFormat sf = new SimpleDateFormat("yyyyMMdd");
+        //获取今天的日期
+        String nowDay = sf.format(now);
+        //对比的时间
+        String day = sf.format(date);
+        return day.equals(nowDay);
+
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -15,6 +15,8 @@
  */
 package me.zhengjie.modules.quartz.task;
 
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -245,7 +247,8 @@ public class ZkDataSyncTask {
                     if (dmUserDto != null) {
                         dmUserService.update(dmUser);
                     } else {
-                        dmUser.setCardid(UUID.randomUUID().toString());
+                        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+                        dmUser.setCardid(String.valueOf(snowflake.nextId()));
                         dmUserService.create(dmUser);
                     }
                     user.setDmUser(dmUser);