Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java

@@ -19,8 +19,10 @@
import io.swagger.annotations.*;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;

import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -44,7 +46,7 @@
import java.util.Map;

/**
 *  控制器
 * 控制器
 *
 * @author BladeX
 * @since 2020-07-01
@@ -65,10 +67,10 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入equipment")
   public R<EquipmentVOS> detail(Equipment equipment,HttpServletResponse response) {
   public R<EquipmentVOS> detail(Equipment equipment, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      /*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/

      return R.data(equipmentService.selectInfo(equipment));
@@ -91,32 +93,56 @@
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入equipment")
   public R<IPage<EquipmentVO>> page(EquipmentVO equipment, Query query,String pid, HttpServletResponse response) {
   public R<List<Equipment>> page(EquipmentVO equipment, Query query, String pid, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      IPage<EquipmentVO> pages;
      if (pid==null){
          pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
      }
      else {
         String s = catalogService.selectCatalogEqNUmber(pid);
         if(s==null){
            pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
         }else{
            String[] split = s.split(",");
            String strArrays="";
            for(int i=0;i<split.length;i++){
               strArrays+="'"+split[i]+"',";
      response.setHeader("Access-Control-Allow-Credentials", "true");

      //清空全局参数
      childMenu = new ArrayList();

      //根据查询条件得到所有设备
      List<Equipment> pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());

      List<Equipment> datas = new ArrayList<>();

      if (pid == null) {
         datas = pages;
      } else {
         List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
         //根据传入的id递归出该节点下所有的设备
         List<Map<String, Object>> childList = treeMenuList(treedatas, Integer.parseInt(pid));
         //将得到的设备与查询所得设备进行匹配
         for (int i = 0; i < childList.size(); i++) {
            for (int j = 0; j < pages.size(); j++) {
               if (childList.get(i).get("eqid") != null) {
                  if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
                     datas.add(pages.get(j));
                  }
               }
            }
            String substring = strArrays.substring(0,strArrays.length()-1);
            equipment.setDeviceNumber(substring);
            pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
         }
      }
      return R.data(datas);
   }

   //子节点
   private static List childMenu = new ArrayList();

   public static List treeMenuList(List<Map<String, Object>> menuList, int pid) {
      for (int i = 0; i < menuList.size(); i++) {
         //遍历出父id等于参数的id，add进子节点集合

         if (pid != 0) {
            if (menuList.get(i).get("pId").equals(pid)) {
               //递归遍历下一级
               treeMenuList(menuList, Integer.valueOf((Integer) menuList.get(i).get("id")));
               childMenu.add(menuList.get(i));
            }
         }

      }

      return R.data(pages);
      return childMenu;
   }

   /**
@@ -135,8 +161,8 @@
      equipmentService.s(equipment);
      String deviceNumber = equipment.getDeviceNumber();
      String deviceName = equipment.getDeviceName();
      String bType="0";
      iDeployService.insterb(deviceNumber,deviceName,bType);
      String bType = "0";
      iDeployService.insterb(deviceNumber, deviceName, bType);
      return R.success("成功");
   }

@@ -204,14 +230,15 @@

   /**
    * 设备列表
    * @param deviceType  设备类型
    *
    * @param deviceType 设备类型
    * @return
    */
   @GetMapping("/selectList")
   public R<List<EquipmentVOS>> selectList(String deviceType, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      List<EquipmentVOS> list = equipmentService.selectList(deviceType);
      return R.data(list);
   }