From 38d775fa2ccd433c727a5b7cec8bed02493df1ec Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Thu, 18 Aug 2022 09:00:40 +0800
Subject: [PATCH] mq 相关配置去除，启动配置修改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 deletions(-)

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 d454fc0..8ba0eae 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -18,13 +18,17 @@
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
 import org.springblade.modules.system.excel.QrCodeExcel;
+import org.springblade.modules.system.excel.SecurityExcel;
+import org.springblade.modules.system.excel.SecurityYyExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.node.TreeNode;
 import org.springblade.modules.system.vo.UserVO;
@@ -289,14 +293,22 @@
 	 * @param data
 	 * @param isCovered
 	 */
-	void importSecurity(List<UserExcel> data, Boolean isCovered);
+	void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId);
+
+	/**
+	 * 押运人员导入
+	 * @param data
+	 * @param isCovered
+	 * @param deptId
+	 */
+	void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId);
 
 	/**
 	 * 根据保安员编码查询保安信息
 	 * @param securityNumber 保安证编码
 	 * @return
 	 */
-    UserVO getUserInfoBySecurityNumber(String securityNumber);
+    UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid);
 
 	/**
 	 * 保安员信息
@@ -329,4 +341,48 @@
 	void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId);
 
 
+	/**
+	 * 根据用户账户查询用户是否存在
+	 * @param account
+	 * @return
+	 */
+	Integer selectCountAccount(String account);
+
+	/**
+	 * 保安员信息导出
+	 * @param user
+	 * @return
+	 */
+    List<SecurityExcel> exportSecurityInfo(UserVO user);
+
+	/**
+	 * 导入保安员test
+	 * @param data
+	 */
+	void importSecurityTest(List<SecurityExcel> data);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List<Map<String, Object>> selectEquipent();
+
+	/**
+	 * 年龄分布查询
+	 * @param user
+	 * @return
+	 */
+	Object getAgeStatistics(UserVO user);
+
+	/**
+	 * 查询登录密码还是 123456 的单位信息
+	 * @return
+	 */
+    Object getNotUpdatePwdInfo();
+
+	/**
+	 * 根据用户 id 查询用户信息
+	 * @param id
+	 * @return
+	 */
+	User getUserById(String id);
 }

--
Gitblit v1.9.3