定时任务推进

background-service/zksy-admin/src/main/java/com/zksy/web/controller/basicData/XcrEBaseinfoController.java

@@ -0,0 +1,98 @@
+package com.zksy.web.controller.basicData;
+
+import com.zksy.common.core.controller.BaseController;
+import com.zksy.basicData.domain.XcrEBaseinfo;
+import com.zksy.basicData.service.IXcrEBaseinfoService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.AjaxResult;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.common.annotation.Log;
+import com.zksy.common.enums.BusinessType;
+import com.zksy.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 企业基本信息Controller
+ *
+ * @author nahida
+ * @date 2024-11-14
+ */
+@RestController
+@RequestMapping("/basicData/xcrEBaseinfo")
+@Api(tags = "企业基本信息", description = "企业基本信息desc")
+public class XcrEBaseinfoController extends BaseController{
+
+    @Autowired
+    private IXcrEBaseinfoService service;
+
+    @GetMapping("/getById/{borrowId}")
+    @ApiOperation(value = "企业基本信息搜索getById")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrEBaseinfo:list')")
+    public XcrEBaseinfo getById(@PathVariable String borrowId) {
+        return service.getById(borrowId);
+    }
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "企业基本信息分页")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrEBaseinfo:list')")
+    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "企业基本信息查询所有")
+    @PreAuthorize("@ss.hasPermi('basicData:xcrEBaseinfo:list')")
+    public List<XcrEBaseinfo> getList(String conditionJson) throws Exception {
+        return service.list(SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    /**
+     * 新增企业基本信息
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "企业基本信息新增")
+    @Log(title = "新增企业基本信息", businessType = BusinessType.INSERT)
+    public boolean save(@RequestBody XcrEBaseinfo xcrEBaseinfo) {
+        return service.save(xcrEBaseinfo);
+    }
+
+    /**
+     * 修改企业基本信息
+     */
+    @PostMapping("/updateById")
+    @ApiOperation(value = "企业基本信息修改")
+    @Log(title = "修改企业基本信息", businessType = BusinessType.UPDATE)
+    public boolean updateById(@RequestBody XcrEBaseinfo xcrEBaseinfo) {
+        return service.updateById(xcrEBaseinfo);
+    }
+
+
+    @Log(title = "企业基本信息", businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation(value = "删除企业基本信息", notes = "删除企业基本信息")
+    public AjaxResult delete(@RequestBody List<String> ids)
+    {
+        return toAjax(service.removeByIds(ids));
+    }
+
+    /**
+     * 导出企业基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('basicData:xcrEBaseinfo:export')")
+    @Log(title = "企业基本信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,String conditionJson) throws Exception
+    {
+        List<XcrEBaseinfo> list = service.list(SearchUtil.parseWhereSql(conditionJson));
+        ExcelUtil<XcrEBaseinfo> util = new ExcelUtil<XcrEBaseinfo>(XcrEBaseinfo.class);
+        util.exportExcel(response, list, "企业基本信息数据");
+    }
+}

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

@@ -0,0 +1,316 @@
+package com.zksy.basicData.domain;
+
+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 com.zksy.common.annotation.Excel;
+import com.zksy.common.core.domain.BasePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+ * 企业基本信息对象 xcr_e_baseinfo
+ *
+ * @author nahida
+ * @date 2024-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xcr_e_baseinfo")
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "企业基本信息")
+public class XcrEBaseinfo extends BasePo {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("ETPS_ID")
+            @JsonProperty("etpsId")
+    private String etpsId;
+
+    /** 主体身份代码 */
+            @Excel(name = "主体身份代码")
+            @ApiModelProperty("主体身份代码")
+            @TableField("PRIPID")
+            @JsonProperty("PRIPID")
+    private String PRIPID;
+
+    /** 统一社会信用代码 */
+            @Excel(name = "统一社会信用代码")
+            @ApiModelProperty("统一社会信用代码")
+            @TableField("UNISCID")
+            @JsonProperty("UNISCID")
+    private String UNISCID;
+
+    /** 企业（机构）名称 */
+            @Excel(name = "企业", readConverterExp = "机=构")
+            @ApiModelProperty("企业")
+            @TableField("ENTNAME")
+            @JsonProperty("ENTNAME")
+    private String ENTNAME;
+
+    /** 注册号 */
+            @Excel(name = "注册号")
+            @ApiModelProperty("注册号")
+            @TableField("REGNO")
+            @JsonProperty("REGNO")
+    private String REGNO;
+
+    /** 市场主体类型 */
+            @Excel(name = "市场主体类型")
+            @ApiModelProperty("市场主体类型")
+            @TableField("ENTTYPE")
+            @JsonProperty("ENTTYPE")
+    private String ENTTYPE;
+
+    /** 市场主体类型（中文名称） */
+            @Excel(name = "市场主体类型", readConverterExp = "中=文名称")
+            @ApiModelProperty("市场主体类型")
+            @TableField("ENTTYPE_CN")
+            @JsonProperty("enttypeCn")
+    private String enttypeCn;
+
+    /** 行业门类 */
+            @Excel(name = "行业门类")
+            @ApiModelProperty("行业门类")
+            @TableField("INDUSTRYPHY")
+            @JsonProperty("INDUSTRYPHY")
+    private String INDUSTRYPHY;
+
+    /** 行业代码 */
+            @Excel(name = "行业代码")
+            @ApiModelProperty("行业代码")
+            @TableField("INDUSTRYCO")
+            @JsonProperty("INDUSTRYCO")
+    private String INDUSTRYCO;
+
+    /** 成立日期 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("成立日期")
+            @TableField("ESTDATE")
+            @JsonProperty("ESTDATE")
+    private Date ESTDATE;
+
+    /** 登记机关 */
+            @Excel(name = "登记机关")
+            @ApiModelProperty("登记机关")
+            @TableField("REGORG")
+            @JsonProperty("REGORG")
+    private String REGORG;
+
+    /** 登记机关（中文名称） */
+            @Excel(name = "登记机关", readConverterExp = "中=文名称")
+            @ApiModelProperty("登记机关")
+            @TableField("REGORG_CN")
+            @JsonProperty("regorgCn")
+    private String regorgCn;
+
+    /** 业务范围类型 */
+            @Excel(name = "业务范围类型")
+            @ApiModelProperty("业务范围类型")
+            @TableField("OPSCOTYPE")
+            @JsonProperty("OPSCOTYPE")
+    private String OPSCOTYPE;
+
+    /** 业务范围类型（中文名称） */
+            @Excel(name = "业务范围类型", readConverterExp = "中=文名称")
+            @ApiModelProperty("业务范围类型")
+            @TableField("OPSCOTYPE_CN")
+            @JsonProperty("opscotypeCn")
+    private String opscotypeCn;
+
+    /** 经营范围 */
+            @Excel(name = "经营范围")
+            @ApiModelProperty("经营范围")
+            @TableField("OPSCOPE")
+            @JsonProperty("OPSCOPE")
+    private String OPSCOPE;
+
+    /** 经营(驻在)期限自 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "经营(驻在)期限自", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("经营(驻在)期限自")
+            @TableField("OPFROM")
+            @JsonProperty("OPFROM")
+    private Date OPFROM;
+
+    /** 经营(驻在)期限至 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "经营(驻在)期限至", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("经营(驻在)期限至")
+            @TableField("OPTO")
+            @JsonProperty("OPTO")
+    private Date OPTO;
+
+    /** 登记状态 */
+            @Excel(name = "登记状态")
+            @ApiModelProperty("登记状态")
+            @TableField("REGSTATE")
+            @JsonProperty("REGSTATE")
+    private String REGSTATE;
+
+    /** 登记状态（中文名称） */
+            @Excel(name = "登记状态", readConverterExp = "中=文名称")
+            @ApiModelProperty("登记状态")
+            @TableField("REGSTATE_CN")
+            @JsonProperty("regstateCn")
+    private String regstateCn;
+
+    /** 住所所在行政区划 */
+            @Excel(name = "住所所在行政区划")
+            @ApiModelProperty("住所所在行政区划")
+            @TableField("DOMDISTRICT")
+            @JsonProperty("DOMDISTRICT")
+    private String DOMDISTRICT;
+
+    /** 住所 */
+            @Excel(name = "住所")
+            @ApiModelProperty("住所")
+            @TableField("DOM")
+            @JsonProperty("DOM")
+    private String DOM;
+
+    /** 注册资本(金) */
+            @Excel(name = "注册资本(金)")
+            @ApiModelProperty("注册资本(金)")
+            @TableField("REGCAP")
+            @JsonProperty("REGCAP")
+    private BigDecimal REGCAP;
+
+    /** 注册资本(金)币种 */
+            @Excel(name = "注册资本(金)币种")
+            @ApiModelProperty("注册资本(金)币种")
+            @TableField("REGCAPCUR")
+            @JsonProperty("REGCAPCUR")
+    private String REGCAPCUR;
+
+    /** 注册资本(金)币种（中文名称） */
+            @Excel(name = "注册资本(金)币种", readConverterExp = "中=文名称")
+            @ApiModelProperty("注册资本(金)币种")
+            @TableField("REGCAPCUR_CN")
+            @JsonProperty("regcapcurCn")
+    private String regcapcurCn;
+
+    /** 注册资本(金)折万美元 */
+            @Excel(name = "注册资本(金)折万美元")
+            @ApiModelProperty("注册资本(金)折万美元")
+            @TableField("REGCAPUSD")
+            @JsonProperty("REGCAPUSD")
+    private BigDecimal REGCAPUSD;
+
+    /** 实收资本 */
+            @Excel(name = "实收资本")
+            @ApiModelProperty("实收资本")
+            @TableField("RECCAP")
+            @JsonProperty("RECCAP")
+    private BigDecimal RECCAP;
+
+    /** 实收资本折万美元 */
+            @Excel(name = "实收资本折万美元")
+            @ApiModelProperty("实收资本折万美元")
+            @TableField("RECCAPUSD")
+            @JsonProperty("RECCAPUSD")
+    private BigDecimal RECCAPUSD;
+
+    /** 国别(地区) */
+            @Excel(name = "国别(地区)")
+            @ApiModelProperty("国别(地区)")
+            @TableField("COUNTRY")
+            @JsonProperty("COUNTRY")
+    private String COUNTRY;
+
+    /** 从业人员/农专成员总数 */
+            @Excel(name = "从业人员/农专成员总数")
+            @ApiModelProperty("从业人员/农专成员总数")
+            @TableField("EMPNUM")
+            @JsonProperty("EMPNUM")
+    private Long EMPNUM;
+
+    /** 是否城镇 */
+            @Excel(name = "是否城镇")
+            @ApiModelProperty("是否城镇")
+            @TableField("TOWN")
+            @JsonProperty("TOWN")
+    private String TOWN;
+
+    /** 法定代表人 */
+            @Excel(name = "法定代表人")
+            @ApiModelProperty("法定代表人")
+            @TableField("NAME")
+            @JsonProperty("NAME")
+    private String NAME;
+
+    /** 统计企业类型 */
+            @Excel(name = "统计企业类型")
+            @ApiModelProperty("统计企业类型")
+            @TableField("REPORTTYPE")
+            @JsonProperty("REPORTTYPE")
+    private String REPORTTYPE;
+
+    /** 核准日期 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "核准日期", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("核准日期")
+            @TableField("APPRDATE")
+            @JsonProperty("APPRDATE")
+    private Date APPRDATE;
+
+    /** 数据更新时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "数据更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("数据更新时间")
+            @TableField("S_EXT_DATATIME")
+            @JsonProperty("sExtDatatime")
+    private Date sExtDatatime;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("S_EXT_TIMESTAMP")
+            @JsonProperty("sExtTimestamp")
+    private Date sExtTimestamp;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("I_TIME")
+            @JsonProperty("iTime")
+    private Date iTime;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("S_EXT_FROMNODE")
+            @JsonProperty("sExtFromnode")
+    private String sExtFromnode;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("MOD_FLAG")
+            @JsonProperty("modFlag")
+    private String modFlag;
+
+    /** $column.columnComment */
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+            @ApiModelProperty("${comment}")
+            @TableField("UP_TIME")
+            @JsonProperty("upTime")
+    private Date upTime;
+
+
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/mapper/XcrEBaseinfoMapper.java

@@ -0,0 +1,14 @@
+package com.zksy.basicData.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.basicData.domain.XcrEBaseinfo;
+
+/**
+ * 企业基本信息Mapper接口
+ *
+ * @author nahida
+ * @date 2024-11-14
+ */
+public interface XcrEBaseinfoMapper extends BaseMapper<XcrEBaseinfo> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zksy.basicData.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.basicData.domain.XcrEBaseinfo;
+
+/**
+ * 企业基本信息Service接口
+ *
+ * @author nahida
+ * @date 2024-11-14
+ */
+public interface IXcrEBaseinfoService extends IService<XcrEBaseinfo> {
+
+}

background-service/zksy-system/src/main/java/com/zksy/basicData/service/impl/XcrEBaseinfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zksy.basicData.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.basicData.domain.XcrEBaseinfo;
+import com.zksy.basicData.mapper.XcrEBaseinfoMapper;
+import com.zksy.basicData.service.IXcrEBaseinfoService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 企业基本信息Service业务层处理
+ *
+ * @author nahida
+ * @date 2024-11-14
+ */
+@Service
+public class XcrEBaseinfoServiceImpl extends ServiceImpl<XcrEBaseinfoMapper, XcrEBaseinfo> implements IXcrEBaseinfoService {
+
+}

background-service/zksy-system/src/main/resources/mapper/basicData/XcrEBaseinfoMapper.xml

@@ -0,0 +1,50 @@
+<?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.basicData.mapper.XcrEBaseinfoMapper">
+
+    <resultMap type="XcrEBaseinfo" id="XcrEBaseinfoResult">
+            <result property="xhCodeId"    column="xh_code_id"    />
+            <result property="etpsId"    column="ETPS_ID"    />
+            <result property="PRIPID"    column="PRIPID"    />
+            <result property="UNISCID"    column="UNISCID"    />
+            <result property="ENTNAME"    column="ENTNAME"    />
+            <result property="REGNO"    column="REGNO"    />
+            <result property="ENTTYPE"    column="ENTTYPE"    />
+            <result property="enttypeCn"    column="ENTTYPE_CN"    />
+            <result property="INDUSTRYPHY"    column="INDUSTRYPHY"    />
+            <result property="INDUSTRYCO"    column="INDUSTRYCO"    />
+            <result property="ESTDATE"    column="ESTDATE"    />
+            <result property="REGORG"    column="REGORG"    />
+            <result property="regorgCn"    column="REGORG_CN"    />
+            <result property="OPSCOTYPE"    column="OPSCOTYPE"    />
+            <result property="opscotypeCn"    column="OPSCOTYPE_CN"    />
+            <result property="OPSCOPE"    column="OPSCOPE"    />
+            <result property="OPFROM"    column="OPFROM"    />
+            <result property="OPTO"    column="OPTO"    />
+            <result property="REGSTATE"    column="REGSTATE"    />
+            <result property="regstateCn"    column="REGSTATE_CN"    />
+            <result property="DOMDISTRICT"    column="DOMDISTRICT"    />
+            <result property="DOM"    column="DOM"    />
+            <result property="REGCAP"    column="REGCAP"    />
+            <result property="REGCAPCUR"    column="REGCAPCUR"    />
+            <result property="regcapcurCn"    column="REGCAPCUR_CN"    />
+            <result property="REGCAPUSD"    column="REGCAPUSD"    />
+            <result property="RECCAP"    column="RECCAP"    />
+            <result property="RECCAPUSD"    column="RECCAPUSD"    />
+            <result property="COUNTRY"    column="COUNTRY"    />
+            <result property="EMPNUM"    column="EMPNUM"    />
+            <result property="TOWN"    column="TOWN"    />
+            <result property="NAME"    column="NAME"    />
+            <result property="REPORTTYPE"    column="REPORTTYPE"    />
+            <result property="APPRDATE"    column="APPRDATE"    />
+            <result property="sExtDatatime"    column="S_EXT_DATATIME"    />
+            <result property="sExtTimestamp"    column="S_EXT_TIMESTAMP"    />
+            <result property="iTime"    column="I_TIME"    />
+            <result property="sExtFromnode"    column="S_EXT_FROMNODE"    />
+            <result property="modFlag"    column="MOD_FLAG"    />
+            <result property="upTime"    column="UP_TIME"    />
+            <result property="uniCode"    column="uni_code"    />
+    </resultMap>
+</mapper>

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

@@ -3,24 +3,23 @@ package com.zksy.data.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zksy.api.client.TableDataClient;
-import com.zksy.api.dto.tableData.AnBaseinfo;
 import com.zksy.api.dto.tableData.EBaseinfo;
 import com.zksy.common.domain.Result;
-import com.zksy.data.domain.po.XcrAnBaseinfo;
 import com.zksy.data.domain.po.XcrEBaseinfo;
 import com.zksy.data.service.*;
 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.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 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.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @RestController
@@ -493,7 +492,7 @@ public class TestController {
     private XcrEBaseinfoService xcrEBaseinfoService;
     @GetMapping("/testClient")
     public Result testClient(){
-        xcrEBaseinfoService.saveDataByUniCode("123");
+        xcrEBaseinfoService.saveDataByUniCode("");
         return Result.ok();
     }
 }

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

@@ -60,7 +60,7 @@ public class TimeTaskController {
     @SneakyThrows
     @GetMapping("/list")
     @ApiOperation("分页获取所有的可以执行的任务")
-    public Result list(@RequestParam Optional<Long> pageNum, @RequestParam Optional<Long> pageSize, @RequestParam Optional<String> conditionJson) {
+    public Result<PageDTO<XhTimeTask>> list(@RequestParam Optional<Long> pageNum, @RequestParam Optional<Long> pageSize, @RequestParam Optional<String> conditionJson) {
         long defaultPageNum = 1L;
         long defaultPageSize = 10L;
         String defaultCondition = "";

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

@@ -127,6 +127,7 @@ public class CollectDataSchedule {
         serviceMap.put("xcrOtherInfo39ServiceImpl","interface/v1/datawarehouse/list");
         serviceMap.put("xcrTrustworthyIncentive42ServiceImpl","interface/v1/datawarehouse/list");
         serviceMap.put("xcrDishonestyPunishment19ServiceImpl","interface/v1/datawarehouse/list");
+        serviceMap.put("xcrEBaseinfoServiceImpl","");
     }
 
     @Scheduled(cron = "0 0 1 1 * ?")

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

@@ -6,13 +6,13 @@ import com.zksy.api.client.TableDataClient;
 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.service.XcrEBaseinfoService;
 import com.zksy.data.mapper.XcrEBaseinfoMapper;
+import com.zksy.data.service.XcrEBaseinfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
@@ -32,6 +32,7 @@ public class XcrEBaseinfoServiceImpl extends ServiceImpl<XcrEBaseinfoMapper, Xcr
     @Autowired
     private TransactionTemplate transactionTemplate;
     @Override
+    @XhDataLogRecord("企业基本总信息")
     public void saveDataByUniCode(String address) {
         Result<List<EBaseinfo>> baseinfoAll = tableDataClient.getEBaseinfoAll();
         if(baseinfoAll.getCode() != 200){

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Component
 @Slf4j
@@ -39,6 +40,10 @@ public class XhRequestUtil {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
+    private static final int MAX_RETRIES = 3;
+    private static AtomicInteger retryCount = new AtomicInteger(0);
+
+
     public <T extends BaseResponse, K extends BasePo> List<K> httpRequestByUniCode(String uniCode, String address,
                                                                                    Class<T> responseClass,
                                                                                    Class<K> entityClass) {
@@ -250,8 +255,13 @@ public class XhRequestUtil {
             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 (retryCount.get() < MAX_RETRIES) {
+                    retryCount.incrementAndGet();
+                    System.out.println("当前锁住了");
+                    Thread.sleep(3000);
+                } else {
+                    throw new RuntimeException("达到最大重试次数");
+                }
             }
             String token = redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY);
             Request request = new Request.Builder()
@@ -283,12 +293,20 @@ public class XhRequestUtil {
             log.info(s);
             return resList;
         }catch (InvalidFormatException e){
-            refreshTokenSchedule.getToken();
-            this.requestXinyonghuanhuai(requestBodyMap, address, entityResponseClass, entityClass);
+            if (retryCount.get() < MAX_RETRIES) {
+                retryCount.incrementAndGet();
+                refreshTokenSchedule.getToken();
+                return requestXinyonghuanhuai(requestBodyMap, address, entityResponseClass, entityClass);
+            } else {
+                throw new RuntimeException("达到最大重试次数", e);
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
+        }finally {
+            if (retryCount.get() > 0) {
+                retryCount.set(0);
+            }
         }
-        return resList;
     }
     @Autowired
     private RefreshTokenSchedule refreshTokenSchedule;
@@ -306,8 +324,13 @@ public class XhRequestUtil {
             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 (retryCount.get() < MAX_RETRIES) {
+                    retryCount.incrementAndGet();
+                    System.out.println("当前锁住了");
+                    Thread.sleep(3000);
+                } else {
+                    throw new RuntimeException("达到最大重试次数");
+                }
             }
             String token = redisTemplate.opsForValue().get(RedisKeyConstant.HUAIHUA_TOKEN_KEY);
             Request request = new Request.Builder()
@@ -341,11 +364,19 @@ public class XhRequestUtil {
             log.info(requestBodyMap.get("entityCode")+s);
             return resList;
         }catch (InvalidFormatException e){
-            refreshTokenSchedule.getToken();
-            this.requestXinyonghuanhuai2(requestBodyMap, address, entityResponseClass, entityClass);
+            if (retryCount.get() < MAX_RETRIES) {
+                retryCount.incrementAndGet();
+                refreshTokenSchedule.getToken();
+                return requestXinyonghuanhuai2(requestBodyMap, address, entityResponseClass, entityClass);
+            } else {
+                throw new RuntimeException("达到最大重试次数", e);
+            }
         }catch (Exception e) {
             throw new RuntimeException(e);
+        }finally {
+            if (retryCount.get() > 0) {
+                retryCount.set(0);
+            }
         }
-        return resList;
     }
 }