From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 277 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 191 insertions(+), 86 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 4d428c8..aa0c3de 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;
@@ -33,6 +35,7 @@
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
import org.springblade.jfpt.equipment.wrapper.EqWrapper;
+import org.springblade.system.user.entity.User;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -40,10 +43,7 @@
import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 控制器
@@ -88,59 +88,22 @@
}
/**
- * 自定义分页
+ * 查询所有
*/
- @GetMapping("/pages")
- @ApiOperationSupport(order = 3)
+ @GetMapping("/listAll")
+ @ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<EquipmentVO>> pages(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");
+ public R<List<EquipmentVO>> listAll(EquipmentVO equipment, Query query) throws ParseException {
+ List<EquipmentVO> pages = equipmentService.listAll(equipment);
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
- //根据传入的id递归出该节点下所有的设备
- List<Map<String, Object>> childList = treeIdList(treedatas, pid);
-
-
- System.out.println(childList);
-
-
-
-
- return R.data(null);
- }
-
- /**
- * 自定义分页
- */
- @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);
-
- 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类型的
+ 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类型的
+ if (expireTime != null) {
long st = sim.parse(expireTime).getTime();
long en = sim.parse(end).getTime();
//计算天数
@@ -151,43 +114,127 @@
pages.get(j).setType(0);
}
}
- datas = pages;
+
+
+ //判断设备是否在线
+ String Heartbeat = pages.get(j).getHeartbeat();
+ if (Heartbeat != null){
+ long st = sim.parse(Heartbeat).getTime();
+ long en = sim.parse(end).getTime();
+ if ((en - st) >= (60 * 60 * 24 * 1000)){
+ pages.get(j).setOnlineStatus("0");
+ }else{
+ pages.get(j).setOnlineStatus("1");
+ }
+ }else{
+ pages.get(j).setOnlineStatus("0");
+ }
+
+ }
+
+
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义分页
+ */
+ @GetMapping("/pages")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入equipment")
+ public R<IPage<EquipmentVO>> pages(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> page = null;
+ //清空全局参数
+ childMenu = new ArrayList();
+
+ if (pid == null || pid.equals("")) {
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, null);
} else {
- List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
+ List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(null);
//根据传入的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类型的
+ List<Map<String, Object>> childList = treeIdList(treedatas, pid);
+
+ if (childList.size() > 0) {
+ //根据查询条件得到所有设备
+ page = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment, childList);
+ } else {
+ 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);
+ }
+ }
+
+ if (page != null) {
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ String expireTime = page.getRecords().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类型的
+
+ if (expireTime != null) {
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);
+ page.getRecords().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));
- }
+ page.getRecords().get(j).setType(0);
}
}
}
}
- pageData.setRecords(datas);
- pageData.setTotal(datas.size());
- return R.data(pageData);
+ return R.data(page);
}
+
+
+ /**
+ * 自定义分页(部门挂接)
+ */
+ @GetMapping("/pageDept")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入equipment")
+ public R<IPage<EquipmentVO>> pageDept(EquipmentVO equipment, Query query, String pid, String dxtype, 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> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid, dxtype);
+
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ String expireTime = page.getRecords().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类型的
+
+ if (expireTime != null) {
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ page.getRecords().get(j).setType(1);
+ } else {
+ page.getRecords().get(j).setType(0);
+ }
+ }
+ }
+
+ return R.data(page);
+ }
+
//子节点
private static List childMenu = new ArrayList();
@@ -197,9 +244,9 @@
//遍历出父id等于参数的id，add进子节点集合
if (!pid.equals(0)) {
- if (menuList.get(i).get("pId").toString().equals(pid) ) {
+ if (menuList.get(i).get("pId").toString().equals(pid)) {
//递归遍历下一级
- treeMenuList(menuList, menuList.get(i).get("id").toString());
+ treeMenuList(menuList, menuList.get(i).get("id").toString());
childMenu.add(menuList.get(i));
}
}
@@ -213,10 +260,10 @@
//遍历出父id等于参数的id，add进子节点集合
if (!pid.equals(0)) {
- if (menuList.get(i).get("pId").toString().equals(pid) ) {
+ if (menuList.get(i).get("pId").toString().equals(pid)) {
//递归遍历下一级
- treeIdList(menuList, menuList.get(i).get("id").toString());
- if (menuList.get(i).get("eqid") != null || menuList.get(i).get("eqid") != "") {
+ treeIdList(menuList, menuList.get(i).get("id").toString());
+ if (menuList.get(i).get("eqid") != null && !menuList.get(i).get("eqid").equals("")) {
childMenu.add(menuList.get(i).get("eqid"));
}
}
@@ -268,19 +315,29 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入equipment")
- public R submit(@Valid @RequestBody Equipment equipment) {
- if (equipment.getStime() != null && equipment.getStime().equals("")){
+ public R submit(@Valid @RequestBody EquipmentVO equipment) {
+ if (equipment.getStime() != null && equipment.getStime().equals("")) {
equipment.setStime(null);
}
- if (equipment.getExpireTime() != null && equipment.getExpireTime().equals("")){
+ if (equipment.getExpireTime() != null && equipment.getExpireTime().equals("")) {
equipment.setExpireTime(null);
}
- if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")){
+ if (equipment.getHeartbeat() != null && equipment.getHeartbeat().equals("")) {
equipment.setHeartbeat(null);
}
+// String deviceName = equipment.getDeviceName();
+// String deviceNumber = equipment.getDeviceNumber();
+// String pId = equipment.getPid();
+// if (equipment.getId() == null){
+// catalogService.addCatalog(deviceName,deviceNumber,pId);
+// }else{
+// catalogService.updateCatalog(deviceName,deviceNumber,pId);
+// }
+
+ System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -337,4 +394,52 @@
return R.data(list);
}
+ /**
+ * 修改
+ */
+ @PostMapping("/updateexpireTime")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入equipment")
+ public R updateexpireTime(String expireTime, String deviceNumber) {
+ equipmentService.updateexpireTime(expireTime, deviceNumber);
+ return R.success("修改成功");
+ }
+
+ /**
+ * 设备故障修改
+ */
+ @PostMapping("/updateExstate")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入equipment")
+ public R updateExstate(String state, String reason, String deviceNumber) {
+ equipmentService.updateExstate(state, reason, deviceNumber);
+ return R.success("修改成功");
+ }
+
+
+ /**
+ * 监控台统计
+ *
+ * @return
+ */
+ @PostMapping("/SeleC")
+ public R SeleC() {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ String time = df.format(new Date());// new Date()为获取当前系统时间
+ //设备在线数量
+ Integer integerz = equipmentService.selectEqCz();
+ //设备掉线数量
+ Integer integerd = equipmentService.selectEqCd();
+ //设备预警数量
+ List<Map<String, Object>> list = equipmentService.selectEqCy(time);
+ //设备故障数量
+ Integer integerg = equipmentService.selectEqCg();
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("zx", integerz);
+ map.put("dx", integerd);
+ map.put("yj", list.size());
+ map.put("gz", integerg);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3