修改部署后出现的报错

.gitignore

@@ -22,10 +22,6 @@ web/target/
 *.iml
 *.ipr
 
-# 排除配置文件
-web/src/main/resources/application.yml
-web/src/main/resources/application-dev.yml
-
 ### NetBeans ###
 /nbproject/private/
 /nbbuild/

core/src/main/java/com/dite/znpt/mapper/RegulationTypeMapper.java

@@ -18,9 +18,12 @@ public interface RegulationTypeMapper extends BaseMapper<RegulationTypeEntity> {
      * 分页查询制度类型列表（包含创建人姓名）
      * @param page 分页参数
      * @param typeName 类型名称
-     * @param status 状态
+     * @param status 是否启用（1-启用，0-禁用）
      * @param remark 备注
      * @return 分页结果
      */
-    Page<RegulationTypeEntity> selectRegulationTypeListWithCreator(@Param("page") Page<RegulationTypeEntity> page, @Param("typeName") String typeName, @Param("status") String status, @Param("remark") String remark);
+    Page<RegulationTypeEntity> selectRegulationTypeListWithCreator(Page<RegulationTypeEntity> page, 
+                                                                  @Param("typeName") String typeName,
+                                                                  @Param("status") String status,
+                                                                  @Param("remark") String remark);
 } 

core/src/main/java/com/dite/znpt/service/impl/ProjectMemberServiceImpl.java

@@ -40,6 +40,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
     private final TurbineService turbineService;
     private final ProjectTaskService projectTaskService;
     private final ProjectBudgetInfoService projectBudgetInfoService;
+    private final ProjectDailyReportService projectDailyReportService;
 
     @Override
     public List<ProjectMemberResp> selectList(ProjectMemberListReq req) {
@@ -327,19 +328,19 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         }).collect(Collectors.toList()));
 
         // 获取项目日报信息
-        // List<ProjectDailyReportEntity> dailyReports = projectDailyReportService.lambdaQuery()
+        List<ProjectDailyReportEntity> dailyReports = projectDailyReportService.lambdaQuery()
-        //         .eq(ProjectDailyReportEntity::getProjectId, projectId)
+                .eq(ProjectDailyReportEntity::getProjectId, projectId)
-        //         .orderByDesc(ProjectDailyReportEntity::getReportDate)
+                .orderByDesc(ProjectDailyReportEntity::getReportDate)
-        //         .last("LIMIT 10")
+                .last("LIMIT 10")
-        //         .list();
+                .list();
-        // resp.setDailyReports(dailyReports.stream().map(report -> {
+        resp.setDailyReports(dailyReports.stream().map(report -> {
-        //     ProjectDetailResp.DailyReportInfo info = new ProjectDetailResp.DailyReportInfo();
+            ProjectDetailResp.DailyReportInfo info = new ProjectDetailResp.DailyReportInfo();
-        //     BeanUtil.copyProperties(report, info);
+            BeanUtil.copyProperties(report, info);
-        //     // 获取提交人姓名
+            // 获取提交人姓名
-        //     UserEntity user = userService.getById(report.getSubmitUser());
+            UserEntity user = userService.getById(report.getSubmitUser());
-        //     info.setSubmitUserName(user != null ? user.getName() : "");
+            info.setSubmitUserName(user != null ? user.getName() : "");
-        //     return info;
+            return info;
-        // }).collect(Collectors.toList()));
+        }).collect(Collectors.toList()));
 
         return resp;
     }

core/src/main/resources/mapper/ImageMapper.xml

@@ -30,6 +30,7 @@
                 and i.review_state = #{reviewState}
             </if>
         </where>
+        order by i.create_time desc
     </select>
 
     <resultMap id="imageRespMap" type="com.dite.znpt.domain.vo.ImageResp">

core/src/main/resources/mapper/RegulationTypeMapper.xml

@@ -9,8 +9,8 @@
 
     <select id="selectRegulationTypeListWithCreator" resultType="com.dite.znpt.domain.entity.RegulationTypeEntity">
         SELECT 
-            rt.type_id as typeId, rt.type_name as typeName, rt.is_enabled as isEnabled, rt.sort_order as sortOrder, rt.remark, rt.del_flag as delFlag,
+            rt.type_id, rt.type_name, rt.is_enabled, rt.sort_order, rt.remark, rt.del_flag,
-            rt.create_by as createBy, rt.create_time as createTime, rt.update_by as updateBy, rt.update_time as updateTime,
+            rt.create_by, rt.create_time, rt.update_by, rt.update_time,
             u.name as createrName
         FROM regulation_type rt
         LEFT JOIN user u ON rt.create_by COLLATE utf8mb4_general_ci = u.user_id COLLATE utf8mb4_general_ci

web/src/main/resources/application-dev.yml

@@ -0,0 +1,156 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8888
+  address : 0.0.0.0  # 监听所有网络接口
+  servlet:
+    encoding:
+      enabled: true
+      charset: UTF-8
+      force: true
+
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://39.99.201.243:3306/test01?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    username: root
+    password: BUw8YW6%@^8q
+    druid:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 50
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: iotplatform
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    pool:
+      max-active: 3000
+      max-idle: 1000
+      max-wait: 3000
+    host: 39.99.201.243
+    port: 6379
+    password: diTeZn@123
+    timeout: 3000
+    #    0 gaea系统，3 gaea-dev/gaea-test系统，4 znpt开发，5 znpt测试 6 znpt生产
+    database: 4
+  rabbitmq:
+    host: 39.99.201.243
+    port: 3389
+    username: dite
+    password: diTezN@123
+## MINIO配置
+#minio:
+#  url: http://10.20.32.11:9000
+#  accessKey: minio
+#  secretKey: minio@321
+#  private:
+#    bucket: pri
+#    domain:
+#      prefix: /minio-pri/
+#  public:
+#    bucket: pub
+#    domain:
+#      prefix: /minio/
+
+############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
+sa-token:
+  # token 名称（同时也是 cookie 名称）
+  token-name: Authorization
+  # token 有效期（单位：秒） 默认30天，-1 代表永久有效
+  timeout: 2592000
+  # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+  active-timeout: -1
+  # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
+  is-share: false
+  # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+  token-style: uuid
+  # 是否输出操作日志
+  is-log: true
+
+#sip-config:
+#  name: 信令服务
+#  ip: 127.0.0.1
+#  port: 1074
+#  charset: gb2312
+#  domain: 3402000000
+#  id: 34020000002000000001
+#  password: 123456
+#  mediaType: mp4
+#
+#zlm-config:
+#  # 流媒体名称
+#  mediaName: 媒体服务
+#  # 流媒体服务商
+#  mediaService: ZLMdia
+#  # 公网ip
+#  publicHost:
+#  # 接口ip
+#  apiHost: 127.0.0.1
+#  # 接口端口
+#  apiPort:  8080
+#  # 密钥
+#  secretKey: 6Q76ivvVOQDsnnfOSKbtVzcYpbgy4n1G
+#  # 流id前缀
+#  streamPrefix:
+#  # rtp ip
+#  rtpHost: 127.0.0.1
+#  # rtp 端口
+#  rtpPort: 8080
+#  # 动态端口起始值
+#  dynamicPortStart: 30150
+#  # 动态端口结束值
+#  dynamicPortEnd: 30185
+
+upload:
+#  此处仅定义总的父路径，细节定义到 FilePathEnum
+    save-path: D:\Upload\
+
+# 部署配置
+deploy:
+  secret: cRc5888KAo4TxRS4y5iv35GM
+  build-dir: /home/dtyx/znpt-backend/build
+
+# 工具路径
+util:
+  enableImagePreTreatment: false
+  imagePreTreatmentPath: d:\
+  reportGeneratorPath: D:\blade_report_generator.exe
+  reportGeneratorTemplatePath: D:\muban

web/src/main/resources/application.yml

@@ -0,0 +1,31 @@
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: dev
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 100MB
+      # 设置总上传的文件大小
+      max-request-size: 200MB
+  application:
+    name: znpt
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  main:
+    allow-circular-references: true
+    allow-bean-definition-overriding: true
+
+
+# flowable相关表
+flowable:
+  # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用)
+  database-schema-update: false
+  # 关闭定时任务JOB
+  async-executor-activate: false