From fc6be1cc1f57eb54ec4fe2e9f5f23fe09fab653c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 16 Jul 2021 15:14:46 +0800
Subject: [PATCH] 警情任务分类显示问题修复
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java | 21 +++++
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 3
src/main/java/org/springblade/modules/alarm/service/IAlarmService.java | 14 +++
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 91 ++++++++++++++++++++++
src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java | 21 +++++
src/main/resources/application-dev.yml | 2
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java | 48 ++++++++++++
7 files changed, 198 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
index 14b8e54..6230b72 100644
--- a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
+++ b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -766,6 +766,54 @@
}
/**
+ * 查询当前保安需要处理和未处理的巡逻任务
+ * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的巡逻和已接收的巡逻,已处理完成的 2：未接收的 3：处理完成的
+ * @param response
+ * @param query 分页对象
+ * @return
+ */
+ @GetMapping("/APP-getPatrolListPage")
+ public R getPatrolListPage(AlarmVO alarmVO, HttpServletResponse response,Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ Map<String, Object> map = new HashMap<>(2);
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ List<AlarmVO> page = new ArrayList<>();
+ //不分页的情况
+ if (null == query.getCurrent()) {
+ //获取警情数量的集合
+ map.put("number",alarmService.getPatrolNumber(alarmVO));
+ //获取警情数据
+ page = alarmService.getPatrolList(alarmVO);
+ }
+ for (int j = 0; j < page.size(); j++) {
+ if (null!=page.get(j).getDeptId()){
+ String[] split = page.get(j).getDeptId().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+ //封装数据
+ map.put("page",page);
+ //返回数据
+ return R.data(map);
+ }
+
+
+ /**
* APP警情接受
* @param alarmVO
* @param response
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
index 94a268a..ec2b57e 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
@@ -180,4 +180,25 @@
* @return
*/
List<Integer> getAlarmNumber(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 查询当前保安需要处理和未处理以及处理完成的警情信息
+ * @param alarmVO 需包含保安人员id 2：未接收的 3：处理完成的 4.处理中
+ * @return
+ */
+ List<AlarmVO> getPatrolList(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 查询当前保安所有的警情信息
+ * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的警情和已接收的警情,已处理完成的
+ * @return
+ */
+ List<AlarmVO> getAllPatrolList(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 获取警情数量的集合,全部，未处理，已处理的数量
+ * @param alarmVO 需包含保安人员id
+ * @return
+ */
+ List<Integer> getPatrolNumber(@Param("alarm")AlarmVO alarmVO);
}
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 6d5ad03..1e484a3 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -666,6 +666,27 @@
1=1
</sql>
+ <sql id="getPatrolListSqlParam">
+ select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
+ a.deviceNumber,a.region,e.district,a.vaddress,a.aaddress,
+ a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
+ a.securityArr,a.securityId,
+ e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
+ e.stype,
+ e.oneId,
+ e.twoId,
+ e.threeId,
+ e.deptId,
+ e.deviceName,
+ a.place as place,
+ e.channelNumber
+ FROM
+ sys_alarm a
+ LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
+ WHERE
+ 1=1 AND a.alarmType = "巡逻任务"
+ </sql>
+
<!--查询当前保安所有警情信息-->
<!-- <select id="getAllAlarmList" resultMap="alarmResultMap">-->
<!-- (select * from (-->
@@ -745,6 +766,76 @@
where securityId =#{alarm.securityId} and jtype = 1)
</select>
+
+ <!--查询当前保安所有巡逻信息-->
+ <select id="getAllPatrolList" resultMap="alarmResultMap">
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and (securityId = "" or securityId IS NULL
+ AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ order by alarmTime desc limit 9999
+ )a)
+ union
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
+ )a)
+ union
+ (select * from (
+ <include refid="getPatrolListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999
+ )a)
+ </select>
+
+ <!--查询当前保安需要处理和未处理的巡逻信息-->
+ <select id="getPatrolList" resultMap="alarmResultMap">
+ <include refid="getPatrolListSqlParam"/>
+ <if test="alarm.status==2">
+ and (securityId = "" or securityId IS NULL
+ AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ order by alarmTime desc
+ </if>
+ <if test="alarm.status==3">
+ and securityId =#{alarm.securityId} and jtype = 2
+ order by alarmTime desc
+ </if>
+ <if test="alarm.status==4">
+ and securityId =#{alarm.securityId} and jtype = 1
+ order by alarmTime desc
+ </if>
+ </select>
+
+ <!--获取巡逻数量的集合,全部，未处理，已处理的数量-->
+ <select id="getPatrolNumber" resultType="java.lang.Integer">
+ (select ifnull(count(*),0) number from sys_alarm
+ where
+ alarmType = "巡逻任务" AND
+ (securityId =#{alarm.securityId}
+ or securityId = "" or securityId IS NULL
+ and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ )
+
+ UNION ALL
+ (select ifnull(count(*),0) number from sys_alarm
+ where
+ alarmType = "巡逻任务" AND
+ (securityId = "" or securityId IS NULL
+ and securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ )
+
+ UNION ALL
+ (select ifnull(count(*),0) number from sys_alarm
+ where
+ alarmType = "巡逻任务" AND
+ securityId =#{alarm.securityId} and jtype = 2)
+
+ UNION ALL
+ (select ifnull(count(*),0) number from sys_alarm
+ where
+ alarmType = "巡逻任务" AND
+ securityId =#{alarm.securityId} and jtype = 1)
+ </select>
+
<update id="setAlarm">
update sys_alarm SET securityId=#{alarm.securityId} where id=#{alarm.id}
</update>
diff --git a/src/main/java/org/springblade/modules/alarm/service/IAlarmService.java b/src/main/java/org/springblade/modules/alarm/service/IAlarmService.java
index 3e4d442..25db551 100644
--- a/src/main/java/org/springblade/modules/alarm/service/IAlarmService.java
+++ b/src/main/java/org/springblade/modules/alarm/service/IAlarmService.java
@@ -176,4 +176,18 @@
* @return
*/
List<Integer> getAlarmNumber(AlarmVO alarmVO);
+
+ /**
+ * 查询当前保安需要处理和未处理的巡逻信息
+ * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的警情和已接收的警情,已处理完成的 2：未接收的 3：处理完成的
+ * @return
+ */
+ List<AlarmVO> getPatrolList(AlarmVO alarmVO);
+
+ /**
+ * 获取巡逻数量的集合,全部，未处理，已处理的数量
+ * @param alarmVO 需包含保安人员id
+ * @return
+ */
+ List<Integer> getPatrolNumber(AlarmVO alarmVO);
}
diff --git a/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java b/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
index 745c810..c101276 100644
--- a/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java
@@ -470,4 +470,25 @@
public List<Integer> getAlarmNumber(AlarmVO alarmVO) {
return baseMapper.getAlarmNumber(alarmVO);
}
+
+ /**
+ * 查询当前保安需要处理和未处理的警情信息
+ * @param alarmVO 需包含保安人员id,状态 status 1 查当前保安收到的警情和已接收的警情,已处理完成的 2：未接收的 3：处理完成的
+ * @return
+ */
+ @Override
+ public List<AlarmVO> getPatrolList(AlarmVO alarmVO) {
+
+ return alarmVO.getStatus()==1?baseMapper.getAllPatrolList(alarmVO):baseMapper.getPatrolList(alarmVO);
+ }
+
+ /**
+ * 获取警情数量的集合,全部，未处理，已处理的数量
+ * @param alarmVO 需包含保安人员id
+ * @return
+ */
+ @Override
+ public List<Integer> getPatrolNumber(AlarmVO alarmVO) {
+ return baseMapper.getPatrolNumber(alarmVO);
+ }
}
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index 4d4d59a..64d1a0c 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -26,6 +26,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.zc.entity.Zc;
@@ -118,7 +119,7 @@
if (type.equals("1")){
User user = new User();
user.setAccount(zc.getUsername());
- user.setPassword(zc.getPassword());
+ user.setPassword(DigestUtil.encrypt(zc.getPassword()));
user.setRealName(zc.getSname());
user.setSex(Integer.valueOf(zc.getSex()));
user.setPhone(zc.getPhone());
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ac36f21..5ada00a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,7 +13,7 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://36.134.81.48:3306/jfptpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: jfpt123
# PostgreSQL
--
Gitblit v1.9.3