添加数据同步代码

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/FilesController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -51,6 +52,7 @@ public class FilesController {
 		JSONObject jsonObj = uploadFile(file,"csei");
 		return ResponseHelper.buildResponse(jsonObj.toString());
 	}
+
 	private JSONObject uploadFile(MultipartFile file,String tag) {
 		if (ValidationUtil.isEmpty(file)){
 			throw new BadRequest("参数校验失败.");
@@ -69,4 +71,21 @@ public class FilesController {
 		}
 		return jsonObj;
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(value = "上传附件")
+	@PostMapping("/supma")
+	public ResponseModel<JSONObject> upload(@RequestBody MultipartFile file){
+		FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
+		JSONObject jsonObj = new JSONObject();
+		if (date != null) {
+			Map<String, String> map = date.getResult();
+			Iterator<String> it = map.keySet().iterator();
+			String urlString=it.next();
+			jsonObj.put("fileUrl", urlString);
+			jsonObj.put("fileName", map.get(urlString));
+		}
+		return ResponseHelper.buildResponse(jsonObj);
+	}
+
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -17,12 +17,14 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import java.util.List;
 
 /**
+ * 监管业务数据对接
+ *
  * @author Zhang Yingbin
  */
 @RestController
 @RequestMapping(value = "/openapijg/supervise")
 @Api(tags = "Supervise-监管业务数据接入")
-public class TmJgSuperviseController {
+public class SuperviseController {
 
     @Autowired
     private DesignInfoService designInfoService;
@@ -91,7 +93,6 @@ public class TmJgSuperviseController {
     @RestEventTrigger(value = "openapiLogEventHandler")
     public ResponseModel<String> saveConstructionInfo (@RequestBody List<ConstructionInfo> constructionInfo) throws Exception
     {
-        System.out.println("我进来了！");
         return ResponseHelper.buildResponse(constructionInfoService.saveConstructionInfo(constructionInfo));
     }
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/JgFileAttributeEnum.java

-package com.yeejoin.amos.api.openapi.enums;public enum JgFileAttributeEnum {
+package com.yeejoin.amos.api.openapi.enums;
+
+/**
+ * <pre>
+ *  监管附件对象属性枚举
+ * </pre>
+ *
+ * @author Zhang Yingbin
+ */
+
+public enum JgFileAttributeEnum {
+
+    DESIGN_FILE("designFile",JgFileObjectEnum.DESIGN_INFO.getObject()),
+    DESIGN_CODE("designCode",JgFileObjectEnum.DESIGN_INFO.getObject()),
+    PRODUCE_STANDARD("produceStandard",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    PRODUCT_CERTIFICATE("productCertificate",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    IUM_INSTRUCTIONS("iumInstructions",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    SUPERVISION_CERT("supervisionCert",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    CE_CERT("ceCert",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    USE_REGIST_CERTIFICATE("useRegistCertificate",JgFileObjectEnum.REGISTRATION_INFO.getObject()),
+    REPAIR_INFORM("repairInform",JgFileObjectEnum.MAINTENANCE_INFO.getObject()),
+    INSPECTION_REPORT("inspectionReport",JgFileObjectEnum.INSPECTION_INFO.getObject()),
+    BUSINESS_LICENSE("businessLicense",JgFileObjectEnum.ENTERPRISE_INFO.getObject()),
+    QUALIFICATION_CERT("qualificationCert",JgFileObjectEnum.STAFF_QUALIF_INFO.getObject()),
+    GOVERNOR_EFFI_REPORT("governorEffiReport",JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject());
+
+    /**
+     * 属性
+     */
+    private String attribute;
+
+
+    /**
+     * 对象
+     */
+    private String object;
+
+    JgFileAttributeEnum(String attribute, String object) {
+        this.attribute = attribute;
+        this.object = object;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/JgFileObjectEnum.java

-package com.yeejoin.amos.api.openapi.enums;public class JgFileObjectEnum {
+package com.yeejoin.amos.api.openapi.enums;
+
+/**
+ * <pre>
+ *  监管附件对象枚举
+ * </pre>
+ *
+ * @author Zhang Yingbin
+ */
+
+public enum JgFileObjectEnum {
+
+    DESIGN_INFO("designInf"),
+    PRODUCE_INFO("produceInfo"),
+    REGISTRATION_INFO("registrationInfo"),
+    MAINTENANCE_INFO("maintenanceInfo"),
+    INSPECTION_INFO("inspectionInfo"),
+    ENTERPRISE_INFO("enterpriseInfo"),
+    STAFF_QUALIF_INFO("staffQualifInfo"),
+    ELEVATOR_TECH_INFO("elevatorTechInfo");
+
+
+    /**
+     * 对象
+     */
+    private String object;
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    JgFileObjectEnum(String object) {
+        this.object = object;
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/ConstructionInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-施工信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgConstructionInfoVo implements Serializable {
+public class ConstructionInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,20 +55,4 @@ public class TmJgConstructionInfoVo implements Serializable {
     * 施工时间
     */
     private Date uscDate;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/DesignInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import com.baomidou.mybatisplus.annotation.TableField;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-设计信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgDesignInfoVo implements Serializable {
+public class DesignInfoModel extends AbstractBaseModel {
+
+
+    private List designFile;
+    private List designCode;
 
     private static final long serialVersionUID = 1L;
 
@@ -67,20 +78,6 @@ public class TmJgDesignInfoVo implements Serializable {
     * 设计文件鉴定日期
     */
     private Date appraisalDate;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/ElevatorTechInfoModel.java

-package com.yeejoin.amos.api.openapi.face.orm.entity;
+package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
+import java.util.List;
+
 /**
  * 电梯技术参数
  *
@@ -19,13 +19,12 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@Accessors(chain = true)
-@TableName("tm_jg_elevator_tech_info")
-@ApiModel(value="TmJgElevatorTechInfo对象", description="电梯技术参数")
-public class ElevatorTechInfo extends AbstractBaseEntity {
+public class ElevatorTechInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List governorEffiReport;
+
     @ApiModelProperty(value = "设备唯一标识码")
     private String sequenceCode;
 
@@ -111,13 +110,13 @@ public class ElevatorTechInfo extends AbstractBaseEntity {
     private String safeGearProdUnit;
 
     @ApiModelProperty(value = "轿厢缓冲器型号")
-    private String carBufferModel;
+    private String carBufModel;
 
     @ApiModelProperty(value = "轿厢缓冲器编号")
-    private String carBufferNum;
+    private String carBufNum;
 
     @ApiModelProperty(value = "轿厢缓冲器制造单位")
-    private String carBufferProdUnit;
+    private String carBufProdUnit;
 
     @ApiModelProperty(value = "对重缓冲器型号")
     private String countBufModel;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EnclosureInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备附件资料信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgEnclosureInfoVo implements Serializable {
+public class EnclosureInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,20 +55,7 @@ public class TmJgEnclosureInfoVo implements Serializable {
     * 附件资料完整路径
     */
     private String enclosureUrl;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EnterpriseInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 企业数据信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgEnterpriseInfoVo implements Serializable {
+public class EnterpriseInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List businessLicense;
+
             @ApiModelProperty(value = "使用单位唯一标识")
     /**
     * 使用单位唯一标识
@@ -141,20 +149,6 @@ public class TmJgEnterpriseInfoVo implements Serializable {
     * 单位地理坐标纬度
     */
     private String latitude;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/FileModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 附件表Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgFileVo implements Serializable {
+public class FileModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -36,22 +40,13 @@ public class TmJgFileVo implements Serializable {
     * 所属对象
     */
     private String objectType;
-            @ApiModelProperty(value = "所属属性名
-")
+            @ApiModelProperty(value = "所属属性名 ")
     /**
     * 所属属性名
 
     */
     private String attributeType;
-            @ApiModelProperty(value = "同步日期")
-    /**
-    * 同步日期
-    */
-    private Date syncDate;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/InspectionInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备检验信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgInspectionInfoVo implements Serializable {
+public class InspectionInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List inspectionReport;
+
             @ApiModelProperty(value = "设备唯一标识码")
     /**
     * 设备唯一标识码
@@ -31,15 +39,9 @@ public class TmJgInspectionInfoVo implements Serializable {
     * 设备代码
     */
     private String equCode;
-            @ApiModelProperty(value = "检验类型(1法定类监督检验
-2法定类定期检验
-3非法定类检验
-4委托类检验)")
+            @ApiModelProperty(value = "检验类型(1法定类监督检验 2法定类定期检验 3非法定类检验 4委托类检验)")
     /**
-    * 检验类型(1法定类监督检验
-2法定类定期检验
-3非法定类检验
-4委托类检验)
+    * 检验类型(1法定类监督检验2法定类定期检验3非法定类检验4委托类检验)
     */
     private String inspectType;
             @ApiModelProperty(value = "检验机构名称")
@@ -82,20 +84,7 @@ public class TmJgInspectionInfoVo implements Serializable {
     * 下次检验日期
     */
     private Date nextInspectDate;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MaintenanceInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-维保备案信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgMaintenanceInfoVo implements Serializable {
+public class MaintenanceInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+
+    private List repairInform;
+
+
             @ApiModelProperty(value = "设备唯一标识码")
     /**
     * 设备唯一标识码
@@ -80,21 +90,8 @@ public class TmJgMaintenanceInfoVo implements Serializable {
     /**
     * 24小时维保电话
     */
-    private String meTelephone24;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+    private String me24Telephone;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/OtherInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import com.baomidou.mybatisplus.annotation.TableName;
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-其他信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgOtherInfoVo implements Serializable {
+public class OtherInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -57,20 +62,7 @@ public class TmJgOtherInfoVo implements Serializable {
     * 96333识别码(七位电梯应急救援识别码)
     */
     private String code96333;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/ProduceInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import javax.management.loading.PrivateMLet;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-制造信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgProduceInfoVo implements Serializable {
+public class ProduceInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List produceStandard;
+    private List productCertificate;
+    private List iumInstructions;
+    private List supervisionCert;
+    private List ceCert;
+
+
             @ApiModelProperty(value = "设备唯一标识码")
     /**
     * 设备唯一标识码
@@ -71,20 +86,7 @@ public class TmJgProduceInfoVo implements Serializable {
     * 型式试验ID
     */
     private String typeTestId;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/RegistrationInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-注册登记信息 Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgRegistrationInfoVo implements Serializable {
+public class RegistrationInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List useRegistCertificate;
+
+
             @ApiModelProperty(value = "设备唯一标识码")
     /**
     * 设备唯一标识码
@@ -26,6 +35,13 @@ public class TmJgRegistrationInfoVo implements Serializable {
     * 监管系统唯一编码
     */
     private String superviseCode;
+
+    /**
+     * 登记机关组织机构代码
+     */
+    @ApiModelProperty(value = "登记机关组织机构代码")
+    private String organizationCode;
+
             @ApiModelProperty(value = "登记机关名称")
     /**
     * 登记机关名称
@@ -36,11 +52,9 @@ public class TmJgRegistrationInfoVo implements Serializable {
     * 使用登记证编号
     */
     private String useOrgCode;
-            @ApiModelProperty(value = "注册状态(已注册 
-未注册)")
+            @ApiModelProperty(value = "注册状态(已注册 未注册)")
     /**
-    * 注册状态(已注册 
-未注册)
+    * 注册状态(已注册未注册)
     */
     private String registerState;
             @ApiModelProperty(value = "使用登记ID")
@@ -88,20 +102,7 @@ public class TmJgRegistrationInfoVo implements Serializable {
     * 设备总价值（万元）
     */
     private Double equPrice;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/StaffBaseInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 人员数据信息-基本信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgStaffBaseInfoVo implements Serializable {
+public class StaffBaseInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -56,20 +60,7 @@ public class TmJgStaffBaseInfoVo implements Serializable {
     * 聘用时间
     */
     private Date employmentDate;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/StaffQualifInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 人员数据信息-资质信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgStaffQualifInfoVo implements Serializable {
+public class StaffQualifInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
+    private List qualificationCert;
+
             @ApiModelProperty(value = "作业人员身份证号")
     /**
     * 作业人员身份证号
@@ -41,20 +49,7 @@ public class TmJgStaffQualifInfoVo implements Serializable {
     * 发证机关
     */
     private String issuingAuthor;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/SuperviseInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-监督管理信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgSuperviseInfoVo implements Serializable {
+public class SuperviseInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,20 +55,8 @@ public class TmJgSuperviseInfoVo implements Serializable {
     * 是否在重要场所(是、否)
     */
     private String importantPlaces;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
+
+
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/UseInfoModel.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
-    import java.util.Date;
-    import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
-    import io.swagger.annotations.ApiModel;
-    import io.swagger.annotations.ApiModelProperty;
-    import lombok.Data;
 /**
 * 特种设备基本信息-使用信息Vo
 *
 * @author duanwei
 * @date 2022-07-20
 */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class TmJgUseInfoVo implements Serializable {
+public class UseInfoModel extends AbstractBaseModel {
 
     private static final long serialVersionUID = 1L;
 
-            @ApiModelProperty(value = "设备唯一标识码")
+        @ApiModelProperty(value = "设备唯一标识码")
     /**
     * 设备唯一标识码
     */
     private String sequenceCode;
-            @ApiModelProperty(value = "监管系统唯一编码")
+        @ApiModelProperty(value = "监管系统唯一编码")
     /**
     * 监管系统唯一编码
     */
     private String superviseCode;
-            @ApiModelProperty(value = "使用单位统一信用代码")
+        @ApiModelProperty(value = "使用单位统一信用代码")
     /**
     * 使用单位统一信用代码
     */
     private String useUnitCreditCode;
-            @ApiModelProperty(value = "使用单位名称")
+        @ApiModelProperty(value = "使用单位名称")
     /**
     * 使用单位名称
     */
     private String useUnitName;
-            @ApiModelProperty(value = "产权单位统一信用代码")
+        @ApiModelProperty(value = "产权单位统一信用代码")
     /**
     * 产权单位统一信用代码
     */
     private String estateUnitCreditCode;
-            @ApiModelProperty(value = "产权单位名称")
+        @ApiModelProperty(value = "产权单位名称")
     /**
     * 产权单位名称
     */
     private String estateUnitName;
-            @ApiModelProperty(value = "使用状态变更日期")
+        @ApiModelProperty(value = "使用状态变更日期")
     /**
     * 使用状态变更日期
     */
     private Date useStateChangeDate;
-            @ApiModelProperty(value = "变更事项(使用单位名称变更、变更使用单位、改造/移装变更、延期使用变更)")
+        @ApiModelProperty(value = "变更事项(使用单位名称变更、变更使用单位、改造/移装变更、延期使用变更)")
     /**
     * 变更事项(使用单位名称变更、变更使用单位、改造/移装变更、延期使用变更)
     */
     private String changes;
-            @ApiModelProperty(value = "使用内部编号")
+        @ApiModelProperty(value = "使用内部编号")
     /**
     * 使用内部编号
     */
     private String useInnerCode;
-            @ApiModelProperty(value = "投入使用日期")
+        @ApiModelProperty(value = "投入使用日期")
     /**
     * 投入使用日期
     */
     private Date useDate;
-            @ApiModelProperty(value = "经办人")
+        @ApiModelProperty(value = "经办人")
     /**
     * 经办人
     */
     private String agent;
-            @ApiModelProperty(value = "设备所在地区代码")
+        @ApiModelProperty(value = "设备所在地区代码")
     /**
     * 设备所在地区代码
     */
     private String areaCode;
-            @ApiModelProperty(value = "设备使用地点_省")
+        @ApiModelProperty(value = "设备使用地点_省")
     /**
     * 设备使用地点_省
     */
     private String province;
-            @ApiModelProperty(value = "设备使用地点_市")
+        @ApiModelProperty(value = "设备使用地点_市")
     /**
     * 设备使用地点_市
     */
     private String city;
-            @ApiModelProperty(value = "设备使用地点_区（县）")
+        @ApiModelProperty(value = "设备使用地点_区（县）")
     /**
     * 设备使用地点_区（县）
     */
     private String county;
-            @ApiModelProperty(value = "设备使用地点_街道（镇）")
+        @ApiModelProperty(value = "设备使用地点_街道（镇）")
     /**
     * 设备使用地点_街道（镇）
     */
     private String street;
-            @ApiModelProperty(value = "设备详细使用地址")
+        @ApiModelProperty(value = "设备详细使用地址")
     /**
     * 设备详细使用地址
     */
     private String address;
-            @ApiModelProperty(value = "设备地理坐标经度")
+        @ApiModelProperty(value = "设备地理坐标经度")
     /**
     * 设备地理坐标经度
     */
     private String longitude;
-            @ApiModelProperty(value = "设备地理坐标纬度")
+        @ApiModelProperty(value = "设备地理坐标纬度")
     /**
     * 设备地理坐标纬度
     */
     private String latitude;
-            @ApiModelProperty(value = "设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)")
+        @ApiModelProperty(value = "设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)")
     /**
     * 设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)
     */
     private String usePlace;
-            @ApiModelProperty(value = "设备主管部门(药监局、经信委、文化委、市政市容委、发改委、水务局、住房建设委、交通局、商务委、旅游局、体育局、住房建设委、园林绿化局、水利局、商务委、卫生局、教育局等)")
+        @ApiModelProperty(value = "设备主管部门(药监局、经信委、文化委、市政市容委、发改委、水务局、住房建设委、交通局、商务委、旅游局、体育局、住房建设委、园林绿化局、水利局、商务委、卫生局、教育局等)")
     /**
     * 设备主管部门(药监局、经信委、文化委、市政市容委、发改委、水务局、住房建设委、交通局、商务委、旅游局、体育局、住房建设委、园林绿化局、水利局、商务委、卫生局、教育局等)
     */
     private String equManageDt;
-            @ApiModelProperty(value = "安全管理部门名称")
+        @ApiModelProperty(value = "安全管理部门名称")
     /**
     * 安全管理部门名称
     */
     private String safetyManageDt;
-            @ApiModelProperty(value = "安全管理员")
+        @ApiModelProperty(value = "安全管理员")
     /**
     * 安全管理员
     */
     private String safetyManager;
-            @ApiModelProperty(value = "安全管理员移动电话")
+        @ApiModelProperty(value = "安全管理员移动电话")
     /**
     * 安全管理员移动电话
     */
-    private Integer phone;
-            @ApiModelProperty(value = "设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)")
+    private Long phone;
+        @ApiModelProperty(value = "设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)")
     /**
     * 设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)
     */
     private String equState;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private String syncState;
-    /**
-    * 
-    */
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ConstructionInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgConstructionInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
 
 /**
  * 特种设备基本信息-施工信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgConstructionInfoMapper extends BaseMapper<TmJgConstructionInfo> {
+public interface ConstructionInfoMapper extends BaseMapper<ConstructionInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/DesignInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgDesignInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
 
 /**
  * 特种设备基本信息-设计信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgDesignInfoMapper extends BaseMapper<TmJgDesignInfo> {
+public interface DesignInfoMapper extends BaseMapper<DesignInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorTechInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgElevatorTechInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
 
 /**
  * 电梯技术参数 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgElevatorTechInfoMapper extends BaseMapper<TmJgElevatorTechInfo> {
+public interface ElevatorTechInfoMapper extends BaseMapper<ElevatorTechInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EnclosureInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgEnclosureInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EnclosureInfo;
 
 /**
  * 特种设备附件资料信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgEnclosureInfoMapper extends BaseMapper<TmJgEnclosureInfo> {
+public interface EnclosureInfoMapper extends BaseMapper<EnclosureInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EnterpriseInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgEnterpriseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EnterpriseInfo;
 
 /**
  * 企业数据信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgEnterpriseInfoMapper extends BaseMapper<TmJgEnterpriseInfo> {
+public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/FileMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
 
 /**
  *  Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgFileMapper extends BaseMapper<TmJgFile> {
+public interface FileMapper extends BaseMapper<File> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/InspectionInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgInspectionInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.InspectionInfo;
 
 /**
  * 特种设备检验信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgInspectionInfoMapper extends BaseMapper<TmJgInspectionInfo> {
+public interface InspectionInfoMapper extends BaseMapper<InspectionInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MaintenanceInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgMaintenanceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
 
 /**
  * 特种设备基本信息-维保备案信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgMaintenanceInfoMapper extends BaseMapper<TmJgMaintenanceInfo> {
+public interface MaintenanceInfoMapper extends BaseMapper<MaintenanceInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/OtherInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgOtherInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
 
 /**
  * 特种设备基本信息-其他信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgOtherInfoMapper extends BaseMapper<TmJgOtherInfo> {
+public interface OtherInfoMapper extends BaseMapper<OtherInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ProduceInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgProduceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
 
 /**
  * 特种设备基本信息-制造信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgProduceInfoMapper extends BaseMapper<TmJgProduceInfo> {
+public interface ProduceInfoMapper extends BaseMapper<ProduceInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/RegistrationInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgRegistrationInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
 
 /**
  * 特种设备基本信息-注册登记信息  Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgRegistrationInfoMapper extends BaseMapper<TmJgRegistrationInfo> {
+public interface RegistrationInfoMapper extends BaseMapper<RegistrationInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/StaffBaseInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgStaffBaseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
 
 /**
  * 人员数据信息-基本信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgStaffBaseInfoMapper extends BaseMapper<TmJgStaffBaseInfo> {
+public interface StaffBaseInfoMapper extends BaseMapper<StaffBaseInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/StaffQualifInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgStaffQualifInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo;
 
 /**
  * 人员数据信息-资质信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgStaffQualifInfoMapper extends BaseMapper<TmJgStaffQualifInfo> {
+public interface StaffQualifInfoMapper extends BaseMapper<StaffQualifInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/SuperviseInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgSuperviseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
 
 /**
  * 特种设备基本信息-监督管理信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgSuperviseInfoMapper extends BaseMapper<TmJgSuperviseInfo> {
+public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/UseInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
-import com.yeejoin.amos.api.openapi.face.orm.entity.TmJgUseInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
 
 /**
  * 特种设备基本信息-使用信息 Mapper 接口
  *
- * @author duanwei
+ * @author Zhang Yingbin
  * @date 2022-07-19
  */
-public interface TmJgUseInfoMapper extends BaseMapper<TmJgUseInfo> {
+public interface UseInfoMapper extends BaseMapper<UseInfo> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ConstructionInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,17 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-施工信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
+@Data
+@TableName("tm_jg_construction_info")
 @ApiModel(value="TmJgConstructionInfo对象", description="特种设备基本信息-施工信息")
 public class ConstructionInfo extends AbstractBaseEntity {
 
@@ -48,13 +51,6 @@ public class ConstructionInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "施工时间")
     private Date uscDate;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/DesignInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
@@ -12,15 +13,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-设计信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_design_info")
 @ApiModel(value="TmJgDesignInfo对象", description="特种设备基本信息-设计信息")
 public class DesignInfo extends AbstractBaseEntity {
 
@@ -28,7 +32,6 @@ public class DesignInfo extends AbstractBaseEntity {
 
 
     @ApiModelProperty(value = "设备唯一标识码")
-
     private String sequenceCode;
 
     @ApiModelProperty(value = "监管系统唯一编码(监管系统对接标识)")
@@ -59,13 +62,6 @@ public class DesignInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "设计文件鉴定日期")
     private Date appraisalDate;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
 
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ElevatorTechInfo.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.orm.entity;
 
 import java.util.Date;
-import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,19 +17,15 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
  * @author duanwei
  * @date 2022-07-22
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_elevator_tech_info")
 @ApiModel(value="TmJgElevatorTechInfo对象", description="电梯技术参数")
-public class TmJgElevatorTechInfo extends BaseEntity {
+public class ElevatorTechInfo extends AbstractBaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
-    @ApiModelProperty(value = "id")
-
-    private Integer sequenceNbr;
-
     @ApiModelProperty(value = "设备唯一标识码")
     private String sequenceCode;
 
@@ -116,13 +111,13 @@ public class TmJgElevatorTechInfo extends BaseEntity {
     private String safeGearProdUnit;
 
     @ApiModelProperty(value = "轿厢缓冲器型号")
-    private String carBufferModel;
+    private String carBufModel;
 
     @ApiModelProperty(value = "轿厢缓冲器编号")
-    private String carBufferNum;
+    private String carBufNum;
 
     @ApiModelProperty(value = "轿厢缓冲器制造单位")
-    private String carBufferProdUnit;
+    private String carBufProdUnit;
 
     @ApiModelProperty(value = "对重缓冲器型号")
     private String countBufModel;
@@ -169,19 +164,4 @@ public class TmJgElevatorTechInfo extends BaseEntity {
     @ApiModelProperty(value = "轿厢意外移动保护装置制造单位")
     private String carAccProtProdUnit;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date recDate;
-
-    @ApiModelProperty(value = "操作人员")
-    private String recUserId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EnclosureInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备附件资料信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_enclosure_info")
 @ApiModel(value="TmJgEnclosureInfo对象", description="特种设备附件资料信息")
 public class EnclosureInfo extends AbstractBaseEntity {
 
@@ -48,13 +52,4 @@ public class EnclosureInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "附件资料完整路径")
     private String enclosureUrl;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EnterpriseInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 企业数据信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_enterprise_info")
 @ApiModel(value="TmJgEnterpriseInfo对象", description="企业数据信息")
 public class EnterpriseInfo extends AbstractBaseEntity {
 
@@ -102,13 +106,4 @@ public class EnterpriseInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "单位地理坐标纬度")
     private String latitude;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/File.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 附件表
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_file")
 @ApiModel(value="TmJgFile对象", description="附件表")
 public class File extends AbstractBaseEntity {
 
@@ -41,10 +45,4 @@ public class File extends AbstractBaseEntity {
     @ApiModelProperty(value = "所属属性名 ")
     private String attributeType;
 
-    @ApiModelProperty(value = "同步日期")
-    private Date syncDate;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/InspectionInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备检验信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_inspection_info")
 @ApiModel(value="TmJgInspectionInfo对象", description="特种设备检验信息")
 public class InspectionInfo extends AbstractBaseEntity {
 
@@ -62,14 +66,4 @@ public class InspectionInfo extends AbstractBaseEntity {
 
     @ApiModelProperty(value = "下次检验日期")
     private Date nextInspectDate;
-
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MaintenanceInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-维保备案信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_maintenance_info")
 @ApiModel(value="TmJgMaintenanceInfo对象", description="特种设备基本信息-维保备案信息")
 public class MaintenanceInfo extends AbstractBaseEntity {
 
@@ -64,15 +68,5 @@ public class MaintenanceInfo extends AbstractBaseEntity {
     private Integer overhaulCycle;
 
     @ApiModelProperty(value = "24小时维保电话")
-    private String meTelephone24;
-
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
+    private String me24Telephone;
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/OtherInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,14 +14,16 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-其他信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
 @TableName("tm_jg_other_info")
 @ApiModel(value="TmJgOtherInfo对象", description="特种设备基本信息-其他信息")
@@ -52,14 +56,4 @@ public class OtherInfo extends AbstractBaseEntity {
 
     @ApiModelProperty(value = "96333识别码(七位电梯应急救援识别码)")
     private String code96333;
-
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ProduceInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-制造信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_produce_info")
 @ApiModel(value="TmJgProduceInfo对象", description="特种设备基本信息-制造信息")
 public class ProduceInfo extends AbstractBaseEntity {
 
@@ -59,14 +63,4 @@ public class ProduceInfo extends AbstractBaseEntity {
 
     @ApiModelProperty(value = "型式试验ID")
     private String typeTestId;
-
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/RegistrationInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-注册登记信息 
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_registration_info")
 @ApiModel(value="TmJgRegistrationInfo对象", description="特种设备基本信息-注册登记信息 ")
 public class RegistrationInfo extends AbstractBaseEntity {
 
@@ -33,6 +37,9 @@ public class RegistrationInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "监管系统唯一编码")
     private String superviseCode;
 
+    @ApiModelProperty(value = "登记机关组织机构代码")
+    private String organizationCode;
+
     @ApiModelProperty(value = "登记机关名称")
     private String organizationName;
 
@@ -69,13 +76,4 @@ public class RegistrationInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "设备总价值（万元）")
     private Double equPrice;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/StaffBaseInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 人员数据信息-基本信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_staff_base_info")
 @ApiModel(value="TmJgStaffBaseInfo对象", description="人员数据信息-基本信息")
 public class StaffBaseInfo extends AbstractBaseEntity {
 
@@ -51,13 +55,4 @@ public class StaffBaseInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "聘用时间")
     private Date employmentDate;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/StaffQualifInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 人员数据信息-资质信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_staff_qualif_info")
 @ApiModel(value="TmJgStaffQualifInfo对象", description="人员数据信息-资质信息")
 public class StaffQualifInfo extends AbstractBaseEntity {
 
@@ -42,13 +46,5 @@ public class StaffQualifInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "发证机关")
     private String issuingAuthor;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/SuperviseInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,15 +12,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-监督管理信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_supervise_info")
 @ApiModel(value="TmJgSuperviseInfo对象", description="特种设备基本信息-监督管理信息")
 public class SuperviseInfo extends AbstractBaseEntity {
 
@@ -48,13 +52,5 @@ public class SuperviseInfo extends AbstractBaseEntity {
     @ApiModelProperty(value = "是否在重要场所(是、否)")
     private String importantPlaces;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/UseInfo.java

-package com.yeejoin.precontrol.common.entity;
+package com.yeejoin.amos.api.openapi.face.orm.entity;
 
+import java.io.Serializable;
 import java.util.Date;
-import com.yeejoin.precontrol.common.entity.publics.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,23 +12,24 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 /**
  * 特种设备基本信息-使用信息
  *
  * @author duanwei
  * @date 2022-07-20
  */
-@Data
 @EqualsAndHashCode(callSuper = true)
+@Data
 @Accessors(chain = true)
+@TableName("tm_jg_use_info")
 @ApiModel(value="TmJgUseInfo对象", description="特种设备基本信息-使用信息")
-public class TmJgUseInfo extends BaseEntity {
+public class UseInfo extends AbstractBaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "设备唯一标识码")
-
     private String sequenceCode;
 
     @ApiModelProperty(value = "监管系统唯一编码")
@@ -98,18 +99,9 @@ public class TmJgUseInfo extends BaseEntity {
     private String safetyManager;
 
     @ApiModelProperty(value = "安全管理员移动电话")
-    private Integer phone;
+    private Long phone;
 
     @ApiModelProperty(value = "设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)")
     private String equState;
 
-    @ApiModelProperty(value = "同步时间")
-    private Date syncDate;
-
-    @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    private String syncState;
-
-    private String appId;
-
-
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/AppBaseService.java

-package com.yeejoin.amos.api.openapi.face.service;public class AppBaseService {
+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.constant.Constant;
+import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import org.typroject.tyboot.component.cache.Redis;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+
+
+public class AppBaseService<V, P,  M extends BaseMapper<P>> extends BaseService<V,P,M>{
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    public String getAppId() {
+        String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, RequestContext.getToken());
+        BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
+        return bizTokenModel.getAppId();
+    }
+
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ConstructionInfoService.java

@@ -3,9 +3,13 @@ package com.yeejoin.amos.api.openapi.face.service;
 import com.yeejoin.amos.api.openapi.face.model.ConstructionInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.ConstructionInfoMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
-import com.yeejoin.precontrol.common.entity.TmJgConstructionInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-施工信息 服务类
@@ -13,6 +17,65 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgConstructionInfoService extends BaseService<ConstructionInfoModel, ConstructionInfo, ConstructionInfoMapper> {
+@Component
+public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, ConstructionInfo, ConstructionInfoMapper> {
+
+
+    /**
+     *
+     * 新增施工信息
+     *
+     * @param model 施工信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveConstructionInfo(List<ConstructionInfo> model) {
+        //TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("施工信息为空.");
+        }
+        for (ConstructionInfo models : model) {
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
+
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(ConstructionInfo models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUscUnitCreditCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位统一社会信用代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUscUnitName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getConstructionType())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工类型(安装、改造、移装)不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUscInformId())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装/改造/移装告知ID不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUscDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/DesignInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgDesignInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.DesignInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.DesignInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-设计信息 服务类
@@ -9,6 +24,101 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgDesignInfoService extends IService<TmJgDesignInfo> {
+@Component
+public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInfo, DesignInfoMapper>{
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增设计信息
+     *
+     * @param model 设计信息model集合
+     * @return  成功返回“ok” 失败返回“Access_token无效”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveDesignInfo(List<DesignInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("设计信息为空.");
+        }
+
+
+        List<DesignInfo> desList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> designCodeList , designFileList;
+
+        for (DesignInfoModel designInfoModel : model) {
+            DesignInfo designInfo = new DesignInfo();
+            checkModel(designInfoModel);
+            designInfoModel.setRecDate(new Date());
+            designInfoModel.setAppId(getAppId());
+
+            designFileList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignFile()),File.class);
+            designCodeList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignCode()),File.class);
+
+            for (File files : designFileList) {
+                File file = new File();
+                file.setSequenceCode(designInfoModel.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.DESIGN_FILE.getAttribute());
+                file.setSyncDate(designInfoModel.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            for (File files : designCodeList) {
+                File file = new File();
+                file.setSequenceCode(designInfoModel.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.DESIGN_CODE.getAttribute());
+                file.setSyncDate(designInfoModel.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            BeanUtils.copyProperties(designInfoModel,designInfo);
+            desList.add(designInfo);
+
+        }
+        this.saveBatch(desList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(DesignInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getDesignUnitCreditCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位统一社会信用代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getDesignUnitName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位名称不能为空！");
+        }
+        if (ValidationUtil.isEmpty(models.getDesignUseDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计使用年限不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ElevatorTechInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgElevatorTechInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.ElevatorTechInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorTechInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 电梯技术参数 服务类
@@ -9,6 +24,84 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgElevatorTechInfoService extends IService<TmJgElevatorTechInfo> {
+@Component
+public class ElevatorTechInfoService extends AppBaseService<ElevatorTechInfoModel, ElevatorTechInfo, ElevatorTechInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增电梯技术参数
+     *
+     * @param model 电梯技术参数实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveElevatorTechInfo(List<ElevatorTechInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("电梯技术参数为空.");
+        }
+
+        List<ElevatorTechInfo> elevatorList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> governorEffiReportList;
+
+        for (ElevatorTechInfoModel models : model) {
+            ElevatorTechInfo evatorTechInfo = new ElevatorTechInfo();
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+
+            governorEffiReportList = JSONObject.parseArray(JSONObject.toJSONString(models.getGovernorEffiReport()), File.class);
+            for (File files : governorEffiReportList) {
+                File file = new File();
+                file.setSequenceCode(models.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.GOVERNOR_EFFI_REPORT.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+            BeanUtils.copyProperties(models,evatorTechInfo);
+            elevatorList.add(evatorTechInfo);
+
+        }
+        this.saveBatch(elevatorList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(ElevatorTechInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getRatedSpeed())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定速度不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getControlType())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"控制方式不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getRatedLoad())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定载重不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EnclosureInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgEnclosureInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.api.openapi.face.model.EnclosureInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EnclosureInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EnclosureInfo;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备附件资料信息 服务类
@@ -9,6 +17,28 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgEnclosureInfoService extends IService<TmJgEnclosureInfo> {
+@Component
+public class EnclosureInfoService extends AppBaseService<EnclosureInfoModel, EnclosureInfo, EnclosureInfoMapper> {
+
+    /**
+     *
+     * 新增特种设备附件资料信息
+     *
+     * @param model 特种设备附件资料信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveEnclosureInfo(List<EnclosureInfo> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("特种设备附件资料信息为空.");
+        }
 
+        for (EnclosureInfo models : model) {
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EnterpriseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgEnterpriseInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.EnterpriseInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EnterpriseInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EnterpriseInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 企业数据信息 服务类
@@ -9,6 +24,116 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgEnterpriseInfoService extends IService<TmJgEnterpriseInfo> {
+@Component
+public class EnterpriseInfoService extends AppBaseService<EnterpriseInfoModel, EnterpriseInfo, EnterpriseInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增企业数据信息
+     *
+     * @param model 企业数据信息model集合
+     * @return  成功返回“ok” 失败返回“Access_token无效”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveEnterpriseInfo(List<EnterpriseInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("企业数据信息为空.");
+        }
+
+        List<EnterpriseInfo> entList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> businessLicenseList;
+
+        for (EnterpriseInfoModel models : model) {
+            EnterpriseInfo enterpriseInfo = new EnterpriseInfo();
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+
+            businessLicenseList = JSONObject.parseArray(JSONObject.toJSONString(models.getBusinessLicense()),File.class);
+
+            for (File files : businessLicenseList) {
+                File file = new File();
+                file.setSequenceCode(models.getUseUnitCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.ENTERPRISE_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.BUSINESS_LICENSE.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            BeanUtils.copyProperties(models,enterpriseInfo);
+            entList.add(enterpriseInfo);
+        }
+        this.saveBatch(entList);
+        fileService.saveBatch(fileList);
+        return "OK";
+
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(EnterpriseInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getUseUnitCode())) {
+            throw new BadRequest("使用单位唯一标识不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseCode())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"使用单位代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseUnit())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"使用单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProvince())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位所在省份名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getCity())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位所在城市名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getDistrict())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位所在区县名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getStreet())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位所在街道名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getCommunity())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位所在社区名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getAddress())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"单位详细地址不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getLegalPerson())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"使用单位法人不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseContact())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"使用单位联系人不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getContactPhone())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"联系人联系电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSafetyOne())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"安全管理人员1姓名不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSafetyOnePhone())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"安全管理人员1联系电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/FileService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgFile;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.api.openapi.face.model.FileModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.FileMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import org.springframework.stereotype.Component;
 
 /**
  *  服务类
@@ -9,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgFileService extends IService<TmJgFile> {
+@Component
+public class FileService extends AppBaseService<FileModel, File, FileMapper> {
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/InspectionInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgInspectionInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.InspectionInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.InspectionInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import com.yeejoin.amos.api.openapi.face.orm.entity.InspectionInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备检验信息 服务类
@@ -9,6 +24,106 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgInspectionInfoService extends IService<TmJgInspectionInfo> {
+@Component
+public class InspectionInfoService extends AppBaseService<InspectionInfoModel, InspectionInfo, InspectionInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增特种设备检验信息
+     *
+     * @param model 特种设备检验信息model集合
+     * @return  成功返回“ok” 失败返回“Access_token无效”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveInspectionInfo(List<InspectionInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("特种设备检验信息为空.");
+        }
+
+        List<InspectionInfo> insList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> inspectionReportList;
+
+        for (InspectionInfoModel models : model) {
+            InspectionInfo inspectionInfo = new InspectionInfo();
+
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+            checkModel(models);
+            inspectionReportList = JSONObject.parseArray(JSONObject.toJSONString(models.getInspectionReport()),File.class);
+
+            for (File files : inspectionReportList) {
+                File file = new File();
+                file.setSequenceCode(models.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.INSPECTION_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.INSPECTION_REPORT.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            BeanUtils.copyProperties(models,inspectionInfo);
+            insList.add(inspectionInfo);
+        }
+        this.saveBatch(insList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(InspectionInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectOrgName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验机构名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectConclusion())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验结论(合格，复检合格等)不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectType())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验类型不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectReportNum())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验报告ID不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectStaff())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验人员不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProblemRemark())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验问题备注不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getNextInspectDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"下次检验日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectionReport())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"检验报告附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/MaintenanceInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgMaintenanceInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.MaintenanceInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.MaintenanceInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-维保备案信息 服务类
@@ -9,6 +23,102 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgMaintenanceInfoService extends IService<TmJgMaintenanceInfo> {
+@Component
+public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel, MaintenanceInfo, MaintenanceInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增维保备案信息
+     *
+     * @param model 维保备案信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveMaintenanceInfo(List<MaintenanceInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("维保备案信息为空.");
+        }
+
+        List<MaintenanceInfo> mainList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> repairInformList;
+
+        for (MaintenanceInfoModel models : model) {
+            MaintenanceInfo maintenanceInfo = new MaintenanceInfo();
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+
+            repairInformList = JSONObject.parseArray(JSONObject.toJSONString(models.getRepairInform()), File.class);
+
+            for (File files : repairInformList) {
+                File file = new File();
+                file.setSequenceCode(models.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.MAINTENANCE_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.REPAIR_INFORM.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+            BeanUtils.copyProperties(models,maintenanceInfo);
+            mainList.add(maintenanceInfo);
+        }
+        this.saveBatch(mainList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(MaintenanceInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getMeUnitCreditCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位统一社会信用代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getMeUnitName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getRepairInformId())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同备案ID不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInformStart())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同开始日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInformEnd())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同结束日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getMeMaster())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保负责人姓名不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEmergencycall())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"紧急救援电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getMeCycle())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保周期(单位：月)不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getMe24Telephone())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"24小时维保电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OtherInfoService.java

@@ -3,8 +3,13 @@ package com.yeejoin.amos.api.openapi.face.service;
 import com.yeejoin.amos.api.openapi.face.model.OtherInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.OtherInfoMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-其他信息 服务类
@@ -12,6 +17,49 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
  * @author duanwei
  * @date 2022-07-19
  */
-public class OtherInfoService extends BaseService<OtherInfoModel, OtherInfo, OtherInfoMapper> {
+@Component
+public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo, OtherInfoMapper> {
+
+    /**
+     *
+     * 新增其他信息
+     *
+     * @param model 其他信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveOtherInfo(List<OtherInfo> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("其他信息为空.");
+        }
+
+        for (OtherInfo models : model) {
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(OtherInfo models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ProduceInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.amos.api.openapi.constant.Constant;
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
 import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
-import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.DesignInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.ProduceInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.ProduceInfoMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
 import com.yeejoin.amos.api.openapi.face.orm.entity.File;
 import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.typroject.tyboot.component.cache.Redis;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
@@ -31,66 +24,45 @@ import java.util.List;
  * @date 2022-07-19
  */
 @Component
-public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInfo, ProduceInfoMapper> {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
+public class ProduceInfoService extends AppBaseService<ProduceInfoModel, ProduceInfo, ProduceInfoMapper> {
 
     @Autowired
     private FileService fileService;
 
-    private String getAppId() {
-        String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, RequestContext.getToken());
-        BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
-        return bizTokenModel.getAppId();
-    }
-
     /**
      *
      * 新增制造信息
      *
      * @param model 制造信息model列表
      * @return  成功返回“ok”
-     *          失败返回“Access_token无效”
      */
-    public String saveProduceInfo(List<ProduceInfoModel> model){
+    public String saveProduceInfo(List<ProduceInfoModel> model) {
 
         // TODO Auto-generated method stub
         if (ValidationUtil.isEmpty(model)) {
-            throw new BadRequest("制作信息为空.");
+            throw new BadRequest("制造信息为空.");
         }
 
-        ProduceInfo produceInfo = new ProduceInfo();
-        List<ProduceInfo> proList = new ArrayList<>();
-        File file = new File();
 
+        List<ProduceInfo> proList = new ArrayList<>();
         List<File> fileList = new ArrayList<>();
         List<File> produceStandardList,productCertificateList,iumInstructionsList,supervisionCertList,ceCertList;
 
 
         for (ProduceInfoModel models : model) {
-            if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-                throw new BadRequest("设备唯一标识码不能为空！");
-            }
-            if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-                throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-            }
-            if(ValidationUtil.isEmpty(models.getProduceUnitCreditCode())) {
-                throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位统一社会信用代码不能为空！");
-            }
-            if(ValidationUtil.isEmpty(models.getProduceUnitName())) {
-                throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位名称不能为空！");
-            }
+            ProduceInfo produceInfo = new ProduceInfo();
+            checkModel(models);
             models.setRecDate(new Date());
             models.setAppId(getAppId());
 
-            produceStandardList = models.getProduceStandard();
-            productCertificateList = models.getProductCertificate();
-            iumInstructionsList = models.getIumInstructions();
-            supervisionCertList = models.getSupervisionCert();
-            ceCertList = models.getCeCert();
+            produceStandardList = JSONObject.parseArray(JSONObject.toJSONString(models.getProduceStandard()),File.class);
+            productCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getProductCertificate()),File.class);
+            iumInstructionsList = JSONObject.parseArray(JSONObject.toJSONString(models.getIumInstructions()),File.class);
+            supervisionCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getSupervisionCert()),File.class);
+            ceCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getCeCert()),File.class);
 
             for (File files : produceStandardList) {
+                File file = new File();
                 file.setSequenceCode(models.getSequenceCode());
                 file.setAppId(getAppId());
                 file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
@@ -98,10 +70,12 @@ public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInf
                 file.setSyncDate(models.getSyncDate());
                 file.setFileUrl(files.getFileUrl());
                 file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
                 fileList.add(file);
             }
 
             for (File files : productCertificateList) {
+                File file = new File();
                 file.setSequenceCode(models.getSequenceCode());
                 file.setAppId(getAppId());
                 file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
@@ -109,9 +83,11 @@ public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInf
                 file.setSyncDate(models.getSyncDate());
                 file.setFileUrl(files.getFileUrl());
                 file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
                 fileList.add(file);
             }
             for (File files : iumInstructionsList) {
+                File file = new File();
                 file.setSequenceCode(models.getSequenceCode());
                 file.setAppId(getAppId());
                 file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
@@ -119,10 +95,12 @@ public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInf
                 file.setSyncDate(models.getSyncDate());
                 file.setFileUrl(files.getFileUrl());
                 file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
                 fileList.add(file);
             }
 
             for (File files : supervisionCertList) {
+                File file = new File();
                 file.setSequenceCode(models.getSequenceCode());
                 file.setAppId(getAppId());
                 file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
@@ -130,10 +108,12 @@ public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInf
                 file.setSyncDate(models.getSyncDate());
                 file.setFileUrl(files.getFileUrl());
                 file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
                 fileList.add(file);
             }
 
             for (File files : ceCertList) {
+                File file = new File();
                 file.setSequenceCode(models.getSequenceCode());
                 file.setAppId(getAppId());
                 file.setObjectType(JgFileObjectEnum.PRODUCE_INFO.getObject());
@@ -141,18 +121,61 @@ public class ProduceInfoService extends BaseService<ProduceInfoModel, ProduceInf
                 file.setSyncDate(models.getSyncDate());
                 file.setFileUrl(files.getFileUrl());
                 file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
                 fileList.add(file);
             }
 
-            BeanUtils.copyProperties(produceInfo,models);
+            BeanUtils.copyProperties(models,produceInfo);
             proList.add(produceInfo);
         }
-        Boolean bool1 = fileService.saveBatch(fileList);
-        Boolean bool2 = this.saveBatch(proList);
-        if( bool1 && bool2 ) {
-            return "OK";
-        } else {
-            return "Access_token无效";
+        this.saveBatch(proList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
+
+
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(ProduceInfoModel models) {
+
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProduceUnitCreditCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位统一社会信用代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProduceUnitName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getFactoryNum())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"出厂编号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProduceDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getInspectionId())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验ID不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProductCertificate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品质量合格证明附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getIumInstructions())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装及使用维护保养说明附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSupervisionCert())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验证书附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
         }
     }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/RegistrationInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgRegistrationInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.RegistrationInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.RegistrationInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-注册登记信息  服务类
@@ -9,6 +24,109 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgRegistrationInfoService extends IService<TmJgRegistrationInfo> {
+@Component
+public class RegistrationInfoService extends AppBaseService<RegistrationInfoModel, RegistrationInfo, RegistrationInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+    /**
+     *
+     * 新增注册登记信息
+     *
+     * @param model 注册登记信息model集合
+     * @return  成功返回“ok” 失败返回“Access_token无效”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveRegistrationInfo(List<RegistrationInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("注册登记信息为空.");
+        }
+
+        List<RegistrationInfo> regList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> useRegistCertificateList;
+
+        for (RegistrationInfoModel models : model) {
+            RegistrationInfo registrationInfo = new RegistrationInfo();
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+
+            useRegistCertificateList = JSONObject.parseArray(JSONObject.toJSONString(models.getUseRegistCertificate()),File.class);
+
+            for (File files : useRegistCertificateList) {
+                File file = new File();
+                file.setSequenceCode(models.getSequenceCode());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.REGISTRATION_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.USE_REGIST_CERTIFICATE.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            BeanUtils.copyProperties(models,registrationInfo);
+            regList.add(registrationInfo);
+        }
+        this.saveBatch(regList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(RegistrationInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseOrgCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证编号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOrganizationCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关组织机构代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOrganizationName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseOrgId())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记ID不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquList())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备种类不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquCategory())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备类别不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquDefine())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备品种不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProductName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEquType())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备型号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseRegistCertificate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffBaseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgStaffBaseInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.api.openapi.face.model.StaffBaseInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.StaffBaseInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 人员数据信息-基本信息 服务类
@@ -9,6 +17,64 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgStaffBaseInfoService extends IService<TmJgStaffBaseInfo> {
+@Component
+public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, StaffBaseInfo, StaffBaseInfoMapper> {
+
+    /**
+     *
+     * 新增人员基本信息
+     *
+     * @param model 人员基本信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveStaffBaseInfo(List<StaffBaseInfo> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("人员基本信息为空.");
+        }
+
+        for (StaffBaseInfo models : model) {
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(StaffBaseInfo models) {
+        if(ValidationUtil.isEmpty(models.getOperatorId())) {
+            throw new BadRequest("作业人员身份证号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOperator())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员姓名不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUnitCode())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUnit())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOperatorIdType())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员证件类型不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getPhone())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"联系电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEmploymentDate())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"聘用时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffQualifInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgStaffQualifInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.StaffQualifInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.StaffQualifInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.File;
+import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 人员数据信息-资质信息 服务类
@@ -9,6 +24,91 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgStaffQualifInfoService extends IService<TmJgStaffQualifInfo> {
+@Component
+public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel, StaffQualifInfo, StaffQualifInfoMapper> {
+
+    @Autowired
+    private FileService fileService;
+
+
+    /**
+     *
+     * 新增人员资质信息
+     *
+     * @param model 人员资质信息model集合
+     * @return  成功返回“ok”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveStaffQualifInfo(List<StaffQualifInfoModel> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("人员资质信息为空.");
+        }
+
+
+        List<StaffQualifInfo> staList = new ArrayList<>();
+        List<File> fileList = new ArrayList<>();
+        List<File> qualificationCertList;
+
+        for (StaffQualifInfoModel models : model) {
+            StaffQualifInfo staffQualifInfo = new StaffQualifInfo();
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+
+            qualificationCertList = JSONObject.parseArray(JSONObject.toJSONString(models.getQualificationCert()),File.class);
+
+            for (File files : qualificationCertList) {
+                File file = new File();
+                file.setSequenceCode(models.getOperatorId());
+                file.setAppId(getAppId());
+                file.setObjectType(JgFileObjectEnum.STAFF_QUALIF_INFO.getObject());
+                file.setAttributeType(JgFileAttributeEnum.QUALIFICATION_CERT.getAttribute());
+                file.setSyncDate(models.getSyncDate());
+                file.setFileUrl(files.getFileUrl());
+                file.setFileName(files.getFileName());
+                file.setRecDate(new Date());
+                fileList.add(file);
+            }
+
+            BeanUtils.copyProperties(models,staffQualifInfo);
+            staList.add(staffQualifInfo);
+        }
+        this.saveBatch(staList);
+        fileService.saveBatch(fileList);
+        return "OK";
+    }
+
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(StaffQualifInfoModel models) {
+        if(ValidationUtil.isEmpty(models.getOperatorId())) {
+            throw new BadRequest("作业人员身份证号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOperationItem())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOperationItemCode())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目代号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getEffectiveDate())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"有效日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getIssuingAuthor())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"发证机关不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getQualificationCert())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"资质证书附件不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
+        }
+    }
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SuperviseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgSuperviseInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.api.openapi.face.model.SuperviseInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.SuperviseInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-监督管理信息 服务类
@@ -9,6 +17,54 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgSuperviseInfoService extends IService<TmJgSuperviseInfo> {
+@Component
+public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, SuperviseInfo, SuperviseInfoMapper> {
+
+    /**
+     *
+     * 新增监督管理信息
+     *
+     * @param model 监督管理信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveSuperviseInfo(List<SuperviseInfo> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("监督管理信息为空.");
+        }
+        for (SuperviseInfo models : model) {
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
 
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(SuperviseInfo models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOrgBranchCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局组织机构代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getOrgBranchName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
-import com.yeejoin.precontrol.common.entity.TmJgUseInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.api.openapi.face.model.UseInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.UseInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 特种设备基本信息-使用信息 服务类
@@ -9,6 +17,92 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author duanwei
  * @date 2022-07-19
  */
-public interface ITmJgUseInfoService extends IService<TmJgUseInfo> {
+@Component
+public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInfoMapper> {
+
+    /**
+     *
+     * 新增使用信息
+     *
+     * @param model 使用信息实体类集合
+     * @return 成功返回“OK”
+     */
+    @Transactional(rollbackFor= {Exception.class})
+    public String saveUseInfo(List<UseInfo> model) {
+        // TODO Auto-generated method stub
+        if (ValidationUtil.isEmpty(model)) {
+            throw new BadRequest("使用信息为空.");
+        }
 
+        for (UseInfo models : model) {
+            checkModel(models);
+            models.setRecDate(new Date());
+            models.setAppId(getAppId());
+        }
+        this.saveBatch(model);
+        return "OK";
+    }
+
+    /**
+     * 信息校验
+     *
+     * @param models
+     */
+    private static void checkModel(UseInfo models) {
+        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+            throw new BadRequest("设备唯一标识码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseUnitCreditCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位统一信用代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseUnitName())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位名称不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseInnerCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用内部编号不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUseDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"投入使用日期不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getAreaCode())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备所在地区代码不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getProvince())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_省不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getCity())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_市不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getCounty())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_区（县）不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getStreet())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_街道（镇）不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getUsePlace())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getAddress())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备详细使用地址不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSafetyManager())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getPhone())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员移动电话不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getPhone())) {
+            throw new BadRequest("设备标识码为："+models.getEquState()+"的设备，"+"设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+        }
+        if(ValidationUtil.isEmpty(models.getSyncState())) {
+            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+        }
+    }
 }
+

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgBasicInfoDto.java

@@ -66,29 +66,33 @@ public class TzsJgBasicInfoDto extends BaseDto {
 	private String orgBranchCode;
 
 	@ApiModelProperty(value = "监督管理信息")
-	private TzsJgSuperviseInfo superviseInfo;
+	private TzsJgSuperviseInfoDto superviseInfo;
 
 	@ApiModelProperty(value = "设计信息")
-	private TzsJgDesignInfo designInfo;
+	private TzsJgDesignInfoDto designInfo;
 
 	@ApiModelProperty(value = "制造信息")
-	private TzsJgProduceInfo produceInfo;
+	private TzsJgProduceInfoDto produceInfo;
 
 	@ApiModelProperty(value = "注册登记信息")
-	private TzsJgRegistrationInfo registrationInfo;
+	private TzsJgRegistrationInfoDto registrationInfo;
 
 	@ApiModelProperty(value = "使用信息")
-	private TzsJgUseInfo useInfo;
+	private TzsJgUseInfoDto useInfo;
 
 	@ApiModelProperty(value = "施工信息-最新一次")
-	private TzsJgConstructionInfo constructionInfo;
+	private TzsJgConstructionInfoDto constructionInfo;
 
 	@ApiModelProperty(value = "维保信息")
-	private TzsJgMaintenanceInfo maintenanceInfo;
+	private TzsJgMaintenanceInfoDto maintenanceInfo;
+
+	@ApiModelProperty(value = "技术信息")
+	private TzsJgElevatorTechInfoDto elevatorTechInfo;
 
 	@ApiModelProperty(value = "检验信息")
-	private TzsJgInspectionInfo inspectionInfo;
+	private TzsJgInspectionInfoDto inspectionInfo;
 
+	
 	@ApiModelProperty(value = "其他信息")
-	private TzsJgOtherInfo otherInfo;
+	private TzsJgOtherInfoDto otherInfo;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgDesignInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -99,4 +101,7 @@ public class TzsJgDesignInfoDto extends BaseDto {
 	 */
 	private String recUserId;
 
+	List<TzsJgFile> designFile;
+
+	List<TzsJgFile> designCode;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgElevatorTechInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
     import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -279,4 +281,5 @@ public class TzsJgElevatorTechInfoDto extends BaseDto {
     private String recUserId;
 
 
+    List<TzsJgFile> governorEffiReport;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgInspectionInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -111,5 +113,7 @@ public class TzsJgInspectionInfoDto extends BaseDto {
 	 * 操作人员
 	 */
 	private String recUserId;
+	
+	private List<TzsJgFile> inspectionReport;
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgMaintenanceInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
-    import java.util.Date;
+import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 /**
-* 特种设备基本信息-维保备案信息Dto
-*
-* @author duanwei
-* @date 2022-07-26
-*/
+ * 特种设备基本信息-维保备案信息Dto
+ *
+ * @author duanwei
+ * @date 2022-07-26
+ */
 @Data
 public class TzsJgMaintenanceInfoDto extends BaseDto {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-            @ApiModelProperty(value = "id")
-    /**
-    * id
-    */
-    private Long sequenceNbr;
-            @ApiModelProperty(value = "设备唯一标识码")
-    /**
-    * 设备唯一标识码
-    */
-    private String sequenceCode;
-            @ApiModelProperty(value = "监管系统唯一编码")
-    /**
-    * 监管系统唯一编码
-    */
-    private String superviseCode;
-            @ApiModelProperty(value = "维保单位统一社会信用代码")
-    /**
-    * 维保单位统一社会信用代码
-    */
-    private String meUnitCreditCode;
-            @ApiModelProperty(value = "维保单位名称")
-    /**
-    * 维保单位名称
-    */
-    private String meUnitName;
-            @ApiModelProperty(value = "维保合同备案ID")
-    /**
-    * 维保合同备案ID
-    */
-    private String repairInformId;
-            @ApiModelProperty(value = "维保合同开始日期")
-    /**
-    * 维保合同开始日期
-    */
-    private Date informStart;
-            @ApiModelProperty(value = "维保合同结束日期")
-    /**
-    * 维保合同结束日期
-    */
-    private Date informEnd;
-            @ApiModelProperty(value = "维保负责人姓名")
-    /**
-    * 维保负责人姓名
-    */
-    private String meMaster;
-            @ApiModelProperty(value = "维保负责人身份证号")
-    /**
-    * 维保负责人身份证号
-    */
-    private String meMasterId;
-            @ApiModelProperty(value = "紧急救援电话")
-    /**
-    * 紧急救援电话
-    */
-    private String emergencycall;
-            @ApiModelProperty(value = "维保周期(单位：月)")
-    /**
-    * 维保周期(单位：月)
-    */
-    private Integer meCycle;
-            @ApiModelProperty(value = "大修周期(单位：月)")
-    /**
-    * 大修周期(单位：月)
-    */
-    private Integer overhaulCycle;
-            @ApiModelProperty(value = "24小时维保电话")
-    /**
-    * 24小时维保电话
-    */
-    private String me24Telephone;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private Integer syncState;
-            @ApiModelProperty(value = "对接公司编码")
-    /**
-    * 对接公司编码
-    */
-    private String appId;
-            @ApiModelProperty(value = "创建时间")
-    /**
-    * 创建时间
-    */
-    private Date recDate;
-            @ApiModelProperty(value = "操作人员")
-    /**
-    * 操作人员
-    */
-    private String recUserId;
+	@ApiModelProperty(value = "id")
+	/**
+	 * id
+	 */
+	private Long sequenceNbr;
+	@ApiModelProperty(value = "设备唯一标识码")
+	/**
+	 * 设备唯一标识码
+	 */
+	private String sequenceCode;
+	@ApiModelProperty(value = "监管系统唯一编码")
+	/**
+	 * 监管系统唯一编码
+	 */
+	private String superviseCode;
+	@ApiModelProperty(value = "维保单位统一社会信用代码")
+	/**
+	 * 维保单位统一社会信用代码
+	 */
+	private String meUnitCreditCode;
+	@ApiModelProperty(value = "维保单位名称")
+	/**
+	 * 维保单位名称
+	 */
+	private String meUnitName;
+	@ApiModelProperty(value = "维保合同备案ID")
+	/**
+	 * 维保合同备案ID
+	 */
+	private String repairInformId;
+	@ApiModelProperty(value = "维保合同开始日期")
+	/**
+	 * 维保合同开始日期
+	 */
+	private Date informStart;
+	@ApiModelProperty(value = "维保合同结束日期")
+	/**
+	 * 维保合同结束日期
+	 */
+	private Date informEnd;
+	@ApiModelProperty(value = "维保负责人姓名")
+	/**
+	 * 维保负责人姓名
+	 */
+	private String meMaster;
+	@ApiModelProperty(value = "维保负责人身份证号")
+	/**
+	 * 维保负责人身份证号
+	 */
+	private String meMasterId;
+	@ApiModelProperty(value = "紧急救援电话")
+	/**
+	 * 紧急救援电话
+	 */
+	private String emergencycall;
+	@ApiModelProperty(value = "维保周期(单位：月)")
+	/**
+	 * 维保周期(单位：月)
+	 */
+	private Integer meCycle;
+	@ApiModelProperty(value = "大修周期(单位：月)")
+	/**
+	 * 大修周期(单位：月)
+	 */
+	private Integer overhaulCycle;
+	@ApiModelProperty(value = "24小时维保电话")
+	/**
+	 * 24小时维保电话
+	 */
+	private String me24Telephone;
+	@ApiModelProperty(value = "同步时间")
+	/**
+	 * 同步时间
+	 */
+	private Date syncDate;
+	@ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
+	/**
+	 * 同步状态（0-新增 1-更新 2-删除）
+	 */
+	private Integer syncState;
+	@ApiModelProperty(value = "对接公司编码")
+	/**
+	 * 对接公司编码
+	 */
+	private String appId;
+	@ApiModelProperty(value = "创建时间")
+	/**
+	 * 创建时间
+	 */
+	private Date recDate;
+	@ApiModelProperty(value = "操作人员")
+	/**
+	 * 操作人员
+	 */
+	private String recUserId;
 
+	private List<TzsJgFile> repairInform;
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgProduceInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
-    import java.util.Date;
+import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 /**
-* 特种设备基本信息-制造信息Dto
-*
-* @author duanwei
-* @date 2022-07-26
-*/
+ * 特种设备基本信息-制造信息Dto
+ *
+ * @author duanwei
+ * @date 2022-07-26
+ */
 @Data
 public class TzsJgProduceInfoDto extends BaseDto {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "id")
+	/**
+	 * id
+	 */
+	private Long sequenceNbr;
+	@ApiModelProperty(value = "设备唯一标识码")
+	/**
+	 * 设备唯一标识码
+	 */
+	private String sequenceCode;
+	@ApiModelProperty(value = "监管系统唯一编码")
+	/**
+	 * 监管系统唯一编码
+	 */
+	private String superviseCode;
+	@ApiModelProperty(value = "制造单位统一社会信用代码")
+	/**
+	 * 制造单位统一社会信用代码
+	 */
+	private String produceUnitCreditCode;
+	@ApiModelProperty(value = "制造单位名称")
+	/**
+	 * 制造单位名称
+	 */
+	private String produceUnitName;
+	@ApiModelProperty(value = "制造许可编号")
+	/**
+	 * 制造许可编号
+	 */
+	private String produceLicenseNum;
+	@ApiModelProperty(value = "出厂编号")
+	/**
+	 * 出厂编号
+	 */
+	private String factoryNum;
+	@ApiModelProperty(value = "制造日期")
+	/**
+	 * 制造日期
+	 */
+	private Date produceDate;
+	@ApiModelProperty(value = "是否进口(是、否)")
+	/**
+	 * 是否进口(是、否)
+	 */
+	private String imported;
+	@ApiModelProperty(value = "制造国")
+	/**
+	 * 制造国
+	 */
+	private String produceCountry;
+	@ApiModelProperty(value = "监督检验ID")
+	/**
+	 * 监督检验ID
+	 */
+	private String inspectionId;
+	@ApiModelProperty(value = "型式试验ID")
+	/**
+	 * 型式试验ID
+	 */
+	private String typeTestId;
+	@ApiModelProperty(value = "同步时间")
+	/**
+	 * 同步时间
+	 */
+	private Date syncDate;
+	@ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
+	/**
+	 * 同步状态（0-新增 1-更新 2-删除）
+	 */
+	private Integer syncState;
+	@ApiModelProperty(value = "对接公司编码")
+	/**
+	 * 对接公司编码
+	 */
+	private String appId;
+	@ApiModelProperty(value = "创建时间")
+	/**
+	 * 创建时间
+	 */
+	private Date recDate;
+	@ApiModelProperty(value = "操作人员")
+	/**
+	 * 操作人员
+	 */
+	private String recUserId;
+
+	private List<TzsJgFile> produceStandard;
+
+	private List<TzsJgFile> productCertificate;
 
-            @ApiModelProperty(value = "id")
-    /**
-    * id
-    */
-    private Long sequenceNbr;
-            @ApiModelProperty(value = "设备唯一标识码")
-    /**
-    * 设备唯一标识码
-    */
-    private String sequenceCode;
-            @ApiModelProperty(value = "监管系统唯一编码")
-    /**
-    * 监管系统唯一编码
-    */
-    private String superviseCode;
-            @ApiModelProperty(value = "制造单位统一社会信用代码")
-    /**
-    * 制造单位统一社会信用代码
-    */
-    private String produceUnitCreditCode;
-            @ApiModelProperty(value = "制造单位名称")
-    /**
-    * 制造单位名称
-    */
-    private String produceUnitName;
-            @ApiModelProperty(value = "制造许可编号")
-    /**
-    * 制造许可编号
-    */
-    private String produceLicenseNum;
-            @ApiModelProperty(value = "出厂编号")
-    /**
-    * 出厂编号
-    */
-    private String factoryNum;
-            @ApiModelProperty(value = "制造日期")
-    /**
-    * 制造日期
-    */
-    private Date produceDate;
-            @ApiModelProperty(value = "是否进口(是、否)")
-    /**
-    * 是否进口(是、否)
-    */
-    private String imported;
-            @ApiModelProperty(value = "制造国")
-    /**
-    * 制造国
-    */
-    private String produceCountry;
-            @ApiModelProperty(value = "监督检验ID")
-    /**
-    * 监督检验ID
-    */
-    private String inspectionId;
-            @ApiModelProperty(value = "型式试验ID")
-    /**
-    * 型式试验ID
-    */
-    private String typeTestId;
-            @ApiModelProperty(value = "同步时间")
-    /**
-    * 同步时间
-    */
-    private Date syncDate;
-            @ApiModelProperty(value = "同步状态（0-新增   1-更新   2-删除）")
-    /**
-    * 同步状态（0-新增   1-更新   2-删除）
-    */
-    private Integer syncState;
-            @ApiModelProperty(value = "对接公司编码")
-    /**
-    * 对接公司编码
-    */
-    private String appId;
-            @ApiModelProperty(value = "创建时间")
-    /**
-    * 创建时间
-    */
-    private Date recDate;
-            @ApiModelProperty(value = "操作人员")
-    /**
-    * 操作人员
-    */
-    private String recUserId;
+	private List<TzsJgFile> iumInstructions;
 
+	private List<TzsJgFile> supervisionCert;
 
+	private List<TzsJgFile> ceCert;
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgRegistrationInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
     import java.util.Date;
+import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -123,6 +125,6 @@ public class TzsJgRegistrationInfoDto extends BaseDto {
     * 操作人员
     */
     private String recUserId;
-
-
+            
+    private List<TzsJgFile> useRegistCertificate;    
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/JgFileAttributeEnum.java

+package com.yeejoin.amos.boot.module.tzs.api.enums;
+
+/**
+ * <pre>
+ *  监管附件对象属性枚举
+ * </pre>
+ *
+ * @author Zhang Yingbin
+ */
+
+public enum JgFileAttributeEnum {
+
+    DESIGN_FILE("designFile",JgFileObjectEnum.DESIGN_INFO.getObject()),
+    DESIGN_CODE("designCode",JgFileObjectEnum.DESIGN_INFO.getObject()),
+    PRODUCE_STANDARD("produceStandard",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    PRODUCT_CERTIFICATE("productCertificate",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    IUM_INSTRUCTIONS("iumInstructions",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    SUPERVISION_CERT("supervisionCert",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    CE_CERT("ceCert",JgFileObjectEnum.PRODUCE_INFO.getObject()),
+    USE_REGIST_CERTIFICATE("useRegistCertificate",JgFileObjectEnum.REGISTRATION_INFO.getObject()),
+    REPAIR_INFORM("repairInform",JgFileObjectEnum.MAINTENANCE_INFO.getObject()),
+    INSPECTION_REPORT("inspectionReport",JgFileObjectEnum.INSPECTION_INFO.getObject()),
+    BUSINESS_LICENSE("businessLicense",JgFileObjectEnum.ENTERPRISE_INFO.getObject()),
+    QUALIFICATION_CERT("qualificationCert",JgFileObjectEnum.STAFF_QUALIF_INFO.getObject()),
+    GOVERNOR_EFFI_REPORT("governorEffiReport",JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject());
+
+    /**
+     * 属性
+     */
+    private String attribute;
+
+
+    /**
+     * 对象
+     */
+    private String object;
+
+    JgFileAttributeEnum(String attribute, String object) {
+        this.attribute = attribute;
+        this.object = object;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/JgFileObjectEnum.java

+package com.yeejoin.amos.boot.module.tzs.api.enums;
+
+/**
+ * <pre>
+ *  监管附件对象枚举
+ * </pre>
+ *
+ * @author Zhang Yingbin
+ */
+
+public enum JgFileObjectEnum {
+
+    DESIGN_INFO("designInf"),
+    PRODUCE_INFO("produceInfo"),
+    REGISTRATION_INFO("registrationInfo"),
+    MAINTENANCE_INFO("maintenanceInfo"),
+    INSPECTION_INFO("inspectionInfo"),
+    ENTERPRISE_INFO("enterpriseInfo"),
+    STAFF_QUALIF_INFO("staffQualifInfo"),
+    ELEVATOR_TECH_INFO("elevatorTechInfo");
+
+
+    /**
+     * 对象
+     */
+    private String object;
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    JgFileObjectEnum(String object) {
+        this.object = object;
+    }
+}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgConstructionInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgDesignInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgElevatorTechInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgInspectionInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgMaintenanceInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgOtherInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgProduceInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgRegistrationInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgSuperviseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgUseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgConstructionInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgDesignInfo;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgElevatorTechInfo;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgInspectionInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgMaintenanceInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgOtherInfo;
@@ -17,9 +33,13 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgProduceInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgRegistrationInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgSuperviseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgUseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.enums.JgFileAttributeEnum;
+import com.yeejoin.amos.boot.module.tzs.api.enums.JgFileObjectEnum;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.TzsJgMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgConstructionInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgDesignInfoService;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgElevatorTechInfoService;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgFileService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgInspectionInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgMaintenanceInfoService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzsJgOtherInfoService;
@@ -60,8 +80,20 @@ public class TzsJgServiceImpl implements ITzsJgService {
 	ITzsJgInspectionInfoService iTzsJgInspectionInfoService;
 
 	@Autowired
+	ITzsJgElevatorTechInfoService iTzsJgElevatorTechInfoService;
+
+	@Autowired
 	ITzsJgOtherInfoService iTzsJgOtherInfoService;
 
+	@Autowired
+	ITzsJgFileService iTzsJgFileService;
+
+	/**
+	 * 文件服务器地址
+	 */
+	@Value("${fileserver.domain}")
+	String fileServerUrl;
+
 	@Override
 	public IPage<TzsJgBasicInfoDto> page(PageParam pageParam, TzsJgBasicInfoDto tzsJgBasicInfoDto) {
 		Page<TzsJgBasicInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
@@ -73,25 +105,133 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgBasicInfoDto dto = new TzsJgBasicInfoDto();
 		TzsJgSuperviseInfo superviseInfo = iTzsJgSuperviseInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgSuperviseInfo>().eq(TzsJgSuperviseInfo::getSequenceCode, code));
+		TzsJgSuperviseInfoDto superviseInfoDto = new TzsJgSuperviseInfoDto();
+		if (superviseInfo != null) {
+			BeanUtils.copyProperties(superviseInfo, superviseInfoDto);
+		}
 		TzsJgDesignInfo designInfo = iTzsJgDesignInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgDesignInfo>().eq(TzsJgDesignInfo::getSequenceCode, code));
+		TzsJgDesignInfoDto designInfoDto = new TzsJgDesignInfoDto();
+		if (designInfo != null) {
+			BeanUtils.copyProperties(designInfo, designInfoDto);
+			List<TzsJgFile> designFile = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.DESIGN_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.DESIGN_FILE.getAttribute()));
+			designFile.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			List<TzsJgFile> designCode = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.DESIGN_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.DESIGN_CODE.getAttribute()));
+			designCode.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			designInfoDto.setDesignFile(designFile);
+			designInfoDto.setDesignCode(designCode);
+		}
 		TzsJgProduceInfo produceInfo = iTzsJgProduceInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgProduceInfo>().eq(TzsJgProduceInfo::getSequenceCode, code));
+		TzsJgProduceInfoDto produceInfoDto = new TzsJgProduceInfoDto();
+		if (produceInfo != null) {
+			BeanUtils.copyProperties(produceInfo, produceInfoDto);
+			List<TzsJgFile> produceStandard = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.PRODUCE_STANDARD.getAttribute()));
+			List<TzsJgFile> productCertificate = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.PRODUCT_CERTIFICATE.getAttribute()));
+			List<TzsJgFile> iumInstructions = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.IUM_INSTRUCTIONS.getAttribute()));
+			List<TzsJgFile> supervisionCert = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.SUPERVISION_CERT.getAttribute()));
+			List<TzsJgFile> ceCert = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.CE_CERT.getAttribute()));
+			produceStandard.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			productCertificate.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			iumInstructions.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			supervisionCert.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			ceCert.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			produceInfoDto.setProduceStandard(produceStandard);
+			produceInfoDto.setProductCertificate(productCertificate);
+			produceInfoDto.setIumInstructions(iumInstructions);
+			produceInfoDto.setSupervisionCert(supervisionCert);
+			produceInfoDto.setCeCert(ceCert);
+		}
 		TzsJgRegistrationInfo registrationInfo = iTzsJgRegistrationInfoService.getOne(
 				new LambdaQueryWrapper<TzsJgRegistrationInfo>().eq(TzsJgRegistrationInfo::getSequenceCode, code));
+		TzsJgRegistrationInfoDto registrationInfoDto = new TzsJgRegistrationInfoDto();
+		if (registrationInfo != null) {
+			BeanUtils.copyProperties(registrationInfo, registrationInfoDto);
+			List<TzsJgFile> useRegistCertificate = iTzsJgFileService.list(new LambdaQueryWrapper<TzsJgFile>()
+					.eq(TzsJgFile::getSequenceCode, code)
+					.eq(TzsJgFile::getObjectType, JgFileObjectEnum.REGISTRATION_INFO.getObject())
+					.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.USE_REGIST_CERTIFICATE.getAttribute()));
+			useRegistCertificate.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			registrationInfoDto.setUseRegistCertificate(useRegistCertificate);
+		}
 		TzsJgUseInfo useInfo = iTzsJgUseInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgUseInfo>().eq(TzsJgUseInfo::getSequenceCode, code));
+		TzsJgUseInfoDto useInfoDto = new TzsJgUseInfoDto();
+		if (useInfo != null) {
+			BeanUtils.copyProperties(useInfo, useInfoDto);
+		}
 		TzsJgConstructionInfo constructionInfo = iTzsJgConstructionInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgConstructionInfo>().eq(TzsJgConstructionInfo::getSequenceCode, code)
 						.orderByDesc(TzsJgConstructionInfo::getRecDate).last("limit 1"));
+		TzsJgConstructionInfoDto constructionInfoDto = new TzsJgConstructionInfoDto();
+		if (constructionInfo != null) {
+			BeanUtils.copyProperties(constructionInfo, constructionInfoDto);
+		}
 		TzsJgMaintenanceInfo maintenanceInfo = iTzsJgMaintenanceInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgMaintenanceInfo>().eq(TzsJgMaintenanceInfo::getSequenceCode, code)
 						.orderByDesc(TzsJgMaintenanceInfo::getRecDate).last("limit 1"));
+		TzsJgMaintenanceInfoDto maintenanceInfoDto = new TzsJgMaintenanceInfoDto();
+		if (maintenanceInfo != null) {
+			BeanUtils.copyProperties(maintenanceInfo, maintenanceInfoDto);
+			List<TzsJgFile> repairInform = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.MAINTENANCE_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.REPAIR_INFORM.getAttribute()));
+			repairInform.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			maintenanceInfoDto.setRepairInform(repairInform);
+		}
 		TzsJgInspectionInfo inspectionInfo = iTzsJgInspectionInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgInspectionInfo>().eq(TzsJgInspectionInfo::getSequenceCode, code)
 						.orderByDesc(TzsJgInspectionInfo::getRecDate).last("limit 1"));
+		TzsJgInspectionInfoDto inspectionInfoDto = new TzsJgInspectionInfoDto();
+		if (inspectionInfo != null) {
+			BeanUtils.copyProperties(inspectionInfo, inspectionInfoDto);
+			List<TzsJgFile> inspectionReport = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.INSPECTION_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.INSPECTION_REPORT.getAttribute()));
+			inspectionReport.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			inspectionInfoDto.setInspectionReport(inspectionReport);
+		}
 		TzsJgOtherInfo otherInfo = iTzsJgOtherInfoService
 				.getOne(new LambdaQueryWrapper<TzsJgOtherInfo>().eq(TzsJgOtherInfo::getSequenceCode, code));
+		TzsJgOtherInfoDto otherInfoDto = new TzsJgOtherInfoDto();
+		if (otherInfo != null) {
+			BeanUtils.copyProperties(otherInfo, otherInfoDto);
+		}
+		TzsJgElevatorTechInfo elevatorTechInfo = iTzsJgElevatorTechInfoService.getOne(
+				new LambdaQueryWrapper<TzsJgElevatorTechInfo>().eq(TzsJgElevatorTechInfo::getSequenceCode, code));
+		TzsJgElevatorTechInfoDto elevatorTechInfoDto = new TzsJgElevatorTechInfoDto();
+		if (elevatorTechInfo != null) {
+			BeanUtils.copyProperties(elevatorTechInfo, elevatorTechInfoDto);
+			List<TzsJgFile> governorEffiReport = iTzsJgFileService
+					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSequenceCode, code)
+							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject())
+							.eq(TzsJgFile::getAttributeType, JgFileAttributeEnum.GOVERNOR_EFFI_REPORT.getAttribute()));
+			governorEffiReport.forEach(i -> i.setFileUrl(fileServerUrl + i.getFileUrl()));
+			elevatorTechInfoDto.setGovernorEffiReport(governorEffiReport);
+		}
 		dto.setSequenceCode(code);
 		if (superviseInfo != null) {
 			dto.setSuperviseCode(superviseInfo.getSuperviseCode());
@@ -118,15 +258,16 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		if (produceInfo != null) {
 			dto.setFactoryNum(produceInfo.getFactoryNum());
 		}
-		dto.setSuperviseInfo(superviseInfo);
-		dto.setDesignInfo(designInfo);
-		dto.setProduceInfo(produceInfo);
-		dto.setRegistrationInfo(registrationInfo);
-		dto.setUseInfo(useInfo);
-		dto.setConstructionInfo(constructionInfo);
-		dto.setMaintenanceInfo(maintenanceInfo);
-		dto.setInspectionInfo(inspectionInfo);
-		dto.setOtherInfo(otherInfo);
+		dto.setSuperviseInfo(superviseInfoDto);
+		dto.setDesignInfo(designInfoDto);
+		dto.setProduceInfo(produceInfoDto);
+		dto.setRegistrationInfo(registrationInfoDto);
+		dto.setUseInfo(useInfoDto);
+		dto.setElevatorTechInfo(elevatorTechInfoDto);
+		dto.setConstructionInfo(constructionInfoDto);
+		dto.setMaintenanceInfo(maintenanceInfoDto);
+		dto.setInspectionInfo(inspectionInfoDto);
+		dto.setOtherInfo(otherInfoDto);
 		return dto;
 	}
 

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

@@ -27,7 +27,7 @@ biz.elasticsearch.address=39.100.239.237
 ## unit(h)
 alertcall.es.synchrony.time=48
 
-
+fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=39.100.239.237