Browse Source

优化整体处理逻辑,修改部分信息点编码key值

zhangqiankun 3 years ago
parent
commit
b233f9603e

+ 11 - 11
src/main/java/com/persagy/transfer/constant/InfosKeyConstant.java

@@ -13,9 +13,14 @@ public class InfosKeyConstant {
     public static final String EQUIPMENT_CODE = "wD_gongchengxinxihua";
 
     /**
-     * 设备名称(工程设备名称)
+     * 设备名称(工程设备名称),慧云本地名称
      */
-    public static final String EQUIPMENT_NAME = "wD_shebeimingcheng";
+    public static final String EQUIPMENT_NAME = "wD_huiyunbendimingcheng";
+    
+    /**
+     * 慧云本地编码
+     */
+    public static final String WISDOM_CLOUD_LOCAL_CODE = "wD_huiyunbendibianma";
 
     /**
      * 设备安装位置
@@ -40,7 +45,7 @@ public class InfosKeyConstant {
     /**
      * 设备状态
      */
-    public static final String EQUIPMENT_STATUS = "EquipStatus";
+    public static final String EQUIPMENT_STATUS = "equipStatus";
 
     /**
      * 设备序号
@@ -90,7 +95,7 @@ public class InfosKeyConstant {
     /**
      * 生产日期/出厂日期
      */
-    public static final String PRODUCT_DATE = "productDate";
+    public static final String PRODUCT_DATE = "wD_productdate";
 
     /**
      * 采购日期
@@ -138,17 +143,12 @@ public class InfosKeyConstant {
     public static final String EQUIPMENT_MANAGE_OWNERSHIP = "wD_equipmanageownership";
 
     /**
-     * 慧云本地编码
-     */
-    public static final String WISDOM_CLOUD_LOCAL_CODE = "wD_huiyunbendibianma";
-
-    /**
-     * 是否慧云使用
+     * 是否慧云使用,缺省为 是
      */
     public static final String WISDOM_CLOUD_USE = "wD_huiyunuse";
 
     /**
-     * 是否是主力店
+     * 是否是主力店,缺省为 否
      */
     public static final String MAIN_STORE = "wD_mainstore";
 

+ 26 - 1
src/main/java/com/persagy/transfer/controller/CommonController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseUtil;
 import com.persagy.transfer.handle.CommonHandler;
+import com.persagy.transfer.handle.WDRwdObjectTransferHandler;
 
 /**
  * 通用controller
@@ -19,12 +20,23 @@ import com.persagy.transfer.handle.CommonHandler;
  * @date 2021年9月17日 上午10:02:22
  */
 @RestController
+@RequestMapping("/common")
 public class CommonController {
 
     @Autowired
     private CommonHandler commonHandler;
     
-    @RequestMapping("/refreshCache")
+    @Autowired
+    private WDRwdObjectTransferHandler wdRwdObjectTransferHandler;
+    
+    /**
+     * 刷新本地缓存
+     * 
+     * @param request
+     * @return
+     * @date 2021年9月17日 下午7:36:45
+     */
+    @RequestMapping(value = "/refreshCache")
     public ResponseResult refreshCache(HttpServletRequest request) {
 		// 生成设备类编码缓存
 		this.commonHandler.createWDClassCache();
@@ -35,4 +47,17 @@ public class CommonController {
         return ResponseUtil.successResult("本地缓存刷新成功");
     }
     
+    /**
+     * 同步物理世界对象数据至万达数据表中
+     * 
+     * @param request
+     * @return
+     * @date 2021年9月17日 下午7:37:35
+     */
+    @RequestMapping(value = "/syncRwdObject2WD")
+    public ResponseResult syncRwdObject2WD(HttpServletRequest request) {
+    	this.wdRwdObjectTransferHandler.syncRwdObject2WD();
+        return ResponseUtil.successResult("物理世界对象数据同步成功");
+    }
+    
 }

+ 12 - 4
src/main/java/com/persagy/transfer/handle/WDRwdObjectTransferHandler.java

@@ -124,13 +124,14 @@ public class WDRwdObjectTransferHandler {
         			log.warn("设备信息编码为空,不进行同步");
         			continue;
         		}
+            	
             	// 查询出18类设备单独的信息点
                 if (CollectionUtil.isEmpty(wdfacilityRelList)) {
                 	// 循环万达项目ID与博锐尚格项目ID映射表数据时,wdfacility_rel_persagy只查询一次
                     wdfacilityRelList = this.listWdfacilityRelPersagy(calassPersagy.getWdClassCode(), calassPersagy.getClassstructureid());
                 }
                 
-                // 数据开始同步
+                // 正常数据开始同步
                 this.saveHydomcAssetAndAssetspec(wdfacilityRelList, rwdObjectWd, infos, wdProjectId, calassPersagy.getClassstructureid(), sbybm);
 			} catch (Exception e) {
 				log.error("对象数据同步失败,失败对象ID:" + rwdObjectWd.getId(), e);
@@ -156,7 +157,14 @@ public class WDRwdObjectTransferHandler {
     	// 优先同步主表数据 万达设备信息表
         boolean result = this.hydomcAssetService.saveHydomcAsset(rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
         if (!result) {
-			log.error("万达设备信息主表数据同步失败,本方对象ID:{}, 项目ID:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId());
+			log.warn("万达设备信息主表数据同步失败,本方对象ID:{}, 项目ID:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId());
+        	return;
+		}
+        
+        // 再验证 主对象数据是否已被删除,已被删除,直接级联更新子表,不需要再去单独更新子表数据
+		int valid = rwdObjectWd.getValid() == null ? 0 : rwdObjectWd.getValid();
+        if (valid == 0) {
+        	this.hydomcAssetspecService.deleteHydomcAssetspec(wdProjectId, sbybm, rwdObjectWd.getUpdateTime());
         	return;
 		}
         
@@ -166,11 +174,11 @@ public class WDRwdObjectTransferHandler {
 				// 保证一个信息点的异常,不影响其余信息点的录入
 				result = this.hydomcAssetspecService.saveHydomcAssetspec(wdfacilityRelPersagy, rwdObjectWd, infos, wdProjectId, classstructureid, sbybm);
 				if (!result) {
-					log.error("万达设备参数信息从表数据同步失败,本方对象ID:{}, 项目ID:{}, 信息点编码:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId(), wdfacilityRelPersagy.getCode());
-		        	return;
+					log.warn("万达设备参数信息从表数据同步失败,本方对象ID:{}, 项目ID:{}, 信息点编码:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId(), wdfacilityRelPersagy.getCode());
 				}
 			} catch (Exception e) {
 				log.error("万达设备参数信息从表数据同步失败,本方对象ID:{}, 项目ID:{}, 信息点编码:{}", rwdObjectWd.getId(), rwdObjectWd.getProjectId(), wdfacilityRelPersagy.getCode());
+				log.error("失败原因", e);
 			}
 		}
     }

+ 2 - 1
src/main/java/com/persagy/transfer/service/IHydomcAssetService.java

@@ -44,10 +44,11 @@ public interface IHydomcAssetService extends ISuperService<HydomcAsset> {
 	 * @param wdProjectId 万达项目ID
 	 * @param classstructureid 设备分类ID
 	 * @param valid 有效性 0-无效,1-有效
+	 * @param updateUser 更新用户
 	 * @param updateTime 更新时间
 	 * @return 
 	 */
-	HydomcAsset buildHydomcAsset(JSONObject infos, String wdProjectId, String classstructureid, int valid, Date updateTime);
+	HydomcAsset buildHydomcAsset(JSONObject infos, String wdProjectId, String classstructureid, String updateUser, int valid, Date updateTime);
 	
 }
 

+ 13 - 1
src/main/java/com/persagy/transfer/service/IHydomcAssetspecService.java

@@ -45,6 +45,18 @@ public interface IHydomcAssetspecService extends ISuperService<HydomcAssetspec>
 	boolean saveHydomcAssetspec(WdfacilityRelPersagy wdfacilityRelPersagy, RwdObjectWd rwdObjectWd, JSONObject infos, String wdProjectid, String classstructureid, String sbybm);
 	
 	/**
+	 * 所有对应的设备参数 从表信息置为失效状态
+	 * 
+	 * @param wdProjectId 万达项目ID
+	 * @param sbybm		  设备编码
+	 * @param updateTime	更新时间
+	 * @return true-成功
+	 * @date 2021年9月17日 下午10:29:35
+	 */
+	boolean deleteHydomcAssetspec(String wdProjectId, String sbybm, Date updateTime);
+	
+	/**
+	 * 切记不包含数据状态标识,请返回结果后,自行处理添加
 	 * 
 	 * @param infos                博锐尚格项目表debugs字段数据
 	 * @param wdfacilityRelPersagy 万达设备参数信息表与博锐尚格信息点的映射表
@@ -58,6 +70,6 @@ public interface IHydomcAssetspecService extends ISuperService<HydomcAssetspec>
 	 * @date 2021/9/17 10:55
 	 */
 	HydomcAssetspec buildHydomcAssetspec(JSONObject infos, WdfacilityRelPersagy wdfacilityRelPersagy, String assetspecid, String wdProjectid, String classstructureid, Date changedate);
-	
+
 }
 

+ 17 - 11
src/main/java/com/persagy/transfer/service/impl/HydomcAssetServiceImpl.java

@@ -53,31 +53,36 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
     	Integer result = null;
         HydomcAsset hydomcAsset = this.getHydomcAssetByPKey(sbybm);
         if (hydomcAsset == null) {
-        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, valid, updateTime);
+        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, rwdObjectWd.getUpdateUser(), valid, updateTime);
         	result = this.baseMapper.insert(hydomcAsset);
         	return SqlHelper.retBool(result);
         }
         
-        LambdaUpdateWrapper<HydomcAsset> updateWrapper = new HydomcAsset.BuilderUpdateWrapper().sbybmEq(sbybm).builder();
         // 数据更新时间 增量字段
+        LambdaUpdateWrapper<HydomcAsset> updateWrapper = new HydomcAsset.BuilderUpdateWrapper().sbybmEq(sbybm).builder();
         if (valid == 0) {
             updateWrapper.set(HydomcAsset::getStatus, SwitchConstant.SCRAP); 		// 设备状态 运行中/报废    默认都为运行中
-            updateWrapper.set(HydomcAsset::getStatus, SwitchConstant.IS_DELETE); 	// 数据状态 update/delete 当数据状态为delete时,设备状态需改为报废
+            updateWrapper.set(HydomcAsset::getDatastatus, SwitchConstant.IS_DELETE); 	// 数据状态 update/delete 当数据状态为delete时,设备状态需改为报废
             updateWrapper.set(HydomcAsset::getChangedate, updateTime); 				// 数据更新时间 增量字段
+            result = this.baseMapper.update(null, updateWrapper);
         } else {
-        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, valid, updateTime);
+        	hydomcAsset = this.buildHydomcAsset(infos, wdProjectId, classstructureid, rwdObjectWd.getUpdateUser(), valid, updateTime);
+        	hydomcAsset.setSbybm(sbybm);
+        	result = this.baseMapper.update(hydomcAsset, updateWrapper);
         }
-        result = this.baseMapper.update(hydomcAsset, updateWrapper);
         return SqlHelper.retBool(result);
     }
 
     
     @Override
-    public HydomcAsset buildHydomcAsset(JSONObject infos, String wdProjectId, String classstructureid, int valid, Date updateTime) {
+    public HydomcAsset buildHydomcAsset(JSONObject infos, String wdProjectId, String classstructureid, String updateUser, int valid, Date updateTime) {
     	String sfhysy = StringTool.object2String(infos.get(InfosKeyConstant.WISDOM_CLOUD_USE));
     	sfhysy = StringUtil.isBlank(sfhysy) ? "是" : sfhysy;
     	
-    	HydomcAsset hydomcAsset = HydomcAsset.builder()
+    	String sfzld = StringTool.object2String(infos.get(InfosKeyConstant.MAIN_STORE));
+    	sfzld = StringUtil.isBlank(sfzld) ? "否" : sfzld;
+    	
+    	HydomcAsset hydomcAsset = HydomcAsset.builder().siteid(wdProjectId) // 项目唯一id,可采用租赁系统广场id,同步后不可更改 
     			// 主键  无其他主键可采用设备编码为主键,但要确保唯一(工程信息化设备原码)
     			.sbybm(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_CODE)))
     			// 详细设备安装位置,格式:楼体-楼层-区域 没有key 后续补充
@@ -88,7 +93,8 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
     			.description(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_NAME)))
     	 		// 厂商设备型号
     			.sbxh(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_MODEL)))
-    			.classstructureid(classstructureid)
+    			// 设备分类ID
+    			.classstructureid(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT)))
     			// 设备状态 运行中/报废    默认都为运行中
     			.status(valid == 0 ? SwitchConstant.SCRAP : SwitchConstant.RUNNING)
     			// 设备序号 同类设备的序号,即第几台设备:第几台电梯
@@ -130,15 +136,15 @@ public class HydomcAssetServiceImpl extends SuperServiceImpl<HydomcAssetMapper,
 		    	// 是否慧云使用 是/否   缺省为 是
 		    	.sfhysy(sfhysy) 
 		    	// 是否是主力店 缺省为 否
-		    	.sfzld(StringTool.object2String(infos.get(InfosKeyConstant.MAIN_STORE))) 
+		    	.sfzld(sfzld) 
 		    	// 备注 wD_beizhu
 		    	.mark(StringTool.object2String(infos.get(InfosKeyConstant.REMARK))) 
-		    	// 项目唯一id,可采用租赁系统广场id,同步后不可更改
-		    	.siteid(wdProjectId) 
 		    	// 数据状态 update/delete 当数据状态为delete时,设备状态需改为报废
 		    	.datastatus(valid == 0 ? SwitchConstant.IS_DELETE : SwitchConstant.IS_UPDATE) 
 		    	// 数据更新时间 增量字段
 		    	.changedate(updateTime) 
+		    	// 更新人员
+		    	.ctx(updateUser)
     			.build();
     	return hydomcAsset;
     }

+ 24 - 11
src/main/java/com/persagy/transfer/service/impl/HydomcAssetspecServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.persagy.common.service.impl.SuperServiceImpl;
 import com.persagy.common.utils.DateUtil;
@@ -48,35 +49,53 @@ public class HydomcAssetspecServiceImpl extends SuperServiceImpl<HydomcAssetspec
 	@Transactional
 	public boolean saveHydomcAssetspec(WdfacilityRelPersagy wdfacilityRelPersagy, RwdObjectWd rwdObjectWd, JSONObject infos, String wdProjectid, String classstructureid, String sbybm) {
 		Date updateTime = rwdObjectWd.getUpdateTime() == null ? DateUtil.date().toJdkDate() : rwdObjectWd.getUpdateTime();
-
+		String codeValue = StringTool.object2String(infos.get(wdfacilityRelPersagy.getCode()));
+		
 		Integer result = null;
 		// 根据万达设备信息表的SITEID、SBYBM、ASSETATTRID查询数据是否存在
 		HydomcAssetspec hydomcAssetspec = this.getHydomcAssetspec(sbybm, wdProjectid, wdfacilityRelPersagy.getAssetattrid());
 		if (hydomcAssetspec == null) {
-			hydomcAssetspec = this.buildHydomcAssetspec(infos, wdfacilityRelPersagy, null, wdProjectid, classstructureid, updateTime);
-			result = this.baseMapper.insert(hydomcAssetspec);
+			if (StringUtil.isNotBlank(codeValue)) {
+				// 查询不到时,且code 有值,走插入逻辑
+				hydomcAssetspec = this.buildHydomcAssetspec(infos, wdfacilityRelPersagy, null, wdProjectid, classstructureid, updateTime);
+				hydomcAssetspec.setDatastatus(SwitchConstant.IS_UPDATE); // 数据状态 update/delete
+				result = this.baseMapper.insert(hydomcAssetspec);
+			}
 			return SqlHelper.retBool(result);
 		}
 		
 		// key为wdfacility_rel_persagy的code值从debugs取 有值update 无值(空、空字符串)就是delete
 		if (StringUtils.isBlank(StringTool.object2String(infos.get(wdfacilityRelPersagy.getCode())))) {
 			hydomcAssetspec.setDatastatus(SwitchConstant.IS_DELETE); // 数据状态 update/delete
-			hydomcAssetspec.setChangedate(updateTime); // 数据更新时间 增量字段
+			hydomcAssetspec.setChangedate(updateTime); 				// 数据更新时间 增量字段
 		} else {
 			hydomcAssetspec = this.buildHydomcAssetspec(infos, wdfacilityRelPersagy, hydomcAssetspec.getAssetspecid(), wdProjectid, classstructureid, updateTime);
+			hydomcAssetspec.setDatastatus(SwitchConstant.IS_UPDATE); // 数据状态 update/delete
 		}
 		result = this.baseMapper.updateById(hydomcAssetspec);
 		return SqlHelper.retBool(result);
 	}
 
 	@Override
+	@Transactional
+	public boolean deleteHydomcAssetspec(String wdProjectId, String sbybm, Date updateTime) {
+		updateTime = updateTime == null ? DateUtil.date().toJdkDate() : updateTime;
+		LambdaUpdateWrapper<HydomcAssetspec> updateWrapper = new HydomcAssetspec.BuilderUpdateWrapper().sbybmEq(sbybm).siteidEq(wdProjectId).builder();
+        updateWrapper.set(HydomcAssetspec::getDatastatus, SwitchConstant.IS_DELETE); 	// 数据状态 update/delete 当数据状态为delete时,设备状态需改为报废
+        updateWrapper.set(HydomcAssetspec::getChangedate, updateTime); 				// 数据更新时间 增量字段
+        Integer result = this.baseMapper.update(null, updateWrapper);
+	    return SqlHelper.retBool(result);
+	        
+	}
+	
+	@Override
 	public HydomcAssetspec buildHydomcAssetspec(JSONObject infos, WdfacilityRelPersagy wdfacilityRelPersagy, String assetspecid,
 			String wdProjectid, String classstructureid, Date changedate) {
 		HydomcAssetspec hydomcAssetspec = HydomcAssetspec.builder().siteid(wdProjectid) // 广场id 关联设备信息 Pj4403070003
 				// 设备编码 关联设备信息 wD_gongchengxinxihua
 				.sbybm(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_CODE)))
 				// 设备分类id 1507
-				.classstructureid(classstructureid)
+				.classstructureid(StringTool.object2String(infos.get(InfosKeyConstant.EQUIPMENT_SORT)))
 				// 设备分类名称 电梯系统/扶梯/人行步道 (取自中间表wdfacility_rel_persagy)
 				.classqc(wdfacilityRelPersagy.getClassqc())
 				// 设备参数id 1106 (取自中间表wdfacility_rel_persagy)
@@ -99,12 +118,6 @@ public class HydomcAssetspecServiceImpl extends SuperServiceImpl<HydomcAssetspec
 			// 默认字符串
 			hydomcAssetspec.setAlnvalue(StringTool.object2String(infos.get(wdfacilityRelPersagy.getCode()))); // 设备参数文本值
 		}
-		// key为wdfacility_rel_persagy的code值从debugs取 有值update 无值(空、空字符串)就是delete
-		if (StringUtils.isBlank(StringTool.object2String(infos.get(wdfacilityRelPersagy.getCode())))) {
-			hydomcAssetspec.setDatastatus(SwitchConstant.IS_DELETE); // 数据状态 update/delete
-		} else {
-			hydomcAssetspec.setDatastatus(SwitchConstant.IS_UPDATE); // 数据状态 update/delete
-		}
 
 		// 主键ID 赋值
 		if (StringUtil.isNotBlank(assetspecid)) {

+ 3 - 1
src/main/java/com/persagy/transfer/service/impl/RwdObjectWdServiceImpl.java

@@ -31,7 +31,9 @@ public class RwdObjectWdServiceImpl implements IRwdObjectWdService {
 	
 	@Override
 	public List<RwdObjectWd> listByProjectId(String projectId, String classCode, String objType) {
-		List<RwdObjectWd> list = rwdObjectWdMapper.listByProjectId(classCode, objType, projectId);
+		// 项目ID 字母小写
+		projectId = projectId.toLowerCase();
+		List<RwdObjectWd> list = rwdObjectWdMapper.listByProjectId(projectId, classCode, objType);
 		return CollectionUtil.isEmpty(list) ? Lists.newArrayList() : list;
 	}
 

+ 6 - 6
src/main/java/com/persagy/transfer/task/SycnEquDataToWdTask.java

@@ -1,20 +1,20 @@
 package com.persagy.transfer.task;
 
-import com.persagy.transfer.service.IPersagyDbService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import com.persagy.transfer.service.IPersagyDbService;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @description: 同步设备数据到万达数据库
  * @author: YangWanYi
  * @create: 2021-09-16 11:28
  **/
-@Component
 @Slf4j
-@PropertySource("classpath:/configuration.properties")
+@Component
 public class SycnEquDataToWdTask {
 
     private int times;
@@ -25,7 +25,7 @@ public class SycnEquDataToWdTask {
     /**
      * 数据同步逻辑
      */
-    @Scheduled(cron = "${sycnData2wdTaskCron:0 0 0 * * ?}")
+    @Scheduled(cron = "${sync.rwd-object.to-wd:0 0/1 * * * ?}")
     public void execute() {
         log.debug("定时任务:开始同步设备信息到万达数据库,类限定名:com.persagy.transfer.task.SycnEquDataToWdTask,thread id:{},FixedPrintTask execute times:{}", Thread.currentThread().getId(), ++times);
         try {

+ 3 - 0
src/main/resources/application.yml

@@ -0,0 +1,3 @@
+sync:
+  rwd-object:
+    to-wd: ${WD_SYCN_RWD_OBJECT_CRON:0 0 0/1 * * ?}

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

@@ -11,9 +11,9 @@ spring:
       strict: true   #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master_1:
-          url: jdbc:mysql://192.168.64.15:9934/dmp_rwd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://192.168.18.105:3306/dmp_rwd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://127.0.0.1:3306/dmp_rwd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          url: jdbc:mysql://192.168.64.15:9934/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+#          url: jdbc:mysql://192.168.18.105:3306/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+#          url: jdbc:mysql://127.0.0.1:3306/dmp_rwd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: root
           password: D56dLvRbSy5bMn
 #          password: 123456
@@ -36,9 +36,9 @@ spring:
             time-between-eviction-runs-millis: 50000
             max-pool-prepared-statement-per-connection-size: 20  
         master_2:
-          url: jdbc:mysql://192.168.64.15:9934/ibms-switch?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://192.168.18.105:3306/fakewd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
-#          url: jdbc:mysql://127.0.0.1:3306/fakewd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+          url: jdbc:mysql://192.168.64.15:9934/ibms-switch?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+#          url: jdbc:mysql://192.168.18.105:3306/fakewd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
+#          url: jdbc:mysql://127.0.0.1:3306/fakewd?serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: root
           password: D56dLvRbSy5bMn
 #          password: 123456

+ 0 - 1
src/main/resources/configuration.properties

@@ -1 +0,0 @@
-sycnData2wdTaskCron=0 */3 * * * ?