From 92cd9131fa7d8929fa63bc01fb3054069af23062 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 10 Mar 2021 20:31:53 +0800
Subject: [PATCH] 客户管理完善
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 98 +++++++++----------------------------------------
1 files changed, 18 insertions(+), 80 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 839243f..dedb107 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -20,12 +20,14 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.omg.PortableInterceptor.INACTIVE;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.Func;
+import org.springblade.jfpt.catalog.entitly.catalog;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.deploy.service.IDeployService;
import org.springblade.jfpt.equipment.entity.Equipment;
@@ -137,7 +139,7 @@
//根据查询条件得到所有设备
page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, null);
} else {
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(null);
//根据传入的id递归出该节点下所有的设备
List<Map<String, Object>> childList = treeIdList(treedatas, pid);
@@ -145,7 +147,11 @@
//根据查询条件得到所有设备
page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, childList);
} else {
- page = null;
+ List<Map<String, Object>> ces = catalogService.selectCatalogEqNUmber(pid);
+ List list = new ArrayList();
+ list.add(ces.get(0).get("eqid"));
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, list);
}
}
@@ -175,82 +181,6 @@
return R.data(page);
}
- /**
- * 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<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");
-
- //清空全局参数
- childMenu = new ArrayList();
-
- //根据查询条件得到所有设备
- IPage<EquipmentVO> pageData = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, null);
-
- List<EquipmentVO> pages = pageData.getRecords();
- 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);
- }
- }
- datas = pages;
- } else {
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber();
- //根据传入的id递归出该节点下所有的设备
- List<Map<String, Object>> childList = treeMenuList(treedatas, 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 && !childList.get(i).get("eqid").equals("")) {
- if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
- datas.add(pages.get(j));
- }
- }
- }
- }
- }
-
- pageData.setRecords(datas);
- pageData.setTotal(datas.size());
- return R.data(pageData);
- }
//子节点
private static List childMenu = new ArrayList();
@@ -331,7 +261,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入equipment")
- public R submit(@Valid @RequestBody Equipment equipment) {
+ public R submit(@Valid @RequestBody EquipmentVO equipment) {
if (equipment.getStime() != null && equipment.getStime().equals("")) {
equipment.setStime(null);
}
@@ -343,9 +273,17 @@
if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
+
String deviceName = equipment.getDeviceName();
String deviceNumber = equipment.getDeviceNumber();
- catalogService.updateCatalog(deviceName,deviceNumber);
+ String pId = equipment.getPid();
+ if (equipment.getId() == null){
+ catalogService.addCatalog(deviceName,deviceNumber,pId);
+ }else{
+ catalogService.updateCatalog(deviceName,deviceNumber,pId);
+ }
+
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
--
Gitblit v1.9.3