bugfix

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.AssetBasicNetwork;
-import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.AssetBusinessForm;
-import com.ruoyi.tc.entity.request.*;
+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) {

ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://39.101.188.84:3307/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Admin123@
+                password: adminadmin
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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/*
@@ -59,3 +59,8 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+
+# Swagger配置
+knife4j:
+    production: true
+    enable: false

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: