From b5bc0b851586c8ac4c74602a173fa5c141ef1353 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jan 2021 23:42:11 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 27 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 5c17f5a..8a0438e 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/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;
@@ -38,13 +40,15 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2020-07-01
@@ -65,10 +69,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 +95,89 @@
@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) throws ParseException {
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<EquipmentVO> pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+
+ List<EquipmentVO> datas = new ArrayList<>();
+
+ if (pid == null || pid.equals("")) {
+ for (int j = 0; j < pages.size(); j++) {
+ String expireTime = pages.get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ //把string类型转换为long类型的
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
}
- String substring = strArrays.substring(0,strArrays.length()-1);
- equipment.setDeviceNumber(substring);
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ }
+ 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++) {
+ String expireTime = pages.get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ //把string类型转换为long类型的
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
+ }
+
+ if (childList.get(i).get("eqid") != null) {
+ if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
+ datas.add(pages.get(j));
+ }
+ }
+ }
+ }
+ }
+ 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 +196,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 +265,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);
}
--
Gitblit v1.9.3