fix(tcm):调整业务代码结构

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/pom.xml

@@ -12,11 +12,6 @@
     <artifactId>amos-boot-module-tcm-api</artifactId>
     <dependencies>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-elasticsearch</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-common-api</artifactId>
             <version>${amos-biz-boot.version}</version>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/pom.xml

@@ -11,4 +11,15 @@
     <modelVersion>4.0.0</modelVersion>
     <version>1.0.0</version>
     <artifactId>amos-boot-module-tcm-common</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-elasticsearch</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <artifactId>amos-component-rule</artifactId>
+            <groupId>com.yeejoin</groupId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/AlertCalledDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorDto.java

@@ -2,13 +2,12 @@ package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/ElevatorInsureDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.Date;
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/WechatDispatchFeedbackDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,7 +32,7 @@ public class WechatDispatchFeedbackDto {
     private String remark;
 
     @ApiModelProperty(value = "现场照片")
-    private List<AttachmentDto>  imgs;
+    private List<AttachmentDto> imgs;
 
 
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/WechatMyBussinessDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.Date;
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/WechatMyTaskDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/WechatUserFeedbackDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.List;
 
 /**
@@ -26,7 +25,7 @@ public class WechatUserFeedbackDto {
     private String remark;
 
     @ApiModelProperty(value = "现场照片")
-    private List<AttachmentDto>  imgs;
+    private List<AttachmentDto> imgs;
 
 
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/AlertCalled.java

@@ -3,12 +3,11 @@ package com.yeejoin.amos.boot.module.tcm.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.tcm.flc.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.util.Date;
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.elasticsearch.common.recycler.Recycler;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 /**

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/AttachmentDto.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 附件表

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/DynamicFormInstance.java

+package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 动态表单实例表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "cb_dynamic_form_instance", autoResultMap = true)
+public class DynamicFormInstance extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 字段名
+     */
+    @TableField("field_code")
+    private String fieldCode;
+    /**
+     * 中文名
+     */
+    @TableField("field_name")
+    private String fieldName;
+    /**
+     * 数据类型：文本，数字，枚举,日期
+     */
+    @TableField("field_type")
+    private String fieldType;
+    /**
+     * 分组编号
+     */
+    @TableField("group_code")
+    private String groupCode;
+    /**
+     * 字段分组id
+     */
+    @TableField("group_id")
+    private Long groupId;
+    /**
+     * 动态配置字段的值
+     */
+    @TableField("field_value")
+    private String fieldValue;
+    /**
+     * field_value的描述（冗余字段，在列表时查询时显示）
+     */
+    @TableField("field_value_label")
+    private String fieldValueLabel;
+    /**
+     * 设备实例id
+     */
+    @TableField("instance_id")
+    private Long instanceId;
+    /**
+     * 字段定义信息的主键
+     */
+    @TableField("form_column_id")
+    private Long formColumnId;
+    /**
+     * 查询策略;全等,模糊,区间
+     */
+    @TableField("query_strategy")
+    private String queryStrategy;
+    /**
+     * 应用标识（数据隔离使用）
+     */
+    @TableField("app_key")
+    private String appKey;
+
+    /**
+     * 不能为空
+     */
+    @TableField("not_null")
+    private Boolean notNull;
+
+    /**
+     * 是否一行显示(兼容已有动态表单使用)
+     */
+    @TableField("block")
+    private Boolean block;
+
+    @TableField(value = "column_Config", typeHandler = JacksonTypeHandler.class)
+    private JSONObject columnConfig;
+
+    /**
+     * 排序字段
+     */
+    @TableField("sort")
+    private int sort;
+
+    /**
+     * 组织机构
+     */
+    @TableField("org_code")
+    private String orgCode;
+
+
+    public DynamicFormInstance() {
+        super();
+    }
+
+    public DynamicFormInstance(Long alertFormId, String fieldName, String fieldCode, boolean block) {
+        this.instanceId = alertFormId;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.block = block;
+    }
+
+    public DynamicFormInstance(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode) {
+        this.instanceId = alertFormId;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.block = block;
+        this.fieldValueLabel = alertTypeCode;
+    }
+
+    public DynamicFormInstance(Long alertFormId, String fieldName, String fieldCode, boolean block, String groupCode,
+                               String fieldValue, String fieldValueCode) {
+        this.instanceId = alertFormId;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.block = block;
+        this.groupCode = groupCode;
+        this.fieldValue = fieldValue;
+        this.fieldValueLabel = fieldValueCode;
+    }
+
+    public DynamicFormInstance(Long alertFormId, String groupCode, String fieldName, String fieldCode,
+                               String fieldValue, String fieldValueCode, Boolean block) {
+        this.instanceId = alertFormId;
+        this.groupCode = groupCode;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.fieldValue = fieldValue;
+        this.fieldValueLabel = fieldValueCode;
+        this.block = block;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/EquipmentDto.java

@@ -3,7 +3,12 @@ package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.List;
+import java.util.Map;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/EquipmentInformDto.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/InformEquipmentDto.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/PersonEducationDto.java

 package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/PersonQualityDto.java

 package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/UnitInfoDto.java

 package com.yeejoin.amos.boot.module.tcm.flc.api.dto;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-common/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/UnitPersonInfoDto.java

@@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.tcm.api.dto.FormValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.List;
 
 /**