修改线路查询bug

xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java

@@ -8,14 +8,18 @@ import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.shxy.xymanager_common.bean.PermissionDetail;
+import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.config.CustomRsaProperties;
 import com.shxy.xymanager_common.dto.*;
 import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.enums.CommonStatus;
+import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.util.*;
+import com.shxy.xymanager_common.vo.UpdateTowerVo;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.CacheService;
 import com.shxy.xymanager_service.service.NewCacheService;
+import com.shxy.xymanager_service.service.TowerService;
 import com.shxy.xymanager_service.service.UserService;
 import io.swagger.models.auth.In;
 import org.junit.jupiter.api.Test;
@@ -66,6 +70,10 @@ class XymanagerAdminApplicationTests {
     UserService userService;
     @Autowired
     NewCacheService newCacheService;
+    @Autowired
+    TowerDao towerDao;
+    @Autowired
+    TowerService towerService;
     @Test
     void contextLoads() {
 
@@ -494,8 +502,18 @@ class XymanagerAdminApplicationTests {
 //
 //        System.out.println(s);
 
-        PermissionDetail permissionDetailFull = newCacheService.getPermissionDetailOver(24);
-        System.out.println(permissionDetailFull.toString());
+//        PermissionDetail permissionDetailFull = newCacheService.getPermissionDetailOver(24);
+//        System.out.println(permissionDetailFull.toString());
+
+
+        UpdateTowerVo towers = new UpdateTowerVo();
+        towers.setId(2);
+        towers.setName("ceshsish");
+        towers.setLineId(108);
+        towers.setOrder(1);
+        towers.setAddress("838837");
+        ServiceBody<String> serviceBody = towerService.updateTower(towers);
+        System.out.println(serviceBody);
     }
 
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java

@@ -85,9 +85,11 @@ public class LineServiceImpl implements LineService {
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
         example.setGroupByClause("line_id");
         example.setOrderByClause("id desc");
-        View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
         if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
-            criteria.andLineIdIn(pList);
+            if (CollectionUtil.isNotEmpty(pList)) {
+                View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+                criteria.andLineIdIn(pList);
+            }
         }
         if (StrUtil.isNotBlank(search)) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -160,7 +160,6 @@ public class TerminalServiceImpl implements TerminalService {
         if (StrUtil.isNotEmpty(search)) {
             or.andDyNameLike(search).andLineNameLike(search).andTowerNameLike(search).andCmdidLike(search);
         }
-
         if (BeanUtil.isNotEmpty(dyid) && dyid.intValue() != -1) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
             or2.andDyIdEqualTo(dyid);
@@ -173,7 +172,7 @@ public class TerminalServiceImpl implements TerminalService {
             View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
             or2.andTowerIdEqualTo(tower);
         }
-        if (BeanUtil.isNotEmpty(isonline)) {
+        if (BeanUtil.isNotEmpty(isonline) && isonline.intValue() != -1) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
             if (CommonStatus.EFFECTIVE.value().equals(isonline)) {
                 or2.andLastHeartbeatGreaterThanOrEqualTo(time.longValue());
@@ -745,7 +744,6 @@ public class TerminalServiceImpl implements TerminalService {
                         }
                     }
                 }
-
             }
         }
         return Asserts.success(modellist);

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java

@@ -41,6 +41,7 @@ public class TowerServiceImpl implements TowerService {
 
     @Autowired
     private TowerDao towerDao;
+
     @Autowired
     private View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao;
 
@@ -105,6 +106,7 @@ public class TowerServiceImpl implements TowerService {
                 towerBean.setName(item.getTowerName());
                 towerBean.setOrder(item.getOrder());
                 towerBean.setTermcount(item.getTermcount());
+                towerBean.setAddress(item.getAddress());
                 list1.add(towerBean);
             }
             model.setList(list1);