bugfix

2 months ago · 4c894756a3
parent 044e41bbe7
commit 4c894756a3
4 changed files with 100 additions and 73 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
@ -4,23 +4,46 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.tc.entity.*;
-import com.ruoyi.tc.entity.po.*;
-import com.ruoyi.tc.entity.request.*;
+import com.ruoyi.tc.entity.AssetBasicNetwork;
+import com.ruoyi.tc.entity.AssetBusinessForm;
+import com.ruoyi.tc.entity.AssetCurrent;
+import com.ruoyi.tc.entity.AssetLc;
+import com.ruoyi.tc.entity.AssetSupplyChain;
+import com.ruoyi.tc.entity.AssetTask;
+import com.ruoyi.tc.entity.UnitOtherConcat;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.request.Acomma;
+import com.ruoyi.tc.entity.request.AssestTaskXqRequest;
+import com.ruoyi.tc.entity.request.AssetCurrentShRequest;
+import com.ruoyi.tc.entity.request.AssetTaskPageRequest;
+import com.ruoyi.tc.entity.request.AssetdwHcRequest;
 import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
 import com.ruoyi.tc.entity.response.AssetTaskResponse;
 import com.ruoyi.tc.entity.response.AssetTaskStatusResponse;
 import com.ruoyi.tc.entity.response.AssetdwHcResponse;
 import com.ruoyi.tc.mapper.AssetTaskMapper;
-import com.ruoyi.tc.service.*;
+import com.ruoyi.tc.service.AssetBasicNetworkCpService;
+import com.ruoyi.tc.service.AssetBasicNetworkService;
+import com.ruoyi.tc.service.AssetBusinessFormCpService;
+import com.ruoyi.tc.service.AssetBusinessFormService;
+import com.ruoyi.tc.service.AssetCurrentCpService;
+import com.ruoyi.tc.service.AssetCurrentService;
+import com.ruoyi.tc.service.AssetLcService;
+import com.ruoyi.tc.service.AssetSupplyChainCpService;
+import com.ruoyi.tc.service.AssetSupplyChainService;
+import com.ruoyi.tc.service.AssetTaskService;
+import com.ruoyi.tc.service.UnitOtherConcatCpService;
+import com.ruoyi.tc.service.UnitOtherConcatService;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;

 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;

@ -99,7 +122,6 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
     * 新增数据
     *
     * @param assetTask 实例对象
-     * @return 实例对象
     */
    @Override
    public void insert(AssetTask assetTask) {
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@ -1,61 +1,61 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://39.101.188.84:3307/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: Admin123@
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置连接超时时间
-            connectTimeout: 30000
-            # 配置网络超时时间
-            socketTimeout: 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: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://localhost:3306/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: adminadmin
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 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: ruoyi
+                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
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@ -6,9 +6,9 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://localhost:3306/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://39.101.188.84:3307/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
-                password: adminadmin
+                password: Admin123@
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
@ -42,7 +42,7 @@ spring:
            webStatFilter: 
                enabled: true
            statViewServlet:
-                enabled: true
+                enabled: false
                # 设置白名单，不填则允许所有访问
                allow:
                url-pattern: /druid/*
@ -58,4 +58,9 @@ spring:
                    merge-sql: true
                wall:
                    config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+# Swagger配置
+knife4j:
+    production: true
+    enable: false
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
  # 服务器的HTTP端口，默认为8080
-  port: 9015
+  port: 9115
  servlet:
    # 应用的访问路径
    context-path: /
@ -52,7 +52,7 @@ spring:
    # 国际化资源文件路径
    basename: i18n/messages
  profiles:
-    active: druid
+    active: test
  # 文件上传
  servlet:
    multipart: