添加农专年报分支机构信息表

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

@@ -223,6 +223,8 @@ public class TestController {
     private XcrAgriculturalSpecializedWebsiteService xcrAgriculturalSpecializedWebsiteService;
     @Autowired
     private XcrMajorMembersService xcrMajorMembersService;
+    @Autowired
+    private XcrAnSfcBranchinfoService xcrAnSfcBranchinfoService;
     @GetMapping("/a")
     public String hello(){
         executeServiceCall(() -> xcrELicNcertificateService.saveDataByUniCode("gateway/api/1/getXzxkxxByUniscid"), "gateway/api/1/getXzxkxxByUniscid");
@@ -373,6 +375,7 @@ public class TestController {
         executeServiceCall(() -> xcrAgriculturalSpecializedWebsiteService.saveDataByUniCode("gateway/api/1/nznbwzhwdxxByUniscid"), "gateway/api/1/nznbwzhwdxxByUniscid");
         // 主要成员信息
         executeServiceCall(() -> xcrMajorMembersService.saveDataByUniCode("gateway/api/1/zyryxxByUniscid"), "gateway/api/1/zyryxxByUniscid");
+        executeServiceCall(() -> xcrAnSfcBranchinfoService.saveDataByUniCode("gateway/api/1/getNznbfzjgxxByUniscid"), "gateway/api/1/getNznbfzjgxxByUniscid");
         return "成功";
     }
     /**

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

@@ -10,98 +10,24 @@ import java.util.Date;
 
 @Data
 public class Temp extends BasePo implements Serializable {
-    @JsonProperty("RANINSTASKID")
-    @TableField("RANINSTASKID")
-    private String RANINSTASKID;
+    @JsonProperty("BRID")
+    @TableField("BRID")
+    private String BRID;
 
-    @JsonProperty("INSAUTH")
-    @TableField("INSAUTH")
-    private String INSAUTH;
+    @JsonProperty("ANCHEID")
+    @TableField("ANCHEID")
+    private String ANCHEID;
 
-    @JsonProperty("RANINSTASKNAME")
-    @TableField("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("RANINSTYPENAME")
-    @TableField("RANINSTYPENAME")
-    private String RANINSTYPENAME;
+    @JsonProperty("BRNAME")
+    @TableField("BRNAME")
+    private String BRNAME;
 
     @JsonProperty("UNISCID")
     @TableField("UNISCID")
     private String UNISCID;
 
-    @JsonProperty("PRIPID")
-    @TableField("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("INSENTERID")
-    @TableField("INSENTERID")
-    private String INSENTERID;
-
-    @JsonProperty("INSAUTHCODE")
-    @TableField("INSAUTHCODE")
-    private String INSAUTHCODE;
-
-    @JsonProperty("CHECK_ID")
-    @TableField("CHECK_ID")
-    private String CHECK_ID;
-
-    @JsonProperty("RANINSTYPE")
-    @TableField("RANINSTYPE")
-    private String RANINSTYPE;
-
-    @JsonProperty("RANINSITEM")
-    @TableField("RANINSITEM")
-    private String RANINSITEM;
-
-    @JsonProperty("RANINSITEMNAME")
-    @TableField("RANINSITEMNAME")
-    private String RANINSITEMNAME;
-
-    @JsonProperty("REGNO")
-    @TableField("REGNO")
-    private String REGNO;
-
-    @JsonProperty("CHECKRESID")
-    @TableField("CHECKRESID")
-    private String CHECKRESID;
-
-    @JsonProperty("ENTNAME")
-    @TableField("ENTNAME")
-    private String ENTNAME;
-
-    @JsonProperty("RANINSPLANID")
-    @TableField("RANINSPLANID")
-    private String RANINSPLANID;
-
-    @JsonProperty("REMARK")
-    @TableField("REMARK")
-    private String REMARK;
-
-    @JsonProperty("S_EXT_DATATIME")
-    @TableField("S_EXT_DATATIME")
+    @JsonProperty("ENTCHEYEAR")
+    @TableField("ENTCHEYEAR")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date S_EXT_DATATIME;
-
-    @JsonProperty("RANINSCHECKRES")
-    @TableField("RANINSCHECKRES")
-    private String RANINSCHECKRES;
+    private Date ENTCHEYEAR;
 }

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

@@ -0,0 +1,39 @@
+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_an_sfc_branchinfo
+ */
+@TableName(value ="xcr_an_sfc_branchinfo")
+@Data
+public class XcrAnSfcBranchinfo extends BasePo implements Serializable {
+    @JsonProperty("BRID")
+    @TableField("BRID")
+    private String BRID;
+
+    @JsonProperty("ANCHEID")
+    @TableField("ANCHEID")
+    private String ANCHEID;
+
+    @JsonProperty("BRNAME")
+    @TableField("BRNAME")
+    private String BRNAME;
+
+    @JsonProperty("UNISCID")
+    @TableField("UNISCID")
+    private String UNISCID;
+
+    @JsonProperty("ENTCHEYEAR")
+    @TableField("ENTCHEYEAR")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ENTCHEYEAR;
+}

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

@@ -0,0 +1,12 @@
+package com.zksy.data.domain.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zksy.common.domain.response.BaseResponse;
+import com.zksy.data.domain.po.XcrAnSfcBranchinfo;
+
+import java.util.List;
+
+public class XcrAnSfcBranchinfoResponse extends BaseResponse {
+    @JsonProperty("data")
+    private List<XcrAnSfcBranchinfo> data;
+}

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

@@ -0,0 +1,18 @@
+package com.zksy.data.mapper;
+
+import com.zksy.data.domain.po.XcrAnSfcBranchinfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_an_sfc_branchinfo(农专年报分支机构信息)】的数据库操作Mapper
+* @createDate 2024-10-29 15:03:15
+* @Entity com.zksy.data.domain.po.XcrAnSfcBranchinfo
+*/
+public interface XcrAnSfcBranchinfoMapper extends BaseMapper<XcrAnSfcBranchinfo> {
+
+}
+
+
+
+

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

@@ -99,6 +99,7 @@ public class CollectDataSchedule {
         serviceMap.put("xcrEnterprisePollutionPermitInfoServiceImpl", "gateway/api/1/getQypwxkxxByUniscid");
         serviceMap.put("xcrKeyPollutionSourcesServiceImpl", "gateway/api/1/getZdpwdwmlByShxyfwm");
         serviceMap.put("xcrEnvironmentalPenaltyDecisionServiceImpl","gateway/api/1/getHbcfjdqkxxByUniscid");
+        serviceMap.put("xcrAgriculturalSpecializedWebsiteService","gateway/api/1/nznbwzhwdxxByUniscid");
     }
 
     @Scheduled(cron = "0 0 1 1 * ?")
@@ -126,7 +127,9 @@ public class CollectDataSchedule {
     @Scheduled(cron = "0 0 4 ? * SUN")
     public void getDataByWeek1() {
         List<String> serviceList = List.of(
-                "xcrEnterprisePollutionPermitInfoServiceImpl"
+                "xcrEnterprisePollutionPermitInfoServiceImpl",
+                "xcrKeyPollutionSourcesServiceImpl",
+                "xcrAgriculturalSpecializedWebsiteService"
         );
         commonHandler(serviceList);
 

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

@@ -0,0 +1,13 @@
+package com.zksy.data.service;
+
+import com.zksy.data.domain.po.XcrAnSfcBranchinfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_an_sfc_branchinfo(农专年报分支机构信息)】的数据库操作Service
+* @createDate 2024-10-29 15:03:15
+*/
+public interface XcrAnSfcBranchinfoService extends IService<XcrAnSfcBranchinfo>,IBaseSaveDataInterface {
+
+}

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

@@ -0,0 +1,57 @@
+package com.zksy.data.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.data.annotation.XhDataLogRecord;
+import com.zksy.data.domain.po.XcrAnSfcBranchinfo;
+import com.zksy.data.domain.response.XcrAnSfcBranchinfoResponse;
+import com.zksy.data.mapper.XcrAnSfcBranchinfoMapper;
+import com.zksy.data.service.XcrAnSfcBranchinfoService;
+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.List;
+import java.util.Vector;
+
+/**
+* @author Administrator
+* @description 针对表【xcr_an_sfc_branchinfo(农专年报分支机构信息)】的数据库操作Service实现
+* @createDate 2024-10-29 15:03:15
+*/
+@Service
+@Slf4j
+public class XcrAnSfcBranchinfoServiceImpl extends ServiceImpl<XcrAnSfcBranchinfoMapper, XcrAnSfcBranchinfo>
+    implements XcrAnSfcBranchinfoService{
+    @Autowired
+    private XhRequestUtil xhRequestUtil;
+    @Autowired
+    private RedisService redisService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    @XhDataLogRecord("同步农专年报分支机构信息")
+    public void saveDataByUniCode(String address) {
+        //模拟从数据库中取数据大约为3000-4000条
+        List<String> creditCodes = (List<String>) redisService.getList("creditCodes").get(0);
+        Vector<XcrAnSfcBranchinfo> toDatabaseList = new Vector<>();
+        creditCodes.parallelStream().forEach(creditCode -> {
+            List<XcrAnSfcBranchinfo> list = xhRequestUtil.httpRequestByUniCode(creditCode, address,
+                    XcrAnSfcBranchinfoResponse.class,
+                    XcrAnSfcBranchinfo.class
+            );
+            if(list != null){
+                toDatabaseList.addAll(list);
+            }
+        });
+        this.remove(null);
+        this.saveBatch(toDatabaseList);
+        log.info("农专年报分支机构信息同步完成");
+    }
+}
+
+
+
+

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

@@ -0,0 +1,19 @@
+<?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.XcrAnSfcBranchinfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.data.domain.po.XcrAnSfcBranchinfo">
+            <result property="brid" column="BRID" jdbcType="VARCHAR"/>
+            <result property="ancheid" column="ANCHEID" jdbcType="VARCHAR"/>
+            <result property="brname" column="BRNAME" jdbcType="VARCHAR"/>
+            <result property="uniscid" column="UNISCID" jdbcType="VARCHAR"/>
+            <result property="sExtDatatime" column="S_EXT_DATATIME" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        BRID,ANCHEID,BRNAME,
+        UNISCID,S_EXT_DATATIME
+    </sql>
+</mapper>