修改

jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java

@@ -9,9 +9,11 @@ import com.kms.common.utils.BaseEntityUtils;
 import com.kms.config.WaterRequestUtil;
 import com.kms.config.WaterResult;
 import com.kms.config.singleDomain.SingleOrg;
+import com.kms.config.singleDomain.SingleRole;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysRoleService;
 import com.kms.system.service.SysUserService;
+import com.kms.web.controller.system.SysRoleController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -35,34 +37,44 @@ public class WaterScheduled {
     @Autowired
     SysDeptService deptService;
     @Autowired
+    SysRoleController roleController;
+    @Autowired
     SysRoleService roleService;
 
 
-//    @Scheduled
-//    public void userScheduled(){
-//
-//
-//
-//    }
+    @Scheduled
+    public void userScheduled(){
+
+
+
+
+
+    }
 
     /**
      *
      */
-//    @Scheduled(cron = "0 0 0 ? * ? ")
+//    @Scheduled(cron = "0 0 0 ? * ? ") 每天
     public void orgScheduled(){
         WaterResult waterResult = waterRequestUtil.getOrgPage();
         String data = waterResult.getData();
         String records = JSONObject.parseObject(data).getString("records");
         List<SingleOrg> singleOrgs = JSONObject.parseArray(records, SingleOrg.class);
         for (SingleOrg singleOrg : singleOrgs) {
-            SysDept byId = deptService.getById(singleOrg.getId());
-            if(byId!=null){
+            SysDept dept = deptService.getById(singleOrg.getId());
+            boolean flag = (dept!=null);
+            if(flag){
                 String md = MD5Util.MD5Encode(singleOrg.toString(), "utf-8");
-                if(byId.getMd5()!=null&&md.equals(byId.getMd5())){
+                if(dept.getMd5()!=null&&md.equals(dept.getMd5())){
                     continue;
                 }
+            }else {
+                dept.setIsDownload("0");
+                dept.setIsComment("0");
+                dept.setDelFlag("0");
+                dept.setCreateTime(new Date());
             }
-            SysDept dept = new SysDept();
+            dept = new SysDept();
             dept.setMd5(MD5Util.MD5Encode(singleOrg.toString(), "utf-8"));
             BeanUtils.copyProperties(singleOrg,dept);
             dept.setXzqhId(singleOrg.getArea());
@@ -72,13 +84,9 @@ public class WaterScheduled {
             dept.setSingleType(singleOrg.getType());
             dept.setDeptName(singleOrg.getName());
             dept.setParentId(singleOrg.getParent());
-            dept.setIsDownload("0");
-            dept.setIsComment("0");
-            dept.setDelFlag("0");
             dept.setLeader(singleOrg.getDutyPerson());
             dept.setName(singleOrg.getName());
             dept.setAdminName(singleOrg.getName());
-            dept.setCreateTime(new Date());
             dept.setUpdateTime(new Date());
             if(singleOrg.getStatus()==null||singleOrg.getStatus().equals("1")){
                 dept.setStatus("0");
@@ -89,25 +97,47 @@ public class WaterScheduled {
             {
                 log.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
             }
-            deptService.saveOrUpdate(dept);
+            if(flag){
+                deptService.updateDept(dept);
+            }else {
+                deptService.insertDept(dept);
+            }
         }
     }
 
-
+//   @Scheduled(cron = "0/10 * * * * ? ") 10秒
    public void  roeScheduled(){
        WaterResult rolePage = waterRequestUtil.getRolePage();
        String data = rolePage.getData();
        String records = JSONObject.parseObject(data).getString("records");
-       List<SysRole> roles = JSONObject.parseArray(records, SysRole.class);
-       for (SysRole role : roles) {
-           SysRole byId = roleService.getById(role.getId());
-           if(byId!=null){
-
-
-               continue;
+       List<SingleRole> singleRoles = JSONObject.parseArray(records, SingleRole.class);
+       for (SingleRole singleRole : singleRoles) {
+           SysRole sysRole = roleService.getById(singleRole.getId());
+           if(sysRole!=null){
+               String md = MD5Util.MD5Encode(singleRole.toString(), "utf-8");
+               if(sysRole.getMd5()!=null&&md.equals(sysRole.getMd5())){
+                   continue;
+               }
+               sysRole.setMd5(MD5Util.MD5Encode(singleRole.toString(), "utf-8"));
+               BeanUtils.copyProperties(singleRole,sysRole);
+               sysRole.setRoleName(singleRole.getName());
+               sysRole.setRoleKey(singleRole.getCode());
+               sysRole.setUpdateTime(new Date());
+               roleService.updateRole(sysRole);
+           }else {
+               sysRole = new SysRole();
+               sysRole.setStatus("0");
+               sysRole.setDelFlag("0");
+               sysRole.setRoleSort("0");
+               sysRole.setCreateTime(new Date());
+               sysRole.setMd5(MD5Util.MD5Encode(singleRole.toString(), "utf-8"));
+               BeanUtils.copyProperties(singleRole,sysRole);
+               sysRole.setRoleName(singleRole.getName());
+               sysRole.setRoleKey(singleRole.getCode());
+               sysRole.setUpdateTime(new Date());
+               roleService.insertRole(sysRole);
            }
        }
-
    }
 
 

jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysRole.java

@@ -67,6 +67,7 @@ public class SysRole extends BaseEntity
     private String dataConfig;
     private String type;
     private String category;
+    private String md5;
 
     public SysRole()
     {