From c50e7293cb05a212d9c67828e42cbc82f28d087d Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 07 Jan 2021 17:24:53 +0800
Subject: [PATCH] 1.netty调整 2.客户列表
---
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
index 74f3136..5c17f5a 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -26,6 +26,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.catalog.service.catalogService;
import org.springblade.modules.deploy.service.IDeployService;
import org.springblade.modules.equipment.vo.EquipmentVOS;
import org.springblade.modules.equipment.wrapper.EqWrapper;
@@ -56,6 +57,7 @@
private final IEquipmentService equipmentService;
private final IDeployService iDeployService;
+ private final catalogService catalogService;
/**
* 详情
@@ -89,8 +91,31 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<EquipmentVO>> page(EquipmentVO equipment, Query query) {
- IPage<EquipmentVO> pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ public R<IPage<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;
+ 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]+"',";
+ }
+ String substring = strArrays.substring(0,strArrays.length()-1);
+ equipment.setDeviceNumber(substring);
+ pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ }
+
+ }
+
return R.data(pages);
}
--
Gitblit v1.9.3