From 030cc847e46dcaa687f961785b458c6f9714ed49 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 10 Aug 2021 09:02:43 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 63 ++++++++++++++++++++-
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 5 +
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 22 +++++++
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 4
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 2
src/main/java/org/springblade/modules/zc/vo/ZcVO.java | 1
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 4 +
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6 ++
src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml | 2
src/main/java/org/springblade/modules/system/service/IDeptService.java | 6 ++
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java | 19 ++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 16 ++++-
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 4 +
src/main/java/org/springblade/modules/system/service/IUserService.java | 5 +
15 files changed, 150 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index efa02a9..dd84d9d 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -96,6 +96,7 @@
secureRegistry.excludePathPatterns("/xlfeedback/xlfeedback/**");
secureRegistry.excludePathPatterns("/zc/**");
secureRegistry.excludePathPatterns("/energy/**");
+ secureRegistry.excludePathPatterns("/jurisdiction/**");
return secureRegistry;
}
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 6230b72..ac50ef9 100644
--- a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
+++ b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -860,4 +860,23 @@
return R.status(false);
}
+ /**
+ * 一周警情统计(主动报警+被动报警类型（体温异常，红码，违禁品）) 2021-3-16 arsn 柱状图展示
+ * @param response
+ * @return
+ */
+ @GetMapping("/countAlarm")
+ public R countAlarm(HttpServletResponse response,ConditionVo conditionVo) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ //创建类型，时间对象，分别存取类型，时间数据
+ List<String> times = new ArrayList<>();
+ times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ Map<String, Object> alarmData = alarmService.selectAlarmData();
+ alarmData.put("times",times);
+ //返回数据
+ return R.data(alarmData);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index 0e3541a..61faadc 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -104,8 +104,8 @@
@GetMapping("/tree")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<JurisdictionVO>> tree(String tenantId, BladeUser bladeUser) {
- List<JurisdictionVO> tree = jurisdictionService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ public R<List<JurisdictionVO>> tree(String tenantId) {
+ List<JurisdictionVO> tree = jurisdictionService.tree(tenantId);
return R.data(tree);
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index a6faf6f..d65a174 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -80,11 +80,11 @@
static BASE64Encoder encoder = new BASE64Encoder();
- private final String sm4Key = "bf679652628841dc8f35f84989abf350";
+ private final String sm4Key = "cd888d57e21a4ffc9be7ed601ab3ccd6";
- private final String clientCode = "909BCF57904BDBD3E053AF0A020A3760";
+ private final String clientCode = "369947";
- private final String url = "http://eid.gongqing.gov.cn/uias-test/fca/verifyFace";
+ private final String url = "http://218.87.21.104:59944/uias/verifyFace";
@PostMapping("/faceCompare")
public R upload(@RequestParam("name")String name,@RequestParam("idCardNo")String idCardNo,@RequestParam("file") MultipartFile file){
@@ -448,10 +448,18 @@
* @return
*/
@GetMapping("/getUserRegisterStatisticsData")
- public R getUserRegisterStatisticsData(){
+ public R getUserRegisterStatisticsData() {
return R.data(userService.getUserRegisterStatisticsData());
}
+ /**
+ * 统计六大队伍
+ */
+ @GetMapping("/getUserTypeCount")
+ public R getUserTypeCount() {
+ return R.data(userService.getUserTypeCount());
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index a07289e..3ed5907 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -87,6 +87,8 @@
*/
List<DeptVo> selDeptList();
+ List<DeptVo> selXQList();
+
List<DeptVO> selectInfo();
@SqlParser(filter=true)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index da3d47c..11887f3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -154,6 +154,10 @@
select id ,dept_name deptName from blade_dept where is_deleted=0
</select>
+ <select id="selXQList" resultType="org.springblade.common.vo.DeptVo">
+ select id ,dept_name deptName from sys_jurisdiction where is_deleted=0
+ </select>
+
<select id="selectInfo" resultType="java.util.HashMap">
SELECT
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index a551b51..32beaec 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -103,4 +103,8 @@
* @return
*/
List<UserRegisterStatisVO> getUserRegisterStatisticsData();
+
+
+ List<UserRegisterStatisVO> getUserTypeCount();
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 9f4dbea..60cc750 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -62,7 +62,7 @@
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user
+ select * from blade_user
where is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
and tenant_id = #{tenantId}
@@ -97,7 +97,7 @@
<select id="selectUserPages" resultMap="userResultMaps">
- select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
LEFT JOIN sys_position p ON p.snumber = s.CODE
LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
left join
@@ -137,7 +137,7 @@
</select>
<select id="selectUserPagetxl" resultMap="userResultMaps">
- select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
LEFT JOIN sys_position p ON p.snumber = s.CODE
LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
left join
@@ -247,4 +247,61 @@
where bu.region_id is not null
group by bu.region_id
</select>
+
+ <!-- 统计六大队伍数量 -->
+ <select id="getUserTypeCount" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">
+ SELECT
+ '治保会队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615693403414529'
+ UNION ALL
+ SELECT
+ '内保干部队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615773594312705'
+ UNION ALL
+ SELECT
+ '治安巡防队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615835435130881'
+ UNION ALL
+ SELECT
+ '信息员队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615909959524354'
+ UNION ALL
+ SELECT
+ '保安员队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615972718895106'
+ UNION ALL
+ SELECT
+ '警务辅助队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424616047083905026'
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index 0387ea4..7835667 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -131,6 +131,12 @@
List<DeptVo> selDeptList();
/**
+ * 查询所有的辖区信息
+ * @return
+ */
+ List<DeptVo> selXQList();
+
+ /**
* 懒加载获取部门树形结构--关联组织机构（包含保安员信息）
*/
List<DeptVO> lazyTreeSecurity(String toStrWithEmpty, Long parentId);
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index aa7458e..7600308 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -262,4 +262,9 @@
* @return
*/
List<UserRegisterStatisVO> getUserRegisterStatisticsData();
+
+ /**
+ * 统计六大队伍
+ */
+ List<UserRegisterStatisVO> getUserTypeCount();
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index cd4f668..02e6919 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -181,6 +181,11 @@
return baseMapper.selDeptList();
}
+ @Override
+ public List<DeptVo> selXQList() {
+ return baseMapper.selXQList();
+ }
+
/**
* 懒加载获取部门树形结构--关联组织机构（包含保安员信息）
*/
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 8932a45..c0aad74 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -495,4 +495,10 @@
public List<UserRegisterStatisVO> getUserRegisterStatisticsData() {
return baseMapper.getUserRegisterStatisticsData();
}
+
+
+ @Override
+ public List<UserRegisterStatisVO> getUserTypeCount() {
+ return baseMapper.getUserTypeCount();
+ }
}
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 e5bd678..4b8ac51 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -92,6 +92,10 @@
public R<IPage<ZcVO>> page(ZcVO zc, Query query) {
//获取部门数据
List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ //获取辖区数据
+ List<DeptVo> xqVos = deptFeignApi.selXQList();
+
IPage<ZcVO> page = zcService.selectZcPage(Condition.getPage(query), zc);
for (int j = 0; j < page.getRecords().size(); j++) {
if (page.getRecords().get(j).getDeptid() != null && !page.getRecords().get(j).getDeptid().equals("")){
@@ -111,6 +115,24 @@
}
}
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ if (page.getRecords().get(j).getJurisdiction() != null && !page.getRecords().get(j).getJurisdiction().equals("")){
+ String[] split = page.getRecords().get(j).getJurisdiction().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:xqVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.getRecords().get(j).setXQName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
return R.data(page);
}
diff --git a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
index 57726b4..859fc6b 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -39,7 +39,7 @@
<!--注册新增-->
<insert id="inster">
- insert into act_zc(username,password,sname,sex,phone,zctime,deptid) values(#{username},#{password},#{sname},#{sex},#{phone},#{zctime},#{deptid})
+ insert into act_zc(username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction) values(#{username},#{password},#{sname},#{sex},#{phone},#{zctime},#{deptid},#{parentId},#{jurisdiction})
</insert>
<select id="selectType" resultType="String">
diff --git a/src/main/java/org/springblade/modules/zc/vo/ZcVO.java b/src/main/java/org/springblade/modules/zc/vo/ZcVO.java
index cf17f0b..1034939 100644
--- a/src/main/java/org/springblade/modules/zc/vo/ZcVO.java
+++ b/src/main/java/org/springblade/modules/zc/vo/ZcVO.java
@@ -33,4 +33,5 @@
public class ZcVO extends Zc {
private static final long serialVersionUID = 1L;
private String deptName;
+ private String XQName;
}
--
Gitblit v1.9.3