树状列表新增查找类型

下发指令修改

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,8 +37,8 @@ public class DyLevelController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getdyTreeList")
     @Log(title = "获取电压等级树状列表接口", type = "查询")
-    public ResponseReult<DyLineTreeListModel> getdyTreeList() {
+    public ResponseReult<DyLineTreeListModel> getdyTreeList(@Param("type") Integer type) {
-        ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getdyTreeList();
+        ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getdyTreeList(type);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java

@@ -68,4 +68,18 @@ public class TermSetController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "设备控制接口", notes = "设备控制接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/setTermCamera")
+    @Log(title = "设备控制接口", type = "查询")
+    public ResponseReult<CmaRequestModel> setTermCamera(UpdateCameraVo vo) {
+        ServiceBody<CmaRequestModel> serviceBody = termSetService.updateTermCamera(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 }

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java

@@ -13,7 +13,7 @@ public interface DyLevelDao {
 
     List<DyAndLineAndTowerAndTermDto> selectDyAndLineAndTowerAnTermList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("termid") Integer termid, @Param("search") String search, @Param("status") Integer status);
 
-    List<DyLineAndTowertDto> selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid,@Param("status") Integer status);
+    List<DyLineAndTowertDto> selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("status") Integer status);
 
     int deleteByPrimaryKey(Integer id);
 
@@ -25,7 +25,7 @@ public interface DyLevelDao {
 
     List<DyLevel> selectAll(@Param("status") Integer status);
 
-    List<DyLineAndTerminalWithHeartDto> selectTreeList(@Param("status") Integer status);
+    List<DyLineAndTerminalWithHeartDto> selectTreeList( @Param("status") Integer status);
 
     List<DyLineAndTerminalNoHeartDto> selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status);
 

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

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -55,7 +56,7 @@ public class DyLevelServiceImpl implements DyLevelService {
      * @return
      */
     @Override
-    public ServiceBody<DyLineTreeListModel> getdyTreeList() {
+    public ServiceBody<DyLineTreeListModel> getdyTreeList(Integer type) {
         DyLineTreeListModel model = new DyLineTreeListModel();
         List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value());
         boolean empty = CollectionUtil.isEmpty(list);
@@ -64,27 +65,81 @@ public class DyLevelServiceImpl implements DyLevelService {
         } else {
             int onlinenum = 0;
             int totalnum = 0;
-            List<DyLineTreeListModel.DyListBean> beans = BeanUtil.copyToList(list, DyLineTreeListModel.DyListBean.class, CopyOptions.create().ignoreCase());
+            ArrayList<DyLineTreeListModel.DyListBean> dyListBeans = new ArrayList<>();
-            for (int i = 0; i < beans.size(); i++) {
+            for (int i = 0; i < list.size(); i++) {
-                for (int j = 0; j < beans.get(i).getList().size(); j++) {
+                DyLineAndTerminalWithHeartDto dyDto = list.get(i);
-                    for (int k = 0; k < beans.get(i).getList().get(j).getList().size(); k++) {
+                List<LineAndTerminalWithHeartDto> linelist = dyDto.getList();
+                if (CollectionUtil.isEmpty(linelist)) {
+                    continue;
+                }
+                DyLineTreeListModel.DyListBean dyModel = new DyLineTreeListModel.DyListBean();
+                dyModel.setId(dyDto.getId());
+                dyModel.setDyValue(dyDto.getDyValue());
+                dyModel.setName(dyDto.getName());
+                ArrayList<DyLineTreeListModel.LineBean> lineBeans = new ArrayList<>();
+                for (int j = 0; j < linelist.size(); j++) {
+                    LineAndTerminalWithHeartDto lineDto = linelist.get(j);
+                    List<TerminalsWithHeart> termlist = lineDto.getList();
+                    if (CollectionUtil.isEmpty(termlist)) {
+                        continue;
+                    }
+                    DyLineTreeListModel.LineBean lineBean = new DyLineTreeListModel.LineBean();
+                    lineBean.setId(lineDto.getId());
+                    lineBean.setName(lineDto.getName());
+                    lineBean.setBsManufacturer(lineDto.getBsManufacturer());
+
+                    ArrayList<DyLineTreeListModel.TerminalBean> beanlist = new ArrayList<>();
+                    for (int k = 0; k < termlist.size(); k++){
                         totalnum++;
-                        TerminalsWithHeart terminalsWithHeart = list.get(i).getList().get(j).getList().get(k);
+                        TerminalsWithHeart terminalsWithHeart = termlist.get(k);
+
+                        DyLineTreeListModel.TerminalBean bean = new DyLineTreeListModel.TerminalBean();
+                        bean.setId(terminalsWithHeart.getId());
+                        bean.setAddress(terminalsWithHeart.getAddress());
+                        bean.setCmdid(terminalsWithHeart.getCmdid());
+                        bean.setDisplayname(terminalsWithHeart.getDisplayname());
+                        bean.setEquipname(terminalsWithHeart.getEquipname());
+                        bean.setModel(terminalsWithHeart.getModel());
+                        bean.setName(terminalsWithHeart.getName());
+                        bean.setProtocol(terminalsWithHeart.getProtocol());
+                        bean.setTowerid(terminalsWithHeart.getTowerid());
                         BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat();
                         boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat);
+                        if (type == null || type.intValue() == -1) {//查询全部
+                            if (b) {
+                                bean.setOnlinestatus(CommonStatus.EFFECTIVE.value());
+                                onlinenum++;
+                            } else {
+                                bean.setOnlinestatus(CommonStatus.DELETE.value());
+                            }
+                            beanlist.add(bean);
+                        } else if (type.intValue() == 0) {
                             if (b) {
-                            beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.EFFECTIVE.value());
                                 onlinenum++;
+                                bean.setOnlinestatus(CommonStatus.EFFECTIVE.value());
                             } else {
-                            beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.DELETE.value());
+                                bean.setOnlinestatus(CommonStatus.DELETE.value());
+                                beanlist.add(bean);
                             }
+                        } else if (type.intValue() == 1) {
+                            if (b) {
+                                onlinenum++;
+                                bean.setOnlinestatus(CommonStatus.EFFECTIVE.value());
+                                beanlist.add(bean);
+                            } else {
+                                bean.setOnlinestatus(CommonStatus.DELETE.value());
                             }
                         }
                     }
-
+                    lineBean.setList(beanlist);
+                    lineBeans.add(lineBean);
+                }
+                dyModel.setList(lineBeans);
+                dyListBeans.add(dyModel);
+            }
             model.setOnlineNum(onlinenum);
             model.setTotalNum(totalnum);
-            model.setList(beans);
+            model.setList(dyListBeans);
         }
         return Asserts.success(model);
     }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java

@@ -20,7 +20,7 @@ public interface DyLevelService {
      *
      * @return
      */
-    ServiceBody<DyLineTreeListModel> getdyTreeList();
+    ServiceBody<DyLineTreeListModel> getdyTreeList(Integer type);
 
 
     /**