新增任务修改

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java

@@ -17,13 +17,14 @@ import java.util.List;
 public interface AssetBasicNetWorkCpMapper extends BaseMapper<AssetBasicNetworkCpPo> {
 
     /**
-     * 根据任务id资产供应链原有id
+     * 根据资产id资产供应链原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    @Select("select a.* from asset_basic_network a  left join asset_current_cp b  on a.asset_id =b.id where  b.task_id=#{taskId} ")
+   // @Select("select a.* from asset_basic_network a  left join asset_current_cp b  on a.asset_id =b.id where  b.task_id=#{taskId} ")
-    List<AssetBasicNetworkCpPo> findByassetId(String taskId);
+    @Select("select * from asset_basic_network where asset_id=#{id} ")
+    List<AssetBasicNetworkCpPo> findByassetId(@Param("id") Long id);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java

@@ -23,8 +23,9 @@ public interface AssetBusinessFormCpMapper extends BaseMapper<AssetBusinessFormC
      * @param taskId 任务id
      * @return
      */
-    @Select("select a.* from asset_business_form a left join asset_current_cp b  on a.asset_id =b.id where b.task_id=#{taskId} ")
+//    @Select("select a.* from asset_business_form a left join asset_current_cp b  on a.asset_id =b.id where b.task_id=#{taskId} ")
-    List<AssetBusinessFormCpPo> findByassetId(String taskId);
+    @Select("select * from  asset_business_form where asset_id =#{id}")
+    List<AssetBusinessFormCpPo> findByassetId(@Param("id") Long id);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java

@@ -18,13 +18,14 @@ public interface AssetSupplyChainCpMapper extends BaseMapper<AssetSupplyChainCpP
 
 
     /**
-     * 根据任务id资产供应链原有id
+     * 根据资产id资产供应链原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    @Select("select a.* from asset_supply_chain a left join asset_current_cp b  on a.asset_id =b.id where b.task_id=#{taskId}")
+//    @Select("select a.* from asset_supply_chain a left join asset_current_cp b  on a.asset_id =b.id where b.task_id=#{taskId}")
-    List<AssetSupplyChainCpPo> findByassetId(String taskId);
+    @Select("select * from asset_supply_chain where  asset_id=#{id}")
+    List<AssetSupplyChainCpPo> findByassetId(@Param("id") Long id);
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java

@@ -17,13 +17,14 @@ public interface UnitOtherConcatCpMapper extends BaseMapper<UnitOtherConcatCpPo>
 
 
     /**
-     * 根据任务id资产供应链原有id
+     * 根据资产id资产供应链原有id
      *
-     * @param taskId 资产id
+     * @param id 资产id
      * @return
      */
-    @Select("select a.* from unit_other_contact a left  join asset_current_cp b  on a.asset_id =b.id where b.task_id =#{taskId}")
+    //@Select("select a.* from unit_other_contact a left  join asset_current_cp b  on a.asset_id =b.id where b.task_id =#{taskId}")
-    List<UnitOtherConcatCpPo> findByassetId( String taskId);
+    @Select("select * from unit_other_contact where asset_id=#{id}")
+    List<UnitOtherConcatCpPo> findByassetId(@Param("id") Long id);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java

@@ -14,12 +14,12 @@ import java.util.List;
 public interface AssetBasicNetworkCpService extends IService<AssetBasicNetworkCpPo> {
 
     /**
-     * 根据任务id资产供应链原有id
+     * 根据资产id资产供应链原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    List<AssetBasicNetworkCpPo> findByassetId(String taskId);
+    List<AssetBasicNetworkCpPo> findByassetId(Long id);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java

@@ -14,12 +14,12 @@ import java.util.List;
 public interface AssetBusinessFormCpService extends IService<AssetBusinessFormCpPo> {
 
     /**
-     * 根据任务id查询业务主表原有id
+     * 根据资产id查询业务主表原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    List<AssetBusinessFormCpPo> findByassetId(String taskId);
+    List<AssetBusinessFormCpPo> findByassetId(Long id);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java

@@ -14,12 +14,12 @@ import java.util.List;
 public interface AssetSupplyChainCpService extends IService<AssetSupplyChainCpPo> {
 
     /**
-     * 根据任务id资产供应链原有id
+     * 根据资产id资产供应链原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    List<AssetSupplyChainCpPo> findByassetId(String taskId);
+    List<AssetSupplyChainCpPo> findByassetId(Long id);
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java

@@ -16,10 +16,10 @@ public interface UnitOtherConcatCpService extends IService<UnitOtherConcatCpPo>
     /**
      * 根据资产id资产供应链原有id
      *
-     * @param taskId 任务id
+     * @param id 资产id
      * @return
      */
-    List<UnitOtherConcatCpPo> findByassetId(String taskId);
+    List<UnitOtherConcatCpPo> findByassetId(Long id);
 
 
     /**

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

@@ -22,8 +22,8 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl<AssetBasicNetWor
     private AssetBasicNetWorkCpMapper assetBasicNetWorkCpMapper;
 
     @Override
-    public List<AssetBasicNetworkCpPo> findByassetId(String taskId) {
+    public List<AssetBasicNetworkCpPo> findByassetId(Long id) {
-        return assetBasicNetWorkCpMapper.findByassetId(taskId);
+        return assetBasicNetWorkCpMapper.findByassetId(id);
     }
 
     @Override

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

@@ -22,8 +22,8 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl<AssetBusinessFor
     private AssetBusinessFormCpMapper assetBusinessFormCpMapper;
 
     @Override
-    public List<AssetBusinessFormCpPo> findByassetId(String taskId) {
+    public List<AssetBusinessFormCpPo> findByassetId(Long id) {
-        return assetBusinessFormCpMapper.findByassetId(taskId);
+        return assetBusinessFormCpMapper.findByassetId(id);
     }
 
     @Override

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

@@ -22,8 +22,8 @@ public class AssetSupplyChainCpServiceImpl extends ServiceImpl<AssetSupplyChainC
    @Resource
    private  AssetSupplyChainCpMapper assetSupplyChainCpMapper;
     @Override
-        public  List<AssetSupplyChainCpPo> findByassetId(String taskId) {
+        public  List<AssetSupplyChainCpPo> findByassetId(Long id) {
-        return assetSupplyChainCpMapper.findByassetId(taskId);
+        return assetSupplyChainCpMapper.findByassetId(id);
     }
 
     @Override

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

@@ -203,21 +203,43 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                             assetCurrentResponse.setBtgyy(null);
                             assetCurrentResponse.setUpdateTime(null);
                         }
-                    });
 
-                    assetCurrentCpService.saveBatch(list);
                         //新增新监管业务形态
-                    List<AssetBusinessFormCpPo> bussList = assetBusinessFormCpService.findByassetId(assetTask.getTaskId());
+                        List<AssetBusinessFormCpPo> bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId());
+                        bussList.stream()
+                                .forEach(assetBusinessFormCp -> {
+                                    assetBusinessFormCp.setBusinessId(null);
+                                    assetBusinessFormCp.setTaskId(id);
+                                });
                         assetBusinessFormCpService.saveBatch(bussList);
                         //新增供应
-                    List<AssetSupplyChainCpPo> supplyChainList = assetSupplyChainCpService.findByassetId(assetTask.getTaskId());
+                        List<AssetSupplyChainCpPo> supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId());
+                        supplyChainList.stream()
+                                .forEach(assetSupplyChainCpPo ->{
+                                    assetSupplyChainCpPo.setSupplyId(null);
+                                    assetSupplyChainCpPo.setTaskId(id);
+                                } );
                         assetSupplyChainCpService.saveBatch(supplyChainList);
                         //新增基础网络
-                    List<AssetBasicNetworkCpPo> BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetTask.getTaskId());
+                        List<AssetBasicNetworkCpPo> BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId());
+                        BasicNetworkCpList.stream()
+                                .forEach(assetBasicNetworkCpPo -> {
+                                    assetBasicNetworkCpPo.setNetworkId(null);
+                                    assetBasicNetworkCpPo.setTaskId(id);
+                                });
                         assetBasicNetworkCpService.saveBatch(BasicNetworkCpList);
                         //新增其他联系人
-                    List<UnitOtherConcatCpPo> unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetTask.getTaskId());
+                        List<UnitOtherConcatCpPo> unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId());
+                        unitOtherConcatList.stream()
+                                .forEach(unitOtherConcatCpPo -> {
+                                    unitOtherConcatCpPo.setConcatId(null);
+                                    unitOtherConcatCpPo.setTaskId(id);
+                                });
                         unitOtherConcatCpService.saveBatch(unitOtherConcatList);
+                    });
+
+                    assetCurrentCpService.saveBatch(list);
+
                 }
             } else if (assetPart.equals("1")) {
                 //遍历小程序资产单位
@@ -395,7 +417,10 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                 JSONObject jsonObject = JSONObject.parseObject(o.toString());
                 acomma.setKey(jsonObject.get("key").toString());
                 acomma.setIpType(jsonObject.get("ipType").toString());
-                acomma.setPort(jsonObject.get("port").toString());
+                Object portValue = jsonObject.get("port");
+                if (portValue != null && !portValue.toString().isEmpty()) {
+                    acomma.setPort(portValue.toString());
+                }
                 a2.add(acomma);
             }
             byId.setGlIpList(a2);

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

@@ -21,8 +21,8 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl<UnitOtherConcatCpM
     private UnitOtherConcatCpMapper unitOtherConcatCpMapper;
 
     @Override
-    public List<UnitOtherConcatCpPo> findByassetId(String taskId) {
+    public List<UnitOtherConcatCpPo> findByassetId(Long id) {
-        return unitOtherConcatCpMapper.findByassetId(taskId);
+        return unitOtherConcatCpMapper.findByassetId(id);
     }
 
     @Override