库表接口同步以及指定调用修改为异步处理 添加定时任务添加判断

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

@@ -1,17 +1,15 @@
 package com.zksy.data.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 企业年报基本信息表
  * @TableName xcr_annual_report_base_info
@@ -21,232 +19,232 @@ import lombok.Data;
 public class XcrAnnualReportBaseInfo extends BasePo implements Serializable {
     @TableField("ANCHEID")
     @JsonProperty("ANCHEID")
-    private String ANCHEID;  // 年报ID
+    private String ancheid;  // 年报ID
 
     @TableField("PRIPID")
     @JsonProperty("PRIPID")
-    private String PRIPID;  // 主体身份代码
+    private String pripid;  // 主体身份代码
 
-    @TableField("ANCEDATE")
-    @JsonProperty("ANCEDATE")
+    @TableField("ANCHEDATE")
+    @JsonProperty("ANCHEDATE")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date ANCHEDATE;  // 年报时间
+    private Date anchedate;  // 年报时间
 
     @TableField("ANCHEYEAR")
     @JsonProperty("ANCHEYEAR")
-    private String ANCHEYEAR;  // 年报年度
+    private String ancheyear;  // 年报年度
 
     @TableField("REGNO")
     @JsonProperty("REGNO")
-    private String REGNO;  // 注册号
+    private String regno;  // 注册号
 
     @TableField("UNISCID")
     @JsonProperty("UNISCID")
-    private String UNISCID;  // 统一社会信用代码
+    private String uniscid;  // 统一社会信用代码
 
     @TableField("ENTNAME")
     @JsonProperty("ENTNAME")
-    private String ENTNAME;  // 企业（机构）名称
+    private String entname;  // 企业（机构）名称
 
     @TableField("ENTTYPE")
     @JsonProperty("ENTTYPE")
-    private String ENTTYPE;  // 市场主体类型
+    private String enttype;  // 市场主体类型
 
     @TableField("TEL")
     @JsonProperty("TEL")
-    private String TEL;  // 企业联系电话
+    private String tel;  // 企业联系电话
 
     @TableField("ADDR")
     @JsonProperty("ADDR")
-    private String ADDR;  // 企业通信地址
+    private String addr;  // 企业通信地址
 
     @TableField("POSTALCODE")
     @JsonProperty("POSTALCODE")
-    private String POSTALCODE;  // 邮政编码
+    private String postalcode;  // 邮政编码
 
     @TableField("EMAIL")
     @JsonProperty("EMAIL")
-    private String EMAIL;  // 电子邮箱
+    private String email;  // 电子邮箱
 
     @TableField("BUSST")
     @JsonProperty("BUSST")
-    private String BUSST;  // 经营状态
+    private String busst;  // 经营状态
 
     @TableField("BUSST_CN")
     @JsonProperty("BUSST_CN")
-    private String BUSST_CN;  // 经营状态（中文名称）
+    private String busstCn;  // 经营状态（中文名称）
 
     @TableField("EMPNUM")
     @JsonProperty("EMPNUM")
-    private Integer EMPNUM;  // 从业人数
+    private Integer empnum;  // 从业人数
 
     @TableField("EMPNUMDIS")
     @JsonProperty("EMPNUMDIS")
-    private String EMPNUMDIS;  // 从业人数是否公示
+    private String empnumdis;  // 从业人数是否公示
 
     @TableField("ANTYPE")
     @JsonProperty("ANTYPE")
-    private String ANTYPE;  // 企业年报类别
+    private String antype;  // 企业年报类别
 
     @TableField("COLGRANUM")
     @JsonProperty("COLGRANUM")
-    private Integer COLGRANUM;  // 其中高校毕业生人数(经营者)
+    private Integer colgranum;  // 其中高校毕业生人数(经营者)
 
     @TableField("COLEMPLNUM")
     @JsonProperty("COLEMPLNUM")
-    private Integer COLEMPLNUM;  // 其中高校毕业生人数(雇工)
+    private Integer colemplnum;  // 其中高校毕业生人数(雇工)
 
     @TableField("RETSOLNUM")
     @JsonProperty("RETSOLNUM")
-    private Integer RETSOLNUM;  // 其中退役士兵人数(经营者)
+    private Integer retsolnum;  // 其中退役士兵人数(经营者)
 
-    @TableField("RETEMLNUM")
-    @JsonProperty("RETEMLNUM")
-    private Integer RETEMPLNUM;  // 其中退役士兵人数(雇工)
+    @TableField("RETEMPLNUM")
+    @JsonProperty("RETEMPLNUM")
+    private Integer retemplnum;  // 其中退役士兵人数(雇工)
 
     @TableField("DISPERNUM")
     @JsonProperty("DISPERNUM")
-    private Integer DISPERNUM;  // 其中残疾人人数(经营者)
+    private Integer dispernum;  // 其中残疾人人数(经营者)
 
     @TableField("DISEMPLNUM")
     @JsonProperty("DISEMPLNUM")
-    private Integer DISEMPLNUM;  // 其中残疾人人数(雇工)
+    private Integer disemplnum;  // 其中残疾人人数(雇工)
 
     @TableField("UNENUM")
     @JsonProperty("UNENUM")
-    private Integer UNENUM;  // 其中失业人员再就业人数(经营者)
+    private Integer unenum;  // 其中失业人员再就业人数(经营者)
 
     @TableField("UNEEMPLNUM")
     @JsonProperty("UNEEMPLNUM")
-    private Integer UNEEMPLNUM;  // 其中失业人员再就业人数(雇工)
+    private Integer uneemplnum;  // 其中失业人员再就业人数(雇工)
 
     @TableField("DEPENDENTENTNAME")
     @JsonProperty("DEPENDENTENTNAME")
-    private String DEPENDENTENTNAME;  // 隶属企业名称
+    private String dependententname;  // 隶属企业名称
 
     @TableField("ASSGRO")
     @JsonProperty("ASSGRO")
-    private BigDecimal ASSGRO;  // 资产总额
+    private BigDecimal assgro;  // 资产总额
 
     @TableField("ASSGRODIS")
     @JsonProperty("ASSGRODIS")
-    private String ASSGRODIS;  // 资产总额是否公示
+    private String assgrodis;  // 资产总额是否公示
 
     @TableField("LIAGRO")
     @JsonProperty("LIAGRO")
-    private BigDecimal LIAGRO;  // 负债总额
+    private BigDecimal liagro;  // 负债总额
 
     @TableField("LIAGRODIS")
     @JsonProperty("LIAGRODIS")
-    private String LIAGRODIS;  // 负债总额是否公示
+    private String liagrodis;  // 负债总额是否公示
 
     @TableField("VENDINC")
     @JsonProperty("VENDINC")
-    private BigDecimal VENDINC;  // 营业总收入
+    private BigDecimal vendinc;  // 营业总收入
 
     @TableField("VENDINCDIS")
     @JsonProperty("VENDINCDIS")
-    private String VENDINCDIS;  // 营业总收入是否公示
+    private String vendincdis;  // 营业总收入是否公示
 
     @TableField("MAIBUSINC")
     @JsonProperty("MAIBUSINC")
-    private BigDecimal MAIBUSINC;  // 其中主营业务收入
+    private BigDecimal maibusinc;  // 其中主营业务收入
 
     @TableField("MAIBUSINCDIS")
     @JsonProperty("MAIBUSINCDIS")
-    private String MAIBUSINCDIS;  // 其中主营业务收入是否公示
+    private String maibusincdis;  // 其中主营业务收入是否公示
 
     @TableField("PROGRO")
     @JsonProperty("PROGRO")
-    private BigDecimal PROGRO;  // 利润总额
+    private BigDecimal progro;  // 利润总额
 
     @TableField("PROGRODIS")
     @JsonProperty("PROGRODIS")
-    private String PROGRODIS;  // 利润总额是否公示
+    private String progrodis;  // 利润总额是否公示
 
     @TableField("NETINC")
     @JsonProperty("NETINC")
-    private BigDecimal NETINC;  // 净利润
+    private BigDecimal netinc;  // 净利润
 
     @TableField("NETINCDIS")
     @JsonProperty("NETINCDIS")
-    private String NETINCDIS;  // 净利润是否公示
+    private String netincdis;  // 净利润是否公示
 
     @TableField("RATGRO")
     @JsonProperty("RATGRO")
-    private BigDecimal RATGRO;  // 纳税总额
+    private BigDecimal ratgro;  // 纳税总额
 
     @TableField("RATGRODIS")
     @JsonProperty("RATGRODIS")
-    private String RATGRODIS;  // 纳税总额是否公示
+    private String ratgrodis;  // 纳税总额是否公示
 
     @TableField("TOTEQU")
     @JsonProperty("TOTEQU")
-    private BigDecimal TOTEQU;  // 所有者权益合计
+    private BigDecimal totequ;  // 所有者权益合计
 
     @TableField("TOTEQUDIS")
     @JsonProperty("TOTEQUDIS")
-    private String TOTEQUDIS;  // 所有者权益合计是否公示
+    private String totequdis;  // 所有者权益合计是否公示
 
     @TableField("NUMPARM")
     @JsonProperty("NUMPARM")
-    private Integer NUMPARM;  // 党员（预备党员）人数
+    private Integer numparm;  // 党员（预备党员）人数
 
     @TableField("PARINS")
     @JsonProperty("PARINS")
-    private String PARINS;  // 党组织建制
+    private String parins;  // 党组织建制
 
     @TableField("PARINS_CN")
     @JsonProperty("PARINS_CN")
-    private String PARINS_CN;  // 党组织建制（中文名称）
+    private String parinsCn;  // 党组织建制（中文名称）
 
     @TableField("RESPARMSIGN")
     @JsonProperty("RESPARMSIGN")
-    private String RESPARMSIGN;  // 法定代表人是否党员
+    private String resparmsign;  // 法定代表人是否党员
 
     @TableField("RESPARSECSIGN")
     @JsonProperty("RESPARSECSIGN")
-    private String RESPARSECSIGN;  // 法定代表人是否党组织书记
+    private String resparsecsign;  // 法定代表人是否党组织书记
 
     @TableField("LASTUPDATETIME")
     @JsonProperty("LASTUPDATETIME")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date LASTUPDATETIME;  // 最后一次修改时间
+    private Date lastupdatetime;  // 最后一次修改时间
 
     @TableField("ENTCHEYEAR")
     @JsonProperty("ENTCHEYEAR")
-    private Integer ENTCHEYEAR;  // 企业年报年份
+    private Integer entcheyear;  // 企业年报年份
 
     @TableField("S_EXT_DATATIME")
     @JsonProperty("S_EXT_DATATIME")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date S_EXT_DATATIME;  // 数据更新时间
+    private Date sExtDatatime;  // 数据更新时间
 
     @TableField("S_EXT_TIMESTAMP")
     @JsonProperty("S_EXT_TIMESTAMP")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date S_EXT_TIMESTAMP;  // 数据更新时间戳
+    private Date sExtTimestamp;  // 数据更新时间戳
 
     @TableField("I_TIME")
     @JsonProperty("I_TIME")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date I_TIME;  // 插入时间
+    private Date iTime;  // 插入时间
 
     @TableField("S_EXT_FROMNODE")
     @JsonProperty("S_EXT_FROMNODE")
-    private String S_EXT_FROMNODE;  // 数据来源节点
+    private String sExtFromnode;  // 数据来源节点
 
     @TableField("MOD_FLAG")
     @JsonProperty("MOD_FLAG")
-    private String MOD_FLAG;  // 修改标志
+    private String modFlag;  // 修改标志
 
     @TableField("UP_TIME")
     @JsonProperty("UP_TIME")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date UP_TIME;  // 修改时间
+    private Date upTime;  // 修改时间
 
     @TableField("ID")
     @JsonProperty("ID")
-    private Long ID;  // id
+    private Long id;  // id
 
 }

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

@@ -1,18 +1,16 @@
 package com.zksy.data.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 企业年报股东及出资信息表
  * @TableName xcr_enterprise_annual_report_shareholder
@@ -24,38 +22,38 @@ public class XcrEnterpriseAnnualReportShareholder extends BasePo implements Seri
     @ApiModelProperty("投资人ID")
     @TableField("INVID")
     @JsonProperty("INVID")
-    private String INVID;
+    private String invid;
 
     /** 年报ID */
     @ApiModelProperty("年报ID")
     @TableField("ANCHEID")
     @JsonProperty("ANCHEID")
-    private String ANCHEID;
+    private String ancheid;
 
     /** 股东/发起人名称 */
     @ApiModelProperty("股东/发起人名称")
     @TableField("INVNAME")
     @JsonProperty("INVNAME")
-    private String INVNAME;
+    private String invname;
 
     /** 累计认缴额 */
     @ApiModelProperty("累计认缴额")
     @TableField("LISUBCONAM")
     @JsonProperty("LISUBCONAM")
-    private BigDecimal LISUBCONAM;
+    private BigDecimal lisubconam;
 
     /** 认缴出资日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("认缴出资日期")
     @TableField("SUBCONDATE")
     @JsonProperty("SUBCONDATE")
-    private Date SUBCONDATE;
+    private Date subcondate;
 
     /** 认缴出资方式 */
     @ApiModelProperty("认缴出资方式")
     @TableField("SUBCONFORM")
     @JsonProperty("SUBCONFORM")
-    private String SUBCONFORM;
+    private String subconform;
 
     /** 认缴出资方式（中文名称） */
     @ApiModelProperty("认缴出资方式")
@@ -67,20 +65,20 @@ public class XcrEnterpriseAnnualReportShareholder extends BasePo implements Seri
     @ApiModelProperty("累计实缴额")
     @TableField("LIACCONAM")
     @JsonProperty("LIACCONAM")
-    private BigDecimal LIACCONAM;
+    private BigDecimal liacconam;
 
     /** 实缴出资日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("实缴出资日期")
     @TableField("ACCONDATE")
     @JsonProperty("ACCONDATE")
-    private Date ACCONDATE;
+    private Date accondate;
 
     /** 实缴出资方式 */
     @ApiModelProperty("实缴出资方式")
     @TableField("ACCONFORM")
     @JsonProperty("ACCONFORM")
-    private String ACCONFORM;
+    private String acconform;
 
     /** 实缴出资方式（中文名称） */
     @ApiModelProperty("实缴出资方式")
@@ -92,7 +90,7 @@ public class XcrEnterpriseAnnualReportShareholder extends BasePo implements Seri
     @ApiModelProperty("企业年报年份")
     @TableField("ENTCHEYEAR")
     @JsonProperty("ENTCHEYEAR")
-    private String ENTCHEYEAR;
+    private String entcheyear;
 
     /** 数据更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -106,19 +104,19 @@ public class XcrEnterpriseAnnualReportShareholder extends BasePo implements Seri
     @ApiModelProperty("数据更新时间戳")
     @TableField("S_EXT_TIMESTAMP")
     @JsonProperty("S_EXT_TIMESTAMP")
-    private Date S_EXT_TIMESTAMP;
+    private Date sExtTimestamp;
 
     /** 数据插入时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("数据插入时间")
     @TableField("I_TIME")
     @JsonProperty("I_TIME")
-    private Date I_TIME;
+    private Date iTime;
 
     /** 数据插入时间 */
     @ApiModelProperty("数据插入时间")
     @TableField("S_EXT_FROMNODE")
     @JsonProperty("S_EXT_FROMNODE")
-    private String S_EXT_FROMNODE;
+    private String sExtFromnode;
 
 }

data-service/src/main/java/com/zksy/data/listener/InvokerListener.java

@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 @Configuration
 @Slf4j
@@ -34,15 +35,12 @@ public class InvokerListener {
     public void listenForInvoker(String targetTableString) {
         try {
             redisTemplate.opsForValue().set(RedisKeyConstant.LOCK_SERVICE+targetTableString,targetTableString);
-//            try {
-//                Thread.sleep(10000);
-//            } catch (InterruptedException e) {
-//                throw new RuntimeException(e);
-//            }
-            Optional.ofNullable(targetTableString).ifPresent(q -> {
-                String address = collectDataSchedule.serviceMap.get(targetTableString);
-                Object bean = applicationContext.getBean(targetTableString);
-                ((IBaseSaveDataInterface) bean).saveDataByUniCode(address);
+            CompletableFuture.runAsync(()->{
+                Optional.of(targetTableString).ifPresent(q -> {
+                    String address = collectDataSchedule.serviceMap.get(targetTableString);
+                    Object bean = applicationContext.getBean(targetTableString);
+                    ((IBaseSaveDataInterface) bean).saveDataByUniCode(address);
+                });
             });
         } finally {
             redisTemplate.delete(RedisKeyConstant.LOCK_SERVICE+targetTableString);

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

@@ -6,7 +6,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -128,155 +127,157 @@ public class CollectDataSchedule {
         serviceMap.put("xcrTrustworthyIncentive42ServiceImpl","interface/v1/datawarehouse/list");
         serviceMap.put("xcrDishonestyPunishment19ServiceImpl","interface/v1/datawarehouse/list");
         serviceMap.put("xcrEBaseinfoServiceImpl","");
+        serviceMap.put("xcrAnnualReportBaseInfoServiceImpl","");
+        serviceMap.put("xcrEnterpriseAnnualReportShareholderServiceImpl","");
     }
 
-    @Scheduled(cron = "0 0 1 1 * ?")
-    public void getDataByMonth() {
-        List<String> serviceList = List.of(
-                "xcrOtherInfo38ServiceImpl",
-                "xcrOtherInfo39ServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
-    @Scheduled(cron = "0 0 1 * * ?")
-    public void getDataByDay1() {
-        List<String> serviceList = List.of(
-                "xcrEnvironmentalPenaltyDecisionServiceImpl",
-                "xcrAdministrativeLicensingServiceImpl",
-                "xcrTrustworthyIncentive42ServiceImpl",
-                "xcrDishonestyPunishment19ServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
-
-    @Scheduled(cron = "0 0 2 * * ?")
-    public void getDataByDay2() {
-
-    }
-
-    @Scheduled(cron = "0 0 3 ? * SUN")
-    public void getDataByDay0() {
-        List<String> serviceList = List.of(
-                "xcrRecordDishonestyServiceImpl",
-                "xcrInstitutionalClientsServiceImpl",
-                "xcrTaxpayerCreditRatingServiceImpl",
-                "xcrMainFinancialStatementsServiceImpl",
-                "xcrStopBusinessInformationServiceImpl",
-                "xcrAbnormalHouseholdTerminationServiceImpl",
-                "xcrTaxAdministrativePenaltyServiceImpl",
-                "xcrEnterpriseBasicInformationServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
-
-    @Scheduled(cron = "0 0 4 ? * SUN")
-    public void getDataByWeek1() {
-        List<String> serviceList = List.of(
-                "xcrEnterprisePollutionPermitInfoServiceImpl",
-                "xcrKeyPollutionSourcesServiceImpl",
-                "xcrAgriculturalSpecializedWebsiteServiceImpl",
-                "xcrAnSfcBranchinfoServiceImpl",
-                "xcrCompanyInvestmentServiceImpl",
-                "xcrEquityChangeServiceImpl",
-                "xcrSupplementaryForeignInvestmentServiceImpl",
-                "xcrAppointDelegatesServiceImpl",
-                "xcrAgriculturalSupplementServiceImpl",
-                "xcrDomesticCapitalSupplementServiceImpl",
-                "xcrInstallmentPaymentServiceImpl",
-                "xcrInvestorSubscriptionDetailsServiceImpl",
-                "xcrNonNaturalPersonContributionServiceImpl",
-                "xcrNaturalPersonContributionsServiceImpl",
-                "xcrHistoryNameServiceImpl",
-                "xcrHistoricalLegalRepresentativeServiceImpl",
-                "xcrAffiliatedEnterpriseServiceImpl",
-                "xcrInstallmentSubscriptionServiceImpl",
-                "xcrAdministrativeLicensingAgriculturalCollegesServiceImpl",
-                "xcrEnterpriseExceptionListServiceImpl",
-                "xcrInvestorAbnormalRecordServiceImpl"
-        );
-        commonHandler(serviceList);
-
-    }
-    @Scheduled(cron = "0 0 5 ? * SUN")
-    public void getDataByWeek2() {
-        List<String> serviceList = List.of(
-                "xcrNoticeRecordServiceImpl",
-                "xcrPersonalRevokeRecordServiceImpl",
-                "xcrCheckWorkInfoServiceImpl",
-                "xcrAbnormalBusinessOperationsServiceImpl",
-                "xcrEquityFreezeExecutionServiceImpl",
-                "xcrEquityChangeInfoServiceImpl",
-                "xcrEquityFreezeServiceImpl",
-                "xcrEquityPledgeInfoServiceImpl",
-                "xcrSeriousIllegalDishonestEnterprisesDetailServiceImpl",
-                "xcrSeriousIllegalDishonestEnterprisesServiceImpl",
-                "xcrEnterpriseNameApprovalServiceImpl",
-                "xcrBasicSupplementAgriculturalCollegeAnnualServiceImpl",
-                "xcrEnterprisePublicityInvestorInformationStatusServiceImpl",
-                "xcrEnterprisePublicityDetailsContributionsContributorsServiceImpl",
-                "xcrEnterprisePublicationSupplySubscribedDetailsInvestorsServiceImpl",
-                "xcrRevisionInformationAgriculturalCollegeAnnualReportServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
-    @Scheduled(cron = "0 0 6 ? * SUN")
-    public void getDataByWeek3() {
-        List<String> serviceList = List.of(
-                "xcrCancellationServiceImpl",
-                "xcrLiquidationBasicInfoServiceImpl",
-                "xcrLiquidationMemberInfoServiceImpl",
-                "xcrAbnormalOperationAnnouncementServiceImpl",
-                "xcrFarmSpecialAbnormalDetailServiceImpl",
-                "xcrEnterpriseAnnualReportWebsiteServiceImpl",
-                "xcrEnterpriseAnnualReportEquityChangeServiceImpl",
-                "xcrIndividualCancellationObjectionServiceImpl",
-                "xcrRevokeRegistrationServiceImpl",
-                "xcrAgriculturalCollegeAnnualReportServiceImpl",
-                "xcrChangeFilingServiceImpl",
-                "xcrLicenseInfoServiceImpl",
-                "xcrBranchOfficesInfoServiceImpl",
-                "xcrRevokeInfoServiceImpl",
-                "xcrExternalGuaranteeServiceImpl",
-                "xcrAnnualReportExternalInvestmentServiceImpl",
-                "xcrRandomInspectionTaskServiceImpl",
-                "xcrSmallAndMicroEnterprisesServiceImpl",
-                "xcrWebsiteInfoServiceImpl",
-                "xcrOtherInfo36ServiceImpl",
-                "interface/v1/datawarehouse/list",
-                "xcrOtherInfo37ServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
-
-    @Scheduled(cron = "0 0 7 ? * SUN")
-    public void getDataByWeek4() {
-        List<String> serviceList = List.of(
-                "xcrTechnologyPlanProjectServiceImpl",
-                "xcrTechnologyAwardSupplementServiceImpl",
-                "xcrMinorEnterprisesServiceImpl",
-                "xcrInnovationPlatformServiceImpl",
-                "xcrHighTechServiceImpl",
-                "xcrFoodProductionLicenseDetaliServiceImpl",
-                "xcrLegalRepresentativeServiceImpl",
-                "xcrFoodProductionLicenseServiceImpl",
-                "xcrFoodBusinessLicenseServiceImpl",
-                "xcrMsAdministrativeLicenseServiceImpl",
-                "xcrContactInformationServiceImpl",
-                "xcrFinancialManagerServiceImpl",
-                "xcrIndividualBusinessInformationServiceImpl",
-                "xcrIndustryCommerceServiceImpl",
-                "xcrIndividualChangeInformationServiceImpl",
-                "xcrIndividualCancellationServiceImpl",
-                "xcrIndividualBusinessAbnormalityServiceImpl",
-                "xcrMoveOutServiceImpl",
-                "xcrMoveInServiceImpl",
-                "xcrDeregistrationServiceImpl",
-                "xcrEnterprisePublicityLicenseServiceImpl",
-                "xcrEnterprisePublicityEquityChangeServiceImpl",
-                "xcrSimplifiedCancellationAnnouncementServiceImpl"
-        );
-        commonHandler(serviceList);
-    }
+//    @Scheduled(cron = "0 0 1 1 * ?")
+//    public void getDataByMonth() {
+//        List<String> serviceList = List.of(
+//                "xcrOtherInfo38ServiceImpl",
+//                "xcrOtherInfo39ServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
+//    @Scheduled(cron = "0 0 1 * * ?")
+//    public void getDataByDay1() {
+//        List<String> serviceList = List.of(
+//                "xcrEnvironmentalPenaltyDecisionServiceImpl",
+//                "xcrAdministrativeLicensingServiceImpl",
+//                "xcrTrustworthyIncentive42ServiceImpl",
+//                "xcrDishonestyPunishment19ServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
+//
+//    @Scheduled(cron = "0 0 2 * * ?")
+//    public void getDataByDay2() {
+//
+//    }
+//
+//    @Scheduled(cron = "0 0 3 ? * SUN")
+//    public void getDataByDay0() {
+//        List<String> serviceList = List.of(
+//                "xcrRecordDishonestyServiceImpl",
+//                "xcrInstitutionalClientsServiceImpl",
+//                "xcrTaxpayerCreditRatingServiceImpl",
+//                "xcrMainFinancialStatementsServiceImpl",
+//                "xcrStopBusinessInformationServiceImpl",
+//                "xcrAbnormalHouseholdTerminationServiceImpl",
+//                "xcrTaxAdministrativePenaltyServiceImpl",
+//                "xcrEnterpriseBasicInformationServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
+//
+//    @Scheduled(cron = "0 0 4 ? * SUN")
+//    public void getDataByWeek1() {
+//        List<String> serviceList = List.of(
+//                "xcrEnterprisePollutionPermitInfoServiceImpl",
+//                "xcrKeyPollutionSourcesServiceImpl",
+//                "xcrAgriculturalSpecializedWebsiteServiceImpl",
+//                "xcrAnSfcBranchinfoServiceImpl",
+//                "xcrCompanyInvestmentServiceImpl",
+//                "xcrEquityChangeServiceImpl",
+//                "xcrSupplementaryForeignInvestmentServiceImpl",
+//                "xcrAppointDelegatesServiceImpl",
+//                "xcrAgriculturalSupplementServiceImpl",
+//                "xcrDomesticCapitalSupplementServiceImpl",
+//                "xcrInstallmentPaymentServiceImpl",
+//                "xcrInvestorSubscriptionDetailsServiceImpl",
+//                "xcrNonNaturalPersonContributionServiceImpl",
+//                "xcrNaturalPersonContributionsServiceImpl",
+//                "xcrHistoryNameServiceImpl",
+//                "xcrHistoricalLegalRepresentativeServiceImpl",
+//                "xcrAffiliatedEnterpriseServiceImpl",
+//                "xcrInstallmentSubscriptionServiceImpl",
+//                "xcrAdministrativeLicensingAgriculturalCollegesServiceImpl",
+//                "xcrEnterpriseExceptionListServiceImpl",
+//                "xcrInvestorAbnormalRecordServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//
+//    }
+//    @Scheduled(cron = "0 0 5 ? * SUN")
+//    public void getDataByWeek2() {
+//        List<String> serviceList = List.of(
+//                "xcrNoticeRecordServiceImpl",
+//                "xcrPersonalRevokeRecordServiceImpl",
+//                "xcrCheckWorkInfoServiceImpl",
+//                "xcrAbnormalBusinessOperationsServiceImpl",
+//                "xcrEquityFreezeExecutionServiceImpl",
+//                "xcrEquityChangeInfoServiceImpl",
+//                "xcrEquityFreezeServiceImpl",
+//                "xcrEquityPledgeInfoServiceImpl",
+//                "xcrSeriousIllegalDishonestEnterprisesDetailServiceImpl",
+//                "xcrSeriousIllegalDishonestEnterprisesServiceImpl",
+//                "xcrEnterpriseNameApprovalServiceImpl",
+//                "xcrBasicSupplementAgriculturalCollegeAnnualServiceImpl",
+//                "xcrEnterprisePublicityInvestorInformationStatusServiceImpl",
+//                "xcrEnterprisePublicityDetailsContributionsContributorsServiceImpl",
+//                "xcrEnterprisePublicationSupplySubscribedDetailsInvestorsServiceImpl",
+//                "xcrRevisionInformationAgriculturalCollegeAnnualReportServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
+//    @Scheduled(cron = "0 0 6 ? * SUN")
+//    public void getDataByWeek3() {
+//        List<String> serviceList = List.of(
+//                "xcrCancellationServiceImpl",
+//                "xcrLiquidationBasicInfoServiceImpl",
+//                "xcrLiquidationMemberInfoServiceImpl",
+//                "xcrAbnormalOperationAnnouncementServiceImpl",
+//                "xcrFarmSpecialAbnormalDetailServiceImpl",
+//                "xcrEnterpriseAnnualReportWebsiteServiceImpl",
+//                "xcrEnterpriseAnnualReportEquityChangeServiceImpl",
+//                "xcrIndividualCancellationObjectionServiceImpl",
+//                "xcrRevokeRegistrationServiceImpl",
+//                "xcrAgriculturalCollegeAnnualReportServiceImpl",
+//                "xcrChangeFilingServiceImpl",
+//                "xcrLicenseInfoServiceImpl",
+//                "xcrBranchOfficesInfoServiceImpl",
+//                "xcrRevokeInfoServiceImpl",
+//                "xcrExternalGuaranteeServiceImpl",
+//                "xcrAnnualReportExternalInvestmentServiceImpl",
+//                "xcrRandomInspectionTaskServiceImpl",
+//                "xcrSmallAndMicroEnterprisesServiceImpl",
+//                "xcrWebsiteInfoServiceImpl",
+//                "xcrOtherInfo36ServiceImpl",
+//                "interface/v1/datawarehouse/list",
+//                "xcrOtherInfo37ServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
+//
+//    @Scheduled(cron = "0 0 7 ? * SUN")
+//    public void getDataByWeek4() {
+//        List<String> serviceList = List.of(
+//                "xcrTechnologyPlanProjectServiceImpl",
+//                "xcrTechnologyAwardSupplementServiceImpl",
+//                "xcrMinorEnterprisesServiceImpl",
+//                "xcrInnovationPlatformServiceImpl",
+//                "xcrHighTechServiceImpl",
+//                "xcrFoodProductionLicenseDetaliServiceImpl",
+//                "xcrLegalRepresentativeServiceImpl",
+//                "xcrFoodProductionLicenseServiceImpl",
+//                "xcrFoodBusinessLicenseServiceImpl",
+//                "xcrMsAdministrativeLicenseServiceImpl",
+//                "xcrContactInformationServiceImpl",
+//                "xcrFinancialManagerServiceImpl",
+//                "xcrIndividualBusinessInformationServiceImpl",
+//                "xcrIndustryCommerceServiceImpl",
+//                "xcrIndividualChangeInformationServiceImpl",
+//                "xcrIndividualCancellationServiceImpl",
+//                "xcrIndividualBusinessAbnormalityServiceImpl",
+//                "xcrMoveOutServiceImpl",
+//                "xcrMoveInServiceImpl",
+//                "xcrDeregistrationServiceImpl",
+//                "xcrEnterprisePublicityLicenseServiceImpl",
+//                "xcrEnterprisePublicityEquityChangeServiceImpl",
+//                "xcrSimplifiedCancellationAnnouncementServiceImpl"
+//        );
+//        commonHandler(serviceList);
+//    }
 
 
     private void commonHandler(List<String> serviceList) {

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

@@ -3,27 +3,19 @@ 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.AnPbBaseinfo;
-import com.zksy.api.dto.tableData.EBaseinfo;
+import com.zksy.api.dto.tableData.AnBaseinfo;
 import com.zksy.common.domain.Result;
 import com.zksy.common.exception.DbException;
 import com.zksy.data.annotation.XhDataLogRecord;
 import com.zksy.data.domain.po.XcrAnnualReportBaseInfo;
-import com.zksy.data.domain.po.XcrEBaseinfo;
-import com.zksy.data.domain.response.XcrAnnualReportBaseInfoResponse;
 import com.zksy.data.mapper.XcrAnnualReportBaseInfoMapper;
 import com.zksy.data.service.XcrAnnualReportBaseInfoService;
-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 org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
-import java.util.Vector;
-import java.util.stream.Collectors;
 
 /**
 * @author 邵洋
@@ -42,15 +34,14 @@ public class XcrAnnualReportBaseInfoServiceImpl extends ServiceImpl<XcrAnnualRep
     @Override
     @XhDataLogRecord("同步企业年报基本信息")
     public void saveDataByUniCode(String address) {
-        Result<List<AnPbBaseinfo>> baseinfoAll = tableDataClient.getAnBaseinfo();
+        Result<List<AnBaseinfo>> baseinfoAll = tableDataClient.getAnBaseinfo();
         if(baseinfoAll.getCode() != 200){
             throw new RuntimeException(baseinfoAll.getMsg());
         }
         List<XcrAnnualReportBaseInfo> toDatabaseList = BeanUtil.copyToList(baseinfoAll.getData(), XcrAnnualReportBaseInfo.class);
-        toDatabaseList.stream().map(q->{
-            q.setUniCode(q.getUNISCID());
-            return q;
-        }).collect(Collectors.toList());
+        toDatabaseList.forEach(q->{
+            q.setUniCode(q.getUniscid());
+        });
         transactionTemplate.execute((s)->{
             try {
                 this.remove(null);

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

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
 * @author hxb
@@ -39,10 +38,9 @@ public class XcrEBaseinfoServiceImpl extends ServiceImpl<XcrEBaseinfoMapper, Xcr
             throw new RuntimeException(baseinfoAll.getMsg());
         }
         List<XcrEBaseinfo> toDatabaseList = BeanUtil.copyToList(baseinfoAll.getData(), XcrEBaseinfo.class);
-        toDatabaseList.stream().map(q->{
+        toDatabaseList.forEach(q->{
             q.setUniCode(q.getUniscid());
-            return q;
-        }).collect(Collectors.toList());
+        });
         transactionTemplate.execute((s)->{
             try {
                 this.remove(null);

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

@@ -3,31 +3,21 @@ 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.AnPbBaseinfo;
+import com.zksy.api.dto.tableData.AnBaseinfo;
 import com.zksy.api.dto.tableData.AnSubcapital;
-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.XcrAnnualReportBaseInfo;
-import com.zksy.data.domain.po.XcrEBaseinfo;
 import com.zksy.data.domain.po.XcrEnterpriseAnnualReportShareholder;
-import com.zksy.data.domain.po.XcrEnterpriseAnnualReportWebsite;
-import com.zksy.data.domain.response.XcrEnterpriseAnnualReportShareholderResponse;
-import com.zksy.data.domain.response.XcrEnterpriseAnnualReportWebsiteResponse;
-import com.zksy.data.service.XcrEnterpriseAnnualReportShareholderService;
 import com.zksy.data.mapper.XcrEnterpriseAnnualReportShareholderMapper;
-import com.zksy.data.utils.RedisService;
-import com.zksy.data.utils.XhRequestUtil;
+import com.zksy.data.service.XcrEnterpriseAnnualReportShareholderService;
 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;
 import java.util.Map;
-import java.util.Vector;
 import java.util.stream.Collectors;
 
 /**
@@ -47,7 +37,7 @@ public class XcrEnterpriseAnnualReportShareholderServiceImpl extends ServiceImpl
     @Override
     @XhDataLogRecord("同步企业年报股东及出资信息")
     public void saveDataByUniCode(String address) {
-        Result<List<AnPbBaseinfo>> annualReportAll = tableDataClient.getAnBaseinfo();
+        Result<List<AnBaseinfo>> annualReportAll = tableDataClient.getAnBaseinfo();
         if(annualReportAll.getCode() != 200){
             throw new RuntimeException(annualReportAll.getMsg());
         }
@@ -59,12 +49,12 @@ public class XcrEnterpriseAnnualReportShareholderServiceImpl extends ServiceImpl
         List<XcrEnterpriseAnnualReportShareholder> toDatabaseList = BeanUtil.copyToList(baseinfoAll.getData(), XcrEnterpriseAnnualReportShareholder.class);
 
         // 创建一个映射，将 uniscid 映射到年报基本信息对象
-        Map<String, AnPbBaseinfo> annualReportMap = annualReportAll.getData().stream()
-                .collect(Collectors.toMap(AnPbBaseinfo::getAncheid, info -> info));
+        Map<String, AnBaseinfo> annualReportMap = annualReportAll.getData().stream()
+                .collect(Collectors.toMap(AnBaseinfo::getAncheid, info -> info));
 
         // 设置 uniCode 属性
         toDatabaseList.forEach(q -> {
-            AnPbBaseinfo annualReport = annualReportMap.get(q.getANCHEID());
+            AnBaseinfo annualReport = annualReportMap.get(q.getAncheid());
             if (annualReport != null) {
                 q.setUniCode(annualReport.getUniscid());
             }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.common.domain.Result;
 import com.zksy.data.domain.dto.TimeTaskDto;
 import com.zksy.data.domain.po.XhTimeTask;
+import com.zksy.data.service.IBaseSaveDataInterface;
 import com.zksy.data.service.XhTimeTaskService;
 import com.zksy.data.mapper.XhTimeTaskMapper;
 import com.zksy.data.utils.TaskManager;
@@ -34,6 +35,10 @@ public class XhTimeTaskServiceImpl extends ServiceImpl<XhTimeTaskMapper, XhTimeT
         if(!b){
             return Result.error("你想添加的服务不存在");
         }
+        Object bean = applicationContext.getBean(timeTaskDto.getServiceName());
+        if(!(bean instanceof IBaseSaveDataInterface)){
+            return Result.error("该服务不是可被定时任务执行的服务");
+        }
         LambdaQueryWrapper<XhTimeTask> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(XhTimeTask::getServiceName, timeTaskDto.getServiceName());
         if(this.count(wrapper)>0){

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

@@ -1,13 +1,11 @@
 package com.zksy.api.client;
 
 import com.zksy.api.dto.tableData.AnBaseinfo;
-import com.zksy.api.dto.tableData.AnPbBaseinfo;
 import com.zksy.api.dto.tableData.AnSubcapital;
 import com.zksy.api.dto.tableData.EBaseinfo;
 import com.zksy.common.domain.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 
@@ -35,7 +33,7 @@ public interface TableDataClient {
     public Result getDrRaninsres();
 
     @GetMapping("/libraryTable/anBaseinfo")
-    public Result<List<AnPbBaseinfo>> getAnBaseinfo();
+    public Result<List<AnBaseinfo>> getAnBaseinfo();
 
     @GetMapping("/libraryTable/anSubcapital")
     public Result<List<AnSubcapital>> getAnSubcapital();