瀏覽代碼

修改物理世界对象实体类类名

zhangqiankun 3 年之前
父節點
當前提交
f04b8e8dea

+ 0 - 10
pom.xml

@@ -21,11 +21,6 @@
 		<mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
 		<dynamic-datasource-spring-boot-starter.version>3.4.1</dynamic-datasource-spring-boot-starter.version>
 		
-		<!-- 三方jar依赖 -->
-		<dmp-mybatis.version>1.0.0</dmp-mybatis.version>
-		<mybatis-plus.version>3.3.1</mybatis-plus.version>
-		<guava.version>20.0</guava.version>
-
 		<!-- maven依赖 -->
 		<maven.compiler.version>3.8.0</maven.compiler.version>
 		<maven.surefire.version>2.22.1</maven.surefire.version>
@@ -76,11 +71,6 @@
 			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
 			<version>${dynamic-datasource-spring-boot-starter.version}</version>
 		</dependency>
-		<!-- <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>dmp-mybatis</artifactId>
-            <version>${dmp-mybatis.version}</version>
-        </dependency> -->
 
 		<!-- web -->
 		<dependency>

+ 0 - 61
src/main/java/com/persagy/transfer/controller/RwdObjecWdController.java

@@ -1,61 +0,0 @@
-package com.persagy.transfer.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.persagy.common.utils.ResponseResult;
-import com.persagy.common.utils.ResponseUtil;
-import com.persagy.transfer.pojo.dto.RwdObjecWd;
-import com.persagy.transfer.service.IRwdObjecWdService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 对象实例表
- * 
- * @version 1.0.0
- * @company persagy 
- * @author zhangqiankun
- * @date 2021-09-16 13:16:57
- */
-
-@Api(tags = "对象实例表")
-@RestController
-@RequestMapping(value = "/rwdObjecWd", method = RequestMethod.POST)
-public class RwdObjecWdController {
-	
-    @Autowired
-    private IRwdObjecWdService rwdObjecWdService;
-    
-    /**
-     * 列表查询
-     */
-    @ApiOperation(value = "列表查询")
-    @RequestMapping(value = "queryRwdObjecwdPj1101050001List")
-    public ResponseResult queryRwdObjecwdPj1101050001List(@RequestBody RwdObjecWd rwdObjecWd) {
-        return ResponseUtil.successResult();
-    }
-
-    /**
-     * 新增
-     */
-	@ApiOperation(value = "保存")
-	@RequestMapping(value = "createRwdObjecwdPj1101050001")
-    public ResponseResult createRwdObjecwdPj1101050001(@RequestBody RwdObjecWd rwdObjecWd) {
-        return ResponseUtil.successResult("保存成功");
-    }
-    
-    /**
-     * 更新
-     */
-	@ApiOperation(value = "更新")
-	@RequestMapping(value = "updateRwdObjecwdPj1101050001")
-    public ResponseResult updateRwdObjecwdPj1101050001(@RequestBody RwdObjecWd rwdObjecWd) {
-        return ResponseUtil.successResult("更新成功");
-    }
-
-}

+ 48 - 0
src/main/java/com/persagy/transfer/controller/RwdObjectWdController.java

@@ -0,0 +1,48 @@
+package com.persagy.transfer.controller;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.common.collect.Lists;
+import com.persagy.common.utils.ResponseResult;
+import com.persagy.common.utils.ResponseUtil;
+import com.persagy.transfer.pojo.dto.RwdObjectWd;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-17 10:39:43
+ */
+
+@Api(tags = "对象实例表")
+@RestController
+@RequestMapping(value = "/rwdObjectWd", method = RequestMethod.POST)
+public class RwdObjectWdController {
+	
+    //@Autowired
+    //private IRwdObjectWdService rwdObjectWdService;
+    
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询")
+    @RequestMapping(value = "queryRwdObjectWdList")
+    public ResponseResult queryRwdObjectWdList(@RequestBody RwdObjectWd rwdObjectWd) {
+    	/*LambdaQueryWrapper<RwdObjectWd> queryWrapper = new RwdObjectWd.BuilderQueryWrapper()
+    			.projectIdEq("Pj1101050001").builder();
+    	List<RwdObjectWd> list = this.rwdObjectWdService.list(queryWrapper);
+    	if (CollectionUtil.isEmpty(list)) {
+			return ResponseUtil.successResult(Lists.newArrayList(), 0L);
+		}*/
+        return ResponseUtil.successResult(Lists.newArrayList(), 0L);
+    }
+
+}

+ 2 - 2
src/main/java/com/persagy/transfer/handle/CommonHandler.java

@@ -38,7 +38,7 @@ public class CommonHandler {
 	 * @author zhangqiankun
 	 * @date 2021年9月16日 下午11:04:07
 	 */
-	public void createWDProjectCache() {
+	public void createWDClassCache() {
 		// 先清除缓存
 		LocalCache.BDTP_CLASS_CODE_BY_WD.clear();
 		LocalCache.CLASS_CODE_MAPPING_BY_WD.clear();
@@ -61,7 +61,7 @@ public class CommonHandler {
 	 * @author zhangqiankun
 	 * @date 2021年9月16日 下午11:04:07
 	 */
-	public void createWDClassCache() {
+	public void createWDProjectCache() {
 		// 先清除缓存
 		LocalCache.PROJECT_MAPPING_BY_WD.clear();
 		

+ 10 - 8
src/main/java/com/persagy/transfer/mapper/RwdObjecWdMapper.java

@@ -1,21 +1,22 @@
 package com.persagy.transfer.mapper;
 
-import com.persagy.transfer.pojo.dto.RwdObjecWd;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.persagy.transfer.pojo.dto.RwdObjectWd;
 
 /**
  * 对象实例表
- *
- * @author zhangqiankun
+ * 
  * @version 1.0.0
- * @company persagy
- * @date 2021-09-16 13:16:57
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-17 10:39:43
  */
 @Mapper
-public interface RwdObjecWdMapper {
+public interface RwdObjectWdMapper {
 
     /**
      * @param classCode 对象类型编码
@@ -26,5 +27,6 @@ public interface RwdObjecWdMapper {
      * @describe
      * @date 2021/9/16 14:06
      */
-    List<RwdObjecWd> listByProjectId(@Param("classCode") String classCode, @Param("objType") String objType, @Param("projectId") String projectId);
+    List<RwdObjectWd> listByProjectId(@Param("classCode") String classCode, @Param("objType") String objType, @Param("projectId") String projectId);
+	
 }

+ 0 - 175
src/main/java/com/persagy/transfer/pojo/dto/RwdObjecWd.java

@@ -1,175 +0,0 @@
-package com.persagy.transfer.pojo.dto;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.util.Date;
-
-/**
- * 对象实例表
- *
- * @author zhangqiankun
- * @version 1.0.0
- * @company persagy
- * @date 2021-09-16 13:16:57
- */
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode(callSuper = false)
-public class RwdObjecWd {
-
-    private String id; // 主键ID
-
-    private String name; // 对象名称
-
-    private String localId; // 对象本地编码
-
-    private String localName; // 对象本地名称
-
-    private String groupCode; //
-
-    private String projectId; // 项目id
-
-    private String objType; // 对象分类
-
-    private String classCode; // 对象类型编码
-
-    private Integer grouping; // 1单个对象,2对象组
-
-    private Integer valid; // 对象状态:1有效,0无效
-
-    //	private JSONObject infos; // 边类型编码
-    private String infos; // 边类型编码
-
-    //	private JSONObject virtualInfoCodes; // 虚点清单
-    private String virtualInfoCodes; // 虚点清单
-
-    private Date createTime; // 创建时间
-
-    private Date updateTime; // 最后更新时间
-
-    private String createUser; // 创建用户
-
-    private String updateUser; // 最后更新用户
-
-    private String createApp; // 创建应用
-
-    private String updateApp; // 最后更新应用
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder {
-
-        private RwdObjecWd rwdObjecWd = new RwdObjecWd();
-
-        public Builder id(String id) {
-            rwdObjecWd.setId(id);
-            return this;
-        }
-
-        public Builder name(String name) {
-            rwdObjecWd.setName(name);
-            return this;
-        }
-
-        public Builder localId(String localId) {
-            rwdObjecWd.setLocalId(localId);
-            return this;
-        }
-
-        public Builder localName(String localName) {
-            rwdObjecWd.setLocalName(localName);
-            return this;
-        }
-
-        public Builder groupCode(String groupCode) {
-            rwdObjecWd.setGroupCode(groupCode);
-            return this;
-        }
-
-        public Builder projectId(String projectId) {
-            rwdObjecWd.setProjectId(projectId);
-            return this;
-        }
-
-        public Builder objType(String objType) {
-            rwdObjecWd.setObjType(objType);
-            return this;
-        }
-
-        public Builder classCode(String classCode) {
-            rwdObjecWd.setClassCode(classCode);
-            return this;
-        }
-
-        public Builder grouping(Integer grouping) {
-            rwdObjecWd.setGrouping(grouping);
-            return this;
-        }
-
-        public Builder valid(Integer valid) {
-            rwdObjecWd.setValid(valid);
-            return this;
-        }
-
-//		public Builder infos(JSONObject infos) {
-//			rwdObjecWd.setInfos(infos);
-//			return this;
-//		}
-
-        public Builder infos(String infos) {
-            rwdObjecWd.setInfos(infos);
-            return this;
-        }
-
-
-//		public Builder virtualInfoCodes(JSONObject virtualInfoCodes) {
-//			rwdObjecWd.setVirtualInfoCodes(virtualInfoCodes);
-//			return this;
-
-        public Builder virtualInfoCodes(String virtualInfoCodes) {
-            rwdObjecWd.setVirtualInfoCodes(virtualInfoCodes);
-            return this;
-        }
-
-        public Builder createTime(Date createTime) {
-            rwdObjecWd.setCreateTime(createTime);
-            return this;
-        }
-
-        public Builder updateTime(Date updateTime) {
-            rwdObjecWd.setUpdateTime(updateTime);
-            return this;
-        }
-
-        public Builder createUser(String createUser) {
-            rwdObjecWd.setCreateUser(createUser);
-            return this;
-        }
-
-        public Builder updateUser(String updateUser) {
-            rwdObjecWd.setUpdateUser(updateUser);
-            return this;
-        }
-
-        public Builder createApp(String createApp) {
-            rwdObjecWd.setCreateApp(createApp);
-            return this;
-        }
-
-        public Builder updateApp(String updateApp) {
-            rwdObjecWd.setUpdateApp(updateApp);
-            return this;
-        }
-
-        public RwdObjecWd build() {
-            return rwdObjecWd;
-        }
-
-    }
-}

+ 420 - 0
src/main/java/com/persagy/transfer/pojo/dto/RwdObjectWd.java

@@ -0,0 +1,420 @@
+package com.persagy.transfer.pojo.dto;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.persagy.common.utils.StringUtil;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @date 2021-09-17 10:39:43
+ */
+@Getter
+@Setter
+@ToString
+public class RwdObjectWd {
+
+	private String id;	// 主键ID
+	
+	private String name; // 对象名称
+
+	private String localId; // 对象本地编码
+
+	private String localName; // 对象本地名称
+
+	private String groupCode; //
+
+	private String projectId; // 项目id
+
+	private String objType; // 对象分类
+
+	private String classCode; // 对象类型编码
+
+	private Integer grouping; // 1单个对象,2对象组
+
+	private Integer valid; // 对象状态:1有效,0无效
+
+	private String infos; // 边类型编码
+
+	private Date createTime; // 创建时间
+
+	private Date updateTime; // 最后更新时间
+
+	private String createUser; // 创建用户
+
+	private String updateUser; // 最后更新用户
+
+	private String createApp; // 创建应用
+
+	private String updateApp; // 最后更新应用
+	
+	@TableField(exist = false)
+	private String tableSuffix; // 动态表名后缀
+
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	public static class BuilderQueryWrapper {
+
+		private LambdaQueryWrapper<RwdObjectWd> queryWrapper = new LambdaQueryWrapper<RwdObjectWd>();
+
+		public BuilderQueryWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				queryWrapper.eq(RwdObjectWd::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				queryWrapper.eq(RwdObjectWd::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper localIdEq(String localId) {
+			if (StringUtil.isNotBlank(localId)) {
+				queryWrapper.eq(RwdObjectWd::getLocalId, localId);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper localNameEq(String localName) {
+			if (StringUtil.isNotBlank(localName)) {
+				queryWrapper.eq(RwdObjectWd::getLocalName, localName);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				queryWrapper.eq(RwdObjectWd::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				queryWrapper.eq(RwdObjectWd::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper objTypeEq(String objType) {
+			if (StringUtil.isNotBlank(objType)) {
+				queryWrapper.eq(RwdObjectWd::getObjType, objType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				queryWrapper.eq(RwdObjectWd::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper groupingEq(Integer grouping) {
+			if (null != grouping) {
+				queryWrapper.eq(RwdObjectWd::getGrouping, grouping);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper validEq(Integer valid) {
+			if (null != valid) {
+				queryWrapper.eq(RwdObjectWd::getValid, valid);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper infosEq(String infos) {
+			if (null != infos) {
+				queryWrapper.eq(RwdObjectWd::getInfos, infos);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper createTimeEq(Date createTime) {
+			if (null != createTime) {
+				queryWrapper.eq(RwdObjectWd::getCreateTime, createTime);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper updateTimeEq(Date updateTime) {
+			if (null != updateTime) {
+				queryWrapper.eq(RwdObjectWd::getUpdateTime, updateTime);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper createUserEq(String createUser) {
+			if (StringUtil.isNotBlank(createUser)) {
+				queryWrapper.eq(RwdObjectWd::getCreateUser, createUser);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper updateUserEq(String updateUser) {
+			if (StringUtil.isNotBlank(updateUser)) {
+				queryWrapper.eq(RwdObjectWd::getUpdateUser, updateUser);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper createAppEq(String createApp) {
+			if (StringUtil.isNotBlank(createApp)) {
+				queryWrapper.eq(RwdObjectWd::getCreateApp, createApp);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper updateAppEq(String updateApp) {
+			if (StringUtil.isNotBlank(updateApp)) {
+				queryWrapper.eq(RwdObjectWd::getUpdateApp, updateApp);
+			}
+			return this;
+		}
+
+		public LambdaQueryWrapper<RwdObjectWd> builder() {
+			return queryWrapper;
+		}
+
+	}
+
+	public static class BuilderUpdateWrapper {
+
+		private LambdaUpdateWrapper<RwdObjectWd> updateWrapper = new LambdaUpdateWrapper<RwdObjectWd>();
+
+		public BuilderUpdateWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				updateWrapper.eq(RwdObjectWd::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				updateWrapper.eq(RwdObjectWd::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper localIdEq(String localId) {
+			if (StringUtil.isNotBlank(localId)) {
+				updateWrapper.eq(RwdObjectWd::getLocalId, localId);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper localNameEq(String localName) {
+			if (StringUtil.isNotBlank(localName)) {
+				updateWrapper.eq(RwdObjectWd::getLocalName, localName);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				updateWrapper.eq(RwdObjectWd::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				updateWrapper.eq(RwdObjectWd::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper objTypeEq(String objType) {
+			if (StringUtil.isNotBlank(objType)) {
+				updateWrapper.eq(RwdObjectWd::getObjType, objType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				updateWrapper.eq(RwdObjectWd::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper groupingEq(Integer grouping) {
+			if (null != grouping) {
+				updateWrapper.eq(RwdObjectWd::getGrouping, grouping);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper validEq(Integer valid) {
+			if (null != valid) {
+				updateWrapper.eq(RwdObjectWd::getValid, valid);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper infosEq(String infos) {
+			if (null != infos) {
+				updateWrapper.eq(RwdObjectWd::getInfos, infos);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper createTimeEq(Date createTime) {
+			if (null != createTime) {
+				updateWrapper.eq(RwdObjectWd::getCreateTime, createTime);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper updateTimeEq(Date updateTime) {
+			if (null != updateTime) {
+				updateWrapper.eq(RwdObjectWd::getUpdateTime, updateTime);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper createUserEq(String createUser) {
+			if (StringUtil.isNotBlank(createUser)) {
+				updateWrapper.eq(RwdObjectWd::getCreateUser, createUser);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper updateUserEq(String updateUser) {
+			if (StringUtil.isNotBlank(updateUser)) {
+				updateWrapper.eq(RwdObjectWd::getUpdateUser, updateUser);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper createAppEq(String createApp) {
+			if (StringUtil.isNotBlank(createApp)) {
+				updateWrapper.eq(RwdObjectWd::getCreateApp, createApp);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper updateAppEq(String updateApp) {
+			if (StringUtil.isNotBlank(updateApp)) {
+				updateWrapper.eq(RwdObjectWd::getUpdateApp, updateApp);
+			}
+			return this;
+		}
+
+		public LambdaUpdateWrapper<RwdObjectWd> builder() {
+			return updateWrapper;
+		}
+
+	}
+
+	public static class Builder {
+
+		private RwdObjectWd rwdObjectWd = new RwdObjectWd();
+
+		public Builder id(String id) {
+			rwdObjectWd.setId(id);
+			return this;
+		}
+
+		public Builder name(String name) {
+			rwdObjectWd.setName(name);
+			return this;
+		}
+
+		public Builder localId(String localId) {
+			rwdObjectWd.setLocalId(localId);
+			return this;
+		}
+
+		public Builder localName(String localName) {
+			rwdObjectWd.setLocalName(localName);
+			return this;
+		}
+
+		public Builder groupCode(String groupCode) {
+			rwdObjectWd.setGroupCode(groupCode);
+			return this;
+		}
+
+		public Builder projectId(String projectId) {
+			rwdObjectWd.setProjectId(projectId);
+			return this;
+		}
+
+		public Builder objType(String objType) {
+			rwdObjectWd.setObjType(objType);
+			return this;
+		}
+
+		public Builder classCode(String classCode) {
+			rwdObjectWd.setClassCode(classCode);
+			return this;
+		}
+
+		public Builder grouping(Integer grouping) {
+			rwdObjectWd.setGrouping(grouping);
+			return this;
+		}
+
+		public Builder valid(Integer valid) {
+			rwdObjectWd.setValid(valid);
+			return this;
+		}
+
+		public Builder infos(String infos) {
+			rwdObjectWd.setInfos(infos);
+			return this;
+		}
+
+		public Builder createTime(Date createTime) {
+			rwdObjectWd.setCreateTime(createTime);
+			return this;
+		}
+
+		public Builder updateTime(Date updateTime) {
+			rwdObjectWd.setUpdateTime(updateTime);
+			return this;
+		}
+
+		public Builder createUser(String createUser) {
+			rwdObjectWd.setCreateUser(createUser);
+			return this;
+		}
+
+		public Builder updateUser(String updateUser) {
+			rwdObjectWd.setUpdateUser(updateUser);
+			return this;
+		}
+
+		public Builder createApp(String createApp) {
+			rwdObjectWd.setCreateApp(createApp);
+			return this;
+		}
+
+		public Builder updateApp(String updateApp) {
+			rwdObjectWd.setUpdateApp(updateApp);
+			return this;
+		}
+
+		public RwdObjectWd build() {
+			return rwdObjectWd;
+		}
+
+	}
+}

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

@@ -6,9 +6,9 @@ package com.persagy.transfer.service;
  * @version 1.0.0
  * @company persagy 
  * @author zhangqiankun
- * @date 2021-09-16 13:16:57
+ * @date 2021-09-17 10:39:43
  */
-public interface IRwdObjecWdService {
+public interface IRwdObjectWdService {
 
 }
 

+ 3 - 4
src/main/java/com/persagy/transfer/service/impl/DemoService.java

@@ -1,12 +1,12 @@
 package com.persagy.transfer.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.persagy.transfer.constant.SwitchConstant;
 import com.persagy.transfer.mapper.MasterOneMapper;
 import com.persagy.transfer.service.IDemoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 /**
  * 多数据源测试
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @DS(value = SwitchConstant.DS_MASTER_1)
-@Slf4j
 public class DemoService implements IDemoService {
 
     @Autowired

+ 22 - 16
src/main/java/com/persagy/transfer/service/impl/PersagyDbServiceImpl.java

@@ -1,24 +1,30 @@
 package com.persagy.transfer.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.persagy.common.utils.StringUtil;
 import com.persagy.transfer.constant.SwitchConstant;
-import com.persagy.transfer.mapper.RwdObjecWdMapper;
+import com.persagy.transfer.mapper.RwdObjectWdMapper;
 import com.persagy.transfer.mapper.WdclassRelPersagyMapper;
 import com.persagy.transfer.mapper.WdfacilityRelPersagyMapper;
 import com.persagy.transfer.mapper.WdprojRelPersagyprojMapper;
-import com.persagy.transfer.pojo.dto.*;
+import com.persagy.transfer.pojo.dto.HydomcAsset;
+import com.persagy.transfer.pojo.dto.RwdObjectWd;
+import com.persagy.transfer.pojo.dto.WdclassRelPersagy;
+import com.persagy.transfer.pojo.dto.WdfacilityRelPersagy;
+import com.persagy.transfer.pojo.dto.WdprojRelPersagyproj;
 import com.persagy.transfer.service.PersagyDbService;
 import com.persagy.transfer.service.WdDbService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @description: 博锐尚格数据源业务处理
@@ -40,7 +46,7 @@ public class PersagyDbServiceImpl implements PersagyDbService {
     private WdprojRelPersagyprojMapper wdprojRelPersagyprojMapper;
 
     @Autowired
-    private RwdObjecWdMapper rwdObjecWdMapper;
+    private RwdObjectWdMapper rwdObjectWdMapper;
 
     @Autowired
     private WdfacilityRelPersagyMapper wdfacilityRelPersagyMapper;
@@ -70,7 +76,7 @@ public class PersagyDbServiceImpl implements PersagyDbService {
         List<WdprojRelPersagyproj> projList = this.wdprojRelPersagyprojMapper.selectList(queryProjRelWrapper);
 
         // 3.遍历获取rwd_object_wd_?的数据
-        List<RwdObjecWd> rwdObjecWdList;
+        List<RwdObjectWd> rwdObjecWdList;
         final String OBJ_TYPE = "equipment"; // 对象分类(设备类)
         List<String> classCodeList = new ArrayList<>();
         List<String> persagyProjectIdList = new ArrayList<>();
@@ -84,7 +90,7 @@ public class PersagyDbServiceImpl implements PersagyDbService {
                 classCodeList.add(wdclassRelPersagy.getClassCode());
                 persagyProjectIdList.add(wdprojRelPersagyproj.getPersagyProjectid());
                 // 根据外循环对象的classCode、objType='equipment',内循环对象的persagyProjectId,查询wd_object_wd_?表
-                rwdObjecWdList = this.rwdObjecWdMapper.listByProjectId(wdclassRelPersagy.getClassCode(), OBJ_TYPE, StringUtil.lowerFirst(wdprojRelPersagyproj.getPersagyProjectid()));
+                rwdObjecWdList = this.rwdObjectWdMapper.listByProjectId(wdclassRelPersagy.getClassCode(), OBJ_TYPE, StringUtil.lowerFirst(wdprojRelPersagyproj.getPersagyProjectid()));
                 if (rwdObjecWdList != null && !rwdObjecWdList.isEmpty()) {
                     this.handleFieldMapping(rwdObjecWdList, wdprojRelPersagyproj, wdclassRelPersagy);
                 }
@@ -99,20 +105,20 @@ public class PersagyDbServiceImpl implements PersagyDbService {
      * @describe 同步万达设备数据的新增与更新
      * @date 2021/9/16 14:19
      */
-    private void handleFieldMapping(List<RwdObjecWd> rwdObjecWdList, WdprojRelPersagyproj wdprojRelPersagyproj, WdclassRelPersagy wdclassRelPersagy) {
+    private void handleFieldMapping(List<RwdObjectWd> rwdObjecWdList, WdprojRelPersagyproj wdprojRelPersagyproj, WdclassRelPersagy wdclassRelPersagy) {
         JSONObject infosObj;
         HydomcAsset hydomcAsset = null; // 万达数据库的设备信息表实体
         List<WdfacilityRelPersagy> wdfacilityRelList = null;
-        for (RwdObjecWd rwdObjecWd : rwdObjecWdList) {
-            infosObj = JSONObject.parseObject(rwdObjecWd.getInfos());
+        for (RwdObjectWd rwdObjectWd : rwdObjecWdList) {
+            infosObj = JSONObject.parseObject(rwdObjectWd.getInfos());
             if (infosObj != null && !infosObj.isEmpty()) {
                 /*万达设备信息对象数据同步*/
-                this.wdDbService.sycnHydomcAsset(infosObj, wdprojRelPersagyproj.getWdProjectid(), hydomcAsset, rwdObjecWd.getValid(), rwdObjecWd.getUpdateTime(), wdclassRelPersagy.getClassstructureid());
+                this.wdDbService.sycnHydomcAsset(infosObj, wdprojRelPersagyproj.getWdProjectid(), hydomcAsset, rwdObjectWd.getValid(), rwdObjectWd.getUpdateTime(), wdclassRelPersagy.getClassstructureid());
                 /*万达设备参数信息数据同步*/
                 if (wdfacilityRelList == null) { // 循环万达项目ID与博锐尚格项目ID映射表数据时,wdfacility_rel_persagy只查询一次
                     wdfacilityRelList = this.listWdfacilityRelPersagy(wdclassRelPersagy.getWdClassCode(), wdclassRelPersagy.getClassstructureid());
                 }
-                this.wdDbService.sycnHydomcAssetspec(wdfacilityRelList, wdprojRelPersagyproj.getWdProjectid(), infosObj, rwdObjecWd.getUpdateTime());
+                this.wdDbService.sycnHydomcAssetspec(wdfacilityRelList, wdprojRelPersagyproj.getWdProjectid(), infosObj, rwdObjectWd.getUpdateTime());
             }
         }
     }

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

@@ -4,7 +4,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.persagy.transfer.constant.SwitchConstant;
-import com.persagy.transfer.service.IRwdObjecWdService;
+import com.persagy.transfer.service.IRwdObjectWdService;
 
 /**
  * 对象实例表
@@ -12,10 +12,10 @@ import com.persagy.transfer.service.IRwdObjecWdService;
  * @version 1.0.0
  * @company persagy 
  * @author zhangqiankun
- * @date 2021-09-16 13:16:57
+ * @date 2021-09-17 10:39:43
  */
 @Service
 @DS(value = SwitchConstant.DS_MASTER_1)
-public class IRwdObjecWdServiceImpl  implements IRwdObjecWdService {
+public class RwdObjectWdServiceImpl implements IRwdObjectWdService {
 
 }

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

@@ -25,7 +25,7 @@ public class SycnEquDataToWdTask {
     /**
      * 数据同步逻辑
      */
-    @Scheduled(cron = "${sycnData2wdTaskCron:*/15 * * * * ?}")
+    @Scheduled(cron = "${sycnData2wdTaskCron:0 0 0 * * ?}")
     public void execute() {
         log.debug("定时任务:开始同步设备信息到万达数据库,类限定名:com.persagy.transfer.task.SycnEquDataToWdTask,thread id:{},FixedPrintTask execute times:{}", Thread.currentThread().getId(), ++times);
         try {

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

@@ -11,12 +11,12 @@ 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.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://127.0.0.1:3306/dmp_rwd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: root
-#          password: D56dLvRbSy5bMn
-          password: 123456
+          password: D56dLvRbSy5bMn
+#          password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: 
@@ -36,12 +36,12 @@ 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.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://127.0.0.1:3306/fakewd?serverTimezone=GMT&useUnicode=true&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
           username: root
-#          password: D56dLvRbSy5bMn
-          password: 123456
+          password: D56dLvRbSy5bMn
+#          password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid: 

+ 0 - 38
src/main/resources/mapper/RwdObjecWdMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.persagy.transfer.mapper.RwdObjecWdMapper">
-
-    <resultMap id="BaseResultMap" type="com.persagy.transfer.pojo.dto.RwdObjecWd">
-        <result column="id" property="id" jdbcType="VARCHAR"/>
-        <result column="name" property="name" jdbcType="VARCHAR"/>
-        <result column="local_id" property="localId" jdbcType="VARCHAR"/>
-        <result column="local_name" property="localName" jdbcType="VARCHAR"/>
-        <result column="group_code" property="groupCode" jdbcType="VARCHAR"/>
-        <result column="project_id" property="projectId" jdbcType="VARCHAR"/>
-        <result column="obj_type" property="objType" jdbcType="VARCHAR"/>
-        <result column="class_code" property="classCode" jdbcType="VARCHAR"/>
-        <result column="grouping" property="grouping" jdbcType="INTEGER"/>
-        <result column="valid" property="valid" jdbcType="INTEGER"/>
-        <result column="infos" property="infos"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-        <result column="virtual_info_codes" property="virtualInfoCodes"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
-        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
-        <result column="create_app" property="createApp" jdbcType="VARCHAR"/>
-        <result column="update_app" property="updateApp" jdbcType="VARCHAR"/>
-    </resultMap>
-    <select id="listByProjectId" resultType="com.persagy.transfer.pojo.dto.RwdObjecWd">
-        select * from rwd_object_wd_${projectId} where 1=1
-        <if test="objType != null and objType.trim() != ''">
-            and obj_type = #{objType}
-        </if>
-        <if test="classCode != null and classCode.trim() != ''">
-            and class_code = #{classCode}
-        </if>
-    </select>
-
-</mapper>

+ 38 - 0
src/main/resources/mapper/RwdObjectWdMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.persagy.transfer.mapper.RwdObjectWdMapper">
+    
+	<resultMap id="BaseResultMap" type="com.persagy.transfer.pojo.dto.RwdObjectWd">
+		<result column="id" property="id" jdbcType="VARCHAR" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="local_id" property="localId" jdbcType="VARCHAR" />
+		<result column="local_name" property="localName" jdbcType="VARCHAR" />
+		<result column="group_code" property="groupCode" jdbcType="VARCHAR" />
+		<result column="project_id" property="projectId" jdbcType="VARCHAR" />
+		<result column="obj_type" property="objType" jdbcType="VARCHAR" />
+		<result column="class_code" property="classCode" jdbcType="VARCHAR" />
+		<result column="grouping" property="grouping" jdbcType="INTEGER" />
+		<result column="valid" property="valid" jdbcType="INTEGER" />
+		<result column="infos" property="infos" 
+			typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+		<result column="create_user" property="createUser" jdbcType="VARCHAR" />
+		<result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+		<result column="create_app" property="createApp" jdbcType="VARCHAR" />
+		<result column="update_app" property="updateApp" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<select id="listByProjectId" resultType="com.persagy.transfer.pojo.dto.RwdObjectWd">
+        select * from rwd_object_wd_${projectId} 
+        <where>
+        	<if test="objType != null and objType.trim() != ''">
+	            and obj_type = #{objType}
+	        </if>
+	        <if test="classCode != null and classCode.trim() != ''">
+	            and class_code = #{classCode}
+	        </if>
+        </where>
+    </select>
+</mapper>