项目推进提交代码

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

@@ -3667,9 +3667,12 @@ public class TestController {
         redisService.saveList("creditCodes",creditCodes);
         return "成功";
     }
+    @Autowired
+    private XcrAdministrativeLicensingService xcrAdministrativeLicensingService;
     @GetMapping("/d")
     public String test3(){
-        xhRequestUtil.requestXinyonghuanhuai();
+//        xhRequestUtil.requestXinyonghuanhuai();
+        xcrAdministrativeLicensingService.saveDataByUniCode("interface/v1/doublePublic/findLicensingList");
         return "成功";
     }
 }

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

@@ -1,6 +1,5 @@
 package com.zksy.data.domain.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -11,40 +10,164 @@ import java.util.Date;
 @Data
 public class Temp extends BasePo implements Serializable {
 
-    @JsonProperty("CODE")
-    @TableField("CODE")
-    private int CODE;
+    @JsonProperty("BZ")
+    private String BZ;
 
-    @JsonProperty("MESSAGE")
-    @TableField("MESSAGE")
-    private String MESSAGE;
+    @JsonProperty("FBZT")
+    private String FBZT;
 
-    @JsonProperty("CERTYPE")
-    @TableField("CERTYPE")
-    private String CERTYPE;
+    @JsonProperty("ISLATE")
+    private String ISLATE;
 
-    @JsonProperty("CERNO")
-    @TableField("CERNO")
-    private String CERNO;
+    @JsonProperty("UNID")
+    private String UNID;
 
-    @JsonProperty("HISNAMEID")
-    @TableField("HISNAMEID")
-    private String HISNAMEID;
+    @JsonProperty("XK_FDDBRZJLX_OTHER")
+    private String XK_FDDBRZJLX_OTHER;
 
-    @JsonProperty("ETPS_ID")
-    @TableField("ETPS_ID")
-    private String ETPS_ID;
+    @JsonProperty("XK_FRDB")
+    private String XK_FRDB;
 
-    @JsonProperty("PRIPID")
-    @TableField("PRIPID")
-    private String PRIPID;
+    @JsonProperty("XK_FR_ZJHM")
+    private String XK_FR_ZJHM;
 
-    @JsonProperty("S_EXT_DATATIME")
-    @TableField("S_EXT_DATATIME")
+    @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("XK_XDR_GSZC")
+    private String XK_XDR_GSZC;
+
+    @JsonProperty("XK_XDR_LB")
+    private String XK_XDR_LB;
+
+    @JsonProperty("XK_XDR_SHXYM")
+    private String XK_XDR_SHXYM;
+
+    @JsonProperty("XK_XDR_SHZZ")
+    private String XK_XDR_SHZZ;
+
+    @JsonProperty("XK_XDR_SWDJ")
+    private String XK_XDR_SWDJ;
+
+    @JsonProperty("XK_XDR_SYDW")
+    private String XK_XDR_SYDW;
+
+    @JsonProperty("XK_XDR_ZJHM")
+    private String XK_XDR_ZJHM;
+
+    @JsonProperty("XK_XDR_ZJLX")
+    private String XK_XDR_ZJLX;
+
+    @JsonProperty("XK_XDR_ZZJG")
+    private String XK_XDR_ZZJG;
+
+    @JsonProperty("XK_XKBH")
+    private String XK_XKBH;
+
+    @JsonProperty("XK_XKJG")
+    private String XK_XKJG;
+
+    @JsonProperty("XK_XKJGDM")
+    private String XK_XKJGDM;
+
+    @JsonProperty("XK_XKLB")
+    private String XK_XKLB;
+
+    @JsonProperty("XK_XKWS")
+    private String XK_XKWS;
+
+    @JsonProperty("XK_XKZS")
+    private String XK_XKZS;
+
+    @JsonProperty("XK_YXQZ")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private Date XK_YXQZ;
+
+    @JsonProperty("XK_YXQZI")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private Date XK_YXQZI;
+
+    @JsonProperty("XK_ZJLX_OTHER")
+    private String XK_ZJLX_OTHER;
+
+    @JsonProperty("XK_ZT")
+    private String XK_ZT;
+
+    @JsonProperty("batch_no")
+    private Long batch_no;
+
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date create_time;
+
+    @JsonProperty("create_user")
+    private String create_user;
+
+    @JsonProperty("data_code")
+    private String data_code;
+
+    @JsonProperty("dep_id")
+    private Integer dep_id;
+
+    @JsonProperty("entity_code")
+    private String entity_code;
+
+    @JsonProperty("entity_code_add")
+    private String entity_code_add;
+
+    @JsonProperty("entity_name")
+    private String entity_name;
+
+    @JsonProperty("entity_type")
+    private String entity_type;
+
+    @JsonProperty("id")
+    private Long id;
+
+    @JsonProperty("inventory_id")
+    private Integer inventory_id;
+
+    @JsonProperty("inventory_source_id")
+    private Integer inventory_source_id;
+
+    @JsonProperty("is_del")
+    private Integer is_del;
+
+    @JsonProperty("meta_id")
+    private Integer meta_id;
+
+    @JsonProperty("org_id")
+    private Integer org_id;
+
+    @JsonProperty("report_state")
+    private String report_state;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("update_time")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date S_EXT_DATATIME;
+    private Date update_time;
 
-    @JsonProperty("NAME")
-    @TableField("NAME")
-    private String NAME;
+    @JsonProperty("update_user")
+    private String update_user;
 }

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

@@ -0,0 +1,231 @@
+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_licensing
+ */
+@TableName(value ="xcr_administrative_licensing")
+@Data
+public class XcrAdministrativeLicensing extends BasePo implements Serializable {
+    @JsonProperty("BZ")
+    @TableField("BZ")
+    private String BZ;
+
+    @JsonProperty("FBZT")
+    @TableField("FBZT")
+    private String FBZT;
+
+    @JsonProperty("ISLATE")
+    @TableField("ISLATE")
+    private String ISLATE;
+
+    @JsonProperty("UNID")
+    @TableField("UNID")
+    private String UNID;
+
+    @JsonProperty("XK_FDDBRZJLX_OTHER")
+    @TableField("XK_FDDBRZJLX_OTHER")
+    private String XK_FDDBRZJLX_OTHER;
+
+    @JsonProperty("XK_FRDB")
+    @TableField("XK_FRDB")
+    private String XK_FRDB;
+
+    @JsonProperty("XK_FR_ZJHM")
+    @TableField("XK_FR_ZJHM")
+    private String XK_FR_ZJHM;
+
+    @JsonProperty("XK_FR_ZJLX")
+    @TableField("XK_FR_ZJLX")
+    private String XK_FR_ZJLX;
+
+    @JsonProperty("XK_JDRQ")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @TableField("XK_JDRQ")
+    private Date XK_JDRQ;
+
+    @JsonProperty("XK_LB_OTHER")
+    @TableField("XK_LB_OTHER")
+    private String XK_LB_OTHER;
+
+    @JsonProperty("XK_LYDW")
+    @TableField("XK_LYDW")
+    private String XK_LYDW;
+
+    @JsonProperty("XK_LYDWDM")
+    @TableField("XK_LYDWDM")
+    private String XK_LYDWDM;
+
+    @JsonProperty("XK_NR")
+    @TableField("XK_NR")
+    private String XK_NR;
+
+    @JsonProperty("XK_WSH")
+    @TableField("XK_WSH")
+    private String XK_WSH;
+
+    @JsonProperty("XK_XDR_GSZC")
+    @TableField("XK_XDR_GSZC")
+    private String XK_XDR_GSZC;
+
+    @JsonProperty("XK_XDR_LB")
+    @TableField("XK_XDR_LB")
+    private String XK_XDR_LB;
+
+    @JsonProperty("XK_XDR_SHXYM")
+    @TableField("XK_XDR_SHXYM")
+    private String XK_XDR_SHXYM;
+
+    @JsonProperty("XK_XDR_SHZZ")
+    @TableField("XK_XDR_SHZZ")
+    private String XK_XDR_SHZZ;
+
+    @JsonProperty("XK_XDR_SWDJ")
+    @TableField("XK_XDR_SWDJ")
+    private String XK_XDR_SWDJ;
+
+    @JsonProperty("XK_XDR_SYDW")
+    @TableField("XK_XDR_SYDW")
+    private String XK_XDR_SYDW;
+
+    @JsonProperty("XK_XDR_ZJHM")
+    @TableField("XK_XDR_ZJHM")
+    private String XK_XDR_ZJHM;
+
+    @JsonProperty("XK_XDR_ZJLX")
+    @TableField("XK_XDR_ZJLX")
+    private String XK_XDR_ZJLX;
+
+    @JsonProperty("XK_XDR_ZZJG")
+    @TableField("XK_XDR_ZZJG")
+    private String XK_XDR_ZZJG;
+
+    @JsonProperty("XK_XKBH")
+    @TableField("XK_XKBH")
+    private String XK_XKBH;
+
+    @JsonProperty("XK_XKJG")
+    @TableField("XK_XKJG")
+    private String XK_XKJG;
+
+    @JsonProperty("XK_XKJGDM")
+    @TableField("XK_XKJGDM")
+    private String XK_XKJGDM;
+
+    @JsonProperty("XK_XKLB")
+    @TableField("XK_XKLB")
+    private String XK_XKLB;
+
+    @JsonProperty("XK_XKWS")
+    @TableField("XK_XKWS")
+    private String XK_XKWS;
+
+    @JsonProperty("XK_XKZS")
+    @TableField("XK_XKZS")
+    private String XK_XKZS;
+
+    @JsonProperty("XK_YXQZ")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @TableField("XK_YXQZ")
+    private Date XK_YXQZ;
+
+    @JsonProperty("XK_YXQZI")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @TableField("XK_YXQZI")
+    private Date XK_YXQZI;
+
+    @JsonProperty("XK_ZJLX_OTHER")
+    @TableField("XK_ZJLX_OTHER")
+    private String XK_ZJLX_OTHER;
+
+    @JsonProperty("XK_ZT")
+    @TableField("XK_ZT")
+    private String XK_ZT;
+
+    @JsonProperty("batch_no")
+    @TableField("batch_no")
+    private Long batch_no;
+
+    @JsonProperty("create_time")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("create_time")
+    private Date create_time;
+
+    @JsonProperty("create_user")
+    @TableField("create_user")
+    private String create_user;
+
+    @JsonProperty("data_code")
+    @TableField("data_code")
+    private String data_code;
+
+    @JsonProperty("dep_id")
+    @TableField("dep_id")
+    private Integer dep_id;
+
+    @JsonProperty("entity_code")
+    @TableField("entity_code")
+    private String entity_code;
+
+    @JsonProperty("entity_code_add")
+    @TableField("entity_code_add")
+    private String entity_code_add;
+
+    @JsonProperty("entity_name")
+    @TableField("entity_name")
+    private String entity_name;
+
+    @JsonProperty("entity_type")
+    @TableField("entity_type")
+    private String entity_type;
+
+    @JsonProperty("id")
+    @TableField("id")
+    private Long id;
+
+    @JsonProperty("inventory_id")
+    @TableField("inventory_id")
+    private Integer inventory_id;
+
+    @JsonProperty("inventory_source_id")
+    @TableField("inventory_source_id")
+    private Integer inventory_source_id;
+
+    @JsonProperty("is_del")
+    @TableField("is_del")
+    private Integer is_del;
+
+    @JsonProperty("meta_id")
+    @TableField("meta_id")
+    private Integer meta_id;
+
+    @JsonProperty("org_id")
+    @TableField("org_id")
+    private Integer org_id;
+
+    @JsonProperty("report_state")
+    @TableField("report_state")
+    private String report_state;
+
+    @JsonProperty("status")
+    @TableField("status")
+    private String status;
+
+    @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;
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrAdministrativeLicensing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_administrative_licensing(行政许可信息表)】的数据库操作Mapper
+* @createDate 2024-10-12 11:55:15
+* @Entity com.zksy.data.domain.po.XcrAdministrativeLicensing
+*/
+public interface XcrAdministrativeLicensingMapper extends BaseMapper<XcrAdministrativeLicensing> {
+
+}
+
+
+
+

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

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrAdministrativeLicensing;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_administrative_licensing(行政许可信息表)】的数据库操作Service
+* @createDate 2024-10-12 11:55:15
+*/
+public interface XcrAdministrativeLicensingService extends IService<XcrAdministrativeLicensing>,IBaseSaveDataInterface {
+
+}

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

@@ -0,0 +1,51 @@
+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;
+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_licensing(行政许可信息表)】的数据库操作Service实现
+* @createDate 2024-10-12 11:55:15
+*/
+@Service
+@Slf4j
+public class XcrAdministrativeLicensingServiceImpl extends ServiceImpl<XcrAdministrativeLicensingMapper, XcrAdministrativeLicensing>
+    implements XcrAdministrativeLicensingService{
+    @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<XcrAppointDelegates> toDatabaseList = new Vector<>();
+        creditCodes.parallelStream().limit(5).forEach(creditCode -> {
+            HashMap<String, String> requestbodyMap = new HashMap<>();
+            requestbodyMap.put("entityCode", creditCode);
+            xhRequestUtil.requestXinyonghuanhuai(requestbodyMap,address,
+                    XcrAdministrativeLicensingResponse.class);
+        });
+        log.info("委派代表信息同步完成");
+    }
+}
+
+
+
+

data-service/src/main/java/com/zksy/data/utils/XhRequestUtil.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zksy.common.domain.response.BaseResponse;
+import com.zksy.common.domain.response.BaseResponse2;
 import com.zksy.common.exception.CommonException;
 import com.zksy.common.utils.BeanUtils;
 import com.zksy.data.config.XhConfigProperty;
@@ -17,7 +18,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -126,46 +126,41 @@ public class XhRequestUtil {
         return null;
     }
 
-    public void requestXinyonghuanhuai(){
-        refreshToken();
+    public <T extends BaseResponse2> void requestXinyonghuanhuai(Map requestBodyMap, String address,
+                                                                 Class<T> entityResponseClass){
+        getToken();
         HttpUrl url = new HttpUrl.Builder()
                 .scheme("http")
                 .host(xinyonghuaihuaProperty.getHost())
-                .addPathSegment("interface/v1/doublePublic/findLicensingList")
+                .addPathSegment(address)
                 .build();
-        Map<String, Object> requestBodyMap = new HashMap<>();
-        requestBodyMap.put("entityCode", "91431227MA4QPUTX06");
-//        requestBodyMap.put("entityName", "滴滴");
-//        requestBodyMap.put("entityCodeAdd", "12345");
-//        requestBodyMap.put("wsh", "");
-//        requestBodyMap.put("upDateBegin", "2023-01-01 00:00:00");
-//        requestBodyMap.put("upDateEnd", "2023-12-01 00:00:00");
-//        requestBodyMap.put("size", 10);
-//        requestBodyMap.put("page", 1);
         try {
             var json = objectMapper.writeValueAsString(requestBodyMap);
             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", redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY))
+                    .header("Token",redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY))
                     .post(requestBody)
                     .build();
             Response response = okHttpClient.newCall(request).execute();
-            if (!response.isSuccessful()) {
-                throw new CommonException("当前接口请求失败",5000);
-            }
-            if (ObjectUtil.isEmpty(response.body())) {
+            if (!response.isSuccessful() || ObjectUtil.isEmpty(response.body())) {
                 throw new CommonException("当前接口请求失败",5000);
             }
             String s = response.body().string();
+            T value = objectMapper.readValue(s, entityResponseClass);
+
+            if(value.getStatus() != 0){
+                throw new CommonException("当前请求结果异常",5000);
+            }
+            System.out.println(value);
             log.info(s);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    private void refreshToken() {
+    private void getToken() {
         HttpUrl url = new HttpUrl.Builder()
                 .scheme("http")
                 .host(xinyonghuaihuaProperty.getHost())
@@ -193,6 +188,7 @@ public class XhRequestUtil {
             if(StrUtil.isEmpty(token)){
                 throw new CommonException("刷新token的接口返回异常",5000);
             }
+//            return token;
             redisTemplate.opsForValue().set(RedisKeyConstant.HUAIHUA_TOKEN_KEY,token);
         } catch (Exception e) {
             throw new RuntimeException(e);

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

@@ -0,0 +1,82 @@
+<?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.XcrAdministrativeLicensingMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrAdministrativeLicensing">
+            <result property="bz" column="BZ" jdbcType="VARCHAR"/>
+            <result property="fbzt" column="FBZT" jdbcType="VARCHAR"/>
+            <result property="islate" column="ISLATE" jdbcType="VARCHAR"/>
+            <result property="unid" column="UNID" jdbcType="VARCHAR"/>
+            <result property="xkFddbrzjlxOther" column="XK_FDDBRZJLX_OTHER" jdbcType="VARCHAR"/>
+            <result property="xkFrdb" column="XK_FRDB" jdbcType="VARCHAR"/>
+            <result property="xkFrZjhm" column="XK_FR_ZJHM" jdbcType="VARCHAR"/>
+            <result property="xkFrZjlx" column="XK_FR_ZJLX" jdbcType="VARCHAR"/>
+            <result property="xkJdrq" column="XK_JDRQ" jdbcType="TIMESTAMP"/>
+            <result property="xkLbOther" column="XK_LB_OTHER" jdbcType="VARCHAR"/>
+            <result property="xkLydw" column="XK_LYDW" jdbcType="VARCHAR"/>
+            <result property="xkLydwdm" column="XK_LYDWDM" jdbcType="VARCHAR"/>
+            <result property="xkNr" column="XK_NR" jdbcType="VARCHAR"/>
+            <result property="xkWsh" column="XK_WSH" jdbcType="VARCHAR"/>
+            <result property="xkXdrGszc" column="XK_XDR_GSZC" jdbcType="VARCHAR"/>
+            <result property="xkXdrLb" column="XK_XDR_LB" jdbcType="VARCHAR"/>
+            <result property="xkXdrShxym" column="XK_XDR_SHXYM" jdbcType="VARCHAR"/>
+            <result property="xkXdrShzz" column="XK_XDR_SHZZ" jdbcType="VARCHAR"/>
+            <result property="xkXdrSwdj" column="XK_XDR_SWDJ" jdbcType="VARCHAR"/>
+            <result property="xkXdrSydw" column="XK_XDR_SYDW" jdbcType="VARCHAR"/>
+            <result property="xkXdrZjhm" column="XK_XDR_ZJHM" jdbcType="VARCHAR"/>
+            <result property="xkXdrZjlx" column="XK_XDR_ZJLX" jdbcType="VARCHAR"/>
+            <result property="xkXdrZzjg" column="XK_XDR_ZZJG" jdbcType="VARCHAR"/>
+            <result property="xkXkbh" column="XK_XKBH" jdbcType="VARCHAR"/>
+            <result property="xkXkjg" column="XK_XKJG" jdbcType="VARCHAR"/>
+            <result property="xkXkjgdm" column="XK_XKJGDM" jdbcType="VARCHAR"/>
+            <result property="xkXklb" column="XK_XKLB" jdbcType="VARCHAR"/>
+            <result property="xkXkws" column="XK_XKWS" jdbcType="VARCHAR"/>
+            <result property="xkXkzs" column="XK_XKZS" jdbcType="VARCHAR"/>
+            <result property="xkYxqz" column="XK_YXQZ" jdbcType="TIMESTAMP"/>
+            <result property="xkYxqzi" column="XK_YXQZI" jdbcType="TIMESTAMP"/>
+            <result property="xkZjlxOther" column="XK_ZJLX_OTHER" jdbcType="VARCHAR"/>
+            <result property="xkZt" column="XK_ZT" jdbcType="VARCHAR"/>
+            <result property="batchNo" column="batch_no" jdbcType="BIGINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="dataCode" column="data_code" jdbcType="VARCHAR"/>
+            <result property="depId" column="dep_id" jdbcType="INTEGER"/>
+            <result property="entityCode" column="entity_code" jdbcType="VARCHAR"/>
+            <result property="entityCodeAdd" column="entity_code_add" jdbcType="VARCHAR"/>
+            <result property="entityName" column="entity_name" jdbcType="VARCHAR"/>
+            <result property="entityType" column="entity_type" jdbcType="VARCHAR"/>
+            <result property="id" column="id" jdbcType="BIGINT"/>
+            <result property="inventoryId" column="inventory_id" jdbcType="INTEGER"/>
+            <result property="inventorySourceId" column="inventory_source_id" jdbcType="INTEGER"/>
+            <result property="isDel" column="is_del" jdbcType="INTEGER"/>
+            <result property="metaId" column="meta_id" jdbcType="INTEGER"/>
+            <result property="orgId" column="org_id" jdbcType="INTEGER"/>
+            <result property="reportState" column="report_state" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        BZ,FBZT,ISLATE,
+        UNID,XK_FDDBRZJLX_OTHER,XK_FRDB,
+        XK_FR_ZJHM,XK_FR_ZJLX,XK_JDRQ,
+        XK_LB_OTHER,XK_LYDW,XK_LYDWDM,
+        XK_NR,XK_WSH,XK_XDR_GSZC,
+        XK_XDR_LB,XK_XDR_SHXYM,XK_XDR_SHZZ,
+        XK_XDR_SWDJ,XK_XDR_SYDW,XK_XDR_ZJHM,
+        XK_XDR_ZJLX,XK_XDR_ZZJG,XK_XKBH,
+        XK_XKJG,XK_XKJGDM,XK_XKLB,
+        XK_XKWS,XK_XKZS,XK_YXQZ,
+        XK_YXQZI,XK_ZJLX_OTHER,XK_ZT,
+        batch_no,create_time,create_user,
+        data_code,dep_id,entity_code,
+        entity_code_add,entity_name,entity_type,
+        id,inventory_id,inventory_source_id,
+        is_del,meta_id,org_id,
+        report_state,status,update_time,
+        update_user
+    </sql>
+</mapper>

xh-common/src/main/java/com/zksy/common/domain/response/BaseResponse2.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 BaseResponse2 extends PublicData{
+    @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

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