客户列表接口修改

zengh

2021-01-09 855520e4e2863a07fb35c9c4616d505ff03add57

 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;
@@ -91,18 +93,17 @@
   @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<EquipmentVO>> 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;
      List<EquipmentVO> pages;
      if (pid==null){
          pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
      }
      else {
         pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
      } else {
         String s = catalogService.selectCatalogEqNUmber(pid);
         if(s==null){
            pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
            pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
         }else{
            String[] split = s.split(",");
            String strArrays="";
@@ -111,7 +112,7 @@
            }
            String substring = strArrays.substring(0,strArrays.length()-1);
            equipment.setDeviceNumber(substring);
            pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
            pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
         }

      }
@@ -204,6 +205,7 @@

   /**
    * 设备列表
    *
    * @param deviceType  设备类型
    * @return
    */