From b5bc0b851586c8ac4c74602a173fa5c141ef1353 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jan 2021 23:42:11 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/Netty/controller/nettyController.java | 23 +++++++++++
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 4 ++
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 10 ++++
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 22 ++++++++++-
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 2 +
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java | 10 +++++
6 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
index fa922f8..e9a0ed8 100644
--- a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
+++ b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -159,21 +159,33 @@
int zT = 0;
+ String arr = "";
+
+
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
if (childList.get(i).get("eqid") != null) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
+ zT = 1;
+ arr += pages.get(j).getId() + ",";
List<String> outData = new ArrayList<>();
outData.add("LC8109085B#@");
Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ break;
}
}
}
}
+
+ if (!arr.equals("")){
+ String substring = arr.substring(0, arr.length() - 1);
+ equipmentService.updataType(substring);
+ }
+
if (zT == 0) {
- return R.success("暂无设备撤");
+ return R.success("暂无设备布防");
}
return R.success("设备布防");
}
@@ -201,11 +213,15 @@
int zT = 0;
+ String arr = "";
+
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
if (childList.get(i).get("eqid") != null) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
+ zT = 1;
+ arr += pages.get(j).getId() + ",";
List<String> outData = new ArrayList<>();
outData.add("LC8109085C#@");
Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
@@ -215,6 +231,11 @@
}
}
+ if (!arr.equals("")){
+ String substring = arr.substring(0, arr.length() - 1);
+ equipmentService.updataTypeC(substring);
+ }
+
if (zT == 0) {
return R.success("暂无设备布防");
}
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 dfd0eb7..8a0438e 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -108,7 +108,24 @@
List<EquipmentVO> datas = new ArrayList<>();
- if (pid == null) {
+ if (pid == null || pid.equals("")) {
+ 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);
+ } else {
+ pages.get(j).setType(0);
+ }
+ }
datas = pages;
} else {
List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
@@ -117,7 +134,6 @@
//将得到的设备与查询所得设备进行匹配
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();
@@ -130,6 +146,8 @@
int day = (int) ((st - en) / 86400000);
if (day <= 30) {
pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
}
if (childList.get(i).get("eqid") != null) {
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 044562e..066df9b 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -38,6 +38,8 @@
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void updataType(String arr);
+ void updataTypeC(String arr);
/**
* 树形结构
*
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
index 639252f..fea01e7 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -134,7 +134,15 @@
update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
ownership=#{ownership},ownerId=#{yname},devicestate=#{devicestate},stime=#{stime},
coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
-</update>
+ </update>
+
+ <update id="updataType">
+ update sys_equipment SET devicestate = 1 where id in (#{arr})
+ </update>
+
+ <update id="updataTypeC">
+ update sys_equipment SET devicestate = 0 where id in (#{arr})
+ </update>
<update id="updateOnes" parameterType="org.springblade.modules.equipment.entity.Equipment">
update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
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 0820556..a6df8ca 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -47,6 +47,10 @@
void s(Equipment equipment);
+ void updataType(String arr);
+
+ void updataTypeC(String arr);
+
/**
* 懒加载
*
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 b06c103..354992f 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
@@ -69,6 +69,16 @@
}
@Override
+ public void updataType(String arr) {
+ baseMapper.updataType(arr);
+ }
+
+ @Override
+ public void updataTypeC(String arr) {
+ baseMapper.updataTypeC(arr);
+ }
+
+ @Override
public List<EquipmentVOS> lazyList(Long parentId, Map<String, Object> param) {
// 判断点击搜索但是没有查询条件的情况
if (Func.isEmpty(param.get(PARENT_ID)) && param.size() == 1) {
--
Gitblit v1.9.3