同步数据代码修改

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,16 +6,24 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://8.137.121.180:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://8.137.121.180:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://172.19.164.203:30306/subject_api?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 287988448lp5421
+#                password: Hm13579!@#
+#                password: 287988448lp5421
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:mysql://139.155.7.62:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+#                url: jdbc:mysql://172.16.40.20:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+#                url: jdbc:mysql://139.155.7.62:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+                url: jdbc:mysql://localhost:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
                 username: root
-                password: Chaoliu@0917!@#
+#                password: Hm13579!@#
+#                password: Chaoliu@0917!@#
+                password: 123456
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubInfoServiceImpl.java

@@ -157,26 +157,58 @@ public class SubInfoServiceImpl extends ServiceImpl<SubInfoMapper, SubInfo> impl
 
         if (lstSubInfo.size() > 0) {
             for (SubInfo subInfo : lstSubInfo) {
-                subInfo.setSubName(sub.getProjectname());
-                subInfo.setSubCode(sub.getProjectid());
-                subInfo.setIndusKind(kind.getId());
-                subInfo.setContent(sub.getConstructionscale());
-                subInfo.setSubjectId(addressVist.getSysId());
-                subInfo.setBeginDate(sub.getStarttime());
-                subInfo.setEndDate(sub.getEndtime());
-                subInfo.setUnitId(unit.getId());
-                subInfo.setKindNature(sub.getZjlx());
-                subInfo.setNameZrr(sub.getAgename());
-                subInfo.setNameLead(sub.getPagename());
-                subInfo.setCreateTime(sub.getCreatetime());
-                subInfo.setTelLead(sub.getAgephone());
-                subInfo.setTel(sub.getAgemobile());
-                subInfo.setReason(sub.getCbsnum());
-                subInfo.setAmtTotal(sub.getGrossinvestment());
-                subInfo.setLastUpdateTime(new Date());
-                if (sub.getStatu().equals("2")) {
-                    subInfo.setLogicDeleteFlag(1);
+                if(StringUtils.isEmpty(subInfo.getSubName())) {
+                    subInfo.setSubName(sub.getProjectname());
+                }
+                if(StringUtils.isEmpty(subInfo.getSubCode())) {
+                    subInfo.setSubCode(sub.getProjectid());
+                }
+                if(StringUtils.isEmpty(subInfo.getIndusKind())) {
+                    subInfo.setIndusKind(kind.getId());
+                }
+                if(StringUtils.isEmpty(subInfo.getContent())) {
+                    subInfo.setContent(sub.getConstructionscale());
+                }
+                if(StringUtils.isEmpty(subInfo.getSubjectId())) {
+                    subInfo.setSubjectId(addressVist.getSysId());
+                }
+                if(subInfo.getBeginDate()==null) {
+                    subInfo.setBeginDate(sub.getStarttime());
+                }
+                if(subInfo.getEndDate()==null) {
+                    subInfo.setEndDate(sub.getEndtime());
+                }
+                if(StringUtils.isEmpty(subInfo.getUnitId())) {
+                    subInfo.setUnitId(unit.getId());
+                }
+                if(StringUtils.isEmpty(subInfo.getKindNature())) {
+                    subInfo.setKindNature(sub.getZjlx());
                 }
+                if(StringUtils.isEmpty(subInfo.getNameZrr())) {
+                    subInfo.setNameZrr(sub.getAgename());
+                }
+                if(StringUtils.isEmpty(subInfo.getNameLead())) {
+                    subInfo.setNameLead(sub.getPagename());
+                }
+                if(subInfo.getCreateTime()==null) {
+                    subInfo.setCreateTime(sub.getCreatetime());
+                }
+                if(StringUtils.isEmpty(subInfo.getTelLead())) {
+                    subInfo.setTelLead(sub.getAgephone());
+                }
+                if(StringUtils.isEmpty(subInfo.getTel())) {
+                    subInfo.setTel(sub.getAgemobile());
+                }
+                if(StringUtils.isEmpty(subInfo.getReason())) {
+                    subInfo.setReason(sub.getCbsnum());
+                }
+                if(subInfo.getAmtTotal()==null) {
+                    subInfo.setAmtTotal(sub.getGrossinvestment());
+                }
+                subInfo.setLastUpdateTime(new Date());
+//                if (sub.getStatu().equals("2")) {
+//                    subInfo.setLogicDeleteFlag(1);
+//                }
                 subInfoMapper.updateById(subInfo);
                 if (!this.hanlderResouce(sub, subInfo, map)) {
                     return false;