项目推进提交代码

data-service/src/main/java/com/zksy/data/config/RedissonConfig.java

@@ -0,0 +1,25 @@
+package com.zksy.data.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissonConfig {
+    @Value("${redisson.address}")
+    private String address;
+    @Value("${redisson.pw}")
+    private String pw;
+    @Bean(destroyMethod = "shutdown")
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+        config.useSingleServer()
+            .setAddress(address)
+            .setPassword(pw)
+            .setDatabase(0);
+        return Redisson.create(config);
+    }
+}

data-service/src/main/java/com/zksy/data/constant/RedisKeyConstant.java

@@ -2,4 +2,5 @@ package com.zksy.data.constant;
 
 public class RedisKeyConstant {
     public static final String HUAIHUA_TOKEN_KEY = "xinyonghuaihua:token";
+    public static final String HUAIHUA_LOCK_KEY = "xinyonghuaihua:lock";
 }

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

@@ -6,10 +6,13 @@ import com.zksy.data.utils.XhRequestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/test")
@@ -3669,10 +3672,37 @@ public class TestController {
     }
     @Autowired
     private XcrAdministrativeLicensingService xcrAdministrativeLicensingService;
+    @Autowired
+    private XcrAdministrativePenaltyService xcrAdministrativePenaltyService;
+    @Autowired
+    private XcrXinyonghuaihuaBaseInfoService xcrXinyonghuaihuaBaseInfoService;
     @GetMapping("/d")
     public String test3(){
 //        xhRequestUtil.requestXinyonghuanhuai();
-        xcrAdministrativeLicensingService.saveDataByUniCode("interface/v1/doublePublic/findLicensingList");
+//        xcrAdministrativeLicensingService.saveDataByUniCode("interface/v1/doublePublic/findLicensingList");
+        xcrAdministrativePenaltyService.saveDataByUniCode("interface/v1/doublePublic/findSanctionList");
+//        xcrXinyonghuaihuaBaseInfoService.saveDataByUniCode("interface/v1/datawarehouse/list");
         return "成功";
     }
+    @GetMapping("/e")
+    public String test4(String address,@RequestParam(value = "inventoryId",defaultValue = "") Long inventoryId){
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        String s = "";
+        for (String creditCode : creditCodes) {
+            try {
+                HashMap<String, Object> requestbodyMap = new HashMap<>();
+                requestbodyMap.put("entityCode", creditCode);
+                if(!Objects.equals(inventoryId, "")){
+                    requestbodyMap.put("inventoryId",inventoryId);
+                }
+                s = xhRequestUtil.testHttpRequest(requestbodyMap, address);
+            } catch (Exception e) {
+                break;
+            }
+        }
+        ss = s;
+        System.out.println("找到了,去浏览器拿结构建实体类");
+        System.out.println(ss);
+        return ss;
+    }
 }

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

@@ -1,173 +1,162 @@
 package com.zksy.data.domain.po;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class Temp extends BasePo implements Serializable {
+    @JsonProperty("TABLECODE")
+    @TableField("TABLECODE")
+    private String tableCode;
 
-    @JsonProperty("BZ")
-    private String BZ;
+    @JsonProperty("Open_Date")
+    @TableField("Open_Date")
+    private String openDate;
 
-    @JsonProperty("FBZT")
-    private String FBZT;
+    @JsonProperty("Statistical_Base_Date")
+    @TableField("Statistical_Base_Date")
+    private String statisticalBaseDate;
 
-    @JsonProperty("ISLATE")
-    private String ISLATE;
-
-    @JsonProperty("UNID")
-    private String UNID;
-
-    @JsonProperty("XK_FDDBRZJLX_OTHER")
-    private String XK_FDDBRZJLX_OTHER;
-
-    @JsonProperty("XK_FRDB")
-    private String XK_FRDB;
-
-    @JsonProperty("XK_FR_ZJHM")
-    private String XK_FR_ZJHM;
-
-    @JsonProperty("XK_FR_ZJLX")
-    private String XK_FR_ZJLX;
-
-    @JsonProperty("XK_JDRQ")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private Date XK_JDRQ;
-
-    @JsonProperty("XK_LB_OTHER")
-    private String XK_LB_OTHER;
-
-    @JsonProperty("XK_LYDW")
-    private String XK_LYDW;
-
-    @JsonProperty("XK_LYDWDM")
-    private String XK_LYDWDM;
-
-    @JsonProperty("XK_NR")
-    private String XK_NR;
-
-    @JsonProperty("XK_WSH")
-    private String XK_WSH;
+    @JsonProperty("entity_name")
+    @TableField("entity_name")
+    private String entityName;
 
-    @JsonProperty("XK_XDR_GSZC")
-    private String XK_XDR_GSZC;
+    @JsonProperty("MONTHLY_CONSUMPTION_6")
+    @TableField("MONTHLY_CONSUMPTION_6")
+    private Double monthlyConsumption6;
 
-    @JsonProperty("XK_XDR_LB")
-    private String XK_XDR_LB;
+    @JsonProperty("User_Address")
+    @TableField("User_Address")
+    private String userAddress;
 
-    @JsonProperty("XK_XDR_SHXYM")
-    private String XK_XDR_SHXYM;
+    @JsonProperty("Areacode")
+    @TableField("Areacode")
+    private String areacode;
 
-    @JsonProperty("XK_XDR_SHZZ")
-    private String XK_XDR_SHZZ;
+    @JsonProperty("IS_IN_ARREARS")
+    @TableField("IS_IN_ARREARS")
+    private String isInArrears;
 
-    @JsonProperty("XK_XDR_SWDJ")
-    private String XK_XDR_SWDJ;
+    @JsonProperty("update_time")
+    @TableField("update_time")
+    private String updateTime;
 
-    @JsonProperty("XK_XDR_SYDW")
-    private String XK_XDR_SYDW;
+    @JsonProperty("update_user")
+    @TableField("update_user")
+    private String updateUser;
 
-    @JsonProperty("XK_XDR_ZJHM")
-    private String XK_XDR_ZJHM;
+    @JsonProperty("entity_code")
+    @TableField("entity_code")
+    private String entityCode;
 
-    @JsonProperty("XK_XDR_ZJLX")
-    private String XK_XDR_ZJLX;
+    @JsonProperty("is_del")
+    @TableField("is_del")
+    private int isDel;
 
-    @JsonProperty("XK_XDR_ZZJG")
-    private String XK_XDR_ZZJG;
+    @JsonProperty("id")
+    @TableField("id")
+    private Long id;
 
-    @JsonProperty("XK_XKBH")
-    private String XK_XKBH;
+    @JsonProperty("tablename")
+    @TableField("tablename")
+    private String tableName;
 
-    @JsonProperty("XK_XKJG")
-    private String XK_XKJG;
+    @JsonProperty("userinfo")
+    @TableField("userinfo")
+    private String userInfo;
 
-    @JsonProperty("XK_XKJGDM")
-    private String XK_XKJGDM;
+    @JsonProperty("Prepaid_Amount")
+    @TableField("Prepaid_Amount")
+    private String prepaidAmount;
 
-    @JsonProperty("XK_XKLB")
-    private String XK_XKLB;
+    @JsonProperty("payment_detail")
+    @TableField("payment_detail")
+    private String paymentDetail;
 
-    @JsonProperty("XK_XKWS")
-    private String XK_XKWS;
+    @JsonProperty("dep_id")
+    @TableField("dep_id")
+    private Integer depId;
 
-    @JsonProperty("XK_XKZS")
-    private String XK_XKZS;
+    @JsonProperty("batch_no")
+    @TableField("batch_no")
+    private Long batchNo;
 
-    @JsonProperty("XK_YXQZ")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private Date XK_YXQZ;
+    @JsonProperty("create_time")
+    @TableField("create_time")
+    private String createTime;
 
-    @JsonProperty("XK_YXQZI")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private Date XK_YXQZI;
+    @JsonProperty("entity_ztlb")
+    @TableField("entity_ztlb")
+    private Integer entityZtlb;
 
-    @JsonProperty("XK_ZJLX_OTHER")
-    private String XK_ZJLX_OTHER;
+    @JsonProperty("meta_id")
+    @TableField("meta_id")
+    private int metaId;
 
-    @JsonProperty("XK_ZT")
-    private String XK_ZT;
+    @JsonProperty("report_state")
+    @TableField("report_state")
+    private String reportState;
 
-    @JsonProperty("batch_no")
-    private Long batch_no;
+    @JsonProperty("inventory_id")
+    @TableField("inventory_id")
+    private Integer inventoryId;
 
-    @JsonProperty("create_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date create_time;
+    @JsonProperty("inventory_source_id")
+    @TableField("inventory_source_id")
+    private Integer inventorySourceId;
 
-    @JsonProperty("create_user")
-    private String create_user;
+    @JsonProperty("Owed_Amount")
+    @TableField("Owed_Amount")
+    private String owedAmount;
 
     @JsonProperty("data_code")
-    private String data_code;
+    @TableField("data_code")
+    private String dataCode;
 
-    @JsonProperty("dep_id")
-    private Integer dep_id;
-
-    @JsonProperty("entity_code")
-    private String entity_code;
+    @JsonProperty("entity_type")
+    @TableField("entity_type")
+    private String entityType;
 
     @JsonProperty("entity_code_add")
-    private String entity_code_add;
-
-    @JsonProperty("entity_name")
-    private String entity_name;
+    @TableField("entity_code_add")
+    private String entityCodeAdd;
 
-    @JsonProperty("entity_type")
-    private String entity_type;
+    @JsonProperty("One_Household_One_Meter")
+    @TableField("One_Household_One_Meter")
+    private String oneHouseholdOneMeter;
 
-    @JsonProperty("id")
-    private Long id;
+    @JsonProperty("org_id")
+    @TableField("org_id")
+    private int orgId;
 
-    @JsonProperty("inventory_id")
-    private Integer inventory_id;
+    @JsonProperty("Payment_Period")
+    @TableField("Payment_Period")
+    private String paymentPeriod;
 
-    @JsonProperty("inventory_source_id")
-    private Integer inventory_source_id;
+    @JsonProperty("Bz")
+    @TableField("Bz")
+    private String bz;
 
-    @JsonProperty("is_del")
-    private Integer is_del;
+    @JsonProperty("Statistical_Date")
+    @TableField("Statistical_Date")
+    private String statisticalDate;
 
-    @JsonProperty("meta_id")
-    private Integer meta_id;
+    @JsonProperty("create_user")
+    @TableField("create_user")
+    private String createUser;
 
-    @JsonProperty("org_id")
-    private Integer org_id;
+    @JsonProperty("MONTHLY_CONSUMPTION_3")
+    @TableField("MONTHLY_CONSUMPTION_3")
+    private Double monthlyConsumption3;
 
-    @JsonProperty("report_state")
-    private String report_state;
+    @JsonProperty("tjsj")
+    @TableField("tjsj")
+    private String tjsj;
 
     @JsonProperty("status")
+    @TableField("status")
     private String status;
-
-    @JsonProperty("update_time")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date update_time;
-
-    @JsonProperty("update_user")
-    private String update_user;
 }

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

@@ -0,0 +1,189 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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_administrative_penalty
+ */
+@TableName(value ="xcr_administrative_penalty")
+@Data
+public class XcrAdministrativePenalty extends BasePo implements Serializable {
+    @JsonProperty("entity_name")
+    @TableField("ENTITY_NAME")
+    private String ENTITY_NAME;
+    @JsonProperty("CF_XDR_GSZC")
+    @TableField("CF_XDR_GSZC")
+    private String CF_XDR_GSZC;
+    @JsonProperty("CF_JDWSMC")
+    @TableField("CF_JDWSMC")
+    private String CF_JDWSMC;
+    @JsonProperty("CF_SY")
+    @TableField("CF_SY")
+    private String CF_SY;
+    @JsonProperty("entity_code")
+    @TableField("entityCode")
+    private String entityCode;
+    @JsonProperty("CF_SJLY")
+    @TableField("CF_SJLY")
+    private String CF_SJLY;
+    @JsonProperty("ISLATE")
+    @TableField("ISLATE")
+    private String ISLATE;
+    @JsonProperty("id")
+    @TableField("id")
+    private Long id;
+    @JsonProperty("dep_id")
+    @TableField("depId")
+    private Long depId;
+    @JsonProperty("CF_XDR_ZZJG")
+    @TableField("CF_XDR_ZZJG")
+    private String CF_XDR_ZZJG;
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("createTime")
+    private Date createTime;
+    @JsonProperty("report_state")
+    @TableField("reportState")
+    private String reportState;
+    @JsonProperty("inventory_source_id")
+    @TableField("inventorySourceId")
+    private Long inventorySourceId;
+    @JsonProperty("inventory_id")
+    @TableField("inventoryId")
+    private Long inventoryId;
+    @JsonProperty("CF_FR_ZJHM")
+    @TableField("CF_FR_ZJHM")
+    private String CF_FR_ZJHM;
+    @JsonProperty("data_code")
+    @TableField("dataCode")
+    private String dataCode;
+    @JsonProperty("CF_XDR_SHXYM")
+    @TableField("CF_XDR_SHXYM")
+    private String CF_XDR_SHXYM;
+    @JsonProperty("CF_XDR_LB")
+    @TableField("CF_XDR_LB")
+    private String CF_XDR_LB;
+    @JsonProperty("repair_state")
+    @TableField("repairState")
+    private String repairState;
+    @JsonProperty("CF_NR_ZKDX")
+    @TableField("CF_NR_ZKDX")
+    private String CF_NR_ZKDX;
+    @JsonProperty("CF_CFJG")
+    @TableField("CF_CFJG")
+    private String CF_CFJG;
+    @JsonProperty("entity_code_add")
+    @TableField("entityCodeAdd")
+    private String entityCodeAdd;
+    @JsonProperty("CF_NR_FK")
+    @TableField("CF_NR_FK")
+    private Double CF_NR_FK;
+    @JsonProperty("CF_FRDB")
+    @TableField("CF_FRDB")
+    private String CF_FRDB;
+    @JsonProperty("org_id")
+    @TableField("orgId")
+    private Long orgId;
+    @JsonProperty("CF_FR_ZJLX")
+    @TableField("CF_FR_ZJLX")
+    private String CF_FR_ZJLX;
+    @JsonProperty("CF_GSJZQ")
+    @TableField("CF_GSJZQ")
+    private Date CF_GSJZQ;
+    @JsonProperty("create_user")
+    @TableField("createUser")
+    private String createUser;
+    @JsonProperty("CF_YJ")
+    @TableField("CF_YJ")
+    private String CF_YJ;
+    @JsonProperty("CF_XDR_SYDW")
+    @TableField("CF_XDR_SYDW")
+    private String CF_XDR_SYDW;
+    @JsonProperty("status")
+    @TableField("status")
+    private String status;
+    @JsonProperty("CF_JDRQ")
+    @TableField("CF_JDRQ")
+    private Date CF_JDRQ;
+    @JsonProperty("CF_WSH")
+    @TableField("CF_WSH")
+    private String CF_WSH;
+    @JsonProperty("CF_XDR_SWDJ")
+    @TableField("CF_XDR_SWDJ")
+    private String CF_XDR_SWDJ;
+    @JsonProperty("CF_SJLYDM")
+    @TableField("CF_SJLYDM")
+    private String CF_SJLYDM;
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("updateTime")
+    private Date updateTime;
+    @JsonProperty("update_user")
+    @TableField("updateUser")
+    private String updateUser;
+    @JsonProperty("UNID")
+    @TableField("UNID")
+    private String UNID;
+    @JsonProperty("FBZT")
+    @TableField("FBZT")
+    private String FBZT;
+    @JsonProperty("BZ")
+    @TableField("BZ")
+    private String BZ;
+    @JsonProperty("is_del")
+    @TableField("isDel")
+    private Long isDel;
+    @JsonProperty("CF_XDR_SHZZ")
+    @TableField("CF_XDR_SHZZ")
+    private String CF_XDR_SHZZ;
+    @JsonProperty("CF_FDDBRZJLX_OTHER")
+    @TableField("CF_FDDBRZJLX_OTHER")
+    private String CF_FDDBRZJLX_OTHER;
+    @JsonProperty("batch_no")
+    @TableField("batchNo")
+    private long batchNo;
+    @JsonProperty("meta_id")
+    @TableField("metaId")
+    private Long metaId;
+    @JsonProperty("CF_LB_OTHER")
+    @TableField("CF_LB_OTHER")
+    private String CF_LB_OTHER;
+    @JsonProperty("CF_XDR_ZJLX")
+    @TableField("CF_XDR_ZJLX")
+    private String CF_XDR_ZJLX;
+    @JsonProperty("CF_YXQ")
+    @TableField("CF_YXQ")
+    private Date CF_YXQ;
+    @JsonProperty("CF_NR")
+    @TableField("CF_NR")
+    private String CF_NR;
+    @JsonProperty("CF_WFXW")
+    @TableField("CF_WFXW")
+    private String CF_WFXW;
+    @JsonProperty("entity_type")
+    @TableField("entityType")
+    private String entityType;
+    @JsonProperty("CF_CFJGDM")
+    @TableField("CF_CFJGDM")
+    private String CF_CFJGDM;
+    @JsonProperty("CF_ZJLX_OTHER")
+    @TableField("CF_ZJLX_OTHER")
+    private String CF_ZJLX_OTHER;
+    @JsonProperty("CF_CFLB")
+    @TableField("CF_CFLB")
+    private String CF_CFLB;
+    @JsonProperty("CF_NR_WFFF")
+    @TableField("CF_NR_WFFF")
+    private String CF_NR_WFFF;
+    @JsonProperty("CF_XDR_ZJHM")
+    @TableField("CF_XDR_ZJHM")
+    private String CF_XDR_ZJHM;
+}

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

@@ -0,0 +1,193 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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_xinyonghuaihua_base_info
+ */
+@TableName(value ="xcr_xinyonghuaihua_base_info")
+@Data
+public class XcrXinyonghuaihuaBaseInfo extends BasePo implements Serializable {
+    @JsonProperty("entity_name")
+    @TableField("entity_name")
+    private String ENTITY_NAME;
+
+    @JsonProperty("fddbrzjhm")
+    @TableField("fddbrzjhm")
+    private String FDDBRZJHM;
+
+    @JsonProperty("xzqzly")
+    @TableField("xzqzly")
+    private String XZQZLY;
+
+    @JsonProperty("xzqzzxsj")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("xzqzzxsj")
+    private Date XZQZZXSJ;
+
+    @JsonProperty("xzqzyj")
+    @TableField("xzqzyj")
+    private String XZQZYJ;
+
+    @JsonProperty("sxmc")
+    @TableField("sxmc")
+    private String SXMC;
+
+    @JsonProperty("fddbrzjlx")
+    @TableField("fddbrzjlx")
+    private String FDDBRZJLX;
+
+    @JsonProperty("sjlydwmc")
+    @TableField("sjlydwmc")
+    private String SJLYDWMC;
+
+    @JsonProperty("update_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("update_time")
+    private Date UPDATE_TIME;
+
+    @JsonProperty("update_user")
+    @TableField("update_user")
+    private String UPDATE_USER;
+
+    @JsonProperty("entity_code")
+    @TableField("entity_code")
+    private String ENTITY_CODE;
+
+    @JsonProperty("xzqzjdwsmc")
+    @TableField("xzqzjdwsmc")
+    private String XZQZJDWSMC;
+
+    @JsonProperty("ssqzcsjssj")
+    @TableField("ssqzcsjssj")
+    private Date SSQZCSJSSJ;
+
+    @JsonProperty("bz")
+    @TableField("bz")
+    private String BZ;
+
+    @JsonProperty("is_del")
+    @TableField("is_del")
+    private Integer IS_DEL;
+
+    @JsonProperty("xzqzcslx")
+    @TableField("xzqzcslx")
+    private String XZQZCSLX;
+
+    @JsonProperty("xzqzjg")
+    @TableField("xzqzjg")
+    private String XZQZJG;
+
+    @JsonProperty("id")
+    @TableField("id")
+    private Integer id;
+
+    @JsonProperty("xzqznr")
+    @TableField("xzqznr")
+    private String XZQZNR;
+
+    @JsonProperty("xzxdrlb")
+    @TableField("xzxdrlb")
+    private String XZXDRLB;
+
+    @JsonProperty("sjlydwdm")
+    @TableField("sjlydwdm")
+    private String SJLYDWDM;
+
+    @JsonProperty("ssqzcsqssj")
+    @TableField("ssqzcsqssj")
+    private Date SSQZCSQSSJ;
+
+    @JsonProperty("dep_id")
+    @TableField("dep_id")
+    private Integer DEP_ID;
+
+    @JsonProperty("batch_no")
+    @TableField("batch_no")
+    private Long BATCH_NO;
+
+    @JsonProperty("fddbrxm")
+    @TableField("fddbrxm")
+    private String FDDBRXM;
+
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("create_time")
+    private Date CREATE_TIME;
+
+    @JsonProperty("xzqzjdrq")
+    @TableField("xzqzjdrq")
+    private Date XZQZJDRQ;
+
+    @JsonProperty("meta_id")
+    @TableField("meta_id")
+    private Integer META_ID;
+
+    @JsonProperty("report_state")
+    @TableField("report_state")
+    private String REPORT_STATE;
+
+    @JsonProperty("inventory_id")
+    @TableField("inventory_id")
+    private Integer INVENTORY_ID;
+
+    @JsonProperty("inventory_source_id")
+    @TableField("inventory_source_id")
+    private Integer INVENTORY_SOURCE_ID;
+
+    @JsonProperty("xzjgdm")
+    @TableField("xzjgdm")
+    private String XZJGDM;
+
+    @JsonProperty("xzqzzl")
+    @TableField("xzqzzl")
+    private String XZQZZL;
+
+    @JsonProperty("data_code")
+    @TableField("data_code")
+    private String DATA_CODE;
+
+    @JsonProperty("xzqzjdwsh")
+    @TableField("xzqzjdwsh")
+    private String XZQZJDWSH;
+
+    @JsonProperty("entity_type")
+    @TableField("entity_type")
+    private String ENTITY_TYPE;
+
+    @JsonProperty("entity_code_add")
+    @TableField("entity_code_add")
+    private String ENTITY_CODE_ADD;
+
+    @JsonProperty("org_id")
+    @TableField("org_id")
+    private Integer ORG_ID;
+
+    @JsonProperty("xzjgmc")
+    @TableField("xzjgmc")
+    private String XZJGMC;
+
+    @JsonProperty("create_user")
+    @TableField("create_user")
+    private String CREATE_USER;
+
+    @JsonProperty("xzqzzxlx")
+    @TableField("xzqzzxlx")
+    private String XZQZZXLX;
+
+    @JsonProperty("status")
+    @TableField("status")
+    private String STATUS;
+
+    @JsonProperty("xzqzzxfs")
+    @TableField("xzqzzxfs")
+    private String XZQZZXFS;
+}

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

@@ -0,0 +1,168 @@
+package com.zksy.data.domain.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 信用怀化基础数据2
+ * @TableName xcr_xinyonghuaihua_base_info2
+ */
+@TableName(value ="xcr_xinyonghuaihua_base_info2")
+@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;
+
+    @JsonProperty("entity_name")
+    @TableField("entity_name")
+    private String entityName;
+
+    @JsonProperty("MONTHLY_CONSUMPTION_6")
+    @TableField("MONTHLY_CONSUMPTION_6")
+    private Double monthlyConsumption6;
+
+    @JsonProperty("User_Address")
+    @TableField("User_Address")
+    private String userAddress;
+
+    @JsonProperty("Areacode")
+    @TableField("Areacode")
+    private String areacode;
+
+    @JsonProperty("IS_IN_ARREARS")
+    @TableField("IS_IN_ARREARS")
+    private String isInArrears;
+
+    @JsonProperty("update_time")
+    @TableField("update_time")
+    private String updateTime;
+
+    @JsonProperty("update_user")
+    @TableField("update_user")
+    private String updateUser;
+
+    @JsonProperty("entity_code")
+    @TableField("entity_code")
+    private String entityCode;
+
+    @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;
+
+    @JsonProperty("batch_no")
+    @TableField("batch_no")
+    private Long batchNo;
+
+    @JsonProperty("create_time")
+    @TableField("create_time")
+    private String createTime;
+
+    @JsonProperty("entity_ztlb")
+    @TableField("entity_ztlb")
+    private Integer entityZtlb;
+
+    @JsonProperty("meta_id")
+    @TableField("meta_id")
+    private int metaId;
+
+    @JsonProperty("report_state")
+    @TableField("report_state")
+    private String reportState;
+
+    @JsonProperty("inventory_id")
+    @TableField("inventory_id")
+    private Integer inventoryId;
+
+    @JsonProperty("inventory_source_id")
+    @TableField("inventory_source_id")
+    private Integer inventorySourceId;
+
+    @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;
+
+    @JsonProperty("Bz")
+    @TableField("Bz")
+    private String bz;
+
+    @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;
+}

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

@@ -6,5 +6,4 @@ import lombok.Data;
 @Data
 public class XcrAdministrativeLicensingResponse extends BaseResponse2 {
 
-
 }

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

@@ -0,0 +1,8 @@
+package com.zksy.data.domain.response;
+
+import com.zksy.common.domain.response.BaseResponse2;
+import lombok.Data;
+
+@Data
+public class XcrAdministrativePenaltyResponse extends BaseResponse2 {
+}

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

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

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

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

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

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrAdministrativePenalty;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_administrative_penalty(行政处罚信息表)】的数据库操作Mapper
+* @createDate 2024-10-13 17:14:26
+* @Entity com.zksy.data.domain.po.XcrAdministrativePenalty
+*/
+public interface XcrAdministrativePenaltyMapper extends BaseMapper<XcrAdministrativePenalty> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+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/mapper/XcrXinyonghuaihuaBaseInfoMapper.java

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

data-service/src/main/java/com/zksy/data/schedule/RefreshTokenSchedule.java

@@ -0,0 +1,68 @@
+package com.zksy.data.schedule;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zksy.common.exception.CommonException;
+import com.zksy.data.config.XinyonghuaihuaProperty;
+import com.zksy.data.constant.RedisKeyConstant;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@EnableScheduling
+@Component
+public class RefreshTokenSchedule {
+    @Autowired
+    private XinyonghuaihuaProperty xinyonghuaihuaProperty;
+    @Autowired
+    private OkHttpClient okHttpClient;
+    @Autowired
+    private ObjectMapper objectMapper;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+    @Scheduled(fixedRate = 600000)
+    public void getToken() {
+        HttpUrl url = new HttpUrl.Builder()
+                .scheme("http")
+                .host(xinyonghuaihuaProperty.getHost())
+                .addPathSegment("interface/v1/auth/getToken")
+                .addQueryParameter("refreshToken", xinyonghuaihuaProperty.getRefreshToken())
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .get()
+                .build();
+        try {
+            redisTemplate.opsForValue().set(RedisKeyConstant.HUAIHUA_LOCK_KEY,"1");
+            Response response = okHttpClient.newCall(request).execute();
+            if (!response.isSuccessful()) {
+                throw new CommonException("刷新token的接口请求失败",5000);
+            }
+            if (ObjectUtil.isEmpty(response.body())) {
+                throw new CommonException("刷新token的接口出现问题",5000);
+            }
+            String s = response.body().string();
+            Map map = objectMapper.readValue(s, Map.class);
+            if((Integer) map.get("status") != 0){
+                throw new CommonException("刷新token的接口返回异常",5000);
+            }
+            String token = (String) map.get("data");
+            if(StrUtil.isEmpty(token)){
+                throw new CommonException("刷新token的接口返回异常",5000);
+            }
+            redisTemplate.opsForValue().set(RedisKeyConstant.HUAIHUA_TOKEN_KEY,token);
+            redisTemplate.delete(RedisKeyConstant.HUAIHUA_LOCK_KEY);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrAdministrativePenalty;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_administrative_penalty(行政处罚信息表)】的数据库操作Service
+* @createDate 2024-10-13 17:14:26
+*/
+public interface XcrAdministrativePenaltyService extends IService<XcrAdministrativePenalty>,IBaseSaveDataInterface {
+
+}

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

@@ -0,0 +1,13 @@
+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/XcrXinyonghuaihuaBaseInfoService.java

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

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

@@ -2,7 +2,6 @@ package com.zksy.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.data.domain.po.XcrAdministrativeLicensing;
-import com.zksy.data.domain.po.XcrAppointDelegates;
 import com.zksy.data.domain.response.XcrAdministrativeLicensingResponse;
 import com.zksy.data.mapper.XcrAdministrativeLicensingMapper;
 import com.zksy.data.service.XcrAdministrativeLicensingService;
@@ -35,14 +34,31 @@ public class XcrAdministrativeLicensingServiceImpl extends ServiceImpl<XcrAdmini
     public void saveDataByUniCode(String address) {
         //模拟从数据库中取数据大约为3000-4000条
         List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
-        Vector<XcrAppointDelegates> toDatabaseList = new Vector<>();
-        creditCodes.parallelStream().limit(5).forEach(creditCode -> {
+        Vector<XcrAdministrativeLicensing> toDatabaseList = new Vector<>();
+        creditCodes.parallelStream().limit(100).forEach(creditCode -> {
             HashMap<String, String> requestbodyMap = new HashMap<>();
             requestbodyMap.put("entityCode", creditCode);
-            xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
-                    XcrAdministrativeLicensingResponse.class);
+            requestbodyMap.put("size", String.valueOf(10));
+            requestbodyMap.put("page", String.valueOf(1));
+            try {
+                List<XcrAdministrativeLicensing> list = xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
+                        XcrAdministrativeLicensingResponse.class,
+                        XcrAdministrativeLicensing.class);
+                if(list != null){
+                    toDatabaseList.addAll(list);
+                }
+            } catch (Exception e) {
+                List<XcrAdministrativeLicensing> list = xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
+                        XcrAdministrativeLicensingResponse.class,
+                        XcrAdministrativeLicensing.class);
+                if(list != null){
+                    toDatabaseList.addAll(list);
+                }
+            }
         });
-        log.info("委派代表信息同步完成");
+        this.remove(null);
+//        this.saveBatch(toDatabaseList);
+        log.info("行政许可信息同步完成");
     }
 }
 

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

@@ -0,0 +1,67 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.domain.po.XcrAdministrativePenalty;
+import com.zksy.data.domain.response.XcrAdministrativePenaltyResponse;
+import com.zksy.data.mapper.XcrAdministrativePenaltyMapper;
+import com.zksy.data.service.XcrAdministrativePenaltyService;
+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_administrative_penalty(行政处罚信息表)】的数据库操作Service实现
+* @createDate 2024-10-13 17:14:26
+*/
+@Service
+@Slf4j
+public class XcrAdministrativePenaltyServiceImpl extends ServiceImpl<XcrAdministrativePenaltyMapper, XcrAdministrativePenalty>
+    implements XcrAdministrativePenaltyService{
+    @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<XcrAdministrativePenalty> toDatabaseList = new Vector<>();
+        creditCodes.parallelStream().limit(100).forEach(creditCode -> {
+            HashMap<String, String> requestbodyMap = new HashMap<>();
+            requestbodyMap.put("entityCode", creditCode);
+            requestbodyMap.put("size", String.valueOf(10));
+            requestbodyMap.put("page", String.valueOf(1));
+            try {
+                List<XcrAdministrativePenalty> list = xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
+                        XcrAdministrativePenaltyResponse.class,
+                        XcrAdministrativePenalty.class);
+                if(list != null){
+                    toDatabaseList.addAll(list);
+                }
+            } catch (Exception e) {
+                List<XcrAdministrativePenalty> list = xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
+                        XcrAdministrativePenaltyResponse.class,
+                        XcrAdministrativePenalty.class);
+                if(list != null){
+                    toDatabaseList.addAll(list);
+                }
+            }
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("行政处罚信息同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/service/impl/XcrXinyonghuaihuaBaseInfo2ServiceImpl.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.XcrXinyonghuaihuaBaseInfo2;
+import com.zksy.data.domain.response.XcrXinyonghuaihuaBaseInfo2Response;
+import com.zksy.data.mapper.XcrXinyonghuaihuaBaseInfo2Mapper;
+import com.zksy.data.service.XcrXinyonghuaihuaBaseInfo2Service;
+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_xinyonghuaihua_base_info2(信用怀化基础数据2)】的数据库操作Service实现
+* @createDate 2024-10-14 16:55:53
+*/
+@Service
+@Slf4j
+public class XcrXinyonghuaihuaBaseInfo2ServiceImpl extends ServiceImpl<XcrXinyonghuaihuaBaseInfo2Mapper, XcrXinyonghuaihuaBaseInfo2>
+    implements XcrXinyonghuaihuaBaseInfo2Service{
+    @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<XcrXinyonghuaihuaBaseInfo2> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("20", "21","22","23","24");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().limit(300).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);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrXinyonghuaihuaBaseInfo2> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrXinyonghuaihuaBaseInfo2Response.class,
+                            XcrXinyonghuaihuaBaseInfo2.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/XcrXinyonghuaihuaBaseInfoServiceImpl.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.XcrXinyonghuaihuaBaseInfo;
+import com.zksy.data.domain.response.XcrXinyonghuaihuaBaseInfoResponse;
+import com.zksy.data.mapper.XcrXinyonghuaihuaBaseInfoMapper;
+import com.zksy.data.service.XcrXinyonghuaihuaBaseInfoService;
+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_xinyonghuaihua_base_info(信用怀化基础数据)】的数据库操作Service实现
+* @createDate 2024-10-14 11:12:59
+*/
+@Service
+@Slf4j
+public class XcrXinyonghuaihuaBaseInfoServiceImpl extends ServiceImpl<XcrXinyonghuaihuaBaseInfoMapper, XcrXinyonghuaihuaBaseInfo>
+    implements XcrXinyonghuaihuaBaseInfoService{
+    @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<XcrXinyonghuaihuaBaseInfo> toDatabaseList = new Vector<>();
+        List<String> inventoryList = List.of("20", "21","22","23","24");
+        inventoryList.parallelStream().forEach(inventory -> {
+            creditCodes.parallelStream().limit(300).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<XcrXinyonghuaihuaBaseInfo> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrXinyonghuaihuaBaseInfoResponse.class,
+                            XcrXinyonghuaihuaBaseInfo.class);
+                    if(list != null){
+                        toDatabaseList.addAll(list);
+                    }
+                } catch (Exception e) {
+                    List<XcrXinyonghuaihuaBaseInfo> list = xhRequestUtil.requestXinyonghuanhuai2(requestbodyMap,address,
+                            XcrXinyonghuaihuaBaseInfoResponse.class,
+                            XcrXinyonghuaihuaBaseInfo.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/utils/XhRequestUtil.java

@@ -2,15 +2,19 @@ package com.zksy.data.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.zksy.common.domain.response.BaseResponse;
 import com.zksy.common.domain.response.BaseResponse2;
+import com.zksy.common.domain.response.BaseResponse3;
 import com.zksy.common.exception.CommonException;
 import com.zksy.common.utils.BeanUtils;
 import com.zksy.data.config.XhConfigProperty;
 import com.zksy.data.config.XinyonghuaihuaProperty;
 import com.zksy.data.constant.RedisKeyConstant;
 import com.zksy.data.domain.po.BasePo;
+import com.zksy.data.schedule.RefreshTokenSchedule;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +37,12 @@ public class XhRequestUtil {
     @Autowired
     private ObjectMapper objectMapper;
     @Autowired
-    private RedisTemplate<String,String> redisTemplate;
+    private RedisTemplate<String, String> redisTemplate;
 
-    public <T extends BaseResponse,K extends BasePo> List<K> httpRequestByUniCode(String uniCode, String address,
-                                                                               Class<T> responseClass,
-                                                                               Class<K> entityClass) {
-        log.info("正在同步:{}下的:{}",address,uniCode);
+    public <T extends BaseResponse, K extends BasePo> List<K> httpRequestByUniCode(String uniCode, String address,
+                                                                                   Class<T> responseClass,
+                                                                                   Class<K> entityClass) {
+        log.info("正在同步:{}下的:{}", address, uniCode);
         ArrayList<K> resList = new ArrayList<>();
         if (StrUtil.isEmpty(uniCode)) {
             log.warn("统一社会信用代码为空");
@@ -83,8 +87,59 @@ public class XhRequestUtil {
             throw new RuntimeException(e);
         }
     }
+    public <T extends BaseResponse, K extends BasePo> List<K> httpRequestByUniCode(String uniCode, String address,
+                                                                                   Class<T> responseClass,
+                                                                                   Class<K> entityClass,
+                                                                                   String key) {
+        log.info("正在同步:{}下的:{}", address, uniCode);
+        ArrayList<K> resList = new ArrayList<>();
+        if (StrUtil.isEmpty(uniCode)) {
+            log.warn("统一社会信用代码为空");
+        }
+        HttpUrl url = new HttpUrl.Builder()
+                .scheme("http")
+                .host(xhConfigProperty.getHost())
+                .port(Integer.valueOf(xhConfigProperty.getPort()))
+                .addPathSegment(address)
+                .addQueryParameter(key, uniCode)
+                .build();
+        Request request = new Request.Builder()
+                .url(url)
+                .get()
+                .addHeader("appKey", xhConfigProperty.getAppKey())
+                .build();
+        try {
+            Response response = okHttpClient.newCall(request).execute();
+            if (!response.isSuccessful()) {
+                log.error("当前接口请求失败:{}", address);
+            }
+            if (ObjectUtil.isEmpty(response.body())) {
+                log.error("当前接口请求数据出现问题:{}", address);
+            }
+            String s = response.body().string();
+            T value = objectMapper.readValue(s, responseClass);
+            if (value.getCode() != 200) {
+                log.error("当前请求结果异常:{}", value.getMessage());
+            } else {
+                if (value.getData().isEmpty()) {
+                    return null;
+                }
+                for (int i = 0; i < value.getData().size(); i++) {
+                    K e = BeanUtils.copyBean(value.getData().get(i), entityClass);
+                    e.setUniCode(uniCode);
+                    resList.add(e);
+                }
+            }
+            return resList;
+        } catch (Exception e) {
+            log.error("此次数据同步出现异常,接口是:{}", address);
+            throw new RuntimeException(e);
+        }
+    }
+
     private Boolean isEnd = false;
-    public String testHttpRequest(String uniCode,String address,String paramsValue) {
+
+    public String testHttpRequest(String uniCode, String address, String paramsValue) {
         if (isEnd) {
             isEnd = false;
             throw new RuntimeException("已经找到请求结构,不用继续了");
@@ -92,7 +147,7 @@ public class XhRequestUtil {
         if (StrUtil.isEmpty(uniCode)) {
             log.warn("统一社会信用代码为空");
         }
-        log.info("正在找:{}",uniCode);
+        log.info("正在找:{}", uniCode);
         HttpUrl url = new HttpUrl.Builder()
                 .scheme("http")
                 .host(xhConfigProperty.getHost())
@@ -116,7 +171,7 @@ public class XhRequestUtil {
             }
             String s = response.body().string();
             BaseResponse value = objectMapper.readValue(s, BaseResponse.class);
-            if(!value.getData().isEmpty()){
+            if (!value.getData().isEmpty()) {
                 isEnd = true;
                 return s;
             }
@@ -126,72 +181,164 @@ public class XhRequestUtil {
         return null;
     }
 
-    public <T extends BaseResponse2> void requestXinyonghuanhuai(Map requestBodyMap, String address,
-                                                                 Class<T> entityResponseClass){
-        getToken();
+    public String testHttpRequest(Map map, String address) {
+        if (isEnd) {
+            isEnd = false;
+            throw new RuntimeException("已经找到请求结构,不用继续了");
+        }
+        if (map.get("entityCode") == null) {
+            log.warn("统一社会信用代码为空");
+        }
+        log.info("正在找:{}", map.get("entityCode"));
         HttpUrl url = new HttpUrl.Builder()
                 .scheme("http")
                 .host(xinyonghuaihuaProperty.getHost())
                 .addPathSegment(address)
                 .build();
+        String token = redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY);
+        String json;
+        try {
+            json = objectMapper.writeValueAsString(map);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+        RequestBody requestBody = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8"));
+        Request request = new Request.Builder()
+                .url(url)
+                .header("Content-Type", "application/json")
+                .header("Token", token)
+                .post(requestBody)
+                .build();
+
+        try {
+            Response response = okHttpClient.newCall(request).execute();
+            if (!response.isSuccessful()) {
+                log.error("当前接口请求失败:{}", address);
+            }
+            if (ObjectUtil.isEmpty(response.body())) {
+                log.error("当前接口请求数据出现问题:{}", address);
+            }
+            String s = response.body().string();
+            BaseResponse2 value = objectMapper.readValue(s, BaseResponse2.class);
+            if (value.getData().getTotalElements() > 0) {
+                isEnd = true;
+                return s;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("当次请求失败");
+        }
+        return null;
+    }
+
+    public <T extends BaseResponse2, K extends BasePo> List<K> requestXinyonghuanhuai(Map requestBodyMap, String address,
+                                                                                      Class<T> entityResponseClass,
+                                                                                      Class<K> entityClass) {
+        HttpUrl url = new HttpUrl.Builder()
+                .scheme("http")
+                .host(xinyonghuaihuaProperty.getHost())
+                .addPathSegment(address)
+                .build();
+        var resList = new ArrayList<K>();
         try {
             var json = objectMapper.writeValueAsString(requestBodyMap);
             RequestBody requestBody = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8"));
+            while (redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_LOCK_KEY) != null) {
+                System.out.println("当前锁住了");
+                Thread.sleep(3000);
+            }
+            String token = redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY);
             Request request = new Request.Builder()
                     .url(url)
                     .header("Content-Type", "application/json")
-                    .header("Token",redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY))
+                    .header("Token", token)
                     .post(requestBody)
                     .build();
             Response response = okHttpClient.newCall(request).execute();
             if (!response.isSuccessful() || ObjectUtil.isEmpty(response.body())) {
-                throw new CommonException("当前接口请求失败",5000);
+                throw new CommonException("当前接口请求失败", 5000);
             }
             String s = response.body().string();
             T value = objectMapper.readValue(s, entityResponseClass);
-
-            if(value.getStatus() != 0){
-                throw new CommonException("当前请求结果异常",5000);
+            if (value.getStatus() != 0) {
+                throw new CommonException("当前请求结果异常", 5000);
+            }
+            value.getData().getList().stream().forEach(q -> {
+                K converted = objectMapper.convertValue(q, entityClass);
+                converted.setUniCode(requestBodyMap.get("entityCode").toString());
+                resList.add(converted);
+            });
+            if (value.getData().getTotalElements() > (Integer.valueOf(requestBodyMap.get("size").toString()) * (Integer.valueOf(requestBodyMap.get("page").toString())))) {
+                //需要再次获取页数为+1的数据
+                requestBodyMap.put("page", Integer.valueOf(requestBodyMap.get("page").toString()+1));
+                List<K> list = requestXinyonghuanhuai(requestBodyMap, address, entityResponseClass, entityClass);
+                resList.addAll(list);
             }
-            System.out.println(value);
             log.info(s);
+            return resList;
+        }catch (InvalidFormatException e){
+            refreshTokenSchedule.getToken();
+            this.requestXinyonghuanhuai(requestBodyMap, address, entityResponseClass, entityClass);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        return resList;
     }
-
-    private void getToken() {
+    @Autowired
+    private RefreshTokenSchedule refreshTokenSchedule;
+    public <T extends BaseResponse3, K extends BasePo> List<K> requestXinyonghuanhuai2(Map requestBodyMap, String address,
+                                                                                       Class<T> entityResponseClass,
+                                                                                       Class<K> entityClass) {
         HttpUrl url = new HttpUrl.Builder()
                 .scheme("http")
                 .host(xinyonghuaihuaProperty.getHost())
-                .addPathSegment("interface/v1/auth/getToken")
-                .addQueryParameter("refreshToken", xinyonghuaihuaProperty.getRefreshToken())
-                .build();
-        Request request = new Request.Builder()
-                .url(url)
-                .get()
+                .addPathSegment(address)
                 .build();
+        var resList = new ArrayList<K>();
         try {
-            Response response = okHttpClient.newCall(request).execute();
-            if (!response.isSuccessful()) {
-                throw new CommonException("刷新token的接口请求失败",5000);
+
+            var json = objectMapper.writeValueAsString(requestBodyMap);
+            RequestBody requestBody = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8"));
+            while (redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_LOCK_KEY) != null) {
+                System.out.println("当前锁住了");
+                Thread.sleep(3000);
             }
-            if (ObjectUtil.isEmpty(response.body())) {
-                throw new CommonException("刷新token的接口出现问题",5000);
+            String token = redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY);
+            Request request = new Request.Builder()
+                    .url(url)
+                    .header("Content-Type", "application/json")
+                    .header("Token", token)
+                    .post(requestBody)
+                    .build();
+            Response response = okHttpClient.newCall(request).execute();
+            if (!response.isSuccessful() || ObjectUtil.isEmpty(response.body())) {
+                throw new CommonException("当前接口请求失败", 5000);
             }
             String s = response.body().string();
-            Map map = objectMapper.readValue(s, Map.class);
-            if((Integer) map.get("status") != 0){
-                throw new CommonException("刷新token的接口返回异常",5000);
+            T value = objectMapper.readValue(s, entityResponseClass);
+            if (value.getStatus() != 0) {
+                throw new CommonException("当前请求结果异常", 5000);
             }
-            String token = (String) map.get("data");
-            if(StrUtil.isEmpty(token)){
-                throw new CommonException("刷新token的接口返回异常",5000);
+            if (!value.getData().getItems().isEmpty()) {
+                value.getData().getItems().stream().forEach(q -> {
+                    K converted = objectMapper.convertValue(q, entityClass);
+                    converted.setUniCode(requestBodyMap.get("entityCode").toString());
+                    resList.add(converted);
+                });
             }
-//            return token;
-            redisTemplate.opsForValue().set(RedisKeyConstant.HUAIHUA_TOKEN_KEY,token);
-        } catch (Exception e) {
+            if (value.getData().getTotalElements() > (Integer.valueOf(requestBodyMap.get("size").toString()) * (Integer.valueOf(requestBodyMap.get("page").toString())))) {
+                //需要再次获取页数为+1的数据
+                requestBodyMap.put("page", Integer.valueOf(requestBodyMap.get("page").toString()+1));
+                List<K> list = requestXinyonghuanhuai2(requestBodyMap, address, entityResponseClass, entityClass);
+                resList.addAll(list);
+            }
+            log.info(requestBodyMap.get("entityCode")+s);
+            return resList;
+        }catch (InvalidFormatException e){
+            refreshTokenSchedule.getToken();
+            this.requestXinyonghuanhuai2(requestBodyMap, address, entityResponseClass, entityClass);
+        }catch (Exception e) {
             throw new RuntimeException(e);
         }
+        return resList;
     }
 }

data-service/src/main/resources/application-dev.yaml

@@ -5,10 +5,6 @@ zksy:
     pw: 3EZ8TYbzCjiMjsn7@.
     port: 3307
     database: xh_credit_rating
-spring:
-  redis:
-    host: 47.107.107.47
-    port: 6379
 minio:
   endpoint: http://47.107.107.47:9000
   accessKey: minio
@@ -18,3 +14,4 @@ minio:
 
 
 
+

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

@@ -0,0 +1,87 @@
+<?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.XcrAdministrativePenaltyMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrAdministrativePenalty">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="entityName" column="ENTITY_NAME" jdbcType="VARCHAR"/>
+            <result property="cfXdrGszc" column="CF_XDR_GSZC" jdbcType="VARCHAR"/>
+            <result property="cfJdwsmc" column="CF_JDWSMC" jdbcType="VARCHAR"/>
+            <result property="cfSy" column="CF_SY" jdbcType="VARCHAR"/>
+            <result property="entitycode" column="entityCode" jdbcType="VARCHAR"/>
+            <result property="cfSjly" column="CF_SJLY" jdbcType="VARCHAR"/>
+            <result property="islate" column="ISLATE" jdbcType="VARCHAR"/>
+            <result property="depid" column="depId" jdbcType="VARCHAR"/>
+            <result property="cfXdrZzjg" column="CF_XDR_ZZJG" jdbcType="VARCHAR"/>
+            <result property="createtime" column="createTime" jdbcType="TIMESTAMP"/>
+            <result property="reportstate" column="reportState" jdbcType="VARCHAR"/>
+            <result property="inventorysourceid" column="inventorySourceId" jdbcType="VARCHAR"/>
+            <result property="inventoryid" column="inventoryId" jdbcType="VARCHAR"/>
+            <result property="cfFrZjhm" column="CF_FR_ZJHM" jdbcType="VARCHAR"/>
+            <result property="datacode" column="dataCode" jdbcType="VARCHAR"/>
+            <result property="cfXdrShxym" column="CF_XDR_SHXYM" jdbcType="VARCHAR"/>
+            <result property="cfXdrLb" column="CF_XDR_LB" jdbcType="VARCHAR"/>
+            <result property="repairstate" column="repairState" jdbcType="VARCHAR"/>
+            <result property="cfNrZkdx" column="CF_NR_ZKDX" jdbcType="VARCHAR"/>
+            <result property="cfCfjg" column="CF_CFJG" jdbcType="VARCHAR"/>
+            <result property="entitycodeadd" column="entityCodeAdd" jdbcType="VARCHAR"/>
+            <result property="cfNrFk" column="CF_NR_FK" jdbcType="DOUBLE"/>
+            <result property="cfFrdb" column="CF_FRDB" jdbcType="VARCHAR"/>
+            <result property="orgid" column="orgId" jdbcType="VARCHAR"/>
+            <result property="cfFrZjlx" column="CF_FR_ZJLX" jdbcType="VARCHAR"/>
+            <result property="cfGsjzq" column="CF_GSJZQ" jdbcType="TIMESTAMP"/>
+            <result property="createuser" column="createUser" jdbcType="VARCHAR"/>
+            <result property="cfYj" column="CF_YJ" jdbcType="VARCHAR"/>
+            <result property="cfXdrSydw" column="CF_XDR_SYDW" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="cfJdrq" column="CF_JDRQ" jdbcType="TIMESTAMP"/>
+            <result property="cfWsh" column="CF_WSH" jdbcType="VARCHAR"/>
+            <result property="cfXdrSwdj" column="CF_XDR_SWDJ" jdbcType="VARCHAR"/>
+            <result property="cfSjlydm" column="CF_SJLYDM" jdbcType="VARCHAR"/>
+            <result property="updatetime" column="updateTime" jdbcType="TIMESTAMP"/>
+            <result property="updateuser" column="updateUser" jdbcType="VARCHAR"/>
+            <result property="unid" column="UNID" jdbcType="VARCHAR"/>
+            <result property="fbzt" column="FBZT" jdbcType="VARCHAR"/>
+            <result property="bz" column="BZ" jdbcType="VARCHAR"/>
+            <result property="isdel" column="isDel" jdbcType="VARCHAR"/>
+            <result property="cfXdrShzz" column="CF_XDR_SHZZ" jdbcType="VARCHAR"/>
+            <result property="cfFddbrzjlxOther" column="CF_FDDBRZJLX_OTHER" jdbcType="VARCHAR"/>
+            <result property="batchno" column="batchNo" jdbcType="BIGINT"/>
+            <result property="metaid" column="metaId" jdbcType="VARCHAR"/>
+            <result property="cfLbOther" column="CF_LB_OTHER" jdbcType="VARCHAR"/>
+            <result property="cfXdrZjlx" column="CF_XDR_ZJLX" jdbcType="VARCHAR"/>
+            <result property="cfYxq" column="CF_YXQ" jdbcType="TIMESTAMP"/>
+            <result property="cfNr" column="CF_NR" jdbcType="VARCHAR"/>
+            <result property="cfWfxw" column="CF_WFXW" jdbcType="VARCHAR"/>
+            <result property="entitytype" column="entityType" jdbcType="VARCHAR"/>
+            <result property="cfCfjgdm" column="CF_CFJGDM" jdbcType="VARCHAR"/>
+            <result property="cfZjlxOther" column="CF_ZJLX_OTHER" jdbcType="VARCHAR"/>
+            <result property="cfCflb" column="CF_CFLB" jdbcType="VARCHAR"/>
+            <result property="cfNrWfff" column="CF_NR_WFFF" jdbcType="VARCHAR"/>
+            <result property="cfXdrZjhm" column="CF_XDR_ZJHM" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,ENTITY_NAME,CF_XDR_GSZC,
+        CF_JDWSMC,CF_SY,entityCode,
+        CF_SJLY,ISLATE,depId,
+        CF_XDR_ZZJG,createTime,reportState,
+        inventorySourceId,inventoryId,CF_FR_ZJHM,
+        dataCode,CF_XDR_SHXYM,CF_XDR_LB,
+        repairState,CF_NR_ZKDX,CF_CFJG,
+        entityCodeAdd,CF_NR_FK,CF_FRDB,
+        orgId,CF_FR_ZJLX,CF_GSJZQ,
+        createUser,CF_YJ,CF_XDR_SYDW,
+        status,CF_JDRQ,CF_WSH,
+        CF_XDR_SWDJ,CF_SJLYDM,updateTime,
+        updateUser,UNID,FBZT,
+        BZ,isDel,CF_XDR_SHZZ,
+        CF_FDDBRZJLX_OTHER,batchNo,metaId,
+        CF_LB_OTHER,CF_XDR_ZJLX,CF_YXQ,
+        CF_NR,CF_WFXW,entityType,
+        CF_CFJGDM,CF_ZJLX_OTHER,CF_CFLB,
+        CF_NR_WFFF,CF_XDR_ZJHM
+    </sql>
+</mapper>

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

@@ -0,0 +1,63 @@
+<?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.XcrXinyonghuaihuaBaseInfo2Mapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo2">
+            <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="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="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="entityZtlb" column="entity_ztlb" jdbcType="INTEGER"/>
+            <result property="metaId" column="meta_id" jdbcType="INTEGER"/>
+            <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="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"/>
+    </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
+    </sql>
+</mapper>

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

@@ -0,0 +1,70 @@
+<?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.XcrXinyonghuaihuaBaseInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrXinyonghuaihuaBaseInfo">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="fddbrzjhm" column="fddbrzjhm" jdbcType="VARCHAR"/>
+            <result property="xzqzly" column="xzqzly" jdbcType="VARCHAR"/>
+            <result property="xzqzzxsj" column="xzqzzxsj" jdbcType="TIMESTAMP"/>
+            <result property="xzqzyj" column="xzqzyj" jdbcType="VARCHAR"/>
+            <result property="sxmc" column="sxmc" jdbcType="VARCHAR"/>
+            <result property="fddbrzjlx" column="fddbrzjlx" jdbcType="VARCHAR"/>
+            <result property="sjlydwmc" column="sjlydwmc" 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="xzqzjdwsmc" column="xzqzjdwsmc" jdbcType="VARCHAR"/>
+            <result property="ssqzcsjssj" column="ssqzcsjssj" jdbcType="DATE"/>
+            <result property="bz" column="bz" jdbcType="VARCHAR"/>
+            <result property="isDel" column="is_del" jdbcType="TINYINT"/>
+            <result property="xzqzcslx" column="xzqzcslx" jdbcType="VARCHAR"/>
+            <result property="xzqzjg" column="xzqzjg" jdbcType="VARCHAR"/>
+            <result property="xzqznr" column="xzqznr" jdbcType="VARCHAR"/>
+            <result property="xzxdrlb" column="xzxdrlb" jdbcType="VARCHAR"/>
+            <result property="sjlydwdm" column="sjlydwdm" jdbcType="VARCHAR"/>
+            <result property="ssqzcsqssj" column="ssqzcsqssj" jdbcType="DATE"/>
+            <result property="depId" column="dep_id" jdbcType="INTEGER"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="fddbrxm" column="fddbrxm" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="xzqzjdrq" column="xzqzjdrq" jdbcType="DATE"/>
+            <result property="metaId" column="meta_id" jdbcType="INTEGER"/>
+            <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="xzjgdm" column="xzjgdm" jdbcType="VARCHAR"/>
+            <result property="xzqzzl" column="xzqzzl" jdbcType="VARCHAR"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="xzqzjdwsh" column="xzqzjdwsh" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="orgId" column="org_id" jdbcType="INTEGER"/>
+            <result property="xzjgmc" column="xzjgmc" jdbcType="VARCHAR"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="xzqzzxlx" column="xzqzzxlx" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="xzqzzxfs" column="xzqzzxfs" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,entity_name,fddbrzjhm,
+        xzqzly,xzqzzxsj,xzqzyj,
+        sxmc,fddbrzjlx,sjlydwmc,
+        update_time,update_user,entity_code,
+        xzqzjdwsmc,ssqzcsjssj,bz,
+        is_del,xzqzcslx,xzqzjg,
+        xzqznr,xzxdrlb,sjlydwdm,
+        ssqzcsqssj,dep_id,batch_no,
+        fddbrxm,create_time,xzqzjdrq,
+        meta_id,report_state,inventory_id,
+        inventory_source_id,xzjgdm,xzqzzl,
+        data_code,xzqzjdwsh,entity_type,
+        entity_code_add,org_id,xzjgmc,
+        create_user,xzqzzxlx,status,
+        xzqzzxfs
+    </sql>
+</mapper>

xh-common/src/main/java/com/zksy/common/domain/response/BaseResponse3.java

@@ -0,0 +1,28 @@
+package com.zksy.common.domain.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseResponse3 extends PublicData2{
+    @JsonProperty("status")
+    private int status;
+    @JsonProperty("meta")
+    private Meta meta;
+    @JsonProperty("msg")
+    private String msg;
+
+    @lombok.Data
+    private static class Meta{
+        @JsonProperty("it")
+        private Long it;
+        @JsonProperty("ot")
+        private Long ot;
+        @JsonProperty("traceId")
+        private String traceId;
+    }
+}

xh-common/src/main/java/com/zksy/common/domain/response/PublicData.java

@@ -8,9 +8,9 @@ import java.util.List;
 @Data
 public class PublicData {
     @JsonProperty("data")
-    private Data data;
+    public Data data;
     @lombok.Data
-    public class Data{
+    public static class Data{
         @JsonProperty("fields")
         private Object fields;
         @JsonProperty("items")

xh-common/src/main/java/com/zksy/common/domain/response/PublicData2.java

@@ -0,0 +1,21 @@
+package com.zksy.common.domain.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PublicData2 {
+    @JsonProperty("data")
+    public Data data;
+    @lombok.Data
+    public static class Data{
+        @JsonProperty("items")
+        private List<?> items;
+        @JsonProperty("pageTotal")
+        private Integer pageTotal;
+        @JsonProperty("totalElements")
+        private Integer totalElements;
+    }
+}