ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -30,7 +30,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 现有资产表(AssetCurrent)表控制层
@@ -90,7 +89,7 @@ public class AssetCurrentController extends BaseController {
     private AssetBusinessFormJyService assetBusinessFormJyService;
 
     @Resource
-    private AssetSupplyChainJyService assetSupplyChainJyService;
+    private AssetSupplyChainJyService assetSupplyChainJyService ;
 
     @Resource
     private UnitOtherConcatJyservice unitOtherConcatJyservice;
@@ -147,20 +146,16 @@ public class AssetCurrentController extends BaseController {
         StringBuilder a = new StringBuilder();
         if (assetCurrent.getGlymList() != null) {
             assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                a.append(x.getKey());
-                    a.append(x.getKey());
+                a.append(",");
-                    a.append(",");
-                }
             });
         }
         assetCurrent.setGlym(a.toString());
         StringBuilder b = new StringBuilder();
         if (assetCurrent.getGlIpList() != null) {
-            assetCurrent.getGlIpList().forEach(x -> {
+            assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                b.append(x.getKey());
-                    b.append(x.getKey());
+                b.append(",");
-                    b.append(",");
-                }
             });
         }
         assetCurrent.setGlIp(b.toString());
@@ -191,12 +186,11 @@ public class AssetCurrentController extends BaseController {
             //新增其他联系人
             unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat());
         }
-
         // 单位有进行中的任务时，管理端新增该单位下的资产则需同步至当前进行中的任务中。
         //获取新增资产id
         Long id = assetCurrent.getId();
         Integer i = unitService.selectTaskId(assetCurrent.getDwmc(), "0");
-        if (i != null) {
+        if(i!=null){
             //新增资产复制主表
             AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
             BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
@@ -234,13 +228,9 @@ public class AssetCurrentController extends BaseController {
                 unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
             }
         }
-        return
+        return success();
-
-                success();
-
     }
     //=================================================
-
     /**
      * 单位自编辑进行校验
      */
@@ -357,12 +347,12 @@ public class AssetCurrentController extends BaseController {
     @GetMapping("/lookInfo/{id}")
     public AjaxResult lookInfo(@PathVariable Long id) {
         AssetCurrentCpPo byId = assetCurrentCpService.getById(id);
-        byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list());
+        byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId ,byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list());
         byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list());
         byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).one());
         byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list());
         List<Acomma> a1 = new ArrayList<>();
-        if (byId.getGlym() != null) {
+        if(byId.getGlym()!=null){
             Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
                 Acomma acomma = new Acomma();
                 acomma.setKey(x);
@@ -371,7 +361,7 @@ public class AssetCurrentController extends BaseController {
             byId.setGlymList(a1);
         }
         List<Acomma> a2 = new ArrayList<>();
-        if (byId.getGlIp() != null) {
+        if(byId.getGlIp()!=null){
             Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
                 Acomma acomma = new Acomma();
                 acomma.setKey(x);
@@ -454,20 +444,16 @@ public class AssetCurrentController extends BaseController {
         StringBuilder a = new StringBuilder();
         if (assetCurrent.getGlymList() != null) {
             assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                a.append(x.getKey());
-                    a.append(x.getKey());
+                a.append(",");
-                    a.append(",");
-                }
             });
         }
         assetCurrent.setGlym(a.toString());
         StringBuilder b = new StringBuilder();
         if (assetCurrent.getGlIpList() != null) {
-            assetCurrent.getGlIpList().forEach(x -> {
+            assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                b.append(x.getKey());
-                    b.append(x.getKey());
+                b.append(",");
-                    b.append(",");
-                }
             });
         }
         assetCurrent.setGlIp(b.toString());
@@ -718,9 +704,8 @@ public class AssetCurrentController extends BaseController {
                 AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
                 BeanUtil.copyProperties(as, assetCurrentCpPo);
                 assetCurrentCpPo.setTaskId(i);
-                assetCurrentCpPo.setStatus(0);
                 AssetCurrentCpPo two = assetCurrentCpService.lambdaQuery().eq(AssetCurrentCpPo::getXtmc, as.getXtmc())
-                        .eq(AssetCurrentCpPo::getDwmc, as.getDwmc()).isNotNull(AssetCurrentCpPo::getTaskId).one();
+                        .eq(AssetCurrentCpPo::getDwmc, as.getDwmc()).one();
                 if (two != null) {
                     assetCurrentCpPo.setId(two.getId());
                     assetCurrentCpService.updateById(assetCurrentCpPo);

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java

@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -309,20 +308,16 @@ public class AssetTaskController extends BaseController {
         StringBuilder a = new StringBuilder();
         if (!assetCurrent.getGlymList().isEmpty()) {
             assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                a.append(x);
-                    a.append(x.getKey());
+                a.append(",");
-                    a.append(",");
-                }
             });
         }
         assetCurrent.setGlym(a.toString());
         StringBuilder b = new StringBuilder();
         if (!assetCurrent.getGlIpList().isEmpty()) {
-            assetCurrent.getGlIpList().forEach(x -> {
+            assetCurrent.getGlymList().forEach(x -> {
-                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
+                b.append(x);
-                    b.append(x.getKey());
+                b.append(",");
-                    b.append(",");
-                }
             });
         }
         assetCurrent.setGlIp(b.toString());
@@ -490,10 +485,6 @@ public class AssetTaskController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, AssetdwHcRequest req) {
         List<AssetdwHcResponse> list = assetTaskService.export(req);
-        list.forEach(x -> {
-            String formattedRatio = x.getCheckedRatio()  + "%";
-            x.setCheckedRatio(formattedRatio);
-        });
         ExcelUtil<AssetdwHcResponse> util = new ExcelUtil<AssetdwHcResponse>(AssetdwHcResponse.class);
         util.exportExcel(response, list, "单位完成情况");
 

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java

@@ -27,7 +27,7 @@ public class AssetdwHcResponse {
     /**
      * 核查资产数量
      */
-    @Excel(name = "核查资产数量")
+    @Excel(name = "单位名称")
     @ApiModelProperty("核查资产数量")
     private Integer total;
 
@@ -42,7 +42,7 @@ public class AssetdwHcResponse {
     /**
      * 完成状态
      */
-    @Excel(name = "完成状态",readConverterExp = "1=进行中,2=正常完成,3=超期完成")
+    @Excel(name = "完成状态",readConverterExp = "1=进行中,2=正常完成，3=超期完成")
     private Integer taskStatus;
 
 
@@ -58,8 +58,8 @@ public class AssetdwHcResponse {
     /**
      * 百分比
      */
-    @Excel(name = "完成比例")
+    @Excel(name = "百分比")
-    @ApiModelProperty("完成比例")
+    @ApiModelProperty("百分比")
-    private String checkedRatio;
+    private double checkedRatio;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.AssetApp;
 import com.ruoyi.tc.entity.po.AssetAppCpPo;
 import com.ruoyi.tc.entity.po.AssetEmailCpPo;
-import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
 import com.ruoyi.tc.entity.request.AssetAppPageRequest;
 import com.ruoyi.tc.mapper.AssetAppMapper;
 import com.ruoyi.tc.service.AssetAppCpService;
@@ -108,15 +107,11 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
     @Override
     public Boolean edit(AssetApp assetApp) {
         updateById(assetApp);
-        AssetAppCpPo one = assetAppCpService.lambdaQuery()
+        AssetAppCpPo one = assetAppCpService.lambdaQuery().eq(AssetAppCpPo::getAssetId, assetApp.getId()).one();
-                .eq(AssetAppCpPo::getAssetId, assetApp.getId())
-                .isNotNull(AssetAppCpPo::getTaskId)
-                .one();
         if (one != null) {
             BeanUtil.copyProperties(assetApp, one);
             one.setTaskId(unitService.selectTaskId(assetApp.getSsdw(), "4"));
             one.setAssetId(assetApp.getId());
-            one.setStatus(0);
             return assetAppCpService.updateById(one);
         }else {
             return true;

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java

@@ -107,13 +107,11 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
     @Override
     public Boolean edit(AssetEmail assetEmail) {
         updateById(assetEmail);
-        AssetEmailCpPo one = assetEmailCpService.lambdaQuery().eq(AssetEmailCpPo::getAssetId, assetEmail.getId())
+        AssetEmailCpPo one = assetEmailCpService.lambdaQuery().eq(AssetEmailCpPo::getAssetId, assetEmail.getId()).one();
-                .isNotNull(AssetEmailCpPo::getTaskId).one();
         if (one != null) {
             BeanUtil.copyProperties(assetEmail, one);
             one.setTaskId(unitService.selectTaskId(assetEmail.getSsdw(), "3"));
             one.setAssetId(assetEmail.getId());
-            one.setStatus(0);
             return assetEmailCpService.updateById(one);
         }else {
             return true;

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java

@@ -99,13 +99,11 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
     @Override
     public Boolean edit(AssetMiniPrograms assetMiniPrograms) {
         updateById(assetMiniPrograms);
-        AssetMiniProgramsCpPo one = assetMiniProgramsCpService.lambdaQuery().eq(AssetMiniProgramsCpPo::getAssetId, assetMiniPrograms.getId())
+        AssetMiniProgramsCpPo one = assetMiniProgramsCpService.lambdaQuery().eq(AssetMiniProgramsCpPo::getAssetId, assetMiniPrograms.getId()).one();
-                .isNotNull(AssetMiniProgramsCpPo::getTaskId).one();
         if (one!=null){
             BeanUtil.copyProperties(assetMiniPrograms,one);
             one.setTaskId(unitService.selectTaskId(assetMiniPrograms.getSsdw(),"1"));
             one.setAssetId(assetMiniPrograms.getId());
-            one.setStatus(0);
             return assetMiniProgramsCpService.updateById(one);
         }else{
             return true;

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.tc.entity.AssetOfficialAccount;
-import com.ruoyi.tc.entity.po.AssetEmailCpPo;
 import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
 import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
 import com.ruoyi.tc.mapper.AssetOfficialAccountMapper;
@@ -103,15 +102,11 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
     @Override
     public Boolean edit(AssetOfficialAccount assetOfficialAccount) {
         updateById(assetOfficialAccount);
-        AssetOfficialAccountCpPo one = assetOfficialAccountCpService.lambdaQuery()
+        AssetOfficialAccountCpPo one = assetOfficialAccountCpService.lambdaQuery().eq(AssetOfficialAccountCpPo::getAssetId, assetOfficialAccount.getId()).one();
-                .eq(AssetOfficialAccountCpPo::getAssetId, assetOfficialAccount.getId())
-                .isNotNull(AssetOfficialAccountCpPo::getTaskId)
-                .one();
         if (one != null) {
             BeanUtil.copyProperties(assetOfficialAccount, one);
             one.setTaskId(unitService.selectTaskId(assetOfficialAccount.getSsdw(), "2"));
             one.setAssetId(assetOfficialAccount.getId());
-            one.setStatus(0);
             return assetOfficialAccountCpService.updateById(one);
         }else {
             return true;

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java

@@ -364,23 +364,19 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
         byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, assetId).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, taskId).one());
         byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, assetId).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, taskId).list());
         List<Acomma> a1 = new ArrayList<>();
-        if (byId.getGlym() != null) {
+        Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
-            Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
+            Acomma acomma = new Acomma();
-                Acomma acomma = new Acomma();
+            acomma.setKey(x);
-                acomma.setKey(x);
+            a1.add(acomma);
-                a1.add(acomma);
+        });
-            });
+        byId.setGlymList(a1);
-            byId.setGlymList(a1);
-        }
         List<Acomma> a2 = new ArrayList<>();
-        if (byId.getGlIp() != null) {
+        Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
-            Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
+            Acomma acomma = new Acomma();
-                Acomma acomma = new Acomma();
+            acomma.setKey(x);
-                acomma.setKey(x);
+            a2.add(acomma);
-                a2.add(acomma);
+        });
-            });
+        byId.setGlIpList(a2);
-            byId.setGlIpList(a2);
-        }
         return byId;
 
 

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

@@ -108,27 +108,14 @@ server:
   servlet:
     # 应用的访问路径
     context-path: /api
-#  tomcat:
+  tomcat:
-#    # tomcat的URI编码
+    # tomcat的URI编码
-#    uri-encoding: UTF-8
+    uri-encoding: UTF-8
-#    # 连接数满后的排队数，默认为100
+    # 连接数满后的排队数，默认为100
-#    accept-count: 1000
+    accept-count: 1000
-#    threads:
+    threads:
-#      # tomcat最大线程数，默认为200
+      # tomcat最大线程数，默认为200
-#      max: 800
+      max: 800
-#      # Tomcat启动初始化的线程数，默认值10
+      # Tomcat启动初始化的线程数，默认值10
-#      min-spare: 100
+      min-spare: 100
-    tomcat:
+isTime: true
-      max-threads: 500
-      min-spare-threads: 50
-      max-connections: 10000
-      accept-count: 1000
-isTime: true
-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 480

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -234,13 +234,7 @@
                 and b.xtlx = #{req.xtlx}
             </if>
         </where>
-        ORDER BY
+        order by b.status asc
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select *
@@ -464,13 +458,7 @@
             </if>
 
         </where>
-        ORDER BY
+        order by b.status asc
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="gzhZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -497,13 +485,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        ORDER BY
+        order by b.status asc
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="emailZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -530,13 +512,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        ORDER BY
+        order by b.status asc
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="appZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
 
@@ -565,13 +541,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        ORDER BY
+        order by b.status asc
-        CASE
-
-        WHEN b.STATUS = 1 THEN
-        0 ELSE 1
-        END,
-        b.STATUS ASC
     </select>
     <select id="getByTaskId" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="int">
         select * from asset_task where id=#{taskId}