ソースを参照

添加物理数据对象处理类

zhangqiankun 3 年 前
コミット
2a51836dab
25 ファイル変更2077 行追加20 行削除
  1. 83 0
      src/main/java/com/persagy/transfer/controller/RwdDefFuncidController.java
  2. 83 0
      src/main/java/com/persagy/transfer/controller/RwdDefFuncidWdController.java
  3. 61 0
      src/main/java/com/persagy/transfer/controller/RwdObjecWdController.java
  4. 19 0
      src/main/java/com/persagy/transfer/mapper/RwdDefFuncidMapper.java
  5. 19 0
      src/main/java/com/persagy/transfer/mapper/RwdDefFuncidWdMapper.java
  6. 16 0
      src/main/java/com/persagy/transfer/mapper/RwdObjecWdMapper.java
  7. 11 11
      src/main/java/com/persagy/transfer/pojo/dto/HydomcAsset.java
  8. 3 3
      src/main/java/com/persagy/transfer/pojo/dto/HydomcAssetspec.java
  9. 679 0
      src/main/java/com/persagy/transfer/pojo/dto/RwdDefFuncid.java
  10. 679 0
      src/main/java/com/persagy/transfer/pojo/dto/RwdDefFuncidWd.java
  11. 165 0
      src/main/java/com/persagy/transfer/pojo/dto/RwdObjecWd.java
  12. 23 1
      src/main/java/com/persagy/transfer/pojo/dto/WdclassRelPersagy.java
  13. 17 0
      src/main/java/com/persagy/transfer/service/IRwdDefFuncidService.java
  14. 17 0
      src/main/java/com/persagy/transfer/service/IRwdDefFuncidWdService.java
  15. 14 0
      src/main/java/com/persagy/transfer/service/IRwdObjecWdService.java
  16. 21 0
      src/main/java/com/persagy/transfer/service/impl/IRwdObjecWdServiceImpl.java
  17. 24 0
      src/main/java/com/persagy/transfer/service/impl/RwdDefFuncidServiceImpl.java
  18. 24 0
      src/main/java/com/persagy/transfer/service/impl/RwdDefFuncidWdServiceImpl.java
  19. 3 0
      src/main/java/com/persagy/transfer/service/impl/WdclassRelPersagyServiceImpl.java
  20. 3 0
      src/main/java/com/persagy/transfer/service/impl/WdfacilityRelPersagyServiceImpl.java
  21. 3 0
      src/main/java/com/persagy/transfer/service/impl/WdprojRelPersagyprojServiceImpl.java
  22. 37 0
      src/main/resources/mapper/RwdDefFuncidMapper.xml
  23. 38 0
      src/main/resources/mapper/RwdDefFuncidWdMapper.xml
  24. 29 0
      src/main/resources/mapper/RwdObjecWdMapper.xml
  25. 6 5
      src/main/resources/mapper/WdclassRelPersagyMapper.xml

+ 83 - 0
src/main/java/com/persagy/transfer/controller/RwdDefFuncidController.java

@@ -0,0 +1,83 @@
+package com.persagy.transfer.controller;
+
+import java.util.List;
+
+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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Lists;
+import com.persagy.common.utils.ResponseResult;
+import com.persagy.common.utils.ResponseUtil;
+import com.persagy.transfer.pojo.dto.RwdDefFuncid;
+import com.persagy.transfer.service.IRwdDefFuncidService;
+
+import cn.hutool.core.collection.CollectionUtil;
+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 = "/rwdDefFuncid", method = RequestMethod.POST)
+public class RwdDefFuncidController {
+	
+    @Autowired
+    private IRwdDefFuncidService rwdDefFuncidService;
+    
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询")
+    @RequestMapping(value = "queryRwdDefFuncidList")
+    public ResponseResult queryRwdDefFuncidList(@RequestBody RwdDefFuncid rwdDefFuncid) {
+    	LambdaQueryWrapper<RwdDefFuncid> queryWrapper = new RwdDefFuncid.BuilderQueryWrapper().builder();
+    	List<RwdDefFuncid> list = this.rwdDefFuncidService.list(queryWrapper);
+    	if (CollectionUtil.isEmpty(list)) {
+			return ResponseUtil.successResult(Lists.newArrayList(), 0L);
+		}
+        return ResponseUtil.successResult(list, (long)list.size());
+    }
+
+    /**
+     * 新增
+     */
+	@ApiOperation(value = "保存")
+	@RequestMapping(value = "createRwdDefFuncid")
+    public ResponseResult createRwdDefFuncid(@RequestBody RwdDefFuncid rwdDefFuncid) {
+        boolean result = this.rwdDefFuncidService.save(rwdDefFuncid);
+        return result ? ResponseUtil.successResult("保存成功") : ResponseUtil.errorResult("保存失败");
+    }
+    
+    /**
+     * 更新
+     */
+	@ApiOperation(value = "更新")
+	@RequestMapping(value = "updateRwdDefFuncid")
+    public ResponseResult updateRwdDefFuncid(@RequestBody RwdDefFuncid rwdDefFuncid) {
+        boolean result = this.rwdDefFuncidService.updateById(rwdDefFuncid);
+        return result ? ResponseUtil.successResult("更新成功") : ResponseUtil.errorResult("更新失败");
+    }
+
+    /**
+     * 物理删除
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "deleteRwdDefFuncid")
+    public ResponseResult deleteRwdDefFuncid(@RequestBody RwdDefFuncid rwdDefFuncid) {
+        boolean result = this.rwdDefFuncidService.removeById(rwdDefFuncid.getId());
+        return result ? ResponseUtil.successResult("删除成功") : ResponseUtil.errorResult("删除失败");
+    }
+    
+}

+ 83 - 0
src/main/java/com/persagy/transfer/controller/RwdDefFuncidWdController.java

@@ -0,0 +1,83 @@
+package com.persagy.transfer.controller;
+
+import java.util.List;
+
+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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Lists;
+import com.persagy.common.utils.ResponseResult;
+import com.persagy.common.utils.ResponseUtil;
+import com.persagy.transfer.pojo.dto.RwdDefFuncidWd;
+import com.persagy.transfer.service.IRwdDefFuncidWdService;
+
+import cn.hutool.core.collection.CollectionUtil;
+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 = "/rwdDefFuncidWd", method = RequestMethod.POST)
+public class RwdDefFuncidWdController {
+	
+    @Autowired
+    private IRwdDefFuncidWdService rwdDefFuncidWdService;
+    
+    /**
+     * 列表查询
+     */
+    @ApiOperation(value = "列表查询")
+    @RequestMapping(value = "queryRwdDefFuncidWdList")
+    public ResponseResult queryRwdDefFuncidWdList(@RequestBody RwdDefFuncidWd rwdDefFuncidWd) {
+    	LambdaQueryWrapper<RwdDefFuncidWd> queryWrapper = new RwdDefFuncidWd.BuilderQueryWrapper().builder();
+    	List<RwdDefFuncidWd> list = this.rwdDefFuncidWdService.list(queryWrapper);
+    	if (CollectionUtil.isEmpty(list)) {
+			return ResponseUtil.successResult(Lists.newArrayList(), 0L);
+		}
+        return ResponseUtil.successResult(list, (long)list.size());
+    }
+
+    /**
+     * 新增
+     */
+	@ApiOperation(value = "保存")
+	@RequestMapping(value = "createRwdDefFuncidWd")
+    public ResponseResult createRwdDefFuncidWd(@RequestBody RwdDefFuncidWd rwdDefFuncidWd) {
+        boolean result = this.rwdDefFuncidWdService.save(rwdDefFuncidWd);
+        return result ? ResponseUtil.successResult("保存成功") : ResponseUtil.errorResult("保存失败");
+    }
+    
+    /**
+     * 更新
+     */
+	@ApiOperation(value = "更新")
+	@RequestMapping(value = "updateRwdDefFuncidWd")
+    public ResponseResult updateRwdDefFuncidWd(@RequestBody RwdDefFuncidWd rwdDefFuncidWd) {
+        boolean result = this.rwdDefFuncidWdService.updateById(rwdDefFuncidWd);
+        return result ? ResponseUtil.successResult("更新成功") : ResponseUtil.errorResult("更新失败");
+    }
+
+    /**
+     * 物理删除
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "deleteRwdDefFuncidWd")
+    public ResponseResult deleteRwdDefFuncidWd(@RequestBody RwdDefFuncidWd rwdDefFuncidWd) {
+        boolean result = this.rwdDefFuncidWdService.removeById(rwdDefFuncidWd.getId());
+        return result ? ResponseUtil.successResult("删除成功") : ResponseUtil.errorResult("删除失败");
+    }
+    
+}

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

@@ -0,0 +1,61 @@
+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("更新成功");
+    }
+
+}

+ 19 - 0
src/main/java/com/persagy/transfer/mapper/RwdDefFuncidMapper.java

@@ -0,0 +1,19 @@
+package com.persagy.transfer.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.transfer.pojo.dto.RwdDefFuncid;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Mapper
+public interface RwdDefFuncidMapper extends BaseMapper<RwdDefFuncid> {
+
+}

+ 19 - 0
src/main/java/com/persagy/transfer/mapper/RwdDefFuncidWdMapper.java

@@ -0,0 +1,19 @@
+package com.persagy.transfer.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.transfer.pojo.dto.RwdDefFuncidWd;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Mapper
+public interface RwdDefFuncidWdMapper extends BaseMapper<RwdDefFuncidWd> {
+
+}

+ 16 - 0
src/main/java/com/persagy/transfer/mapper/RwdObjecWdMapper.java

@@ -0,0 +1,16 @@
+package com.persagy.transfer.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Mapper
+public interface RwdObjecWdMapper {
+
+}

+ 11 - 11
src/main/java/com/persagy/transfer/pojo/dto/HydomcAsset.java

@@ -70,34 +70,34 @@ public class HydomcAsset extends BaseEntity<HydomcAsset> {
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String fws; // 服务商公司供方管理系统编码code
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Double purchaseprice; // 采购金额,填写人民币元
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Double zjsynx; // 折旧/使用年限,按年填写 如3年半则填写 3.5
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date scrq; // 生产日期/出厂日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date cgrq; // 采购日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date azdate; // 安装日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date installdate; // 启用日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date zbksrq; // 质保开始日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date zbjsrq; // 质保结束日期
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Integer zxzq; // 中修周期,单位为月
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Integer dxzq; // 大修周期,单位为月
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
@@ -121,7 +121,7 @@ public class HydomcAsset extends BaseEntity<HydomcAsset> {
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String datastatus; // 数据状态,update/delete 当数据状态为delete时,设备状态需改为报废
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date changedate; // 数据更新时间
 
 	public static Builder builder() {

+ 3 - 3
src/main/java/com/persagy/transfer/pojo/dto/HydomcAssetspec.java

@@ -58,10 +58,10 @@ public class HydomcAssetspec extends Model<HydomcAssetspec> {
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String measureunitid; // 设备参数单位编码
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private String csjldw; // 设备参数单位名称
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Double numvalue; // 设备参数数字值
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
@@ -70,7 +70,7 @@ public class HydomcAssetspec extends Model<HydomcAssetspec> {
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String datastatus; // 数据状态
 
-	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
 	private Date changedate; // 数据更新时间
 
 	public static Builder builder() {

+ 679 - 0
src/main/java/com/persagy/transfer/pojo/dto/RwdDefFuncid.java

@@ -0,0 +1,679 @@
+package com.persagy.transfer.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.persagy.common.model.BaseEntity;
+import com.persagy.common.utils.StringUtil;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@TableName("rwd_def_funcid")
+public class RwdDefFuncid extends BaseEntity<RwdDefFuncid> {
+	private static final long serialVersionUID = -4533424950082519894L;
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String code; // 信息点编码,同类型下唯一,标准驼峰格式
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origCode; // 信息点编码,同类型下唯一,旧版版格式,非驼峰,已弃用
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String name; // 信息点名称
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasCode; // 编码别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasName; // 别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String classCode; // 类型编码
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String type; // 平台级common,集团级group,项目级project
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String groupCode; // 集团编码
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String projectId; // 项目id
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String category; // 信息点分类:静态,脉冲,阶段,时序
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String firstTag; // 一级标签
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String secondTag; // 二级标签
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String priority; // 优先级
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String inputMode; // 输入方式
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String unit; // 单位
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String dataType; // 数据类型
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origDataType; // 原数据类型,已弃用
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer isMultiple; // 是否复数
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer isRegion; // 是否区间
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String formater; // 数据格式
+
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private Object dataSource; // 数据源取值范围/枚举值清单等,根据dataType有不同的内容
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origDataSource; // 数据源取值范围/枚举值清单等,根据dataType有不同的内容,原始定义
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String note; // 备注
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer subFlag; // 子分类标记:是否可以按此信息点进行子分类替换,同一类型下目前只支持一个子分类信息点
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer weakPoint; // 虚点
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String shareType; // 通用信息点标记,1-通用信息点,2-个性化信息点
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer orderSeq; // 逻辑排序序号
+
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	public static class BuilderQueryWrapper {
+
+		private LambdaQueryWrapper<RwdDefFuncid> queryWrapper = new LambdaQueryWrapper<RwdDefFuncid>();
+
+		public BuilderQueryWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				queryWrapper.eq(RwdDefFuncid::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper codeEq(String code) {
+			if (StringUtil.isNotBlank(code)) {
+				queryWrapper.eq(RwdDefFuncid::getCode, code);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origCodeEq(String origCode) {
+			if (StringUtil.isNotBlank(origCode)) {
+				queryWrapper.eq(RwdDefFuncid::getOrigCode, origCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				queryWrapper.eq(RwdDefFuncid::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasCodeEq(String aliasCode) {
+			if (StringUtil.isNotBlank(aliasCode)) {
+				queryWrapper.eq(RwdDefFuncid::getAliasCode, aliasCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasNameEq(String aliasName) {
+			if (StringUtil.isNotBlank(aliasName)) {
+				queryWrapper.eq(RwdDefFuncid::getAliasName, aliasName);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				queryWrapper.eq(RwdDefFuncid::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper typeEq(String type) {
+			if (StringUtil.isNotBlank(type)) {
+				queryWrapper.eq(RwdDefFuncid::getType, type);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				queryWrapper.eq(RwdDefFuncid::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				queryWrapper.eq(RwdDefFuncid::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper categoryEq(String category) {
+			if (StringUtil.isNotBlank(category)) {
+				queryWrapper.eq(RwdDefFuncid::getCategory, category);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper firstTagEq(String firstTag) {
+			if (StringUtil.isNotBlank(firstTag)) {
+				queryWrapper.eq(RwdDefFuncid::getFirstTag, firstTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper secondTagEq(String secondTag) {
+			if (StringUtil.isNotBlank(secondTag)) {
+				queryWrapper.eq(RwdDefFuncid::getSecondTag, secondTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper priorityEq(String priority) {
+			if (StringUtil.isNotBlank(priority)) {
+				queryWrapper.eq(RwdDefFuncid::getPriority, priority);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper inputModeEq(String inputMode) {
+			if (StringUtil.isNotBlank(inputMode)) {
+				queryWrapper.eq(RwdDefFuncid::getInputMode, inputMode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper unitEq(String unit) {
+			if (StringUtil.isNotBlank(unit)) {
+				queryWrapper.eq(RwdDefFuncid::getUnit, unit);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper dataTypeEq(String dataType) {
+			if (StringUtil.isNotBlank(dataType)) {
+				queryWrapper.eq(RwdDefFuncid::getDataType, dataType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origDataTypeEq(String origDataType) {
+			if (StringUtil.isNotBlank(origDataType)) {
+				queryWrapper.eq(RwdDefFuncid::getOrigDataType, origDataType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper isMultipleEq(Integer isMultiple) {
+			if (null != isMultiple) {
+				queryWrapper.eq(RwdDefFuncid::getIsMultiple, isMultiple);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper isRegionEq(Integer isRegion) {
+			if (null != isRegion) {
+				queryWrapper.eq(RwdDefFuncid::getIsRegion, isRegion);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper formaterEq(String formater) {
+			if (StringUtil.isNotBlank(formater)) {
+				queryWrapper.eq(RwdDefFuncid::getFormater, formater);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper dataSourceEq(Object dataSource) {
+			if (null != dataSource) {
+				queryWrapper.eq(RwdDefFuncid::getDataSource, dataSource);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origDataSourceEq(String origDataSource) {
+			if (StringUtil.isNotBlank(origDataSource)) {
+				queryWrapper.eq(RwdDefFuncid::getOrigDataSource, origDataSource);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper noteEq(String note) {
+			if (StringUtil.isNotBlank(note)) {
+				queryWrapper.eq(RwdDefFuncid::getNote, note);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper subFlagEq(Integer subFlag) {
+			if (null != subFlag) {
+				queryWrapper.eq(RwdDefFuncid::getSubFlag, subFlag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper weakPointEq(Integer weakPoint) {
+			if (null != weakPoint) {
+				queryWrapper.eq(RwdDefFuncid::getWeakPoint, weakPoint);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper shareTypeEq(String shareType) {
+			if (StringUtil.isNotBlank(shareType)) {
+				queryWrapper.eq(RwdDefFuncid::getShareType, shareType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper orderSeqEq(Integer orderSeq) {
+			if (null != orderSeq) {
+				queryWrapper.eq(RwdDefFuncid::getOrderSeq, orderSeq);
+			}
+			return this;
+		}
+
+		public LambdaQueryWrapper<RwdDefFuncid> builder() {
+			return queryWrapper;
+		}
+
+	}
+
+	public static class BuilderUpdateWrapper {
+
+		private LambdaUpdateWrapper<RwdDefFuncid> updateWrapper = new LambdaUpdateWrapper<RwdDefFuncid>();
+
+		public BuilderUpdateWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				updateWrapper.eq(RwdDefFuncid::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper codeEq(String code) {
+			if (StringUtil.isNotBlank(code)) {
+				updateWrapper.eq(RwdDefFuncid::getCode, code);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origCodeEq(String origCode) {
+			if (StringUtil.isNotBlank(origCode)) {
+				updateWrapper.eq(RwdDefFuncid::getOrigCode, origCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				updateWrapper.eq(RwdDefFuncid::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasCodeEq(String aliasCode) {
+			if (StringUtil.isNotBlank(aliasCode)) {
+				updateWrapper.eq(RwdDefFuncid::getAliasCode, aliasCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasNameEq(String aliasName) {
+			if (StringUtil.isNotBlank(aliasName)) {
+				updateWrapper.eq(RwdDefFuncid::getAliasName, aliasName);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				updateWrapper.eq(RwdDefFuncid::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper typeEq(String type) {
+			if (StringUtil.isNotBlank(type)) {
+				updateWrapper.eq(RwdDefFuncid::getType, type);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				updateWrapper.eq(RwdDefFuncid::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				updateWrapper.eq(RwdDefFuncid::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper categoryEq(String category) {
+			if (StringUtil.isNotBlank(category)) {
+				updateWrapper.eq(RwdDefFuncid::getCategory, category);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper firstTagEq(String firstTag) {
+			if (StringUtil.isNotBlank(firstTag)) {
+				updateWrapper.eq(RwdDefFuncid::getFirstTag, firstTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper secondTagEq(String secondTag) {
+			if (StringUtil.isNotBlank(secondTag)) {
+				updateWrapper.eq(RwdDefFuncid::getSecondTag, secondTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper priorityEq(String priority) {
+			if (StringUtil.isNotBlank(priority)) {
+				updateWrapper.eq(RwdDefFuncid::getPriority, priority);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper inputModeEq(String inputMode) {
+			if (StringUtil.isNotBlank(inputMode)) {
+				updateWrapper.eq(RwdDefFuncid::getInputMode, inputMode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper unitEq(String unit) {
+			if (StringUtil.isNotBlank(unit)) {
+				updateWrapper.eq(RwdDefFuncid::getUnit, unit);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper dataTypeEq(String dataType) {
+			if (StringUtil.isNotBlank(dataType)) {
+				updateWrapper.eq(RwdDefFuncid::getDataType, dataType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origDataTypeEq(String origDataType) {
+			if (StringUtil.isNotBlank(origDataType)) {
+				updateWrapper.eq(RwdDefFuncid::getOrigDataType, origDataType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper isMultipleEq(Integer isMultiple) {
+			if (null != isMultiple) {
+				updateWrapper.eq(RwdDefFuncid::getIsMultiple, isMultiple);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper isRegionEq(Integer isRegion) {
+			if (null != isRegion) {
+				updateWrapper.eq(RwdDefFuncid::getIsRegion, isRegion);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper formaterEq(String formater) {
+			if (StringUtil.isNotBlank(formater)) {
+				updateWrapper.eq(RwdDefFuncid::getFormater, formater);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper dataSourceEq(Object dataSource) {
+			if (null != dataSource) {
+				updateWrapper.eq(RwdDefFuncid::getDataSource, dataSource);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origDataSourceEq(String origDataSource) {
+			if (StringUtil.isNotBlank(origDataSource)) {
+				updateWrapper.eq(RwdDefFuncid::getOrigDataSource, origDataSource);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper noteEq(String note) {
+			if (StringUtil.isNotBlank(note)) {
+				updateWrapper.eq(RwdDefFuncid::getNote, note);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper subFlagEq(Integer subFlag) {
+			if (null != subFlag) {
+				updateWrapper.eq(RwdDefFuncid::getSubFlag, subFlag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper weakPointEq(Integer weakPoint) {
+			if (null != weakPoint) {
+				updateWrapper.eq(RwdDefFuncid::getWeakPoint, weakPoint);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper shareTypeEq(String shareType) {
+			if (StringUtil.isNotBlank(shareType)) {
+				updateWrapper.eq(RwdDefFuncid::getShareType, shareType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper orderSeqEq(Integer orderSeq) {
+			if (null != orderSeq) {
+				updateWrapper.eq(RwdDefFuncid::getOrderSeq, orderSeq);
+			}
+			return this;
+		}
+
+		public LambdaUpdateWrapper<RwdDefFuncid> builder() {
+			return updateWrapper;
+		}
+
+	}
+
+	public static class Builder {
+
+		private RwdDefFuncid rwdDefFuncid = new RwdDefFuncid();
+
+		public Builder id(String id) {
+			rwdDefFuncid.setId(id);
+			return this;
+		}
+
+		public Builder code(String code) {
+			rwdDefFuncid.setCode(code);
+			return this;
+		}
+
+		public Builder origCode(String origCode) {
+			rwdDefFuncid.setOrigCode(origCode);
+			return this;
+		}
+
+		public Builder name(String name) {
+			rwdDefFuncid.setName(name);
+			return this;
+		}
+
+		public Builder aliasCode(String aliasCode) {
+			rwdDefFuncid.setAliasCode(aliasCode);
+			return this;
+		}
+
+		public Builder aliasName(String aliasName) {
+			rwdDefFuncid.setAliasName(aliasName);
+			return this;
+		}
+
+		public Builder classCode(String classCode) {
+			rwdDefFuncid.setClassCode(classCode);
+			return this;
+		}
+
+		public Builder type(String type) {
+			rwdDefFuncid.setType(type);
+			return this;
+		}
+
+		public Builder groupCode(String groupCode) {
+			rwdDefFuncid.setGroupCode(groupCode);
+			return this;
+		}
+
+		public Builder projectId(String projectId) {
+			rwdDefFuncid.setProjectId(projectId);
+			return this;
+		}
+
+		public Builder category(String category) {
+			rwdDefFuncid.setCategory(category);
+			return this;
+		}
+
+		public Builder firstTag(String firstTag) {
+			rwdDefFuncid.setFirstTag(firstTag);
+			return this;
+		}
+
+		public Builder secondTag(String secondTag) {
+			rwdDefFuncid.setSecondTag(secondTag);
+			return this;
+		}
+
+		public Builder priority(String priority) {
+			rwdDefFuncid.setPriority(priority);
+			return this;
+		}
+
+		public Builder inputMode(String inputMode) {
+			rwdDefFuncid.setInputMode(inputMode);
+			return this;
+		}
+
+		public Builder unit(String unit) {
+			rwdDefFuncid.setUnit(unit);
+			return this;
+		}
+
+		public Builder dataType(String dataType) {
+			rwdDefFuncid.setDataType(dataType);
+			return this;
+		}
+
+		public Builder origDataType(String origDataType) {
+			rwdDefFuncid.setOrigDataType(origDataType);
+			return this;
+		}
+
+		public Builder isMultiple(Integer isMultiple) {
+			rwdDefFuncid.setIsMultiple(isMultiple);
+			return this;
+		}
+
+		public Builder isRegion(Integer isRegion) {
+			rwdDefFuncid.setIsRegion(isRegion);
+			return this;
+		}
+
+		public Builder formater(String formater) {
+			rwdDefFuncid.setFormater(formater);
+			return this;
+		}
+
+		public Builder dataSource(Object dataSource) {
+			rwdDefFuncid.setDataSource(dataSource);
+			return this;
+		}
+
+		public Builder origDataSource(String origDataSource) {
+			rwdDefFuncid.setOrigDataSource(origDataSource);
+			return this;
+		}
+
+		public Builder note(String note) {
+			rwdDefFuncid.setNote(note);
+			return this;
+		}
+
+		public Builder subFlag(Integer subFlag) {
+			rwdDefFuncid.setSubFlag(subFlag);
+			return this;
+		}
+
+		public Builder weakPoint(Integer weakPoint) {
+			rwdDefFuncid.setWeakPoint(weakPoint);
+			return this;
+		}
+
+		public Builder shareType(String shareType) {
+			rwdDefFuncid.setShareType(shareType);
+			return this;
+		}
+
+		public Builder orderSeq(Integer orderSeq) {
+			rwdDefFuncid.setOrderSeq(orderSeq);
+			return this;
+		}
+
+		public RwdDefFuncid build() {
+			return rwdDefFuncid;
+		}
+
+	}
+}

+ 679 - 0
src/main/java/com/persagy/transfer/pojo/dto/RwdDefFuncidWd.java

@@ -0,0 +1,679 @@
+package com.persagy.transfer.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.persagy.common.model.BaseEntity;
+import com.persagy.common.utils.StringUtil;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@TableName("rwd_def_funcid_wd")
+public class RwdDefFuncidWd extends BaseEntity<RwdDefFuncidWd> {
+	private static final long serialVersionUID = -8446926744906458866L;
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String code; // 信息点编码,同类型下唯一,标准驼峰格式
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origCode; // 信息点编码,同类型下唯一,旧版版格式,非驼峰,已弃用
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String name; // 信息点名称
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasCode; // 编码别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasName; // 别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String classCode; // 类型编码
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String type; // 平台级common,集团级group,项目级project
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String groupCode; // 集团编码
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String projectId; // 项目id
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String category; // 信息点分类:静态,脉冲,阶段,时序
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String firstTag; // 一级标签
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasFirstTag; // 一级标签别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String secondTag; // 二级标签
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String aliasSecondTag; // 二级标签别名
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String priority; // 优先级
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String inputMode; // 输入方式
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String unit; // 单位
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String dataType; // 数据类型
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origDataType; // 原数据类型,已弃用
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer isMultiple; // 是否复数
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer isRegion; // 是否区间
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String formater; // 数据格式
+
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private Object dataSource; // 数据源取值范围/枚举值清单等,根据dataType有不同的内容
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String origDataSource; // 数据源取值范围/枚举值清单等,根据dataType有不同的内容,原始定义
+
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String note; // 备注
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer subFlag; // 子分类标记:是否可以按此信息点进行子分类替换,同一类型下目前只支持一个子分类信息点
+
+	@TableField(updateStrategy = FieldStrategy.NOT_NULL)
+	private Integer weakPoint; // 虚点
+
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	public static class BuilderQueryWrapper {
+
+		private LambdaQueryWrapper<RwdDefFuncidWd> queryWrapper = new LambdaQueryWrapper<RwdDefFuncidWd>();
+
+		public BuilderQueryWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				queryWrapper.eq(RwdDefFuncidWd::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper codeEq(String code) {
+			if (StringUtil.isNotBlank(code)) {
+				queryWrapper.eq(RwdDefFuncidWd::getCode, code);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origCodeEq(String origCode) {
+			if (StringUtil.isNotBlank(origCode)) {
+				queryWrapper.eq(RwdDefFuncidWd::getOrigCode, origCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				queryWrapper.eq(RwdDefFuncidWd::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasCodeEq(String aliasCode) {
+			if (StringUtil.isNotBlank(aliasCode)) {
+				queryWrapper.eq(RwdDefFuncidWd::getAliasCode, aliasCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasNameEq(String aliasName) {
+			if (StringUtil.isNotBlank(aliasName)) {
+				queryWrapper.eq(RwdDefFuncidWd::getAliasName, aliasName);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				queryWrapper.eq(RwdDefFuncidWd::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper typeEq(String type) {
+			if (StringUtil.isNotBlank(type)) {
+				queryWrapper.eq(RwdDefFuncidWd::getType, type);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				queryWrapper.eq(RwdDefFuncidWd::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				queryWrapper.eq(RwdDefFuncidWd::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper categoryEq(String category) {
+			if (StringUtil.isNotBlank(category)) {
+				queryWrapper.eq(RwdDefFuncidWd::getCategory, category);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper firstTagEq(String firstTag) {
+			if (StringUtil.isNotBlank(firstTag)) {
+				queryWrapper.eq(RwdDefFuncidWd::getFirstTag, firstTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasFirstTagEq(String aliasFirstTag) {
+			if (StringUtil.isNotBlank(aliasFirstTag)) {
+				queryWrapper.eq(RwdDefFuncidWd::getAliasFirstTag, aliasFirstTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper secondTagEq(String secondTag) {
+			if (StringUtil.isNotBlank(secondTag)) {
+				queryWrapper.eq(RwdDefFuncidWd::getSecondTag, secondTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper aliasSecondTagEq(String aliasSecondTag) {
+			if (StringUtil.isNotBlank(aliasSecondTag)) {
+				queryWrapper.eq(RwdDefFuncidWd::getAliasSecondTag, aliasSecondTag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper priorityEq(String priority) {
+			if (StringUtil.isNotBlank(priority)) {
+				queryWrapper.eq(RwdDefFuncidWd::getPriority, priority);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper inputModeEq(String inputMode) {
+			if (StringUtil.isNotBlank(inputMode)) {
+				queryWrapper.eq(RwdDefFuncidWd::getInputMode, inputMode);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper unitEq(String unit) {
+			if (StringUtil.isNotBlank(unit)) {
+				queryWrapper.eq(RwdDefFuncidWd::getUnit, unit);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper dataTypeEq(String dataType) {
+			if (StringUtil.isNotBlank(dataType)) {
+				queryWrapper.eq(RwdDefFuncidWd::getDataType, dataType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origDataTypeEq(String origDataType) {
+			if (StringUtil.isNotBlank(origDataType)) {
+				queryWrapper.eq(RwdDefFuncidWd::getOrigDataType, origDataType);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper isMultipleEq(Integer isMultiple) {
+			if (null != isMultiple) {
+				queryWrapper.eq(RwdDefFuncidWd::getIsMultiple, isMultiple);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper isRegionEq(Integer isRegion) {
+			if (null != isRegion) {
+				queryWrapper.eq(RwdDefFuncidWd::getIsRegion, isRegion);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper formaterEq(String formater) {
+			if (StringUtil.isNotBlank(formater)) {
+				queryWrapper.eq(RwdDefFuncidWd::getFormater, formater);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper dataSourceEq(Object dataSource) {
+			if (null != dataSource) {
+				queryWrapper.eq(RwdDefFuncidWd::getDataSource, dataSource);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper origDataSourceEq(String origDataSource) {
+			if (StringUtil.isNotBlank(origDataSource)) {
+				queryWrapper.eq(RwdDefFuncidWd::getOrigDataSource, origDataSource);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper noteEq(String note) {
+			if (StringUtil.isNotBlank(note)) {
+				queryWrapper.eq(RwdDefFuncidWd::getNote, note);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper subFlagEq(Integer subFlag) {
+			if (null != subFlag) {
+				queryWrapper.eq(RwdDefFuncidWd::getSubFlag, subFlag);
+			}
+			return this;
+		}
+
+		public BuilderQueryWrapper weakPointEq(Integer weakPoint) {
+			if (null != weakPoint) {
+				queryWrapper.eq(RwdDefFuncidWd::getWeakPoint, weakPoint);
+			}
+			return this;
+		}
+
+		public LambdaQueryWrapper<RwdDefFuncidWd> builder() {
+			return queryWrapper;
+		}
+
+	}
+
+	public static class BuilderUpdateWrapper {
+
+		private LambdaUpdateWrapper<RwdDefFuncidWd> updateWrapper = new LambdaUpdateWrapper<RwdDefFuncidWd>();
+
+		public BuilderUpdateWrapper idEq(String id) {
+			if (StringUtil.isNotBlank(id)) {
+				updateWrapper.eq(RwdDefFuncidWd::getId, id);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper codeEq(String code) {
+			if (StringUtil.isNotBlank(code)) {
+				updateWrapper.eq(RwdDefFuncidWd::getCode, code);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origCodeEq(String origCode) {
+			if (StringUtil.isNotBlank(origCode)) {
+				updateWrapper.eq(RwdDefFuncidWd::getOrigCode, origCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper nameEq(String name) {
+			if (StringUtil.isNotBlank(name)) {
+				updateWrapper.eq(RwdDefFuncidWd::getName, name);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasCodeEq(String aliasCode) {
+			if (StringUtil.isNotBlank(aliasCode)) {
+				updateWrapper.eq(RwdDefFuncidWd::getAliasCode, aliasCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasNameEq(String aliasName) {
+			if (StringUtil.isNotBlank(aliasName)) {
+				updateWrapper.eq(RwdDefFuncidWd::getAliasName, aliasName);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper classCodeEq(String classCode) {
+			if (StringUtil.isNotBlank(classCode)) {
+				updateWrapper.eq(RwdDefFuncidWd::getClassCode, classCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper typeEq(String type) {
+			if (StringUtil.isNotBlank(type)) {
+				updateWrapper.eq(RwdDefFuncidWd::getType, type);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper groupCodeEq(String groupCode) {
+			if (StringUtil.isNotBlank(groupCode)) {
+				updateWrapper.eq(RwdDefFuncidWd::getGroupCode, groupCode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper projectIdEq(String projectId) {
+			if (StringUtil.isNotBlank(projectId)) {
+				updateWrapper.eq(RwdDefFuncidWd::getProjectId, projectId);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper categoryEq(String category) {
+			if (StringUtil.isNotBlank(category)) {
+				updateWrapper.eq(RwdDefFuncidWd::getCategory, category);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper firstTagEq(String firstTag) {
+			if (StringUtil.isNotBlank(firstTag)) {
+				updateWrapper.eq(RwdDefFuncidWd::getFirstTag, firstTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasFirstTagEq(String aliasFirstTag) {
+			if (StringUtil.isNotBlank(aliasFirstTag)) {
+				updateWrapper.eq(RwdDefFuncidWd::getAliasFirstTag, aliasFirstTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper secondTagEq(String secondTag) {
+			if (StringUtil.isNotBlank(secondTag)) {
+				updateWrapper.eq(RwdDefFuncidWd::getSecondTag, secondTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper aliasSecondTagEq(String aliasSecondTag) {
+			if (StringUtil.isNotBlank(aliasSecondTag)) {
+				updateWrapper.eq(RwdDefFuncidWd::getAliasSecondTag, aliasSecondTag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper priorityEq(String priority) {
+			if (StringUtil.isNotBlank(priority)) {
+				updateWrapper.eq(RwdDefFuncidWd::getPriority, priority);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper inputModeEq(String inputMode) {
+			if (StringUtil.isNotBlank(inputMode)) {
+				updateWrapper.eq(RwdDefFuncidWd::getInputMode, inputMode);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper unitEq(String unit) {
+			if (StringUtil.isNotBlank(unit)) {
+				updateWrapper.eq(RwdDefFuncidWd::getUnit, unit);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper dataTypeEq(String dataType) {
+			if (StringUtil.isNotBlank(dataType)) {
+				updateWrapper.eq(RwdDefFuncidWd::getDataType, dataType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origDataTypeEq(String origDataType) {
+			if (StringUtil.isNotBlank(origDataType)) {
+				updateWrapper.eq(RwdDefFuncidWd::getOrigDataType, origDataType);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper isMultipleEq(Integer isMultiple) {
+			if (null != isMultiple) {
+				updateWrapper.eq(RwdDefFuncidWd::getIsMultiple, isMultiple);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper isRegionEq(Integer isRegion) {
+			if (null != isRegion) {
+				updateWrapper.eq(RwdDefFuncidWd::getIsRegion, isRegion);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper formaterEq(String formater) {
+			if (StringUtil.isNotBlank(formater)) {
+				updateWrapper.eq(RwdDefFuncidWd::getFormater, formater);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper dataSourceEq(Object dataSource) {
+			if (null != dataSource) {
+				updateWrapper.eq(RwdDefFuncidWd::getDataSource, dataSource);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper origDataSourceEq(String origDataSource) {
+			if (StringUtil.isNotBlank(origDataSource)) {
+				updateWrapper.eq(RwdDefFuncidWd::getOrigDataSource, origDataSource);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper noteEq(String note) {
+			if (StringUtil.isNotBlank(note)) {
+				updateWrapper.eq(RwdDefFuncidWd::getNote, note);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper subFlagEq(Integer subFlag) {
+			if (null != subFlag) {
+				updateWrapper.eq(RwdDefFuncidWd::getSubFlag, subFlag);
+			}
+			return this;
+		}
+
+		public BuilderUpdateWrapper weakPointEq(Integer weakPoint) {
+			if (null != weakPoint) {
+				updateWrapper.eq(RwdDefFuncidWd::getWeakPoint, weakPoint);
+			}
+			return this;
+		}
+
+		public LambdaUpdateWrapper<RwdDefFuncidWd> builder() {
+			return updateWrapper;
+		}
+
+	}
+
+	public static class Builder {
+
+		private RwdDefFuncidWd rwdDefFuncidWd = new RwdDefFuncidWd();
+
+		public Builder id(String id) {
+			rwdDefFuncidWd.setId(id);
+			return this;
+		}
+
+		public Builder code(String code) {
+			rwdDefFuncidWd.setCode(code);
+			return this;
+		}
+
+		public Builder origCode(String origCode) {
+			rwdDefFuncidWd.setOrigCode(origCode);
+			return this;
+		}
+
+		public Builder name(String name) {
+			rwdDefFuncidWd.setName(name);
+			return this;
+		}
+
+		public Builder aliasCode(String aliasCode) {
+			rwdDefFuncidWd.setAliasCode(aliasCode);
+			return this;
+		}
+
+		public Builder aliasName(String aliasName) {
+			rwdDefFuncidWd.setAliasName(aliasName);
+			return this;
+		}
+
+		public Builder classCode(String classCode) {
+			rwdDefFuncidWd.setClassCode(classCode);
+			return this;
+		}
+
+		public Builder type(String type) {
+			rwdDefFuncidWd.setType(type);
+			return this;
+		}
+
+		public Builder groupCode(String groupCode) {
+			rwdDefFuncidWd.setGroupCode(groupCode);
+			return this;
+		}
+
+		public Builder projectId(String projectId) {
+			rwdDefFuncidWd.setProjectId(projectId);
+			return this;
+		}
+
+		public Builder category(String category) {
+			rwdDefFuncidWd.setCategory(category);
+			return this;
+		}
+
+		public Builder firstTag(String firstTag) {
+			rwdDefFuncidWd.setFirstTag(firstTag);
+			return this;
+		}
+
+		public Builder aliasFirstTag(String aliasFirstTag) {
+			rwdDefFuncidWd.setAliasFirstTag(aliasFirstTag);
+			return this;
+		}
+
+		public Builder secondTag(String secondTag) {
+			rwdDefFuncidWd.setSecondTag(secondTag);
+			return this;
+		}
+
+		public Builder aliasSecondTag(String aliasSecondTag) {
+			rwdDefFuncidWd.setAliasSecondTag(aliasSecondTag);
+			return this;
+		}
+
+		public Builder priority(String priority) {
+			rwdDefFuncidWd.setPriority(priority);
+			return this;
+		}
+
+		public Builder inputMode(String inputMode) {
+			rwdDefFuncidWd.setInputMode(inputMode);
+			return this;
+		}
+
+		public Builder unit(String unit) {
+			rwdDefFuncidWd.setUnit(unit);
+			return this;
+		}
+
+		public Builder dataType(String dataType) {
+			rwdDefFuncidWd.setDataType(dataType);
+			return this;
+		}
+
+		public Builder origDataType(String origDataType) {
+			rwdDefFuncidWd.setOrigDataType(origDataType);
+			return this;
+		}
+
+		public Builder isMultiple(Integer isMultiple) {
+			rwdDefFuncidWd.setIsMultiple(isMultiple);
+			return this;
+		}
+
+		public Builder isRegion(Integer isRegion) {
+			rwdDefFuncidWd.setIsRegion(isRegion);
+			return this;
+		}
+
+		public Builder formater(String formater) {
+			rwdDefFuncidWd.setFormater(formater);
+			return this;
+		}
+
+		public Builder dataSource(Object dataSource) {
+			rwdDefFuncidWd.setDataSource(dataSource);
+			return this;
+		}
+
+		public Builder origDataSource(String origDataSource) {
+			rwdDefFuncidWd.setOrigDataSource(origDataSource);
+			return this;
+		}
+
+		public Builder note(String note) {
+			rwdDefFuncidWd.setNote(note);
+			return this;
+		}
+
+		public Builder subFlag(Integer subFlag) {
+			rwdDefFuncidWd.setSubFlag(subFlag);
+			return this;
+		}
+
+		public Builder weakPoint(Integer weakPoint) {
+			rwdDefFuncidWd.setWeakPoint(weakPoint);
+			return this;
+		}
+
+		public RwdDefFuncidWd build() {
+			return rwdDefFuncidWd;
+		}
+
+	}
+}

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

@@ -0,0 +1,165 @@
+package com.persagy.transfer.pojo.dto;
+
+import java.util.Date;
+
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @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 JSONObject 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 virtualInfoCodes(JSONObject 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;
+		}
+
+	}
+}

+ 23 - 1
src/main/java/com/persagy/transfer/pojo/dto/WdclassRelPersagy.java

@@ -33,6 +33,9 @@ public class WdclassRelPersagy extends BaseEntity<WdclassRelPersagy> {
 	private String classCode; // BDTP类编码
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+	private String classstrucrureid;//万达设备分类ID
+	
+	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
 	private String wdClassCode; // 万达类编码
 
 	@TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
@@ -59,6 +62,13 @@ public class WdclassRelPersagy extends BaseEntity<WdclassRelPersagy> {
 			}
 			return this;
 		}
+		
+		public BuilderQueryWrapper classstrucrureidEq(String classstrucrureid) {
+			if (StringUtil.isNotBlank(classstrucrureid)) {
+				queryWrapper.eq(WdclassRelPersagy::getClassstrucrureid, classstrucrureid);
+			}
+			return this;
+		}
 
 		public BuilderQueryWrapper wdClassCodeEq(String wdClassCode) {
 			if (StringUtil.isNotBlank(wdClassCode)) {
@@ -97,6 +107,13 @@ public class WdclassRelPersagy extends BaseEntity<WdclassRelPersagy> {
 			}
 			return this;
 		}
+		
+		public BuilderUpdateWrapper classstrucrureidEq(String classstrucrureid) {
+			if (StringUtil.isNotBlank(classstrucrureid)) {
+				updateWrapper.eq(WdclassRelPersagy::getClassstrucrureid, classstrucrureid);
+			}
+			return this;
+		}
 
 		public BuilderUpdateWrapper wdClassCodeEq(String wdClassCode) {
 			if (StringUtil.isNotBlank(wdClassCode)) {
@@ -131,7 +148,12 @@ public class WdclassRelPersagy extends BaseEntity<WdclassRelPersagy> {
 			wdclassRelPersagy.setClassCode(classCode);
 			return this;
 		}
-
+		
+		public Builder classstrucrureid(String classstrucrureid) {
+			wdclassRelPersagy.setClassstrucrureid(classstrucrureid);
+			return this;
+		}
+		
 		public Builder wdClassCode(String wdClassCode) {
 			wdclassRelPersagy.setWdClassCode(wdClassCode);
 			return this;

+ 17 - 0
src/main/java/com/persagy/transfer/service/IRwdDefFuncidService.java

@@ -0,0 +1,17 @@
+package com.persagy.transfer.service;
+
+import com.persagy.common.service.ISuperService;
+import com.persagy.transfer.pojo.dto.RwdDefFuncid;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+public interface IRwdDefFuncidService extends ISuperService<RwdDefFuncid> {
+
+}
+

+ 17 - 0
src/main/java/com/persagy/transfer/service/IRwdDefFuncidWdService.java

@@ -0,0 +1,17 @@
+package com.persagy.transfer.service;
+
+import com.persagy.common.service.ISuperService;
+import com.persagy.transfer.pojo.dto.RwdDefFuncidWd;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+public interface IRwdDefFuncidWdService extends ISuperService<RwdDefFuncidWd> {
+
+}
+

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

@@ -0,0 +1,14 @@
+package com.persagy.transfer.service;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+public interface IRwdObjecWdService {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.persagy.transfer.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.persagy.transfer.constant.SwitchConstant;
+import com.persagy.transfer.service.IRwdObjecWdService;
+
+/**
+ * 对象实例表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Service
+@DS(value = SwitchConstant.DS_MASTER_1)
+public class IRwdObjecWdServiceImpl  implements IRwdObjecWdService {
+
+}

+ 24 - 0
src/main/java/com/persagy/transfer/service/impl/RwdDefFuncidServiceImpl.java

@@ -0,0 +1,24 @@
+package com.persagy.transfer.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.persagy.common.service.impl.SuperServiceImpl;
+import com.persagy.transfer.constant.SwitchConstant;
+import com.persagy.transfer.mapper.RwdDefFuncidMapper;
+import com.persagy.transfer.pojo.dto.RwdDefFuncid;
+import com.persagy.transfer.service.IRwdDefFuncidService;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Service
+@DS(value = SwitchConstant.DS_MASTER_1)
+public class RwdDefFuncidServiceImpl extends SuperServiceImpl<RwdDefFuncidMapper, RwdDefFuncid> implements IRwdDefFuncidService {
+
+}

+ 24 - 0
src/main/java/com/persagy/transfer/service/impl/RwdDefFuncidWdServiceImpl.java

@@ -0,0 +1,24 @@
+package com.persagy.transfer.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.persagy.common.service.impl.SuperServiceImpl;
+import com.persagy.transfer.constant.SwitchConstant;
+import com.persagy.transfer.mapper.RwdDefFuncidWdMapper;
+import com.persagy.transfer.pojo.dto.RwdDefFuncidWd;
+import com.persagy.transfer.service.IRwdDefFuncidWdService;
+
+/**
+ * 信息点定义表
+ * 
+ * @version 1.0.0
+ * @company persagy 
+ * @author zhangqiankun
+ * @date 2021-09-16 13:16:57
+ */
+@Service
+@DS(value = SwitchConstant.DS_MASTER_1)
+public class RwdDefFuncidWdServiceImpl extends SuperServiceImpl<RwdDefFuncidWdMapper, RwdDefFuncidWd> implements IRwdDefFuncidWdService {
+
+}

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

@@ -2,7 +2,9 @@ package com.persagy.transfer.service.impl;
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.persagy.common.service.impl.SuperServiceImpl;
+import com.persagy.transfer.constant.SwitchConstant;
 import com.persagy.transfer.mapper.WdclassRelPersagyMapper;
 import com.persagy.transfer.pojo.dto.WdclassRelPersagy;
 import com.persagy.transfer.service.IWdclassRelPersagyService;
@@ -16,6 +18,7 @@ import com.persagy.transfer.service.IWdclassRelPersagyService;
  * @date 2021-09-16 11:19:53
  */
 @Service
+@DS(value = SwitchConstant.DS_MASTER_1)
 public class WdclassRelPersagyServiceImpl extends SuperServiceImpl<WdclassRelPersagyMapper, WdclassRelPersagy> implements IWdclassRelPersagyService {
 
 }

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

@@ -2,7 +2,9 @@ package com.persagy.transfer.service.impl;
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.persagy.common.service.impl.SuperServiceImpl;
+import com.persagy.transfer.constant.SwitchConstant;
 import com.persagy.transfer.mapper.WdfacilityRelPersagyMapper;
 import com.persagy.transfer.pojo.dto.WdfacilityRelPersagy;
 import com.persagy.transfer.service.IWdfacilityRelPersagyService;
@@ -16,6 +18,7 @@ import com.persagy.transfer.service.IWdfacilityRelPersagyService;
  * @date 2021-09-16 11:06:42
  */
 @Service
+@DS(value = SwitchConstant.DS_MASTER_1)
 public class WdfacilityRelPersagyServiceImpl extends SuperServiceImpl<WdfacilityRelPersagyMapper, WdfacilityRelPersagy> implements IWdfacilityRelPersagyService {
 
 }

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

@@ -2,7 +2,9 @@ package com.persagy.transfer.service.impl;
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.persagy.common.service.impl.SuperServiceImpl;
+import com.persagy.transfer.constant.SwitchConstant;
 import com.persagy.transfer.mapper.WdprojRelPersagyprojMapper;
 import com.persagy.transfer.pojo.dto.WdprojRelPersagyproj;
 import com.persagy.transfer.service.IWdprojRelPersagyprojService;
@@ -16,6 +18,7 @@ import com.persagy.transfer.service.IWdprojRelPersagyprojService;
  * @date 2021-09-16 11:06:42
  */
 @Service
+@DS(value = SwitchConstant.DS_MASTER_1)
 public class WdprojRelPersagyprojServiceImpl extends SuperServiceImpl<WdprojRelPersagyprojMapper, WdprojRelPersagyproj> implements IWdprojRelPersagyprojService {
 
 }

+ 37 - 0
src/main/resources/mapper/RwdDefFuncidMapper.xml

@@ -0,0 +1,37 @@
+<?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.RwdDefFuncidMapper">
+    
+	<resultMap id="BaseResultMap" type="com.persagy.transfer.pojo.dto.RwdDefFuncid">
+			<result column="id" property="id" jdbcType="VARCHAR" />
+			<result column="code" property="code" jdbcType="VARCHAR" />
+			<result column="orig_code" property="origCode" jdbcType="VARCHAR" />
+			<result column="name" property="name" jdbcType="VARCHAR" />
+			<result column="alias_code" property="aliasCode" jdbcType="VARCHAR" />
+			<result column="alias_name" property="aliasName" jdbcType="VARCHAR" />
+			<result column="class_code" property="classCode" jdbcType="VARCHAR" />
+			<result column="type" property="type" jdbcType="VARCHAR" />
+			<result column="group_code" property="groupCode" jdbcType="VARCHAR" />
+			<result column="project_id" property="projectId" jdbcType="VARCHAR" />
+			<result column="category" property="category" jdbcType="VARCHAR" />
+			<result column="first_tag" property="firstTag" jdbcType="VARCHAR" />
+			<result column="second_tag" property="secondTag" jdbcType="VARCHAR" />
+			<result column="priority" property="priority" jdbcType="VARCHAR" />
+			<result column="input_mode" property="inputMode" jdbcType="VARCHAR" />
+			<result column="unit" property="unit" jdbcType="VARCHAR" />
+			<result column="data_type" property="dataType" jdbcType="VARCHAR" />
+			<result column="orig_data_type" property="origDataType" jdbcType="VARCHAR" />
+			<result column="is_multiple" property="isMultiple" jdbcType="INTEGER" />
+			<result column="is_region" property="isRegion" jdbcType="INTEGER" />
+			<result column="formater" property="formater" jdbcType="VARCHAR" />
+			<result column="data_source" property="dataSource" 
+				typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+			<result column="orig_data_source" property="origDataSource" jdbcType="VARCHAR" />
+			<result column="note" property="note" jdbcType="VARCHAR" />
+			<result column="sub_flag" property="subFlag" jdbcType="INTEGER" />
+			<result column="weak_point" property="weakPoint" jdbcType="INTEGER" />
+			<result column="share_type" property="shareType" jdbcType="VARCHAR" />
+			<result column="order_seq" property="orderSeq" jdbcType="INTEGER" />
+		</resultMap>
+</mapper>

+ 38 - 0
src/main/resources/mapper/RwdDefFuncidWdMapper.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.RwdDefFuncidWdMapper">
+    
+	<resultMap id="BaseResultMap" type="com.persagy.transfer.pojo.dto.RwdDefFuncidWd">
+		<result column="id" property="id" jdbcType="VARCHAR" />
+		<result column="code" property="code" jdbcType="VARCHAR" />
+		<result column="orig_code" property="origCode" jdbcType="VARCHAR" />
+		<result column="name" property="name" jdbcType="VARCHAR" />
+		<result column="alias_code" property="aliasCode" jdbcType="VARCHAR" />
+		<result column="alias_name" property="aliasName" jdbcType="VARCHAR" />
+		<result column="class_code" property="classCode" jdbcType="VARCHAR" />
+		<result column="type" property="type" jdbcType="VARCHAR" />
+		<result column="group_code" property="groupCode" jdbcType="VARCHAR" />
+		<result column="project_id" property="projectId" jdbcType="VARCHAR" />
+		<result column="category" property="category" jdbcType="VARCHAR" />
+		<result column="first_tag" property="firstTag" jdbcType="VARCHAR" />
+		<result column="alias_first_tag" property="aliasFirstTag" jdbcType="VARCHAR" />
+		<result column="second_tag" property="secondTag" jdbcType="VARCHAR" />
+		<result column="alias_second_tag" property="aliasSecondTag" jdbcType="VARCHAR" />
+		<result column="priority" property="priority" jdbcType="VARCHAR" />
+		<result column="input_mode" property="inputMode" jdbcType="VARCHAR" />
+		<result column="unit" property="unit" jdbcType="VARCHAR" />
+		<result column="data_type" property="dataType" jdbcType="VARCHAR" />
+		<result column="orig_data_type" property="origDataType" jdbcType="VARCHAR" />
+		<result column="is_multiple" property="isMultiple" jdbcType="INTEGER" />
+		<result column="is_region" property="isRegion" jdbcType="INTEGER" />
+		<result column="formater" property="formater" jdbcType="VARCHAR" />
+		<result column="data_source" property="dataSource" 
+			typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+		<result column="orig_data_source" property="origDataSource" jdbcType="VARCHAR" />
+		<result column="note" property="note" jdbcType="VARCHAR" />
+		<result column="sub_flag" property="subFlag" jdbcType="INTEGER" />
+		<result column="weak_point" property="weakPoint" jdbcType="INTEGER" />
+	</resultMap>
+	
+</mapper>

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

@@ -0,0 +1,29 @@
+<?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>
+	
+</mapper>

+ 6 - 5
src/main/resources/mapper/WdclassRelPersagyMapper.xml

@@ -4,9 +4,10 @@
 <mapper namespace="com.persagy.transfer.mapper.WdclassRelPersagyMapper">
     
 	<resultMap id="BaseResultMap" type="com.persagy.transfer.pojo.dto.WdclassRelPersagy">
-			<result column="id" property="id" jdbcType="VARCHAR" />
-			<result column="class_code" property="classCode" jdbcType="VARCHAR" />
-			<result column="wd_class_code" property="wdClassCode" jdbcType="VARCHAR" />
-			<result column="wd_build_code" property="wdBuildCode" jdbcType="VARCHAR" />
-		</resultMap>
+		<result column="id" property="id" jdbcType="VARCHAR" />
+		<result column="class_code" property="classCode" jdbcType="VARCHAR" />
+		<result column="classstrucrureid" property="classstrucrureid" jdbcType="VARCHAR" />
+		<result column="wd_class_code" property="wdClassCode" jdbcType="VARCHAR" />
+		<result column="wd_build_code" property="wdBuildCode" jdbcType="VARCHAR" />
+	</resultMap>
 </mapper>