From fae887eb975771123b0a559315a15eac72a35f56 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 11:12:01 +0800
Subject: [PATCH] 1.用户列表调整 2.统计接口
---
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
index 337ac3f..da1c409 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -40,10 +40,10 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 控制器
@@ -93,17 +93,47 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<List<EquipmentVO>> page(EquipmentVO equipment, Query query, String pid, HttpServletResponse response) {
+ public R<List<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");
List<EquipmentVO> pages;
if (pid == null) {
pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ for(int i=0;i<pages.size();i++){
+ String expireTime = pages.get(i).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(i).setType(1);
+ }
+ }
} else {
String s = catalogService.selectCatalogEqNUmber(pid);
if (s == null) {
pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ for(int i=0;i<pages.size();i++){
+ String expireTime = pages.get(i).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(i).setType(1);
+ }
+ }
} else {
String[] split = s.split(",");
String strArrays = "";
@@ -113,6 +143,21 @@
String substring = strArrays.substring(0, strArrays.length() - 1);
equipment.setDeviceName(substring);
pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ for(int i=0;i<pages.size();i++){
+ String expireTime = pages.get(i).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(i).setType(1);
+ }
+ }
}
}
@@ -218,4 +263,5 @@
return R.data(list);
}
+
}
--
Gitblit v1.9.3