refactor(cylinder):实体增加version字段

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderFilling.java

 package com.yeejoin.amos.boot.module.cylinder.flc.api.entity;
 
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 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.TableName;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 气瓶充装信息--充装前检查
  *
@@ -91,4 +92,6 @@ public class CylinderFilling extends BaseEntity {
     @ApiModelProperty(value = "不合格项")
     private String nonconformances;
 
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderFillingCheck.java

@@ -69,4 +69,7 @@ public class CylinderFillingCheck extends BaseEntity {
 
     @ApiModelProperty(value = "不合格项")
     private String nonconformances;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderFillingExamine.java

@@ -53,4 +53,6 @@ public class CylinderFillingExamine extends BaseEntity {
     @ApiModelProperty(value = "气瓶唯一标识")
     private String sequenceCode;
 
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderFillingRecord.java

@@ -78,4 +78,7 @@ public class CylinderFillingRecord extends BaseEntity {
 
     @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderInfo.java

@@ -123,4 +123,7 @@ public class CylinderInfo extends BaseEntity {
 
     @ApiModelProperty(value = "制造单位统一信用代码")
     private String manufacturingUnitCreditCode;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderInspection.java

@@ -59,4 +59,7 @@ public class CylinderInspection extends BaseEntity {
 
     @ApiModelProperty(value = "是否处理生过问题")
     private Boolean isDealQuestion = false;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderTags.java

 package com.yeejoin.amos.boot.module.cylinder.flc.api.entity;
 
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 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.TableName;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 气瓶标签信息
  *
@@ -25,10 +26,6 @@ public class CylinderTags extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
-
-
-
     @ApiModelProperty(value = "气瓶唯一标识码")
     private String sequenceCode;
 
@@ -39,8 +36,6 @@ public class CylinderTags extends BaseEntity {
     @ApiModelProperty(value = "电子标签编号")
     private String electronicLabelCode;
 
-
-
     @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
     private Date syncDate;
 
@@ -55,4 +50,7 @@ public class CylinderTags extends BaseEntity {
 
     @ApiModelProperty(value = "气瓶钢印标识")
     private String gasCylinderStamp;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/entity/CylinderUnit.java

 package com.yeejoin.amos.boot.module.cylinder.flc.api.entity;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
 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.TableName;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 气瓶企业信息
  *
@@ -89,4 +90,7 @@ public class CylinderUnit extends BaseEntity {
 
     @ApiModelProperty(value = "设备汇总表附件")
     private String deviceSummaryFile;
+
+    @ApiModelProperty(value = "对接接口版本")
+    private String version = "v1";
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylCylinderFillingCheckMapper.xml

@@ -164,7 +164,8 @@
         credit_code,
         fill_before_item,
         check_results,
-        nonconformances
+        nonconformances,
+        version
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -190,7 +191,8 @@
             #{item.creditCode},
             #{item.fillBeforeItem},
             #{item.checkResults},
-            #{item.nonconformances}
+            #{item.nonconformances},
+            #{item.version}
             )
         </foreach>
         on conflict (app_id, filling_before_id,sequence_code) do update set
@@ -216,7 +218,8 @@
         credit_code = EXCLUDED.credit_code,
         fill_before_item = EXCLUDED.fill_before_item,
         check_results = EXCLUDED.check_results,
-        nonconformances = EXCLUDED.nonconformances
+        nonconformances = EXCLUDED.nonconformances,
+        version = EXCLUDED.version
     </insert>
     <select id="selectCountTotal" resultType="java.lang.Long">
         SELECT
@@ -260,7 +263,8 @@
                                   filling_check_id,
                                   filling_examine_id,
                                   is_not_es,
-                                  sequence_code)
+                                  sequence_code,
+                                  version)
                 VALUES
             <foreach collection ="list" item="item" index= "index" separator =",">
                 (#{item.sequenceNbr},
@@ -281,8 +285,9 @@
                 #{item.fillingBeforeId},
                 #{item.fillingCheckId},
                 #{item.fillingExamineId},
+                null,
                 #{item.sequenceCode},
-                null)
+                #{item.version})
             </foreach>
                 on conflict (app_id, sequence_code, filling_record_id) do update set
             sequence_nbr = EXCLUDED.sequence_nbr,
@@ -304,7 +309,8 @@
             filling_check_id = EXCLUDED.filling_check_id,
             filling_examine_id = EXCLUDED.filling_examine_id,
             is_not_es  = null,
-            sequence_code = EXCLUDED.sequence_code
+            sequence_code = EXCLUDED.sequence_code,
+            version = EXCLUDED.version
     </insert>
 
     <update id="updateSyncState">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderFillingCheckMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingCheckMapper">
     <insert id="saveOrUpdateByCondition">
-        INSERT INTO "amos_tzs_biz".""tz_cylinder_filling_check" (
+        INSERT INTO "amos_tzs_biz"."tz_cylinder_filling_check" (
             "sequence_nbr",
             "filling_check_id",
             "within_scope",
@@ -21,7 +21,8 @@
             "integrity",
             "check_results",
             "nonconformances",
-            "sequence_code"
+            "sequence_code",
+            "version"
         )
         VALUES
         <foreach collection ="list" item="item" index= "index" separator =",">
@@ -44,7 +45,8 @@
             #{item.integrity},
             #{item.checkResults},
             #{item.nonconformances},
-            #{item.sequenceCode}
+            #{item.sequenceCode},
+            #{item.version}
             )
         </foreach>
         ON conflict (app_id, sequence_code, filling_check_id) DO
@@ -67,7 +69,8 @@
             "integrity" = EXCLUDED."integrity",
             "check_results" = EXCLUDED."check_results",
             "nonconformances" = EXCLUDED."nonconformances",
-            "sequence_code" = EXCLUDED."sequence_code"
+            "sequence_code" = EXCLUDED."sequence_code",
+            "version" = EXCLUDED."version"
     </insert>
 
     <select id="queryIntegirtyByAppId" resultType="java.lang.Double">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderFillingExamineMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingExamineMapper">
   <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingExamine">
       INSERT INTO
-      "amos_tzs_biz"."tz_cylinder_filling_examine"(sequence_nbr,filling_examine_id,filling_audit_date,filling_audit_url,filling_audit_name,rec_date,rec_user_id,sync_date,sync_state,app_id,sequence_code)
+      "amos_tzs_biz"."tz_cylinder_filling_examine"(sequence_nbr,filling_examine_id,filling_audit_date,filling_audit_url,filling_audit_name,rec_date,rec_user_id,sync_date,sync_state,app_id,sequence_code, version)
       VALUES
       <foreach collection="list" item="item" index="index" separator=",">
           (#{item.sequenceNbr},
@@ -16,7 +16,8 @@
           #{item.syncDate},
           #{item.syncState},
           #{item.appId},
-          #{item.sequenceCode})
+          #{item.sequenceCode},
+          #{item.version})
       </foreach>
       on conflict (app_id, sequence_code,filling_examine_id) do update set
       "filling_examine_id" = EXCLUDED."filling_examine_id",
@@ -28,6 +29,7 @@
       "sync_date" = EXCLUDED."sync_date",
       "sync_state" = EXCLUDED."sync_state",
       "app_id" = EXCLUDED."app_id",
-      "sequence_code" = EXCLUDED."sequence_code"
+      "sequence_code" = EXCLUDED."sequence_code",
+      "version" = EXCLUDED."version"
   </insert>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -498,7 +498,42 @@
     </update>
 
     <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo">
-        INSERT INTO "amos_tzs_biz"."tz_cylinder_info" ("sequence_nbr","unit_name","factory_num","cylinder_status","cylinder_variety","volume","manufacturing_date","manufacturing_unit","unit_inner_code","sequence_code","early_warning_level","early_warning_level_cal_date","end_custom_code","rec_date","rec_user_id","sync_date","sync_state","app_id","integrity","longitude","latitude","credit_code","filling_media","product_name","product_qualified","proof_quality","supervision_inspec","type_experiments","valve_manufactur_unit","nominal_work_pressure","cylinder_variety_name","filling_media_name","is_not_es","manufacturing_unit_credit_code")
+        INSERT INTO "amos_tzs_biz"."tz_cylinder_info" (
+        "sequence_nbr",
+        "unit_name",
+        "factory_num",
+        "cylinder_status",
+        "cylinder_variety",
+        "volume",
+        "manufacturing_date",
+        "manufacturing_unit",
+        "unit_inner_code",
+        "sequence_code",
+        "early_warning_level",
+        "early_warning_level_cal_date",
+        "end_custom_code",
+        "rec_date",
+        "rec_user_id",
+        "sync_date",
+        "sync_state",
+        "app_id",
+        "integrity",
+        "longitude",
+        "latitude",
+        "credit_code",
+        "filling_media",
+        "product_name",
+        "product_qualified",
+        "proof_quality",
+        "supervision_inspec",
+        "type_experiments",
+        "valve_manufactur_unit",
+        "nominal_work_pressure",
+        "cylinder_variety_name",
+        "filling_media_name",
+        "is_not_es",
+        "manufacturing_unit_credit_code",
+        "version")
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.sequenceNbr},
@@ -534,7 +569,8 @@
             #{item.cylinderVarietyName},
             #{item.fillingMediaName},
             null,
-            #{item.manufacturingUnitCreditCode})
+            #{item.manufacturingUnitCreditCode},
+            #{item.version})
         </foreach>
         on conflict (app_id,sequence_code) do update set
         "unit_name" = EXCLUDED."unit_name",
@@ -568,7 +604,8 @@
         "nominal_work_pressure" = EXCLUDED."nominal_work_pressure",
         "cylinder_variety_name" = EXCLUDED."cylinder_variety_name",
         "filling_media_name" = EXCLUDED."filling_media_name",
-        "manufacturing_unit_credit_code" = EXCLUDED."manufacturing_unit_credit_code"
+        "manufacturing_unit_credit_code" = EXCLUDED."manufacturing_unit_credit_code",
+        "version" = EXCLUDED."version"
     </insert>
 
     <update id="updateCylinderInfoEsStatusBySeqCodes">

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInspectionMapper.xml

@@ -13,7 +13,20 @@
 
     </select>
 	<insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInspection">
-		INSERT INTO "amos_tzs_biz"."tz_cylinder_inspection"(sequence_nbr,inspection_unit,sequence_code,inspection_date,next_inspection_date,inspection_result,rec_date,rec_user_id,sync_date,sync_state,app_id,scrap_quantity)
+		INSERT INTO "amos_tzs_biz"."tz_cylinder_inspection"(
+		sequence_nbr,
+		inspection_unit,
+		sequence_code,
+		inspection_date,
+		next_inspection_date,
+		inspection_result,
+		rec_date,
+		rec_user_id,
+		sync_date,
+		sync_state,
+		app_id,
+		scrap_quantity,
+		version)
 		VALUES
 		<foreach collection="list" item="item" index="index" separator=",">
 			(#{item.sequenceNbr},
@@ -27,7 +40,8 @@
 			#{item.syncDate},
 			#{item.syncState},
 			#{item.appId},
-			#{item.scrapQuantity})
+			#{item.scrapQuantity},
+			#{item.version})
 		</foreach>
 		on conflict (app_id,sequence_code,inspection_date) do update set
 		"inspection_unit" = EXCLUDED."inspection_unit",
@@ -40,6 +54,7 @@
 		"sync_date" = EXCLUDED."sync_date",
 		"sync_state" = EXCLUDED."sync_state",
 		"app_id" = EXCLUDED."app_id",
-		"scrap_quantity" = EXCLUDED."scrap_quantity"
+		"scrap_quantity" = EXCLUDED."scrap_quantity",
+		"version" = EXCLUDED."version"
 	</insert>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderUnitMapper.xml

@@ -93,7 +93,29 @@
         and not EXISTS (select 1 from tz_cylinder_question_info q where u.sequence_nbr = q.question_object_id and q.question_type  = #{questionType} )
     </select>
     <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit">
-        INSERT INTO "amos_tzs_biz"."tz_cylinder_unit" ("sequence_nbr","unit_id","region_code","unit_name","credit_code","address","unit_person","person_mobile_phone","person_telephone","postal_code","rec_date","rec_user_id","sync_date","sync_state","app_id","security_adm","security_adm_phone","region_name","qualification_file", "use_register_file", "device_summary_file")
+        INSERT INTO "amos_tzs_biz"."tz_cylinder_unit" (
+        "sequence_nbr",
+        "unit_id",
+        "region_code",
+        "unit_name",
+        "credit_code",
+        "address",
+        "unit_person",
+        "person_mobile_phone",
+        "person_telephone",
+        "postal_code",
+        "rec_date",
+        "rec_user_id",
+        "sync_date",
+        "sync_state",
+        "app_id",
+        "security_adm",
+        "security_adm_phone",
+        "region_name",
+        "qualification_file",
+        "use_register_file",
+        "device_summary_file",
+        "version")
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.sequenceNbr},
@@ -116,7 +138,8 @@
             #{item.regionName},
             #{item.qualificationFile},
             #{item.useRegisterFile},
-            #{item.deviceSummaryFile})
+            #{item.deviceSummaryFile},
+            #{item.version})
         </foreach>
         on conflict (app_id) do update set
         "unit_id" = EXCLUDED."unit_id",
@@ -138,6 +161,7 @@
         "region_name" = EXCLUDED."region_name",
         "qualification_file" = EXCLUDED."qualification_file",
         "use_register_file" = EXCLUDED."use_register_file",
-        "device_summary_file" = EXCLUDED."device_summary_file"
+        "device_summary_file" = EXCLUDED."device_summary_file",
+        "version" = EXCLUDED."version"
     </insert>
 </mapper>