瀏覽代碼

同步时updateUser给予默认值

zhangqiankun 3 年之前
父節點
當前提交
19d7a185fc

+ 10 - 3
src/main/java/com/persagy/transfer/service/impl/HydomcAssetServiceImpl.java

@@ -22,6 +22,7 @@ import com.persagy.transfer.pojo.dto.RwdObjectWd;
 import com.persagy.transfer.service.IHydomcAssetService;
 import com.persagy.transfer.utils.StringTool;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -46,15 +47,21 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
 	@Override
 	@Transactional
     public boolean saveHydomcAsset(RwdObjectWd rwdObjectWd, JSONObject infos, String wdProjectId, String classstructureid, String sbybm) {
-    	int valid = rwdObjectWd.getValid() == null ? 0 : rwdObjectWd.getValid();
+		String equipmentName = StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_NAME));
+		if (StrUtil.isBlank(equipmentName)) {
+			log.warn("万达设备名称为空,不进行同步,本方对象ID:{}", rwdObjectWd.getId());
+			return false;
+		}
+		int valid = rwdObjectWd.getValid() == null ? 0 : rwdObjectWd.getValid();
 		Date updateTime = rwdObjectWd.getUpdateTime() == null ? DateUtil.date().toJdkDate() : rwdObjectWd.getUpdateTime();
+		String updateUser = StrUtil.isBlank(rwdObjectWd.getUpdateUser()) ? SwitchConstant.USER_ID : rwdObjectWd.getUpdateUser();
 		
     	log.info("设备数据同步至万达数据库,本方对象ID:{},设备状态:{},万达项目ID:{}, 设备分类ID:{}", rwdObjectWd.getId(), valid, wdProjectId, classstructureid);
     	
     	Integer result = null;
         HydomcAsset hydomcAsset = this.getHydomcAssetByPKey(sbybm);
         if (hydomcAsset == null) {
-        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, rwdObjectWd.getUpdateUser(), valid, updateTime);
+        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, updateUser, valid, updateTime);
         	result = this.baseMapper.insert(hydomcAsset);
         	return SqlHelper.retBool(result);
         }
@@ -67,7 +74,7 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
             updateWrapper.set(HydomcAsset::getChangedate, updateTime); 				// 数据更新时间 增量字段
             result = this.baseMapper.update(null, updateWrapper);
         } else {
-        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, rwdObjectWd.getUpdateUser(), valid, updateTime);
+        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, updateUser, valid, updateTime);
         	hydomcAsset.setSbybm(sbybm);
         	result = this.baseMapper.update(hydomcAsset, updateWrapper);
         }

+ 4 - 4
src/main/resources/bootstrap.yml

@@ -22,9 +22,9 @@ spring:
       strict: true   #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master_1:
-          url: jdbc:mysql://${MASTER_DATASOURCE_IP:192.168.64.15}:${MASTER_DATASOURCE_PORT:9934}/${MASTER_DATASOURCE_DATABASE:dmp_rwd}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          url: jdbc:mysql://${MASTER_DATASOURCE_IP:192.168.100.94}:${MASTER_DATASOURCE_PORT:9934}/${MASTER_DATASOURCE_DATABASE:dmp_rwd}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: ${MASTER_DATASOURCE_USERNAME:root}
-          password: ${MASTER_DATASOURCE_PASSWORD:D56dLvRbSy5bMn}
+          password: ${MASTER_DATASOURCE_PASSWORD:persagy@2020}
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: 
@@ -44,9 +44,9 @@ spring:
             time-between-eviction-runs-millis: 50000
             max-pool-prepared-statement-per-connection-size: 20  
         master_2:
-          url: jdbc:mysql://${SLAVE_DATASOURCE_IP:192.168.64.15}:${SLAVE_DATASOURCE_PORT:9934}/${SLAVE_DATASOURCE_DATABASE:ibms-switch}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          url: jdbc:mysql://${SLAVE_DATASOURCE_IP:192.168.100.94}:${SLAVE_DATASOURCE_PORT:9934}/${SLAVE_DATASOURCE_DATABASE:ibms-switch}?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: ${SLAVE_DATASOURCE_USERNAME:root}
-          password: ${SLAVE_DATASOURCE_PASSWORD:D56dLvRbSy5bMn}
+          password: ${SLAVE_DATASOURCE_PASSWORD:persagy@2020}
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: