From 5b6e4a9e17e2425b43e3a6957115366e84ba8ce5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 06 Apr 2021 14:30:34 +0800
Subject: [PATCH] 1.监控台接口 2.客户管理

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java |   87 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 74 insertions(+), 13 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..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
@@ -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;
 
@@ -42,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.*;
 
 /**
  * 控制器
@@ -182,6 +180,44 @@
 	}
 
 
+	/**
+	 * 自定义分页(部门挂接)
+	 */
+	@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();
 
@@ -274,16 +310,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));
 	}
 
@@ -362,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