库表同步修正，以及引了个测试依赖

background-service/pom.xml

@@ -29,6 +29,7 @@
         <jwt.version>0.9.1</jwt.version>
         <knife4j.version>4.1.0</knife4j.version>
         <mybatis-plus.version>3.5.1</mybatis-plus.version>
+        <spring.boot.test.version>2.7.12</spring.boot.test.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -196,6 +197,12 @@
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>${spring.boot.test.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

background-service/zksy-admin/pom.xml

@@ -96,6 +96,10 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
             <version>2021.0.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,23 +1,15 @@
 package com.zksy.web.controller.basicData;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zksy.basicData.domain.XcrAbnormalBusinessOperations;
-import com.zksy.basicData.service.IXcrAbnormalBusinessOperationsService;
 import com.zksy.basicData.service.InformationService;
 import com.zksy.common.annotation.Log;
 import com.zksy.common.core.controller.BaseController;
 import com.zksy.common.core.domain.AjaxResult;
-import com.zksy.common.enums.BusinessType;
-import com.zksy.common.utils.SearchUtil;
-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;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 经营异常名录信息Controller
@@ -37,6 +29,8 @@ public class InformationController extends BaseController{
     @ApiOperation(value = "企业信用报告", notes = "企业信用报告")
     public AjaxResult report(String creditCode)
     {
+//        creditCode = "91431227MA4LY5GC2Y";
         return service.queryByCreditCode(creditCode);
     }
+
 }

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

@@ -23,7 +23,7 @@ import java.util.List;
  * 企业年报基本信息Controller
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @RestController
 @RequestMapping("/basicData/xcrAnnualReportBaseInfo")

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

@@ -23,7 +23,7 @@ import java.util.List;
  * 企业年报股东及出资信息Controller
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @RestController
 @RequestMapping("/basicData/xcrEnterpriseAnnualReportShareholder")

background-service/zksy-admin/src/main/java/com/zksy/web/controller/report/CreditReportController.java

@@ -0,0 +1,10 @@
+package com.zksy.web.controller.report;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/report")
+public class CreditReportController {
+
+}

background-service/zksy-admin/src/test/java/com/zksy/web/controller/basicData/InformationControllerTest.java

@@ -0,0 +1,21 @@
+package com.zksy.web.controller.basicData;
+
+import com.zksy.common.core.domain.AjaxResult;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class InformationControllerTest {
+
+    @Autowired
+    private InformationController informationController;
+
+    @Test
+    void report() {
+        AjaxResult report = informationController.report("1233");
+        System.out.println(report);
+    }
+}

background-service/zksy-admin/src/test/java/com/zksy/web/controller/basicData/XcrEBaseinfoControllerTest.java

@@ -0,0 +1,18 @@
+package com.zksy.web.controller.basicData;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+@SpringBootTest
+class XcrEBaseinfoControllerTest {
+
+    @Autowired
+    private XcrEBaseinfoController xcrEBaseinfoController;
+
+    @Test
+    void export() {
+
+    }
+}

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

@@ -1,26 +1,26 @@
 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.fasterxml.jackson.annotation.JsonFormat;
+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 com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import com.zksy.common.core.domain.BasePo;
 /**
  * 企业年报基本信息对象 xcr_annual_report_base_info
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -385,6 +385,50 @@ private static final long serialVersionUID=1L;
             @JsonProperty("sExtDatatime")
     private Date sExtDatatime;
 
+    /** 数据更新时间戳 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "数据更新时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("数据更新时间戳")
+            @TableField("S_EXT_TIMESTAMP")
+            @JsonProperty("sExtTimestamp")
+    private Date sExtTimestamp;
+
+    /** 数据来源 */
+            @Excel(name = "数据来源")
+            @ApiModelProperty("数据来源")
+            @TableField("S_EXT_FROMNODE")
+            @JsonProperty("sExtFromnode")
+    private String sExtFromnode;
+
+    /** 插入时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "插入时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("插入时间")
+            @TableField("I_TIME")
+            @JsonProperty("iTime")
+    private Date iTime;
+
+    /** id */
+            @ApiModelProperty("id")
+            @TableField("ID")
+            @JsonProperty("ID")
+    private Long ID;
+
+    /** 修改标识 */
+            @Excel(name = "修改标识")
+            @ApiModelProperty("修改标识")
+            @TableField("MOD_FLAG")
+            @JsonProperty("modFlag")
+    private String modFlag;
+
+    /** 修改时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("修改时间")
+            @TableField("UP_TIME")
+            @JsonProperty("upTime")
+    private Date upTime;
+
 
 
 }

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

@@ -1,26 +1,26 @@
 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.fasterxml.jackson.annotation.JsonFormat;
+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 com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import com.zksy.common.core.domain.BasePo;
 /**
  * 企业年报股东及出资信息对象 xcr_enterprise_annual_report_shareholder
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -96,9 +96,9 @@ private static final long serialVersionUID=1L;
             @JsonProperty("ACCONDATE")
     private Date ACCONDATE;
 
-    /** 实缴出资方式 */
-            @Excel(name = "实缴出资方式")
-            @ApiModelProperty("实缴出资方式")
+    /** 实缴出资日期 */
+            @Excel(name = "实缴出资日期")
+            @ApiModelProperty("实缴出资日期")
             @TableField("ACCONFORM")
             @JsonProperty("ACCONFORM")
     private String ACCONFORM;
@@ -110,9 +110,9 @@ private static final long serialVersionUID=1L;
             @JsonProperty("acconformCn")
     private String acconformCn;
 
-    /** 企业年报年份 */
-            @Excel(name = "企业年报年份")
-            @ApiModelProperty("企业年报年份")
+    /** 年份 */
+            @Excel(name = "年份")
+            @ApiModelProperty("年份")
             @TableField("ENTCHEYEAR")
             @JsonProperty("ENTCHEYEAR")
     private String ENTCHEYEAR;
@@ -125,6 +125,29 @@ private static final long serialVersionUID=1L;
             @JsonProperty("sExtDatatime")
     private Date sExtDatatime;
 
+    /** 数据更新时间戳 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "数据更新时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("数据更新时间戳")
+            @TableField("S_EXT_TIMESTAMP")
+            @JsonProperty("sExtTimestamp")
+    private Date sExtTimestamp;
+
+    /** 数据插入时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "数据插入时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("数据插入时间")
+            @TableField("I_TIME")
+            @JsonProperty("iTime")
+    private Date iTime;
+
+    /** 数据来源 */
+            @Excel(name = "数据来源")
+            @ApiModelProperty("数据来源")
+            @TableField("S_EXT_FROMNODE")
+            @JsonProperty("sExtFromnode")
+    private String sExtFromnode;
+
 
 
 }

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

@@ -7,7 +7,7 @@ import com.zksy.basicData.domain.XcrAnnualReportBaseInfo;
  * 企业年报基本信息Mapper接口
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 public interface XcrAnnualReportBaseInfoMapper extends BaseMapper<XcrAnnualReportBaseInfo> {
 

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

@@ -7,7 +7,7 @@ import com.zksy.basicData.domain.XcrEnterpriseAnnualReportShareholder;
  * 企业年报股东及出资信息Mapper接口
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 public interface XcrEnterpriseAnnualReportShareholderMapper extends BaseMapper<XcrEnterpriseAnnualReportShareholder> {
 

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

@@ -7,7 +7,7 @@ import com.zksy.basicData.domain.XcrAnnualReportBaseInfo;
  * 企业年报基本信息Service接口
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 public interface IXcrAnnualReportBaseInfoService extends IService<XcrAnnualReportBaseInfo> {
 

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

@@ -7,7 +7,7 @@ import com.zksy.basicData.domain.XcrEnterpriseAnnualReportShareholder;
  * 企业年报股东及出资信息Service接口
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 public interface IXcrEnterpriseAnnualReportShareholderService extends IService<XcrEnterpriseAnnualReportShareholder> {
 

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

@@ -7,7 +7,6 @@ import com.zksy.basicData.domain.XcrBranchOfficesInfo;
 import com.zksy.basicData.mapper.*;
 import com.zksy.common.core.domain.AjaxResult;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -102,7 +101,7 @@ public class InformationService {
             String className = iface.getSimpleName();
             // 去掉前缀 "Xcr" 和后缀 "Mapper"
             if (className.startsWith("Xcr") && className.endsWith("Mapper")) {
-                return className.substring(3, className.length() - 5);
+                return className.substring(3, className.length() - 6);
             }
         }
         return obj.getClass().getSimpleName();

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 企业年报基本信息Service业务层处理
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @Service
 public class XcrAnnualReportBaseInfoServiceImpl extends ServiceImpl<XcrAnnualReportBaseInfoMapper, XcrAnnualReportBaseInfo> implements IXcrAnnualReportBaseInfoService {

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 企业年报股东及出资信息Service业务层处理
  *
  * @author nahida
- * @date 2024-11-04
+ * @date 2024-11-20
  */
 @Service
 public class XcrEnterpriseAnnualReportShareholderServiceImpl extends ServiceImpl<XcrEnterpriseAnnualReportShareholderMapper, XcrEnterpriseAnnualReportShareholder> implements IXcrEnterpriseAnnualReportShareholderService {

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

@@ -56,6 +56,12 @@
             <result property="LASTUPDATETIME"    column="LASTUPDATETIME"    />
             <result property="ENTCHEYEAR"    column="ENTCHEYEAR"    />
             <result property="sExtDatatime"    column="S_EXT_DATATIME"    />
+            <result property="sExtTimestamp"    column="S_EXT_TIMESTAMP"    />
+            <result property="sExtFromnode"    column="S_EXT_FROMNODE"    />
+            <result property="iTime"    column="I_TIME"    />
+            <result property="ID"    column="ID"    />
+            <result property="modFlag"    column="MOD_FLAG"    />
+            <result property="upTime"    column="UP_TIME"    />
             <result property="uniCode"    column="uni_code"    />
     </resultMap>
 </mapper>

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

@@ -19,6 +19,9 @@
             <result property="acconformCn"    column="ACCONFORM_CN"    />
             <result property="ENTCHEYEAR"    column="ENTCHEYEAR"    />
             <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="uniCode"    column="uni_code"    />
     </resultMap>
 </mapper>