From d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 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 37d9b53..32a5033 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
@@ -43,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.*;
/**
* 控制器
@@ -189,13 +186,35 @@
@GetMapping("/pageDept")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<EquipmentVO>> pageDept(EquipmentVO equipment, Query query, String pid, HttpServletResponse response) throws ParseException {
+ 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> pages = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid);
- return R.data(pages);
+ 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);
}
@@ -300,7 +319,7 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
-
+ System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -379,4 +398,29 @@
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