项目推进提交代码:信用怀化完成

data-service/src/main/java/com/zksy/data/controller/TestController.java

@@ -3676,12 +3676,30 @@ public class TestController {
     private XcrAdministrativePenaltyService xcrAdministrativePenaltyService;
     @Autowired
     private XcrXinyonghuaihuaBaseInfoService xcrXinyonghuaihuaBaseInfoService;
+    @Autowired
+    private XcrOtherInfo36Service xcrOtherInfo36Service;
+    @Autowired
+    private XcrOtherInfo37Service xcrOtherInfo37Service;
+    @Autowired
+    private XcrOtherInfo38Service xcrOtherInfo38Service;
+    @Autowired
+    private XcrOtherInfo39Service xcrOtherInfo39Service;
+    @Autowired
+    private XcrTrustworthyIncentive42Service xcrTrustworthyIncentive42Service;
+    @Autowired
+    private  XcrDishonestyPunishment19Service xcrDishonestyPunishment19Service;
     @GetMapping("/d")
     public String test3(){
 //        xhRequestUtil.requestXinyonghuanhuai();
 //        xcrAdministrativeLicensingService.saveDataByUniCode("interface/v1/doublePublic/findLicensingList");
-        xcrAdministrativePenaltyService.saveDataByUniCode("interface/v1/doublePublic/findSanctionList");
+//        xcrAdministrativePenaltyService.saveDataByUniCode("interface/v1/doublePublic/findSanctionList");
 //        xcrXinyonghuaihuaBaseInfoService.saveDataByUniCode("interface/v1/datawarehouse/list");
+//        xcrOtherInfo36Service.saveDataByUniCode("interface/v1/datawarehouse/list");
+//        xcrOtherInfo37Service.saveDataByUniCode("interface/v1/datawarehouse/list");
+//        xcrOtherInfo38Service.saveDataByUniCode("interface/v1/datawarehouse/list");
+//        xcrOtherInfo39Service.saveDataByUniCode("interface/v1/datawarehouse/list");
+//        xcrTrustworthyIncentive42Service.saveDataByUniCode("interface/v1/datawarehouse/list");
+        xcrDishonestyPunishment19Service.saveDataByUniCode("interface/v1/datawarehouse/list");
         return "成功";
     }
     @GetMapping("/e")

data-service/src/main/java/com/zksy/data/domain/po/XcrDishonestyPunishment19.java

@@ -0,0 +1,119 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 严重失信主体名单表
+ * @TableName xcr_dishonesty_punishment_19
+ */
+@TableName(value ="xcr_dishonesty_punishment_19")
+@Data
+public class XcrDishonestyPunishment19 extends BasePo implements Serializable {
+    @TableField("entity_ztlb")
+    @JsonProperty("entity_ztlb")
+    private String entityZtlb;
+
+    @TableField("entity_hmd")
+    @JsonProperty("entity_hmd")
+    private String entityHmd;
+
+    @TableField("jdjg")
+    @JsonProperty("jdjg")
+    private String jdjg;
+
+    @TableId(value = "id", type = IdType.INPUT)
+    @TableField("id")
+    @JsonProperty("id")
+    private Long id;
+
+    @TableField("entity_name")
+    @JsonProperty("entity_name")
+    private String entityName;
+
+    @TableField("cfnr")
+    @JsonProperty("cfnr")
+    private String cfnr;
+
+    @TableField("entity_code")
+    @JsonProperty("entity_code")
+    private String entityCode;
+
+    @TableField("entity_code_add")
+    @JsonProperty("entity_code_add")
+    private String entityCodeAdd;
+
+    @TableField("entity_type")
+    @JsonProperty("entity_type")
+    private String entityType;
+
+    @TableField("inventory_id")
+    @JsonProperty("inventory_id")
+    private Long inventoryId;
+
+    @TableField("inventory_source_id")
+    @JsonProperty("inventory_source_id")
+    private Long inventorySourceId;
+
+    @TableField("meta_id")
+    @JsonProperty("meta_id")
+    private Long metaId;
+
+    @TableField("status")
+    @JsonProperty("status")
+    private String status;
+
+    @TableField("is_del")
+    @JsonProperty("is_del")
+    private Integer isDel;
+
+    @TableField("dep_id")
+    @JsonProperty("dep_id")
+    private Long depId;
+
+    @TableField("org_id")
+    @JsonProperty("org_id")
+    private Long orgId;
+
+    @TableField("batch_no")
+    @JsonProperty("batch_no")
+    private Long batchNo;
+
+    @TableField("create_user")
+    @JsonProperty("create_user")
+    private String createUser;
+
+    @TableField("update_user")
+    @JsonProperty("update_user")
+    private String updateUser;
+
+    @TableField("create_time")
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("update_time")
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField("data_code")
+    @JsonProperty("data_code")
+    private String dataCode;
+
+    @TableField("jdsj")
+    @JsonProperty("jdsj")
+    private Date jdsj;
+
+    @TableField("ssly")
+    @JsonProperty("ssly")
+    private String ssly;
+}

data-service/src/main/java/com/zksy/data/domain/po/XcrXinyonghuaihuaBaseInfo2.java → data-service/src/main/java/com/zksy/data/domain/po/XcrOtherInfo36.java

@@ -1,6 +1,8 @@
 package com.zksy.data.domain.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -8,136 +10,144 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 信用怀化基础数据2
- * @TableName xcr_xinyonghuaihua_base_info2
+ * 水费清单表
+ * @TableName xcr_other_info_36
  */
-@TableName(value ="xcr_xinyonghuaihua_base_info2")
+@TableName(value ="xcr_other_info_36")
 @Data
-public class XcrXinyonghuaihuaBaseInfo2 extends BasePo implements Serializable {
-    @JsonProperty("TABLECODE")
-    @TableField("TABLECODE")
-    private String tableCode;
-
-    @JsonProperty("Open_Date")
-    @TableField("Open_Date")
-    private String openDate;
-
-    @JsonProperty("Statistical_Base_Date")
-    @TableField("Statistical_Base_Date")
-    private String statisticalBaseDate;
+public class XcrOtherInfo36 extends BasePo implements Serializable {
+    @JsonProperty("id")
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
 
     @JsonProperty("entity_name")
     @TableField("entity_name")
     private String entityName;
 
-    @JsonProperty("MONTHLY_CONSUMPTION_6")
-    @TableField("MONTHLY_CONSUMPTION_6")
-    private Double monthlyConsumption6;
+    @JsonProperty("entity_code")
+    @TableField("entity_code")
+    private String entityCode;
 
-    @JsonProperty("User_Address")
-    @TableField("User_Address")
-    private String userAddress;
+    @JsonProperty("entity_code_add")
+    @TableField("entity_code_add")
+    private String entityCodeAdd;
 
-    @JsonProperty("Areacode")
-    @TableField("Areacode")
-    private String areacode;
+    @JsonProperty("entity_type")
+    @TableField("entity_type")
+    private String entityType;
 
-    @JsonProperty("IS_IN_ARREARS")
-    @TableField("IS_IN_ARREARS")
-    private String isInArrears;
+    @JsonProperty("inventory_id")
+    @TableField("inventory_id")
+    private Long inventoryId;
 
-    @JsonProperty("update_time")
-    @TableField("update_time")
-    private String updateTime;
+    @JsonProperty("inventory_source_id")
+    @TableField("inventory_source_id")
+    private Long inventorySourceId;
 
-    @JsonProperty("update_user")
-    @TableField("update_user")
-    private String updateUser;
+    @JsonProperty("meta_id")
+    @TableField("meta_id")
+    private Long metaId;
 
-    @JsonProperty("entity_code")
-    @TableField("entity_code")
-    private String entityCode;
+    @JsonProperty("status")
+    @TableField("status")
+    private String status;
 
     @JsonProperty("is_del")
     @TableField("is_del")
     private int isDel;
 
-    @JsonProperty("id")
-    @TableField("id")
-    private Long id;
-
-    @JsonProperty("tablename")
-    @TableField("tablename")
-    private String tableName;
-
-    @JsonProperty("userinfo")
-    @TableField("userinfo")
-    private String userInfo;
-
-    @JsonProperty("Prepaid_Amount")
-    @TableField("Prepaid_Amount")
-    private String prepaidAmount;
-
-    @JsonProperty("payment_detail")
-    @TableField("payment_detail")
-    private String paymentDetail;
-
     @JsonProperty("dep_id")
     @TableField("dep_id")
-    private Integer depId;
+    private Long depId;
+
+    @JsonProperty("org_id")
+    @TableField("org_id")
+    private Long orgId;
 
     @JsonProperty("batch_no")
     @TableField("batch_no")
     private Long batchNo;
 
+    @JsonProperty("create_user")
+    @TableField("create_user")
+    private String createUser;
+
+    @JsonProperty("update_user")
+    @TableField("update_user")
+    private String updateUser;
+
     @JsonProperty("create_time")
     @TableField("create_time")
     private String createTime;
 
+    @JsonProperty("update_time")
+    @TableField("update_time")
+    private String updateTime;
+
+    @JsonProperty("data_code")
+    @TableField("data_code")
+    private String dataCode;
+
     @JsonProperty("entity_ztlb")
     @TableField("entity_ztlb")
     private Integer entityZtlb;
 
-    @JsonProperty("meta_id")
-    @TableField("meta_id")
-    private int metaId;
+    @JsonProperty("userinfo")
+    @TableField("userinfo")
+    private String userInfo;
+
+    @JsonProperty("payment_detail")
+    @TableField("payment_detail")
+    private String paymentDetail;
+
+    @JsonProperty("MONTHLY_CONSUMPTION_3")
+    @TableField("MONTHLY_CONSUMPTION_3")
+    private String monthlyConsumption3;
+
+    @JsonProperty("MONTHLY_CONSUMPTION_6")
+    @TableField("MONTHLY_CONSUMPTION_6")
+    private String monthlyConsumption6;
+
+    @JsonProperty("IS_IN_ARREARS")
+    @TableField("IS_IN_ARREARS")
+    private String isInArrears;
+
+    @JsonProperty("tjsj")
+    @TableField("tjsj")
+    private String tjsj;
+
+    @JsonProperty("tablename")
+    @TableField("tablename")
+    private String tableName;
+
+    @JsonProperty("TABLECODE")
+    @TableField("TABLECODE")
+    private String tableCode;
 
     @JsonProperty("report_state")
     @TableField("report_state")
     private String reportState;
 
-    @JsonProperty("inventory_id")
-    @TableField("inventory_id")
-    private Integer inventoryId;
+    @JsonProperty("Open_Date")
+    @TableField("Open_Date")
+    private String openDate;
 
-    @JsonProperty("inventory_source_id")
-    @TableField("inventory_source_id")
-    private Integer inventorySourceId;
+    @JsonProperty("User_Address")
+    @TableField("User_Address")
+    private String userAddress;
+
+    @JsonProperty("Prepaid_Amount")
+    @TableField("Prepaid_Amount")
+    private String prepaidAmount;
 
     @JsonProperty("Owed_Amount")
     @TableField("Owed_Amount")
     private String owedAmount;
 
-    @JsonProperty("data_code")
-    @TableField("data_code")
-    private String dataCode;
-
-    @JsonProperty("entity_type")
-    @TableField("entity_type")
-    private String entityType;
-
-    @JsonProperty("entity_code_add")
-    @TableField("entity_code_add")
-    private String entityCodeAdd;
-
     @JsonProperty("One_Household_One_Meter")
     @TableField("One_Household_One_Meter")
     private String oneHouseholdOneMeter;
 
-    @JsonProperty("org_id")
-    @TableField("org_id")
-    private int orgId;
-
     @JsonProperty("Payment_Period")
     @TableField("Payment_Period")
     private String paymentPeriod;
@@ -146,23 +156,15 @@ public class XcrXinyonghuaihuaBaseInfo2 extends BasePo implements Serializable {
     @TableField("Bz")
     private String bz;
 
+    @JsonProperty("Areacode")
+    @TableField("Areacode")
+    private String areacode;
+
     @JsonProperty("Statistical_Date")
     @TableField("Statistical_Date")
     private String statisticalDate;
 
-    @JsonProperty("create_user")
-    @TableField("create_user")
-    private String createUser;
-
-    @JsonProperty("MONTHLY_CONSUMPTION_3")
-    @TableField("MONTHLY_CONSUMPTION_3")
-    private Double monthlyConsumption3;
-
-    @JsonProperty("tjsj")
-    @TableField("tjsj")
-    private String tjsj;
-
-    @JsonProperty("status")
-    @TableField("status")
-    private String status;
+    @JsonProperty("Statistical_Base_Date")
+    @TableField("Statistical_Base_Date")
+    private String statisticalBaseDate;
 }

data-service/src/main/java/com/zksy/data/domain/po/XcrOtherInfo37.java

@@ -0,0 +1,179 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 燃气费清单表
+ * @TableName xcr_other_info_37
+ */
+@TableName(value ="xcr_other_info_37")
+@Data
+public class XcrOtherInfo37 extends BasePo implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @JsonProperty("id")
+    private Long id;
+
+    @TableField("entity_name")
+    @JsonProperty("entity_name")
+    private String entityName;
+
+    @TableField("entity_code")
+    @JsonProperty("entity_code")
+    private String entityCode;
+
+    @TableField("entity_code_add")
+    @JsonProperty("entity_code_add")
+    private String entityCodeAdd;
+
+    @TableField("entity_type")
+    @JsonProperty("entity_type")
+    private String entityType;
+
+    @TableField("inventory_id")
+    @JsonProperty("inventory_id")
+    private Long inventoryId;
+
+    @TableField("inventory_source_id")
+    @JsonProperty("inventory_source_id")
+    private Long inventorySourceId;
+
+    @TableField("meta_id")
+    @JsonProperty("meta_id")
+    private Long metaId;
+
+    @TableField("status")
+    @JsonProperty("status")
+    private String status;
+
+    @TableField("is_del")
+    @JsonProperty("is_del")
+    private Integer isDel;
+
+    @TableField("dep_id")
+    @JsonProperty("dep_id")
+    private Long depId;
+
+    @TableField("org_id")
+    @JsonProperty("org_id")
+    private Long orgId;
+
+    @TableField("batch_no")
+    @JsonProperty("batch_no")
+    private Long batchNo;
+
+    @TableField("create_user")
+    @JsonProperty("create_user")
+    private String createUser;
+
+    @TableField("update_user")
+    @JsonProperty("update_user")
+    private String updateUser;
+
+    @TableField("create_time")
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("update_time")
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField("data_code")
+    @JsonProperty("data_code")
+    private String dataCode;
+
+    @TableField("TABLENAME")
+    @JsonProperty("TABLENAME")
+    private String tableName;
+
+    @TableField("ztlb")
+    @JsonProperty("ztlb")
+    private String ztlb;
+
+    @TableField("USERINFO")
+    @JsonProperty("USERINFO")
+    private String userinfo;
+
+    @TableField("PAYMENT_DETAIL")
+    @JsonProperty("PAYMENT_DETAIL")
+    private String paymentDetail;
+
+    @TableField("MONTHLY_CONSUMPTION_3")
+    @JsonProperty("MONTHLY_CONSUMPTION_3")
+    private BigDecimal monthlyConsumption3;
+
+    @TableField("MONTHLY_CONSUMPTION_6")
+    @JsonProperty("MONTHLY_CONSUMPTION_6")
+    private BigDecimal monthlyConsumption6;
+
+    @TableField("IS_IN_ARREARS")
+    @JsonProperty("IS_IN_ARREARS")
+    private String isInArrears;
+
+    @TableField("tjsj")
+    @JsonProperty("tjsj")
+    private Date tjsj;
+
+    @TableField("TABLECODE")
+    @JsonProperty("TABLECODE")
+    private String tablecode;
+
+    @TableField("entity_ztlb")
+    @JsonProperty("entity_ztlb")
+    private BigDecimal entityZtlb;
+
+    @TableField("report_state")
+    @JsonProperty("report_state")
+    private String reportState;
+
+    @TableField("Open_Date")
+    @JsonProperty("Open_Date")
+    private Date openDate;
+
+    @TableField("User_Address")
+    @JsonProperty("User_Address")
+    private String userAddress;
+
+    @TableField("Advance_Amount")
+    @JsonProperty("Advance_Amount")
+    private String advanceAmount;
+
+    @TableField("Arrearage_Amount_")
+    @JsonProperty("Arrearage_Amount_")
+    private String arrearageAmount;
+
+    @TableField("Onehouse_Onemeter")
+    @JsonProperty("Onehouse_Onemeter")
+    private String onehouseOnemeter;
+
+    @TableField("Payment_Period")
+    @JsonProperty("Payment_Period")
+    private String paymentPeriod;
+
+    @TableField("Statistical_Date")
+    @JsonProperty("Statistical_Date")
+    private String statisticalDate;
+
+    @TableField("Remark")
+    @JsonProperty("Remark")
+    private String remark;
+
+    @TableField("Areacode")
+    @JsonProperty("Areacode")
+    private String areacode;
+
+    @TableField("Statistical_Base_Date")
+    @JsonProperty("Statistical_Base_Date")
+    private Date statisticalBaseDate;
+}

data-service/src/main/java/com/zksy/data/domain/po/XcrOtherInfo38.java

@@ -0,0 +1,148 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 科技研发清单表
+ * @TableName xcr_other_info_38
+ */
+@TableName(value ="xcr_other_info_38")
+@Data
+public class XcrOtherInfo38 extends BasePo implements Serializable {
+
+    @TableId(value = "id", type = IdType.INPUT)
+    @JsonProperty("id")
+    private Long id;
+
+    @TableField("entity_name")
+    @JsonProperty("entity_name")
+    private String entityName;
+
+    @TableField("entity_code")
+    @JsonProperty("entity_code")
+    private String entityCode;
+
+    @TableField("entity_code_add")
+    @JsonProperty("entity_code_add")
+    private String entityCodeAdd;
+
+    @TableField("entity_type")
+    @JsonProperty("entity_type")
+    private String entityType;
+
+    @TableField("inventory_id")
+    @JsonProperty("inventory_id")
+    private Long inventoryId;
+
+    @TableField("inventory_source_id")
+    @JsonProperty("inventory_source_id")
+    private Long inventorySourceId;
+
+    @TableField("meta_id")
+    @JsonProperty("meta_id")
+    private Long metaId;
+
+    @TableField("status")
+    @JsonProperty("status")
+    private String status;
+
+    @TableField("is_del")
+    @JsonProperty("is_del")
+    private Integer isDel;
+
+    @TableField("dep_id")
+    @JsonProperty("dep_id")
+    private Long depId;
+
+    @TableField("org_id")
+    @JsonProperty("org_id")
+    private Long orgId;
+
+    @TableField("batch_no")
+    @JsonProperty("batch_no")
+    private Long batchNo;
+
+    @TableField("create_user")
+    @JsonProperty("create_user")
+    private String createUser;
+
+    @TableField("update_user")
+    @JsonProperty("update_user")
+    private String updateUser;
+
+    @TableField("create_time")
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("update_time")
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField("data_code")
+    @JsonProperty("data_code")
+    private String dataCode;
+
+    @TableField("TABLENAME")
+    @JsonProperty("TABLENAME")
+    private String tableName;
+
+    @TableField("ZTLB")
+    @JsonProperty("ZTLB")
+    private String ztlb;
+
+    @TableField("IS_HIGHTECH_ENTERPRISE")
+    @JsonProperty("IS_HIGHTECH_ENTERPRISE")
+    private String isHighTechEnterprise;
+
+    @TableField("SUPPORT_INFORMATION")
+    @JsonProperty("SUPPORT_INFORMATION")
+    private String supportInformation;
+
+    @TableField("TABLECODE")
+    @JsonProperty("TABLECODE")
+    private String tablecode;
+
+    @TableField("entity_ztmc")
+    @JsonProperty("entity_ztmc")
+    private BigDecimal entityZtmc;
+
+    @TableField("report_state")
+    @JsonProperty("report_state")
+    private String reportState;
+
+    @TableField("Littlegiant_Enterprises")
+    @JsonProperty("Littlegiant_Enterprises")
+    private String littlegiantEnterprises;
+
+    @TableField("Small_Enterprises")
+    @JsonProperty("Small_Enterprises")
+    private String smallEnterprises;
+
+    @TableField("Innovate_Enterprises")
+    @JsonProperty("Innovate_Enterprises")
+    private String innovateEnterprises;
+
+    @TableField("Highandnew_Enterprises")
+    @JsonProperty("Highandnew_Enterprises")
+    private String highandnewEnterprises;
+
+    @TableField("Technology_Enterprises")
+    @JsonProperty("Technology_Enterprises")
+    private String technologyEnterprises;
+
+    @TableField("Areacode")
+    @JsonProperty("Areacode")
+    private String areacode;
+}

data-service/src/main/java/com/zksy/data/domain/po/XcrOtherInfo39.java

@@ -0,0 +1,154 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 农业主体信息表
+ * @TableName xcr_other_info_39
+ */
+@TableName(value ="xcr_other_info_39")
+@Data
+public class XcrOtherInfo39 extends BasePo implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @JsonProperty("id")
+    private Long id;
+
+    @TableField("entity_name")
+    @JsonProperty("entity_name")
+    private String entityName;
+
+    @TableField("entity_code")
+    @JsonProperty("entity_code")
+    private String entityCode;
+
+    @TableField("entity_code_add")
+    @JsonProperty("entity_code_add")
+    private String entityCodeAdd;
+
+    @TableField("entity_type")
+    @JsonProperty("entity_type")
+    private String entityType;
+
+    @TableField("inventory_id")
+    @JsonProperty("inventory_id")
+    private Long inventoryId;
+
+    @TableField("inventory_source_id")
+    @JsonProperty("inventory_source_id")
+    private Long inventorySourceId;
+
+    @TableField("meta_id")
+    @JsonProperty("meta_id")
+    private Long metaId;
+
+    @TableField("status")
+    @JsonProperty("status")
+    private String status;
+
+    @TableField("is_del")
+    @JsonProperty("is_del")
+    private Integer isDel;
+
+    @TableField("dep_id")
+    @JsonProperty("dep_id")
+    private Long depId;
+
+    @TableField("org_id")
+    @JsonProperty("org_id")
+    private Long orgId;
+
+    @TableField("batch_no")
+    @JsonProperty("batch_no")
+    private Long batchNo;
+
+    @TableField("create_user")
+    @JsonProperty("create_user")
+    private String createUser;
+
+    @TableField("update_user")
+    @JsonProperty("update_user")
+    private String updateUser;
+
+    @TableField("create_time")
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("update_time")
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField("data_code")
+    @JsonProperty("data_code")
+    private String dataCode;
+
+    @TableField("TABLENAME")
+    @JsonProperty("TABLENAME")
+    private String tableName;
+
+    @TableField("PRINCIPAL")
+    @JsonProperty("PRINCIPAL")
+    private String principal;
+
+    @TableField("ADDRESS")
+    @JsonProperty("ADDRESS")
+    private String address;
+
+    @TableField("MANAGEMENT_CONTENT")
+    @JsonProperty("MANAGEMENT_CONTENT")
+    private String managementContent;
+
+    @TableField("MANAGEMENT_RIGHT")
+    @JsonProperty("MANAGEMENT_RIGHT")
+    private String managementRight;
+
+    @TableField("PROPERTY_RIGHT")
+    @JsonProperty("PROPERTY_RIGHT")
+    private String propertyRight;
+
+    @TableField("TABLECODE")
+    @JsonProperty("TABLECODE")
+    private String tablecode;
+
+    @TableField("report_state")
+    @JsonProperty("report_state")
+    private String reportState;
+
+    @TableField("Document_Type")
+    @JsonProperty("Document_Type")
+    private String documentType;
+
+    @TableField("Business_Type")
+    @JsonProperty("Business_Type")
+    private String businessType;
+
+    @TableField("Land_Information")
+    @JsonProperty("Land_Information")
+    private String landInformation;
+
+    @TableField("Breeding_Type")
+    @JsonProperty("Breeding_Type")
+    private String breedingType;
+
+    @TableField("Breeding_Scale")
+    @JsonProperty("Breeding_Scale")
+    private String breedingScale;
+
+    @TableField("Remark")
+    @JsonProperty("Remark")
+    private String remark;
+
+    @TableField("Areacode")
+    @JsonProperty("Areacode")
+    private String areacode;
+}

data-service/src/main/java/com/zksy/data/domain/po/XcrTrustworthyIncentive42.java

@@ -0,0 +1,115 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 红名单表
+ * @TableName xcr_trustworthy_incentive_42
+ */
+@TableName(value ="xcr_trustworthy_incentive_42")
+@Data
+public class XcrTrustworthyIncentive42 extends BasePo implements Serializable {
+    @TableField("entity_ztlb")
+    @JsonProperty("entity_ztlb")
+    private String entityZtlb;
+
+    @TableField("entity_hmd")
+    @JsonProperty("entity_hmd")
+    private String entityHmd;
+
+    @TableField("jdjg")
+    @JsonProperty("jdjg")
+    private String jdjg;
+
+    @TableId(value = "id", type = IdType.INPUT)
+    @TableField("id")
+    @JsonProperty("id")
+    private Long id;
+
+    @TableField("entity_name")
+    @JsonProperty("entity_name")
+    private String entityName;
+
+    @TableField("entity_code")
+    @JsonProperty("entity_code")
+    private String entityCode;
+
+    @TableField("entity_code_add")
+    @JsonProperty("entity_code_add")
+    private String entityCodeAdd;
+
+    @TableField("entity_type")
+    @JsonProperty("entity_type")
+    private String entityType;
+
+    @TableField("inventory_id")
+    @JsonProperty("inventory_id")
+    private Long inventoryId;
+
+    @TableField("inventory_source_id")
+    @JsonProperty("inventory_source_id")
+    private Long inventorySourceId;
+
+    @TableField("meta_id")
+    @JsonProperty("meta_id")
+    private Long metaId;
+
+    @TableField("status")
+    @JsonProperty("status")
+    private String status;
+
+    @TableField("is_del")
+    @JsonProperty("is_del")
+    private Integer isDel;
+
+    @TableField("dep_id")
+    @JsonProperty("dep_id")
+    private Long depId;
+
+    @TableField("org_id")
+    @JsonProperty("org_id")
+    private Long orgId;
+
+    @TableField("batch_no")
+    @JsonProperty("batch_no")
+    private Long batchNo;
+
+    @TableField("create_user")
+    @JsonProperty("create_user")
+    private String createUser;
+
+    @TableField("update_user")
+    @JsonProperty("update_user")
+    private String updateUser;
+
+    @TableField("create_time")
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("update_time")
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @TableField("data_code")
+    @JsonProperty("data_code")
+    private String dataCode;
+
+    @TableField("jdsj")
+    @JsonProperty("jdsj")
+    private Date jdsj;
+
+    @TableField("ssly")
+    @JsonProperty("ssly")
+    private String ssly;
+}

data-service/src/main/java/com/zksy/data/domain/response/XcrXinyonghuaihuaBaseInfo2Response.java → data-service/src/main/java/com/zksy/data/domain/response/XcrDishonestyPunishment19Response.java

@@ -2,5 +2,5 @@ package com.zksy.data.domain.response;
 
 import com.zksy.common.domain.response.BaseResponse3;
 
-public class XcrXinyonghuaihuaBaseInfo2Response extends BaseResponse3 {
+public class XcrDishonestyPunishment19Response extends BaseResponse3 {
 }

data-service/src/main/java/com/zksy/data/domain/response/XcrOtherInfo36Response.java

@@ -0,0 +1,6 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse3;
+
+public class XcrOtherInfo36Response extends BaseResponse3 {
+}

data-service/src/main/java/com/zksy/data/domain/response/XcrOtherInfo37Response.java

@@ -0,0 +1,6 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse3;
+
+public class XcrOtherInfo37Response extends BaseResponse3 {
+}

data-service/src/main/java/com/zksy/data/domain/response/XcrOtherInfo38Response.java

@@ -0,0 +1,6 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse3;
+
+public class XcrOtherInfo38Response extends BaseResponse3 {
+}

data-service/src/main/java/com/zksy/data/domain/response/XcrOtherInfo39Response.java

@@ -0,0 +1,6 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse3;
+
+public class XcrOtherInfo39Response extends BaseResponse3 {
+}

data-service/src/main/java/com/zksy/data/domain/response/XcrTrustworthyIncentive42Response.java

@@ -0,0 +1,6 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse3;
+
+public class XcrTrustworthyIncentive42Response extends BaseResponse3 {
+}

data-service/src/main/java/com/zksy/data/mapper/XcrDishonestyPunishment19Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrDishonestyPunishment19;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_dishonesty_punishment_19(严重失信主体名单表)】的数据库操作Mapper
+* @createDate 2024-10-15 12:03:18
+* @Entity com.zksy.data.domain.po.XcrDishonestyPunishment19
+*/
+public interface XcrDishonestyPunishment19Mapper extends BaseMapper<XcrDishonestyPunishment19> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrOtherInfo36Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrOtherInfo36;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_36(水费清单表)】的数据库操作Mapper
+* @createDate 2024-10-14 18:18:54
+* @Entity com.zksy.data.domain.po.XcrOtherInfo36
+*/
+public interface XcrOtherInfo36Mapper extends BaseMapper<XcrOtherInfo36> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrOtherInfo37Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrOtherInfo37;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_37(燃气费清单表)】的数据库操作Mapper
+* @createDate 2024-10-15 10:27:51
+* @Entity com.zksy.data.domain.po.XcrOtherInfo37
+*/
+public interface XcrOtherInfo37Mapper extends BaseMapper<XcrOtherInfo37> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrOtherInfo38Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrOtherInfo38;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_38(科技研发清单表)】的数据库操作Mapper
+* @createDate 2024-10-15 11:09:09
+* @Entity com.zksy.data.domain.po.XcrOtherInfo38
+*/
+public interface XcrOtherInfo38Mapper extends BaseMapper<XcrOtherInfo38> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrOtherInfo39Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrOtherInfo39;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_39(农业主体信息表)】的数据库操作Mapper
+* @createDate 2024-10-15 11:21:16
+* @Entity com.zksy.data.domain.po.XcrOtherInfo39
+*/
+public interface XcrOtherInfo39Mapper extends BaseMapper<XcrOtherInfo39> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrTrustworthyIncentive42Mapper.java

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrTrustworthyIncentive42;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_trustworthy_incentive_42(红名单表)】的数据库操作Mapper
+* @createDate 2024-10-15 11:51:26
+* @Entity com.zksy.data.domain.po.XcrTrustworthyIncentive42
+*/
+public interface XcrTrustworthyIncentive42Mapper extends BaseMapper<XcrTrustworthyIncentive42> {
+
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/mapper/XcrXinyonghuaihuaBaseInfo2Mapper.java

@@ -1,18 +0,0 @@
-package com.zksy.data.mapper;
-
-import com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 针对表【xcr_xinyonghuaihua_base_info2(信用怀化基础数据2)】的数据库操作Mapper
-* @createDate 2024-10-14 16:55:53
-* @Entity com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2
-*/
-public interface XcrXinyonghuaihuaBaseInfo2Mapper extends BaseMapper<XcrXinyonghuaihuaBaseInfo2> {
-
-}
-
-
-
-

data-service/src/main/java/com/zksy/data/service/XcrDishonestyPunishment19Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrDishonestyPunishment19;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_dishonesty_punishment_19(严重失信主体名单表)】的数据库操作Service
+* @createDate 2024-10-15 12:03:18
+*/
+public interface XcrDishonestyPunishment19Service extends IService<XcrDishonestyPunishment19>,IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrOtherInfo36Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrOtherInfo36;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_36(水费清单表)】的数据库操作Service
+* @createDate 2024-10-14 18:18:54
+*/
+public interface XcrOtherInfo36Service extends IService<XcrOtherInfo36>,IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrOtherInfo37Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrOtherInfo37;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_37(燃气费清单表)】的数据库操作Service
+* @createDate 2024-10-15 10:27:51
+*/
+public interface XcrOtherInfo37Service extends IService<XcrOtherInfo37>, IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrOtherInfo38Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrOtherInfo38;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_38(科技研发清单表)】的数据库操作Service
+* @createDate 2024-10-15 11:09:09
+*/
+public interface XcrOtherInfo38Service extends IService<XcrOtherInfo38>, IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrOtherInfo39Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrOtherInfo39;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_39(农业主体信息表)】的数据库操作Service
+* @createDate 2024-10-15 11:21:16
+*/
+public interface XcrOtherInfo39Service extends IService<XcrOtherInfo39>,IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrTrustworthyIncentive42Service.java

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrTrustworthyIncentive42;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_trustworthy_incentive_42(红名单表)】的数据库操作Service
+* @createDate 2024-10-15 11:51:26
+*/
+public interface XcrTrustworthyIncentive42Service extends IService<XcrTrustworthyIncentive42>,IBaseSaveDataInterface {
+
+}

data-service/src/main/java/com/zksy/data/service/XcrXinyonghuaihuaBaseInfo2Service.java

@@ -1,13 +0,0 @@
-package com.zksy.data.service;
-
-import com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author Administrator
-* @description 针对表【xcr_xinyonghuaihua_base_info2(信用怀化基础数据2)】的数据库操作Service
-* @createDate 2024-10-14 16:55:53
-*/
-public interface XcrXinyonghuaihuaBaseInfo2Service extends IService<XcrXinyonghuaihuaBaseInfo2>,IBaseSaveDataInterface {
-
-}

data-service/src/main/java/com/zksy/data/service/impl/XcrXinyonghuaihuaBaseInfo2ServiceImpl.java → data-service/src/main/java/com/zksy/data/service/impl/XcrDishonestyPunishment19ServiceImpl.java

@@ -1,10 +1,10 @@
 package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2;
-import com.zksy.data.domain.response.XcrXinyonghuaihuaBaseInfo2Response;
-import com.zksy.data.mapper.XcrXinyonghuaihuaBaseInfo2Mapper;
-import com.zksy.data.service.XcrXinyonghuaihuaBaseInfo2Service;
+import com.zksy.data.domain.po.XcrDishonestyPunishment19;
+import com.zksy.data.domain.response.XcrDishonestyPunishment19Response;
+import com.zksy.data.mapper.XcrDishonestyPunishment19Mapper;
+import com.zksy.data.service.XcrDishonestyPunishment19Service;
 import com.zksy.data.utils.RedisService;
 import com.zksy.data.utils.XhRequestUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -18,13 +18,13 @@ import java.util.Vector;
 
 /**
 * @author Administrator
-* @description 针对表【xcr_xinyonghuaihua_base_info2(信用怀化基础数据2)】的数据库操作Service实现
-* @createDate 2024-10-14 16:55:53
+* @description 针对表【xcr_dishonesty_punishment_19(严重失信主体名单表)】的数据库操作Service实现
+* @createDate 2024-10-15 12:03:18
 */
 @Service
 @Slf4j
-public class XcrXinyonghuaihuaBaseInfo2ServiceImpl extends ServiceImpl<XcrXinyonghuaihuaBaseInfo2Mapper, XcrXinyonghuaihuaBaseInfo2>
-    implements XcrXinyonghuaihuaBaseInfo2Service{
+public class XcrDishonestyPunishment19ServiceImpl extends ServiceImpl<XcrDishonestyPunishment19Mapper, XcrDishonestyPunishment19>
+    implements XcrDishonestyPunishment19Service{
     @Autowired
     private XhRequestUtil xhRequestUtil;
     @Autowired
@@ -34,26 +34,26 @@ public class XcrXinyonghuaihuaBaseInfo2ServiceImpl extends ServiceImpl<XcrXinyon
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
         List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
-        Vector<XcrXinyonghuaihuaBaseInfo2> toDatabaseList = new Vector<>();
-        List<String> inventoryList = List.of("20", "21","22","23","24");
+        Vector<XcrDishonestyPunishment19> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("19");
         inventoryList.parallelStream().forEach(inventory -> {
-            creditCodes.parallelStream().limit(300).forEach(creditCode -> {
+            creditCodes.parallelStream().forEach(creditCode -> {
                 HashMap<String, String> requestbodyMap = new HashMap<>();
                 requestbodyMap.put("entityCode", creditCode);
                 requestbodyMap.put("size", String.valueOf(10));
                 requestbodyMap.put("page", String.valueOf(1));
                 requestbodyMap.put("inventoryId", inventory);
                 try {
-                    List<XcrXinyonghuaihuaBaseInfo2> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
-                            XcrXinyonghuaihuaBaseInfo2Response.class,
-                            XcrXinyonghuaihuaBaseInfo2.class);
+                    List<XcrDishonestyPunishment19> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrDishonestyPunishment19Response.class,
+                            XcrDishonestyPunishment19.class);
                     if(list != null){
                         toDatabaseList.addAll(list);
                     }
                 } catch (Exception e) {
-                    List<XcrXinyonghuaihuaBaseInfo2> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
-                            XcrXinyonghuaihuaBaseInfo2Response.class,
-                            XcrXinyonghuaihuaBaseInfo2.class);
+                    List<XcrDishonestyPunishment19> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrDishonestyPunishment19Response.class,
+                            XcrDishonestyPunishment19.class);
                     if(list != null){
                         toDatabaseList.addAll(list);
                     }
@@ -63,7 +63,7 @@ public class XcrXinyonghuaihuaBaseInfo2ServiceImpl extends ServiceImpl<XcrXinyon
         });
         this.remove(null);
         this.saveBatch(toDatabaseList);
-        log.info("信用怀化基础信息同步完成");
+        log.info("严重失信主体名单表同步完成");
     }
 }
 

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo36ServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrOtherInfo36;
+import com.zksy.data.domain.response.XcrOtherInfo36Response;
+import com.zksy.data.mapper.XcrOtherInfo36Mapper;
+import com.zksy.data.service.XcrOtherInfo36Service;
+import com.zksy.data.utils.RedisService;
+import com.zksy.data.utils.XhRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_36(水费清单表)】的数据库操作Service实现
+* @createDate 2024-10-14 18:18:54
+*/
+@Service
+@Slf4j
+public class XcrOtherInfo36ServiceImpl extends ServiceImpl<XcrOtherInfo36Mapper, XcrOtherInfo36>
+    implements XcrOtherInfo36Service{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrOtherInfo36> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("36");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().limit(1000).forEach(creditCode -> {
+                HashMap<String, String> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                requestbodyMap.put("size", String.valueOf(10));
+                requestbodyMap.put("page", String.valueOf(1));
+                requestbodyMap.put("inventoryId", inventory);
+                try {
+                    List<XcrOtherInfo36> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo36Response.class,
+                            XcrOtherInfo36.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrOtherInfo36> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo36Response.class,
+                            XcrOtherInfo36.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                }
+            });
+            log.info("inventorywe为:{}完成",inventory);
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("水费清单表同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo37ServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrOtherInfo37;
+import com.zksy.data.domain.response.XcrOtherInfo37Response;
+import com.zksy.data.mapper.XcrOtherInfo37Mapper;
+import com.zksy.data.service.XcrOtherInfo37Service;
+import com.zksy.data.utils.RedisService;
+import com.zksy.data.utils.XhRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_37(燃气费清单表)】的数据库操作Service实现
+* @createDate 2024-10-15 10:27:51
+*/
+@Service
+@Slf4j
+public class XcrOtherInfo37ServiceImpl extends ServiceImpl<XcrOtherInfo37Mapper, XcrOtherInfo37>
+    implements XcrOtherInfo37Service{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrOtherInfo37> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("37");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().forEach(creditCode -> {
+                HashMap<String, String> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                requestbodyMap.put("size", String.valueOf(10));
+                requestbodyMap.put("page", String.valueOf(1));
+                requestbodyMap.put("inventoryId", inventory);
+                try {
+                    List<XcrOtherInfo37> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo37Response.class,
+                            XcrOtherInfo37.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrOtherInfo37> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo37Response.class,
+                            XcrOtherInfo37.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                }
+            });
+            log.info("inventorywe为:{}完成",inventory);
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("燃气费清单表同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo38ServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrOtherInfo38;
+import com.zksy.data.domain.response.XcrOtherInfo38Response;
+import com.zksy.data.mapper.XcrOtherInfo38Mapper;
+import com.zksy.data.service.XcrOtherInfo38Service;
+import com.zksy.data.utils.RedisService;
+import com.zksy.data.utils.XhRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_38(科技研发清单表)】的数据库操作Service实现
+* @createDate 2024-10-15 11:09:09
+*/
+@Service
+@Slf4j
+public class XcrOtherInfo38ServiceImpl extends ServiceImpl<XcrOtherInfo38Mapper, XcrOtherInfo38>
+    implements XcrOtherInfo38Service{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrOtherInfo38> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("38");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().forEach(creditCode -> {
+                HashMap<String, String> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                requestbodyMap.put("size", String.valueOf(10));
+                requestbodyMap.put("page", String.valueOf(1));
+                requestbodyMap.put("inventoryId", inventory);
+                try {
+                    List<XcrOtherInfo38> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo38Response.class,
+                            XcrOtherInfo38.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrOtherInfo38> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo38Response.class,
+                            XcrOtherInfo38.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                }
+            });
+            log.info("inventorywe为:{}完成",inventory);
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("科技研发清单表同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/service/impl/XcrOtherInfo39ServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrOtherInfo39;
+import com.zksy.data.domain.response.XcrOtherInfo39Response;
+import com.zksy.data.mapper.XcrOtherInfo39Mapper;
+import com.zksy.data.service.XcrOtherInfo39Service;
+import com.zksy.data.utils.RedisService;
+import com.zksy.data.utils.XhRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_other_info_39(农业主体信息表)】的数据库操作Service实现
+* @createDate 2024-10-15 11:21:16
+*/
+@Service
+@Slf4j
+public class XcrOtherInfo39ServiceImpl extends ServiceImpl<XcrOtherInfo39Mapper, XcrOtherInfo39>
+    implements XcrOtherInfo39Service{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrOtherInfo39> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("39");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().forEach(creditCode -> {
+                HashMap<String, String> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                requestbodyMap.put("size", String.valueOf(10));
+                requestbodyMap.put("page", String.valueOf(1));
+                requestbodyMap.put("inventoryId", inventory);
+                try {
+                    List<XcrOtherInfo39> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo39Response.class,
+                            XcrOtherInfo39.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrOtherInfo39> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrOtherInfo39Response.class,
+                            XcrOtherInfo39.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                }
+            });
+            log.info("inventorywe为:{}完成",inventory);
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("农业主体清单表同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/service/impl/XcrTrustworthyIncentive42ServiceImpl.java

@@ -0,0 +1,72 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrTrustworthyIncentive42;
+import com.zksy.data.domain.response.XcrTrustworthyIncentive42Response;
+import com.zksy.data.mapper.XcrTrustworthyIncentive42Mapper;
+import com.zksy.data.service.XcrTrustworthyIncentive42Service;
+import com.zksy.data.utils.RedisService;
+import com.zksy.data.utils.XhRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_trustworthy_incentive_42(红名单表)】的数据库操作Service实现
+* @createDate 2024-10-15 11:51:26
+*/
+@Service
+@Slf4j
+public class XcrTrustworthyIncentive42ServiceImpl extends ServiceImpl<XcrTrustworthyIncentive42Mapper, XcrTrustworthyIncentive42>
+    implements XcrTrustworthyIncentive42Service{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrTrustworthyIncentive42> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("42");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().forEach(creditCode -> {
+                HashMap<String, String> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                requestbodyMap.put("size", String.valueOf(10));
+                requestbodyMap.put("page", String.valueOf(1));
+                requestbodyMap.put("inventoryId", inventory);
+                try {
+                    List<XcrTrustworthyIncentive42> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrTrustworthyIncentive42Response.class,
+                            XcrTrustworthyIncentive42.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrTrustworthyIncentive42> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrTrustworthyIncentive42Response.class,
+                            XcrTrustworthyIncentive42.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                }
+            });
+            log.info("inventorywe为:{}完成",inventory);
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("红名单表同步完成");
+    }
+}
+
+
+
+

data-service/src/main/resources/mapper/XcrDishonestyPunishment19Mapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.data.mapper.XcrDishonestyPunishment19Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrDishonestyPunishment19">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="lybm" column="lybm" jdbcType="VARCHAR"/>
+            <result property="cfbm" column="cfbm" jdbcType="VARCHAR"/>
+            <result property="cfnr" column="cfnr" jdbcType="VARCHAR"/>
+            <result property="hmdlx" column="hmdlx" jdbcType="VARCHAR"/>
+            <result property="cfsj" column="cfsj" jdbcType="VARCHAR"/>
+            <result property="ah" column="ah" jdbcType="VARCHAR"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,lybm,cfbm,
+        cfnr,hmdlx,cfsj,
+        ah,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code
+    </sql>
+</mapper>

data-service/src/main/resources/mapper/XcrXinyonghuaihuaBaseInfo2Mapper.xml → data-service/src/main/resources/mapper/XcrOtherInfo36Mapper.xml

@@ -2,62 +2,62 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zksy.data.mapper.XcrXinyonghuaihuaBaseInfo2Mapper">
+<mapper namespace="com.zksy.data.mapper.XcrOtherInfo36Mapper">
 
-    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2">
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrOtherInfo36">
             <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="tablecode" column="TABLECODE" jdbcType="VARCHAR"/>
-            <result property="openDate" column="Open_Date" jdbcType="DATE"/>
-            <result property="statisticalBaseDate" column="Statistical_Base_Date" jdbcType="DATE"/>
             <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
-            <result property="monthlyConsumption6" column="MONTHLY_CONSUMPTION_6" jdbcType="DECIMAL"/>
-            <result property="userAddress" column="User_Address" jdbcType="VARCHAR"/>
-            <result property="areacode" column="Areacode" jdbcType="VARCHAR"/>
-            <result property="isInArrears" column="IS_IN_ARREARS" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
             <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
             <result property="isDel" column="is_del" jdbcType="INTEGER"/>
-            <result property="tablename" column="tablename" jdbcType="VARCHAR"/>
-            <result property="userinfo" column="userinfo" jdbcType="VARCHAR"/>
-            <result property="prepaidAmount" column="Prepaid_Amount" jdbcType="VARCHAR"/>
-            <result property="paymentDetail" column="payment_detail" jdbcType="VARCHAR"/>
-            <result property="depId" column="dep_id" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
             <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
             <result property="entityZtlb" column="entity_ztlb" jdbcType="INTEGER"/>
-            <result property="metaId" column="meta_id" jdbcType="INTEGER"/>
+            <result property="userinfo" column="userinfo" jdbcType="VARCHAR"/>
+            <result property="paymentDetail" column="payment_detail" jdbcType="VARCHAR"/>
+            <result property="monthlyConsumption3" column="MONTHLY_CONSUMPTION_3" jdbcType="VARCHAR"/>
+            <result property="monthlyConsumption6" column="MONTHLY_CONSUMPTION_6" jdbcType="VARCHAR"/>
+            <result property="isInArrears" column="IS_IN_ARREARS" jdbcType="VARCHAR"/>
+            <result property="tjsj" column="tjsj" jdbcType="TIMESTAMP"/>
+            <result property="tablename" column="tablename" jdbcType="VARCHAR"/>
+            <result property="tablecode" column="TABLECODE" jdbcType="VARCHAR"/>
             <result property="reportState" column="report_state" jdbcType="VARCHAR"/>
-            <result property="inventoryId" column="inventory_id" jdbcType="INTEGER"/>
-            <result property="inventorySourceId" column="inventory_source_id" jdbcType="INTEGER"/>
+            <result property="openDate" column="Open_Date" jdbcType="VARCHAR"/>
+            <result property="userAddress" column="User_Address" jdbcType="VARCHAR"/>
+            <result property="prepaidAmount" column="Prepaid_Amount" jdbcType="VARCHAR"/>
             <result property="owedAmount" column="Owed_Amount" jdbcType="VARCHAR"/>
-            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
-            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
-            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
             <result property="oneHouseholdOneMeter" column="One_Household_One_Meter" jdbcType="VARCHAR"/>
-            <result property="orgId" column="org_id" jdbcType="INTEGER"/>
             <result property="paymentPeriod" column="Payment_Period" jdbcType="VARCHAR"/>
             <result property="bz" column="Bz" jdbcType="VARCHAR"/>
-            <result property="statisticalDate" column="Statistical_Date" jdbcType="DATE"/>
-            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
-            <result property="monthlyConsumption3" column="MONTHLY_CONSUMPTION_3" jdbcType="DECIMAL"/>
-            <result property="tjsj" column="tjsj" jdbcType="TIMESTAMP"/>
-            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="areacode" column="Areacode" jdbcType="VARCHAR"/>
+            <result property="statisticalDate" column="Statistical_Date" jdbcType="VARCHAR"/>
+            <result property="statisticalBaseDate" column="Statistical_Base_Date" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,TABLECODE,Open_Date,
-        Statistical_Base_Date,entity_name,MONTHLY_CONSUMPTION_6,
-        User_Address,Areacode,IS_IN_ARREARS,
-        update_time,update_user,entity_code,
-        is_del,tablename,userinfo,
-        Prepaid_Amount,payment_detail,dep_id,
-        batch_no,create_time,entity_ztlb,
-        meta_id,report_state,inventory_id,
-        inventory_source_id,Owed_Amount,data_code,
-        entity_type,entity_code_add,One_Household_One_Meter,
-        org_id,Payment_Period,Bz,
-        Statistical_Date,create_user,MONTHLY_CONSUMPTION_3,
-        tjsj,status
+        id,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code,
+        entity_ztlb,userinfo,payment_detail,
+        MONTHLY_CONSUMPTION_3,MONTHLY_CONSUMPTION_6,IS_IN_ARREARS,
+        tjsj,tablename,TABLECODE,
+        report_state,Open_Date,User_Address,
+        Prepaid_Amount,Owed_Amount,One_Household_One_Meter,
+        Payment_Period,Bz,Areacode,
+        Statistical_Date,Statistical_Base_Date
     </sql>
 </mapper>

data-service/src/main/resources/mapper/XcrOtherInfo37Mapper.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.data.mapper.XcrOtherInfo37Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrOtherInfo37">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="tablename" column="TABLENAME" jdbcType="VARCHAR"/>
+            <result property="ztlb" column="ztlb" jdbcType="VARCHAR"/>
+            <result property="userinfo" column="USERINFO" jdbcType="VARCHAR"/>
+            <result property="paymentDetail" column="PAYMENT_DETAIL" jdbcType="VARCHAR"/>
+            <result property="monthlyConsumption3" column="MONTHLY_CONSUMPTION_3" jdbcType="DECIMAL"/>
+            <result property="monthlyConsumption6" column="MONTHLY_CONSUMPTION_6" jdbcType="DECIMAL"/>
+            <result property="isInArrears" column="IS_IN_ARREARS" jdbcType="VARCHAR"/>
+            <result property="tjsj" column="tjsj" jdbcType="TIMESTAMP"/>
+            <result property="tablecode" column="TABLECODE" jdbcType="VARCHAR"/>
+            <result property="entityZtlb" column="entity_ztlb" jdbcType="DECIMAL"/>
+            <result property="reportState" column="report_state" jdbcType="VARCHAR"/>
+            <result property="openDate" column="Open_Date" jdbcType="TIMESTAMP"/>
+            <result property="userAddress" column="User_Address" jdbcType="VARCHAR"/>
+            <result property="advanceAmount" column="Advance_Amount" jdbcType="VARCHAR"/>
+            <result property="arrearageAmount" column="Arrearage_Amount_" jdbcType="VARCHAR"/>
+            <result property="onehouseOnemeter" column="Onehouse_Onemeter" jdbcType="VARCHAR"/>
+            <result property="paymentPeriod" column="Payment_Period" jdbcType="VARCHAR"/>
+            <result property="statisticalDate" column="Statistical_Date" jdbcType="VARCHAR"/>
+            <result property="remark" column="Remark" jdbcType="VARCHAR"/>
+            <result property="areacode" column="Areacode" jdbcType="VARCHAR"/>
+            <result property="statisticalBaseDate" column="Statistical_Base_Date" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code,
+        TABLENAME,ztlb,USERINFO,
+        PAYMENT_DETAIL,MONTHLY_CONSUMPTION_3,MONTHLY_CONSUMPTION_6,
+        IS_IN_ARREARS,tjsj,TABLECODE,
+        entity_ztlb,report_state,Open_Date,
+        User_Address,Advance_Amount,Arrearage_Amount_,
+        Onehouse_Onemeter,Payment_Period,Statistical_Date,
+        Remark,Areacode,Statistical_Base_Date
+    </sql>
+</mapper>

data-service/src/main/resources/mapper/XcrOtherInfo38Mapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.data.mapper.XcrOtherInfo38Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrOtherInfo38">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="tablename" column="TABLENAME" jdbcType="VARCHAR"/>
+            <result property="ztlb" column="ZTLB" jdbcType="VARCHAR"/>
+            <result property="isHightechEnterprise" column="IS_HIGHTECH_ENTERPRISE" jdbcType="VARCHAR"/>
+            <result property="supportInformation" column="SUPPORT_INFORMATION" jdbcType="VARCHAR"/>
+            <result property="tablecode" column="TABLECODE" jdbcType="VARCHAR"/>
+            <result property="entityZtmc" column="entity_ztmc" jdbcType="DECIMAL"/>
+            <result property="reportState" column="report_state" jdbcType="VARCHAR"/>
+            <result property="littlegiantEnterprises" column="Littlegiant_Enterprises" jdbcType="VARCHAR"/>
+            <result property="smallEnterprises" column="Small_Enterprises" jdbcType="VARCHAR"/>
+            <result property="innovateEnterprises" column="Innovate_Enterprises" jdbcType="VARCHAR"/>
+            <result property="highandnewEnterprises" column="Highandnew_Enterprises" jdbcType="VARCHAR"/>
+            <result property="technologyEnterprises" column="Technology_Enterprises" jdbcType="VARCHAR"/>
+            <result property="areacode" column="Areacode" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code,
+        TABLENAME,ZTLB,IS_HIGHTECH_ENTERPRISE,
+        SUPPORT_INFORMATION,TABLECODE,entity_ztmc,
+        report_state,Littlegiant_Enterprises,Small_Enterprises,
+        Innovate_Enterprises,Highandnew_Enterprises,Technology_Enterprises,
+        Areacode
+    </sql>
+</mapper>

data-service/src/main/resources/mapper/XcrOtherInfo39Mapper.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.data.mapper.XcrOtherInfo39Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrOtherInfo39">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="tablename" column="TABLENAME" jdbcType="VARCHAR"/>
+            <result property="principal" column="PRINCIPAL" jdbcType="VARCHAR"/>
+            <result property="address" column="ADDRESS" jdbcType="VARCHAR"/>
+            <result property="managementContent" column="MANAGEMENT_CONTENT" jdbcType="VARCHAR"/>
+            <result property="managementRight" column="MANAGEMENT_RIGHT" jdbcType="VARCHAR"/>
+            <result property="propertyRight" column="PROPERTY_RIGHT" jdbcType="VARCHAR"/>
+            <result property="tablecode" column="TABLECODE" jdbcType="VARCHAR"/>
+            <result property="reportState" column="report_state" jdbcType="VARCHAR"/>
+            <result property="documentType" column="Document_Type" jdbcType="VARCHAR"/>
+            <result property="businessType" column="Business_Type" jdbcType="VARCHAR"/>
+            <result property="landInformation" column="Land_Information" jdbcType="VARCHAR"/>
+            <result property="breedingType" column="Breeding_Type" jdbcType="VARCHAR"/>
+            <result property="breedingScale" column="Breeding_Scale" jdbcType="VARCHAR"/>
+            <result property="remark" column="Remark" jdbcType="VARCHAR"/>
+            <result property="areacode" column="Areacode" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code,
+        TABLENAME,PRINCIPAL,ADDRESS,
+        MANAGEMENT_CONTENT,MANAGEMENT_RIGHT,PROPERTY_RIGHT,
+        TABLECODE,report_state,Document_Type,
+        Business_Type,Land_Information,Breeding_Type,
+        Breeding_Scale,Remark,Areacode
+    </sql>
+</mapper>

data-service/src/main/resources/mapper/XcrTrustworthyIncentive42Mapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.data.mapper.XcrTrustworthyIncentive42Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrTrustworthyIncentive42">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityZtlb" column="entity_ztlb" jdbcType="VARCHAR"/>
+            <result property="entityHmd" column="entity_hmd" jdbcType="VARCHAR"/>
+            <result property="jdjg" column="jdjg" jdbcType="VARCHAR"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="BIGINT"/>
+            <result property="metaId" column="meta_id" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="depId" column="dep_id" jdbcType="BIGINT"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="jdsj" column="jdsj" jdbcType="TIMESTAMP"/>
+            <result property="ssly" column="ssly" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_ztlb,entity_hmd,
+        jdjg,entity_name,entity_code,
+        entity_code_add,entity_type,inventory_id,
+        inventory_source_id,meta_id,status,
+        is_del,dep_id,org_id,
+        batch_no,create_user,update_user,
+        create_time,update_time,data_code,
+        jdsj,ssly
+    </sql>
+</mapper>