From 126307d406e990256ab5e0937695fe2019d1b606 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 13 Mar 2021 22:38:58 +0800
Subject: [PATCH] 健康码当天统计接口修改，新增保安分页列表接口
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 11 +++++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 19 +++++++++
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 15 +++++++
blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java | 12 ++++++
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java | 9 ++++
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java | 7 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml | 25 +++++++++---
7 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
index ea4369d..4dc5e6b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
@@ -60,14 +60,25 @@
<insert id="insert">
insert into healthcode(<include refid="key"/>) values(<include refid="value"/>)
</insert>
+
+<!-- <select id="selectCountr" resultType="java.util.HashMap">-->
+<!-- SELECT COUNT( * ) AS num,type-->
+<!-- FROM-->
+<!-- healthcode-->
+<!-- WHERE-->
+<!-- DATE_FORMAT(dtime,'%Y-%m-%d')=#{time} GROUP BY type-->
+<!-- </select>-->
+
+ <!--查询当天的健康码统计数据 2021-03-13 arsn修改-->
<select id="selectCountr" resultType="java.util.HashMap">
- SELECT
- COUNT( * ) AS num,
- type
-FROM
- healthcode
-WHERE
-DATE_FORMAT(dtime,'%Y-%m-%d')=#{time} GROUP BY type
+ SELECT COUNT( * ) AS num,1 as type FROM healthcode WHERE
+ TO_DAYS(dtime)=TO_DAYS(NOW()) and type=1
+ union all
+ SELECT COUNT( * ) AS num,2 as type FROM healthcode WHERE
+ TO_DAYS(dtime)=TO_DAYS(NOW()) and type=2
+ union all
+ SELECT COUNT( * ) AS num,3 as type FROM healthcode WHERE
+ TO_DAYS(dtime)=TO_DAYS(NOW()) and type=3
</select>
<select id="selectCountz" resultType="java.util.HashMap">
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 7a9f515..64222b3 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -43,6 +43,7 @@
import org.springblade.system.user.excel.UserImporter;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
import org.springblade.system.user.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -291,4 +292,18 @@
return R.data(userService.platformDetail(user));
}
+ /**
+ * 查询处警人员列表
+ * @param user 用户对象
+ * @param query 分页
+ * @param response 返回
+ */
+ @GetMapping("/security-list")
+ public R<IPage<UsersVo>> page(@ApiIgnore User user, Query query, 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");
+ return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
+ }
+
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
index 30a83db..2ef9f26 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
@@ -22,6 +22,7 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.UsersVo;
import java.util.List;
@@ -60,4 +61,10 @@
*/
List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ /**
+ * 查询处警人员列表
+ * @param user 用户对象
+ * @param page 分页
+ */
+ List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 307340e..0c95ce6 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -73,4 +73,23 @@
SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
</select>
+ <!--查询处警人员列表-->
+ <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
+ SELECT bu.*,p.jd,p.wd FROM blade_user bu
+ LEFT JOIN
+ jfpt.sys_position p
+ on
+ p.snumber=bu.code
+ where
+ role_id = #{user.roleId}
+ <if test="user.realName!=null and user.realName !=''">
+ <bind name="realName" value="'%'+user.realName+'%'"/>
+ and bu.real_name like #{realName}
+ </if>
+ <if test="user.code!=null">
+ <bind name="code" value="'%'+user.code+'%'"/>
+ and bu.code like #{code}
+ </if>
+ order by bu.code asc
+ </select>
</mapper>
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index aeb994f..1333216 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -26,6 +26,7 @@
import org.springblade.system.user.enums.UserEnum;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
import java.util.List;
@@ -194,4 +195,12 @@
* @return
*/
UserVO platformDetail(User user);
+
+ /**
+ * 查询处警人员列表
+ * @param page 分页
+ * @param user 用户对象
+ * @return
+ */
+ IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 4b3ba1a..12d596d 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -48,6 +48,7 @@
import org.springblade.system.user.service.IUserOauthService;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.UsersVo;
import org.springblade.system.user.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -396,4 +397,14 @@
return userVO;
}
+ /**
+ * 查询处警人员列表
+ * @param page 分页
+ * @param user 用户对象
+ * @return
+ */
+ @Override
+ public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
+ return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
+ }
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java
new file mode 100644
index 0000000..7fcd589
--- /dev/null
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/vo/UsersVo.java
@@ -0,0 +1,12 @@
+package org.springblade.system.user.vo;
+
+import lombok.Data;
+import org.springblade.system.user.entity.User;
+
+@Data
+public class UsersVo extends User {
+ private static final long serialVersionUID = 1L;
+ private String jd;
+ private String wd;
+ private String coordinate;
+}
--
Gitblit v1.9.3