From c83bd5ccc72512c9935135ff76b7c3f7e81a14b8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 24 五月 2023 15:27:45 +0800
Subject: [PATCH] 检索上报数据时，兼容改名
---
src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java | 2 ++
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 7 +++++--
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 3 ++-
src/main/resources/mybatis/system/UserMapper.xml | 5 +++++
src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java | 5 +++++
src/main/java/com/ruoyi/project/system/user/service/IUserService.java | 2 ++
6 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 9c3a37c..a465e18 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -87,7 +87,8 @@
@Transactional
- @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次
+// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次
+// @Scheduled(cron = "0 0/2 * * * ? ") // 分钟
//@Scheduled(cron = "0/30 * * * * ?")
public void execReportDateSchedule() throws UnsupportedEncodingException {
logger.info("【####】上报数据开始...");
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index cf8cd8b..5d1c8bf 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -465,8 +465,11 @@
if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
}
-
- User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+ User createUser = new User();
+ createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
+ }
User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
//封装上报昌吉州的任务数据 todo taskUUid
diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
index b2f6fb2..52f7e32 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
@@ -142,4 +142,6 @@
* 用户getBY LoginName
*/
User getUserByLoginName(String createBy);
+
+ User getUserByName(String createBy);
}
diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
index d578645..30bceba 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
@@ -230,4 +230,6 @@
* 用户getBY LoginName
*/
User getUserByLoginName(String createBy);
+
+ User getUserByName(String createBy);
}
diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
index d5dd9c6..1ec3101 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
@@ -571,4 +571,9 @@
public User getUserByLoginName(String createBy) {
return userMapper.getUserByLoginName(createBy);
}
+
+ @Override
+ public User getUserByName(String createBy) {
+ return userMapper.getUserByName(createBy);
+ }
}
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index 3f9f7ec..72a822f 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -285,4 +285,9 @@
<select id="getUserByLoginName" parameterType="User" resultMap="UserResult">
select * from sys_user where user_name = #{createBy}
</select>
+
+ <!-- User getUserByLoginName(String createBy);-->
+ <select id="getUserByName" parameterType="User" resultMap="UserResult">
+ select * from sys_user where login_name = #{createBy}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2