From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 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 21d2ff4..b43f634 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
@@ -35,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;
@@ -182,6 +183,44 @@
}
+ /**
+ * 自定义分页(部门挂接)
+ */
+ @GetMapping("/pageDept")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入equipment")
+ public R<IPage<EquipmentVO>> pageDept(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 = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid);
+
+ 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();
@@ -274,16 +313,16 @@
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);
- }
+// 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));
}
--
Gitblit v1.9.3