From 9514f338dc8dfa6fc5310f6339f05c69e2e2375b Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 17:13:12 +0800
Subject: [PATCH] 1.用户列表调整 2.统计接口
---
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 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 5c17f5a..da1c409 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -19,8 +19,10 @@
import io.swagger.annotations.*;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -38,13 +40,13 @@
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.*;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2020-07-01
@@ -65,10 +67,10 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入equipment")
- public R<EquipmentVOS> detail(Equipment equipment,HttpServletResponse response) {
+ public R<EquipmentVOS> detail(Equipment equipment, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
/*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/
return R.data(equipmentService.selectInfo(equipment));
@@ -91,27 +93,71 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<IPage<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");
- IPage<EquipmentVO> pages;
- if (pid==null){
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
- }
- else {
- String s = catalogService.selectCatalogEqNUmber(pid);
- if(s==null){
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
- }else{
- String[] split = s.split(",");
- String strArrays="";
- for(int i=0;i<split.length;i++){
- strArrays+="'"+split[i]+"',";
+ 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);
}
- String substring = strArrays.substring(0,strArrays.length()-1);
- equipment.setDeviceNumber(substring);
- pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+ }
+ } 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 = "";
+ for (int i = 0; i < split.length; i++) {
+ strArrays += "'" + split[i] + "',";
+ }
+ 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);
+ }
+ }
}
}
@@ -135,8 +181,8 @@
equipmentService.s(equipment);
String deviceNumber = equipment.getDeviceNumber();
String deviceName = equipment.getDeviceName();
- String bType="0";
- iDeployService.insterb(deviceNumber,deviceName,bType);
+ String bType = "0";
+ iDeployService.insterb(deviceNumber, deviceName, bType);
return R.success("成功");
}
@@ -204,16 +250,18 @@
/**
* 设备列表
- * @param deviceType 设备类型
+ *
+ * @param deviceType 设备类型
* @return
*/
@GetMapping("/selectList")
public R<List<EquipmentVOS>> selectList(String deviceType, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
List<EquipmentVOS> list = equipmentService.selectList(deviceType);
return R.data(list);
}
+
}
--
Gitblit v1.9.3