关联ip不为空修改

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

@@ -167,10 +167,35 @@ public class AssetCurrentController extends BaseController {
             });
         }
         assetCurrent.setGlym(a.toString());
+        List<Acomma> a2 = new ArrayList<>();
         if (assetCurrent.getGlIpList() != null) {
-            assetCurrent.setGlIp(assetCurrent.getGlIpList().toString());
+            if (assetCurrent.getGlIp() != null && !assetCurrent.getGlIp().isEmpty()) {
+                for (Object o : JSONArray.parseArray(assetCurrent.getGlIp())) {
+                    Acomma acomma = new Acomma();
+                    JSONObject jsonObject = JSONObject.parseObject(o.toString());
+                    if (BeanUtil.isNotEmpty(jsonObject.get("key"))) {
+                        acomma.setKey(jsonObject.get("key").toString());
+                    } else {
+                        acomma.setKey("");
+                    }
+                    if (BeanUtil.isNotEmpty(jsonObject.get("ipType"))) {
+                        acomma.setIpType(jsonObject.get("ipType").toString());
+                    } else {
+                        acomma.setIpType("");
+                    }
+                    Object portValue = jsonObject.get("port");
+                    if (portValue != null && !portValue.toString().isEmpty()) {
+                        acomma.setPort(portValue.toString());
+                    }else{
+                        acomma.setPort("");
+                    }
+                    a2.add(acomma);
+                }
+                assetCurrent.setGlIpList(a2);
+            }
+
         } else {
-            assetCurrent.setGlIp("");
+            assetCurrent.setGlIpList(new ArrayList<>());
         }
 //        assetCurrent.setGlIp(b.toString());
         assetCurrentService.save(assetCurrent);
@@ -551,16 +576,35 @@ public class AssetCurrentController extends BaseController {
             });
         }
         assetCurrent.setGlym(a.toString());
+        List<Acomma> a2 = new ArrayList<>();
         if (assetCurrent.getGlIpList() != null) {
-//            assetCurrent.getGlIpList().forEach(x -> {
-//                if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
-//                    b.append(x.getKey());
-//                    b.append(",");
-//                }
-//            });
-            assetCurrent.setGlIp(assetCurrent.getGlIpList().toString());
+            if (assetCurrent.getGlIp() != null && !assetCurrent.getGlIp().isEmpty()) {
+                for (Object o : JSONArray.parseArray(assetCurrent.getGlIp())) {
+                    Acomma acomma = new Acomma();
+                    JSONObject jsonObject = JSONObject.parseObject(o.toString());
+                    if (BeanUtil.isNotEmpty(jsonObject.get("key"))) {
+                        acomma.setKey(jsonObject.get("key").toString());
+                    } else {
+                        acomma.setKey("");
+                    }
+                    if (BeanUtil.isNotEmpty(jsonObject.get("ipType"))) {
+                        acomma.setIpType(jsonObject.get("ipType").toString());
+                    } else {
+                        acomma.setIpType("");
+                    }
+                    Object portValue = jsonObject.get("port");
+                    if (portValue != null && !portValue.toString().isEmpty()) {
+                        acomma.setPort(portValue.toString());
+                    }else{
+                        acomma.setPort("");
+                    }
+                    a2.add(acomma);
+                }
+                assetCurrent.setGlIpList(a2);
+            }
+
         } else {
-            assetCurrent.setGlIp("");
+            assetCurrent.setGlIpList(new ArrayList<>());
         }
 
         if (!assetCurrent.getXtzt().equals("7")) {
@@ -573,6 +617,7 @@ public class AssetCurrentController extends BaseController {
         assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
         assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
         unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
+
         if (assetCurrent.getXjgywxt() != null) {
             assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId());
             assetCurrent.getXjgywxt().setId(null);

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

@@ -1,6 +1,9 @@
 package com.ruoyi.tc.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
@@ -28,10 +31,7 @@ import javax.validation.Valid;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -384,10 +384,35 @@ public class AssetTaskController extends BaseController {
         }
         assetCurrent.setGlym(a.toString());
         StringBuilder b = new StringBuilder();
+        List<Acomma> a2 = new ArrayList<>();
         if (assetCurrent.getGlIpList() != null) {
-            assetCurrent.setGlIp(assetCurrent.getGlIpList().toString());
+            if (assetCurrent.getGlIp() != null && !assetCurrent.getGlIp().isEmpty()) {
+                for (Object o : JSONArray.parseArray(assetCurrent.getGlIp())) {
+                    Acomma acomma = new Acomma();
+                    JSONObject jsonObject = JSONObject.parseObject(o.toString());
+                    if (BeanUtil.isNotEmpty(jsonObject.get("key"))) {
+                        acomma.setKey(jsonObject.get("key").toString());
+                    } else {
+                        acomma.setKey("");
+                    }
+                    if (BeanUtil.isNotEmpty(jsonObject.get("ipType"))) {
+                        acomma.setIpType(jsonObject.get("ipType").toString());
+                    } else {
+                        acomma.setIpType("");
+                    }
+                    Object portValue = jsonObject.get("port");
+                    if (portValue != null && !portValue.toString().isEmpty()) {
+                        acomma.setPort(portValue.toString());
+                    }else{
+                        acomma.setPort("");
+                    }
+                    a2.add(acomma);
+                }
+                assetCurrent.setGlIpList(a2);
+            }
+
         } else {
-            assetCurrent.setGlIp("");
+            assetCurrent.setGlIpList(new ArrayList<>());
         }
 //        assetCurrent.setCurrentId(null);
         BeanUtils.copyProperties(assetCurrent, ac);
@@ -566,12 +591,36 @@ public class AssetTaskController extends BaseController {
         }
         assetCurrent.setGlym(a.toString());
         StringBuilder b = new StringBuilder();
+        List<Acomma> a2 = new ArrayList<>();
         if (assetCurrent.getGlIpList() != null) {
-            assetCurrent.setGlIp(assetCurrent.getGlIpList().toString());
+            if (assetCurrent.getGlIp() != null && !assetCurrent.getGlIp().isEmpty()) {
+                for (Object o : JSONArray.parseArray(assetCurrent.getGlIp())) {
+                    Acomma acomma = new Acomma();
+                    JSONObject jsonObject = JSONObject.parseObject(o.toString());
+                    if (BeanUtil.isNotEmpty(jsonObject.get("key"))) {
+                        acomma.setKey(jsonObject.get("key").toString());
+                    } else {
+                        acomma.setKey("");
+                    }
+                    if (BeanUtil.isNotEmpty(jsonObject.get("ipType"))) {
+                        acomma.setIpType(jsonObject.get("ipType").toString());
+                    } else {
+                        acomma.setIpType("");
+                    }
+                    Object portValue = jsonObject.get("port");
+                    if (portValue != null && !portValue.toString().isEmpty()) {
+                        acomma.setPort(portValue.toString());
+                    }else{
+                        acomma.setPort("");
+                    }
+                    a2.add(acomma);
+                }
+                assetCurrent.setGlIpList(a2);
+            }
+
         } else {
-            assetCurrent.setGlIp("");
+            assetCurrent.setGlIpList(new ArrayList<>());
         }
-
         assetCurrent.setStatus(1);
         Date date = new Date();
         assetCurrent.setUpdateTime(date);

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java

@@ -1057,4 +1057,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
     @ApiModelProperty("审核")
     @TableField(exist = false)
     private String auditState;
+
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型1:管理端，2：单位端")
+    private Integer type;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java

@@ -1043,4 +1043,13 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
     @TableField("is_zjhlwip")
     @ApiModelProperty("是否自建互联网专线ip")
     private String isZjhlwip;
+
+
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型1:管理端，2：单位端")
+    private Integer type;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java

@@ -1078,4 +1078,11 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
      */
     @ApiModelProperty("是否自建互联网专线ip")
     private String isZjhlwip;
+
+    /**
+     * 审核
+     */
+    @ApiModelProperty("类型1:管理端，2：单位端")
+    private Integer type;
+
 }