From 0418a51d3dd29da8b0e8c62f88fcf0ba8e10410e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:11:45 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 2 +-
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 24 +++++++++++++++++++++---
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 2 +-
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java | 2 +-
4 files changed, 24 insertions(+), 6 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 9ac58ec..2d5fa03 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -40,7 +40,9 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -93,7 +95,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入equipment")
- public R<List<Equipment>> 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");
@@ -102,9 +104,9 @@
childMenu = new ArrayList();
//根据查询条件得到所有设备
- List<Equipment> pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
+ List<EquipmentVO> pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
- List<Equipment> datas = new ArrayList<>();
+ List<EquipmentVO> datas = new ArrayList<>();
if (pid == null) {
datas = pages;
@@ -115,6 +117,22 @@
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
+
+ String expireTime = pages.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类型的
+ long st=sim.parse(expireTime).getTime();
+ long en=sim.parse(end).getTime();
+ //计算天数
+ int day=(int) ((st-en)/86400000);
+ if (day<=30){
+ pages.get(j).setType(1);
+ }
+
+
if (childList.get(i).get("eqid") != null) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
datas.add(pages.get(j));
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
index c03db3c..a4d625f 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -34,7 +34,7 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
- List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
+ List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
void s(Equipment equipment);
void updateOne(Equipment equipment);
diff --git a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
index 37cae41..3899bb0 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -34,7 +34,7 @@
*/
public interface IEquipmentService extends IService<Equipment> {
- List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
+ List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
/**
* 树形结构
diff --git a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
index 5013454..17de56c 100644
--- a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
@@ -47,7 +47,7 @@
private static final String PARENT_ID = "parentId";
@Override
- public List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
+ public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
}
--
Gitblit v1.9.3