增加test配置文件

src/main/java/com/cqut/stack/bn/dao/SysPageConfigureMapper.java

@@ -1,16 +0,0 @@
-package com.cqut.stack.bn.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cqut.stack.bn.pojo.entity.sysPageConfigure.SysPageConfigure;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 页面配置表 Mapper 接口
- * </p>
- *
- * @author 宇
- * @since 2024-11-17
- */
-public interface SysPageConfigureMapper extends BaseMapper<SysPageConfigure> {
-}

src/main/java/com/cqut/stack/bn/pojo/dto/electronicSeal/ElectronicSealInfoImportDTO.java

@@ -12,7 +12,7 @@ public class ElectronicSealInfoImportDTO {
 
     @ApiModelProperty(value = "地区")
     @ExcelProperty(value = "地区",index = 0)
-    private String districtName;
+    private String districtCode;
 
     @ApiModelProperty(value = "印章申领数")
     @ExcelProperty(value = "印章申领数",index = 1)

src/main/java/com/cqut/stack/bn/pojo/entity/AreaHandle.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("area_handle")
-@ApiModel(value="AreaHandle对象", description="区域办件情况")
+    @ApiModel(value="AreaHandle对象", description="区域办件情况")
 public class AreaHandle implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/cqut/stack/bn/pojo/entity/AreaTransaction.java

@@ -2,6 +2,8 @@ package com.cqut.stack.bn.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -45,7 +47,7 @@ public class AreaTransaction implements Serializable {
 
     @ApiModelProperty(value = "统计时间")
     @TableField("stat_date")
-    private String statDate;
+    private LocalDate statDate;
 
     @ApiModelProperty(value = "预算金额")
     @TableField("budget_amount")

src/main/java/com/cqut/stack/bn/pojo/entity/ElectronicSeal.java

@@ -53,6 +53,4 @@ public class ElectronicSeal implements Serializable {
     @TableField("stat_date")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date statDate;
-
-
 }

src/main/java/com/cqut/stack/bn/pojo/entity/ResourceTransaction.java

@@ -36,9 +36,9 @@ public class ResourceTransaction implements Serializable {
 
     @ApiModelProperty(value = "预算金额")
     @TableField("budget_amount")
-    private String budgetAmount;
+    private Double budgetAmount;
 
     @ApiModelProperty(value = "成交金额")
     @TableField("transaction_amount")
-    private String transactionAmount;
+    private Double transactionAmount;
 }

src/main/java/com/cqut/stack/bn/pojo/entity/sysPageConfigure/SysPageConfigure.java

@@ -1,75 +0,0 @@
-package com.cqut.stack.bn.pojo.entity.sysPageConfigure;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 页面配置表
- * </p>
- *
- * @author 宇
- * @since 2024-11-17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_page_configure")
-@ApiModel(value="SysPageConfigure对象", description="页面配置表")
-public class SysPageConfigure implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "配置id.")
-      @TableId("configure_id")
-    private String configureId;
-
-    @ApiModelProperty(value = "所属系统.")
-    @TableField("system_type")
-    private Integer systemType;
-
-    @ApiModelProperty(value = "所属模块.")
-    @TableField("module_type")
-    private Integer moduleType;
-
-    @ApiModelProperty(value = "页面中是否显示.")
-    @TableField("is_display")
-    private Integer isDisplay;
-
-    @ApiModelProperty(value = "数据显示形式.")
-    @TableField("data_show_type")
-    private Integer dataShowType;
-
-    @ApiModelProperty(value = "是否支持切换.")
-    @TableField("is_switch")
-    private Integer isSwitch;
-
-    @ApiModelProperty(value = "支持切换类别.")
-    @TableField("switch_type")
-    private String switchType;
-
-    @ApiModelProperty(value = "切换时间间隔.")
-    @TableField("switch_interval")
-    private Integer switchInterval;
-
-    @ApiModelProperty(value = "上一次搜索状态：0-代表本日，1代表月，2代表本季度，3代表本年")
-    @TableField("search_status")
-    private Integer searchStatus;
-
-    @ApiModelProperty(value = "创建时间.")
-    @TableField("create_time")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间.")
-    @TableField("update_time")
-    private Date updateTime;
-
-
-}

src/main/java/com/cqut/stack/bn/pojo/listener/ElectronicSealListener.java

@@ -23,7 +23,7 @@ public class ElectronicSealListener implements ReadListener<ElectronicSealInfoIm
     public void invoke(ElectronicSealInfoImportDTO electronicSealInfoImportDTO, AnalysisContext analysisContext) {
         ElectronicSeal electronicSeal = new ElectronicSeal();
         BeanUtil.copyProperties(electronicSealInfoImportDTO,electronicSeal);
-        electronicSeal.setDistrictName(GovernmentServiceEnum.DistrictEnum.getCodeByName(electronicSealInfoImportDTO.getDistrictName()));
+        electronicSeal.setDistrictName(GovernmentServiceEnum.DistrictEnum.getCodeByName(electronicSealInfoImportDTO.getDistrictCode()));
         electronicSealList.add(electronicSeal);
     }
 

src/main/java/com/cqut/stack/bn/service/SysPageConfigureService.java

@@ -1,15 +0,0 @@
-package com.cqut.stack.bn.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.cqut.stack.bn.pojo.entity.sysPageConfigure.SysPageConfigure;
-
-/**
- * <p>
- * 页面配置表 服务类
- * </p>
- *
- * @author 宇
- * @since 2024-11-17
- */
-public interface SysPageConfigureService extends IService<SysPageConfigure> {
-}

src/main/java/com/cqut/stack/bn/service/impl/SysPageConfigureServiceImpl.java

@@ -1,21 +0,0 @@
-package com.cqut.stack.bn.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cqut.stack.bn.dao.SysPageConfigureMapper;
-import com.cqut.stack.bn.pojo.entity.sysPageConfigure.SysPageConfigure;
-import com.cqut.stack.bn.service.SysPageConfigureService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 页面配置表 服务实现类
- * </p>
- *
- * @author 宇
- * @since 2024-11-17
- */
-@Service
-public class SysPageConfigureServiceImpl extends ServiceImpl<SysPageConfigureMapper, SysPageConfigure> implements SysPageConfigureService {
-}

src/main/resources/application-dev.yml

@@ -0,0 +1,76 @@
+spring:
+  datasource:
+    url: jdbc:mysql://120.79.182.152:3230/bazhong-new?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    username: root
+    password: Su28092015__
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      #不能小于30秒，否则默认回到1800秒
+      max-lifetime: 30000
+      idle-timeout: 10000
+      connection-test-query: SELECT 1
+  mvc:
+    path match:
+      matching-strategy: ANT_PATH_MATCHER
+  jackson:
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: true
+  redis:
+    port: 6379
+    database: 1
+    host: localhost
+    timeout: 3s
+    lettuce:
+      pool:
+        # 连接池最大连接数
+        max-active: 20
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+        # 连接池中的最大空闲连接
+        max-idle: 10
+        # 连接池中的最小空闲连接
+        min-idle: 3
+        time-between-eviction-runs: 100
+  servlet: #配置，
+    multipart:
+      # 单次上传文件大小500MB以内
+      max-file-size: 500MB
+      # 单次请求大小1000MB以内
+      max-request-size: 1000MB
+  jmx:
+    enabled: true
+
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    map-underscore-to-camel-case: true
+
+swagger:
+  basic:
+    enabled: true
+
+pagehelper:
+  # pageSize=0时会传回所有数据
+  page-size-zero: true
+  # 指定数据库，不指定的话会默认自动检测数据库类型
+  helperDialect: mysql
+  #启用合理化，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页
+  reasonable: true
+  #支持通过 Mapper 接口参数来传递分页参数，默认值false，分页插件会从查询方法的参数值中，自动根据上面 params 配置的字段中取值，查找到合适的值时就会自动分页
+  supportMethodsArguments: true
+
+
+minio:
+  # 绝对路径
+  endpoint: http://localhost:9000
+  # 用户名
+  accessKey: admin
+  # 密码
+  secretKey: 12345678
+  # 桶名称
+  bucketName: government
+

src/main/resources/application-test.yml

@@ -0,0 +1,76 @@
+spring:
+  datasource:
+    url: jdbc:mysql://47.109.199.163:3306/bazhong-new?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      #不能小于30秒，否则默认回到1800秒
+      max-lifetime: 30000
+      idle-timeout: 10000
+      connection-test-query: SELECT 1
+  mvc:
+    path match:
+      matching-strategy: ANT_PATH_MATCHER
+  jackson:
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: true
+  redis:
+    port: 6379
+    database: 1
+    host: localhost
+    timeout: 3s
+    lettuce:
+      pool:
+        # 连接池最大连接数
+        max-active: 20
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+        # 连接池中的最大空闲连接
+        max-idle: 10
+        # 连接池中的最小空闲连接
+        min-idle: 3
+        time-between-eviction-runs: 100
+  servlet: #配置，
+    multipart:
+      # 单次上传文件大小500MB以内
+      max-file-size: 500MB
+      # 单次请求大小1000MB以内
+      max-request-size: 1000MB
+  jmx:
+    enabled: true
+
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    map-underscore-to-camel-case: true
+
+swagger:
+  basic:
+    enabled: true
+
+pagehelper:
+  # pageSize=0时会传回所有数据
+  page-size-zero: true
+  # 指定数据库，不指定的话会默认自动检测数据库类型
+  helperDialect: mysql
+  #启用合理化，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页
+  reasonable: true
+  #支持通过 Mapper 接口参数来传递分页参数，默认值false，分页插件会从查询方法的参数值中，自动根据上面 params 配置的字段中取值，查找到合适的值时就会自动分页
+  supportMethodsArguments: true
+
+
+minio:
+  # 绝对路径
+  endpoint: http://localhost:9000
+  # 用户名
+  accessKey: admin
+  # 密码
+  secretKey: 12345678
+  # 桶名称
+  bucketName: government
+

src/main/resources/application.yml

@@ -3,79 +3,6 @@ server:
 
 spring:
   application:
-    name: goverment-server-master-new
-  datasource:
-    url: jdbc:mysql://120.79.182.152:3230/bazhong-new?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-    username: root
-    password: Su28092015__
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    hikari:
-      minimum-idle: 3
-      maximum-pool-size: 10
-      #不能小于30秒，否则默认回到1800秒
-      max-lifetime: 30000
-      idle-timeout: 10000
-      connection-test-query: SELECT 1
-  mvc:
-    path match:
-      matching-strategy: ANT_PATH_MATCHER
-  jackson:
-    time-zone: GMT+8
-    serialization:
-      write-dates-as-timestamps: true
-  redis:
-    port: 6379
-    database: 1
-    host: localhost
-    timeout: 3s
-    lettuce:
-      pool:
-        # 连接池最大连接数
-        max-active: 20
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-        # 连接池中的最大空闲连接
-        max-idle: 10
-        # 连接池中的最小空闲连接
-        min-idle: 3
-        time-between-eviction-runs: 100
-  servlet: #配置，
-    multipart:
-      # 单次上传文件大小500MB以内
-      max-file-size: 500MB
-      # 单次请求大小1000MB以内
-      max-request-size: 1000MB
-  jmx:
-    enabled: true
-
-mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    map-underscore-to-camel-case: true
-
-swagger:
-  basic:
-    enabled: true
-
-pagehelper:
-  # pageSize=0时会传回所有数据
-  page-size-zero: true
-  # 指定数据库，不指定的话会默认自动检测数据库类型
-  helperDialect: mysql
-  #启用合理化，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页
-  reasonable: true
-  #支持通过 Mapper 接口参数来传递分页参数，默认值false，分页插件会从查询方法的参数值中，自动根据上面 params 配置的字段中取值，查找到合适的值时就会自动分页
-  supportMethodsArguments: true
-
-
-minio:
-  # 绝对路径
-  endpoint: http://localhost:9000
-  # 用户名
-  accessKey: admin
-  # 密码
-  secretKey: 12345678
-  # 桶名称
-  bucketName: government
-
+    name: government-server-master-new
+  profiles:
+    active: test

src/main/resources/mapper/SysPageConfigureMapper.xml

@@ -1,25 +0,0 @@
-<?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.cqut.stack.bn.dao.SysPageConfigureMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.cqut.stack.bn.pojo.entity.sysPageConfigure.SysPageConfigure">
-        <id column="configure_id" property="configureId" />
-        <result column="system_type" property="systemType" />
-        <result column="module_type" property="moduleType" />
-        <result column="is_display" property="isDisplay" />
-        <result column="data_show_type" property="dataShowType" />
-        <result column="is_switch" property="isSwitch" />
-        <result column="switch_type" property="switchType" />
-        <result column="switch_interval" property="switchInterval" />
-        <result column="search_status" property="searchStatus" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        configure_id, system_type, module_type, is_display, data_show_type, is_switch, switch_type, switch_interval, search_status, create_time, update_time
-    </sql>
-
-</mapper>