新增抽查结果信息库表同步

background-service/zksy-system/src/main/java/com/zksy/basicData/domain/XcrInspectionResults.java

@@ -180,12 +180,33 @@ private static final long serialVersionUID=1L;
 
     /** 数据初始化或更新时间戳 */
             @JsonFormat(pattern = "yyyy-MM-dd")
-            @Excel(name = "数据初始化或更新时间戳", width = 30, dateFormat = "yyyy-MM-dd")
-            @ApiModelProperty("数据初始化或更新时间戳")
+            @Excel(name = "数据初始化更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("数据初始化更新时间")
             @TableField("S_EXT_DATATIME")
             @JsonProperty("sExtDatatime")
     private Date sExtDatatime;
 
+    @JsonProperty("sExtTimestamp")
+    @Excel(name = "更新时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("更新时间戳")
+    @TableField("S_EXT_TIMESTAMP")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sExtTimestamp;
+
+
+    @JsonProperty("iTIME")
+    @Excel(name = "插入时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("插入时间")
+    @TableField("I_TIME")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date iTIME;
+
+
+    @JsonProperty("sExtFromnode")
+    @Excel(name = "数据来源", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("数据来源")
+    @TableField("S_EXT_FROMNODE")
+    private String sExtFromnode;
 
 
 }

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

@@ -16,98 +16,137 @@ import java.util.Date;
 @TableName(value ="xcr_inspection_results")
 @Data
 public class XcrInspectionResults extends BasePo implements Serializable {
+    @JsonProperty("CHECK_ID")
+    @TableField("CHECK_ID")
+    private String checkId;
+
+
+    @JsonProperty("CHECKRESID")
+    @TableField("CHECKRESID")
+    private String checkresid;
+
+
+    @JsonProperty("INSENTERID")
+    @TableField("INSENTERID")
+    private String insenterid;
+
+
+    @JsonProperty("RANINSPLANID")
+    @TableField("RANINSPLANID")
+    private String raninsplanid;
+
+
+    @JsonProperty("RANINSPLANNAME")
+    @TableField("RANINSPLANNAME")
+    private String raninsplanname;
+
+
     @JsonProperty("RANINSTASKID")
     @TableField("RANINSTASKID")
-    private String RANINSTASKID;
+    private String raninstaskid;
 
-    @JsonProperty("INSAUTH")
-    @TableField("INSAUTH")
-    private String INSAUTH;
 
     @JsonProperty("RANINSTASKNAME")
     @TableField("RANINSTASKNAME")
-    private String RANINSTASKNAME;
+    private String raninstaskname;
 
-    @JsonProperty("RANINSPLANNAME")
-    @TableField("RANINSPLANNAME")
-    private String RANINSPLANNAME;
 
-    @JsonProperty("PUBDATE")
-    @TableField("PUBDATE")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date PUBDATE;
+    @JsonProperty("RANINSTYPE")
+    @TableField("RANINSTYPE")
+    private String raninstype;
+
 
     @JsonProperty("RANINSTYPENAME")
     @TableField("RANINSTYPENAME")
-    private String RANINSTYPENAME;
+    private String raninstypename;
 
-    @JsonProperty("UNISCID")
-    @TableField("UNISCID")
-    private String UNISCID;
 
     @JsonProperty("PRIPID")
     @TableField("PRIPID")
-    private String PRIPID;
+    private String pripid;
 
-    @JsonProperty("INSDATE")
-    @TableField("INSDATE")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date INSDATE;
 
-    @JsonProperty("RANINSCHECKRESNAME")
-    @TableField("RANINSCHECKRESNAME")
-    private String RANINSCHECKRESNAME;
+    @JsonProperty("UNISCID")
+    @TableField("UNISCID")
+    private String uniscid;
+
+
+    @JsonProperty("REGNO")
+    @TableField("REGNO")
+    private String regno;
+
+
+    @JsonProperty("ENTNAME")
+    @TableField("ENTNAME")
+    private String entname;
 
-    @JsonProperty("INSENTERID")
-    @TableField("INSENTERID")
-    private String INSENTERID;
 
     @JsonProperty("INSAUTHCODE")
     @TableField("INSAUTHCODE")
-    private String INSAUTHCODE;
+    private String insauthcode;
 
-    @JsonProperty("CHECK_ID")
-    @TableField("CHECK_ID")
-    private String CHECK_ID;
 
-    @JsonProperty("RANINSTYPE")
-    @TableField("RANINSTYPE")
-    private String RANINSTYPE;
+    @JsonProperty("INSAUTH")
+    @TableField("INSAUTH")
+    private String insauth;
+
+
+    @JsonProperty("INSDATE")
+    @TableField("INSDATE")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date insdate;
+
 
     @JsonProperty("RANINSITEM")
     @TableField("RANINSITEM")
-    private String RANINSITEM;
+    private String raninsitem;
+
 
     @JsonProperty("RANINSITEMNAME")
     @TableField("RANINSITEMNAME")
-    private String RANINSITEMNAME;
+    private String raninsitemname;
 
-    @JsonProperty("REGNO")
-    @TableField("REGNO")
-    private String REGNO;
 
-    @JsonProperty("CHECKRESID")
-    @TableField("CHECKRESID")
-    private String CHECKRESID;
+    @JsonProperty("RANINSCHECKRES")
+    @TableField("RANINSCHECKRES")
+    private String raninscheckres;
 
-    @JsonProperty("ENTNAME")
-    @TableField("ENTNAME")
-    private String ENTNAME;
 
-    @JsonProperty("RANINSPLANID")
-    @TableField("RANINSPLANID")
-    private String RANINSPLANID;
+    @JsonProperty("RANINSCHECKRESNAME")
+    @TableField("RANINSCHECKRESNAME")
+    private String raninscheckresname;
+
 
     @JsonProperty("REMARK")
     @TableField("REMARK")
-    private String REMARK;
+    private String remark;
+
+
+    @JsonProperty("PUBDATE")
+    @TableField("PUBDATE")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pubdate;
+
 
     @JsonProperty("S_EXT_DATATIME")
     @TableField("S_EXT_DATATIME")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date S_EXT_DATATIME;
+    private Date sExtDatatime;
 
-    @JsonProperty("RANINSCHECKRES")
-    @TableField("RANINSCHECKRES")
-    private String RANINSCHECKRES;
+
+    @JsonProperty("S_EXT_TIMESTAMP")
+    @TableField("S_EXT_TIMESTAMP")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sExtTimestamp;
+
+
+    @JsonProperty("I_TIME")
+    @TableField("I_TIME")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date iTime;
+
+
+    @JsonProperty("S_EXT_FROMNODE")
+    @TableField("S_EXT_FROMNODE")
+    private String sExtFromnode;
 }

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

@@ -1,8 +1,14 @@
 package com.zksy.data.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.api.client.TableDataClient;
+import com.zksy.api.dto.tableData.DrRaninsres;
+import com.zksy.api.dto.tableData.EBaseinfo;
+import com.zksy.common.domain.Result;
 import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
+import com.zksy.data.domain.po.XcrEBaseinfo;
 import com.zksy.data.domain.po.XcrInspectionResults;
 import com.zksy.data.domain.response.XcrInspectionResultsResponse;
 import com.zksy.data.mapper.XcrInspectionResultsMapper;
@@ -27,9 +33,7 @@ import java.util.Vector;
 public class XcrInspectionResultsServiceImpl extends ServiceImpl<XcrInspectionResultsMapper, XcrInspectionResults>
     implements XcrInspectionResultsService{
     @Autowired
-    private XhRequestUtil xhRequestUtil;
-    @Autowired
-    private RedisService redisService;
+    private TableDataClient tableDataClient;
     @Autowired
     private TransactionTemplate transactionTemplate;
 
@@ -37,17 +41,13 @@ public class XcrInspectionResultsServiceImpl extends ServiceImpl<XcrInspectionRe
 
     @XhDataLogRecord("同步抽查结果信息")
     public void saveDataByUniCode(String address) {
-        //模拟从数据库中取数据大约为3000-4000条
-        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
-        Vector<XcrInspectionResults> toDatabaseList = new Vector<>();
-        creditCodes.parallelStream().forEach(creditCode -> {
-            List<XcrInspectionResults> list = xhRequestUtil.httpRequestByUniCode(creditCode, address,
-                    XcrInspectionResultsResponse.class,
-                    XcrInspectionResults.class
-            );
-            if(list != null){
-                toDatabaseList.addAll(list);
-            }
+        Result<List<DrRaninsres>> drRaninsresAll = tableDataClient.getDrRaninsres();
+        if(drRaninsresAll.getCode() != 200){
+            throw new RuntimeException(drRaninsresAll.getMsg());
+        }
+        List<XcrInspectionResults> toDatabaseList = BeanUtil.copyToList(drRaninsresAll.getData(), XcrInspectionResults.class);
+        toDatabaseList.forEach(q->{
+            q.setUniCode(q.getUniscid());
         });
         transactionTemplate.execute((s)->{
             try {
@@ -59,7 +59,6 @@ public class XcrInspectionResultsServiceImpl extends ServiceImpl<XcrInspectionRe
             }
             return null;
         });
-        log.info("抽查结果信息同步完成");
     }
 }
 

xh-api/src/main/java/com/zksy/api/client/TableDataClient.java

@@ -2,6 +2,7 @@ package com.zksy.api.client;
 
 import com.zksy.api.dto.tableData.AnBaseinfo;
 import com.zksy.api.dto.tableData.AnSubcapital;
+import com.zksy.api.dto.tableData.DrRaninsres;
 import com.zksy.api.dto.tableData.EBaseinfo;
 import com.zksy.common.domain.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -29,8 +30,8 @@ public interface TableDataClient {
     @GetMapping("/anUpdateinfo")
     public Result getAnUpdateinfo();
 
-    @GetMapping("/drRaninsres")
-    public Result getDrRaninsres();
+    @GetMapping("/libraryTable/drRaninsres")
+    public Result<List<DrRaninsres>> getDrRaninsres();
 
     @GetMapping("/libraryTable/anBaseinfo")
     public Result<List<AnBaseinfo>> getAnBaseinfo();