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/common/config/BladeConfiguration.java | 1
src/main/java/org/springblade/modules/catalog/service/catalogService.java | 3 +
src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml | 27 +++++++++++++
src/main/java/org/springblade/modules/equipment/entity/Equipment.java | 1
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 1
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 5 ++
src/main/java/org/springblade/modules/nettyServer/ServerHandler.java | 6 ++
src/main/java/org/springblade/modules/catalog/controller/catalogController.java | 43 +++++++++++++++++++++
src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java | 15 +++++++
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java | 1
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java | 5 ++
src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java | 3 +
12 files changed, 110 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index b3c6725..c506c06 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -70,6 +70,7 @@
secureRegistry.excludePathPatterns("/position/position/**");
secureRegistry.excludePathPatterns("/deploy/deploy/**");
secureRegistry.excludePathPatterns("/feedback/feedback/**");
+ secureRegistry.excludePathPatterns("/netty/netty/**");
secureRegistry.excludePathPatterns("/regions/regions/**");
secureRegistry.excludePathPatterns("/position/position/**");
secureRegistry.excludePathPatterns("/street/street/**");
diff --git a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
index 9feb09b..6243e4b 100644
--- a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
+++ b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
@@ -188,4 +188,47 @@
return R.data(lists);
}
+
+ /**
+ * 按行政区统计用户数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectAddvcd")
+ public R selectAddvcd(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");
+ List<Map<String, Object>> list = catalogService.selectAddvcd();
+ return R.data(list);
+ }
+
+ /**
+ * 按行政区统计设备数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectEq")
+ public R selectEq(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");
+ List<Map<String, Object>> list = catalogService.selectEq();
+ return R.data(list);
+ }
+
+ /**
+ * 按警情类型查询数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectWar")
+ public R selectWar(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");
+ List<Map<String, Object>> list = catalogService.selectWar();
+ return R.data(list);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
index 72f1221..af232ea 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
@@ -35,6 +35,9 @@
public interface catalogMapper extends BaseMapper<catalog> {
List<Map<String, Object>> selectCatalogList();
List<Map<String, Object>> selectCount();
+ List<Map<String, Object>> selectAddvcd();
+ List<Map<String, Object>> selectEq();
+ List<Map<String, Object>> selectWar();
String selectCatalogEqNUmber(String pid);
}
diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
index 2046e31..4491447 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
@@ -40,5 +40,32 @@
sys_security WHERE type=1
</select>
+ <select id="selectAddvcd" resultType="java.util.HashMap">
+ SELECT
+ COUNT(*) AS value,
+ s.addvcd,
+ d.addvnm as name
+FROM
+ sys_suser s
+ LEFT JOIN sys_district d ON d.addvcds = s.addvcd
+GROUP BY
+ s.addvcd
+ </select>
+ <select id="selectEq" resultType="java.util.HashMap">
+ SELECT
+ COUNT(*) AS value,
+ s.addvcd,
+ d.addvnm as name
+FROM
+ sys_equipment s
+ LEFT JOIN sys_district d ON d.addvcds = s.addvcd
+ WHERE s.parent_id!=0
+GROUP BY
+ s.addvcd
+ </select>
+ <select id="selectWar" resultType="java.util.HashMap">
+ SELECT COUNT(*) as cou,waringType FROM `sys_alarm` GROUP BY waringType
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/catalog/service/catalogService.java b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
index b001220..a671c77 100644
--- a/src/main/java/org/springblade/modules/catalog/service/catalogService.java
+++ b/src/main/java/org/springblade/modules/catalog/service/catalogService.java
@@ -36,4 +36,7 @@
List<Map<String, Object>> selectCatalogList();
String selectCatalogEqNUmber(String pid);
List<Map<String, Object>> selectCount();
+ List<Map<String, Object>> selectAddvcd();
+ List<Map<String, Object>> selectEq();
+ List<Map<String, Object>> selectWar();
}
diff --git a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
index 4660c38..ce8dca1 100644
--- a/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
+++ b/src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java
@@ -55,4 +55,19 @@
public List<Map<String, Object>> selectCount() {
return baseMapper.selectCount();
}
+
+ @Override
+ public List<Map<String, Object>> selectAddvcd() {
+ return baseMapper.selectAddvcd();
+ }
+
+ @Override
+ public List<Map<String, Object>> selectEq() {
+ return baseMapper.selectEq();
+ }
+
+ @Override
+ public List<Map<String, Object>> selectWar() {
+ return baseMapper.selectWar();
+ }
}
diff --git a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
index 7604af1..6e43b18 100644
--- a/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
+++ b/src/main/java/org/springblade/modules/equipment/entity/Equipment.java
@@ -110,6 +110,7 @@
private String channelNumber;
private String pay;
private String expireTime;
+ private String heartbeat;
}
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 a4d625f..044562e 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -61,4 +61,5 @@
List<EquipmentVOS> selectList(String deviceType);
EquipmentVOS selectInfo(Equipment equipment);
List<Map<String, Object>> selectInfos(String deviceNumber);
+ void updateChannel(String heartbeat,String deviceNumber);
}
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 55ead26..639252f 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -23,6 +23,7 @@
<result column="channelNumber" property="channelNumber"/>
<result column="pay" property="pay"/>
<result column="expireTime" property="expireTime"/>
+ <result column="heartbeat" property="heartbeat"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -203,4 +204,8 @@
LEFT JOIN sys_street s ON s.id = dept.street WHERE dept.deviceNumber=#{deviceNumber}
</select>
+ <update id="updateChannel">
+ update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
+</update>
+
</mapper>
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 3899bb0..0820556 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -66,4 +66,5 @@
* @return
*/
List<EquipmentVOS> selectList(String deviceType);
+ void updateChannel(String heartbeat,String deviceNumber);
}
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 17de56c..b06c103 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
@@ -96,4 +96,9 @@
return baseMapper.selectList(deviceType);
}
+ @Override
+ public void updateChannel(String heartbeat, String deviceNumber) {
+ baseMapper.updateChannel(heartbeat, deviceNumber);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java b/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
index af535c3..d06ed1e 100644
--- a/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
+++ b/src/main/java/org/springblade/modules/nettyServer/ServerHandler.java
@@ -183,13 +183,13 @@
case "LD":
{
// if (Pattern.matches(content, reg_LD))
+ String deviceNumber = content.substring(10, 22);
String keyword = content.substring(23, 27);
System.out.println(keyword);
switch(keyword)
{
case "IMEI":
{
- System.out.println("IMEI------------------");
Date d = new Date();
SimpleDateFormat sbf = new SimpleDateFormat("MMddHHmm");
outData.add("LC8C0470" + sbf.format(d) + "#@" + "LEOK#@");
@@ -212,6 +212,10 @@
}
case "TEST":
{
+ Date d = new Date();
+ SimpleDateFormat sbf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String format = sbf.format(d);
+ serverHandler.equipmentService.updateChannel(format,deviceNumber);
outData.add("LEOK#@");
outData.add("LEON#@");
break;
--
Gitblit v1.9.3