diff --git a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java index 4ffcf53..0d7c425 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UserController.java @@ -347,7 +347,7 @@ public class UserController { String user = "{'phone':'" + phones + "','pd':'" + passwords + "'}"; JSONObject object = JSON.parseObject(user); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null); - String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/userLogin", object, null); + String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null); JSONObject jsonObject = JSONObject.parseObject(result); String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token"); return string; @@ -361,7 +361,7 @@ public class UserController { userVo.setUserName(userName); userVo.setPhone(phone); userVo.setSystemName("健康体检"); - String permissionQuery = userService.getPermissionQuery(userVo); + String permissionQuery = userService.getPermissionQuerys(userVo); userVo.setAuth(permissionQuery); userVo.setIsBlacklist("0"); userVo.setAccountStatus("1"); @@ -371,7 +371,7 @@ public class UserController { String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); - String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token); + String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("新增code="+code); @@ -436,7 +436,7 @@ public class UserController { String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); // String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); - String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/delUser", object, token); + String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token); JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); System.err.println("删除code="+code); diff --git a/src/main/java/com/bonus/boot/manager/manager/dao/UserDao.java b/src/main/java/com/bonus/boot/manager/manager/dao/UserDao.java index 910f26d..c3d56e0 100644 --- a/src/main/java/com/bonus/boot/manager/manager/dao/UserDao.java +++ b/src/main/java/com/bonus/boot/manager/manager/dao/UserDao.java @@ -78,6 +78,12 @@ public interface UserDao { String getPermissionQuery(UnifyBean userVo); + List getPushByBackOfficePersonnel(); + + int updateUserBackstagePushStatus(List list); + + String getPermissionQuerys(UnifyBean userVo); + //统一权限新增 diff --git a/src/main/java/com/bonus/boot/manager/manager/service/UserService.java b/src/main/java/com/bonus/boot/manager/manager/service/UserService.java index 034082b..ed67ad5 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/UserService.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/UserService.java @@ -34,4 +34,6 @@ public interface UserService { void updateUnify(Long id); String getPermissionQuery(UnifyBean userVo); + + String getPermissionQuerys(UnifyBean userVo); } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java index 471bcea..195ee19 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/UserServiceImpl.java @@ -76,7 +76,8 @@ public class UserServiceImpl implements UserService { log.debug("修改{}的密码", username); } - @Transactional + @Override + @Transactional public SysUser updateUser(UserDto userDto) { userDao.update(userDto); saveUserRoles(userDto.getId(), userDto.getRoleIds()); @@ -172,4 +173,13 @@ public class UserServiceImpl implements UserService { return userDao.getPermissionQuery(userVo); } + /** + * @param userVo + * @return + */ + @Override + public String getPermissionQuerys(UnifyBean userVo) { + return userDao.getPermissionQuerys(userVo); + } + } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java index 14b74d7..a879a70 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/UtilServiceImpl.java @@ -71,6 +71,8 @@ public class UtilServiceImpl implements UtilService { */ @Override public List getNewHospitalSelect(MapBean bean) { + String hospiral = UserUtil.getLoginUser().getHospitalId(); + bean.setHospitalId(hospiral); return utilDao.getNewHospitalSelect(bean); } } diff --git a/src/main/java/com/bonus/boot/manager/task/UnifyTask.java b/src/main/java/com/bonus/boot/manager/task/UnifyTask.java index f0fc704..ddb434f 100644 --- a/src/main/java/com/bonus/boot/manager/task/UnifyTask.java +++ b/src/main/java/com/bonus/boot/manager/task/UnifyTask.java @@ -21,6 +21,9 @@ import java.time.LocalDate; import java.util.Date; import java.util.List; +/** + * @author 19814 + */ @Configuration @EnableScheduling @Slf4j @@ -115,7 +118,7 @@ public class UnifyTask { log.info("操作日志数据="+result); } -// @Scheduled(fixedRate = 1000*60*60) + @Scheduled(cron = "0 0 2 * * ?") @PostConstruct @Async public void physicalExaminationPersonnel() throws Exception { @@ -138,20 +141,50 @@ public class UnifyTask { // 根据索引范围获取当前分组的元素，并调用接口处理分组数据 List group = list.subList(fromIndex, toIndex); - physicalExaminationPush(group,token); + physicalExaminationPush(group,token, "1"); } } else { log.info("无体检人员数据"); } } - private void physicalExaminationPush(List list, String token) throws Exception { + @Scheduled(cron = "0 0 1 * * ?") + @PostConstruct + @Async + public void pushByBackOfficePersonnel() throws Exception { + log.info("--------定时统一后台人员数据扫描器启动------"); + //查询某日登录日志数据 + List list = userDao.getPushByBackOfficePersonnel(); + if (!list.isEmpty()) { + //获取登录的token + String token = UserController.login(); + // 每组的大小 + int groupSize = 20; + // 总的分组数 + int totalGroups = (int) Math.ceil((double) list.size() / groupSize); + // 遍历分组 + for (int i = 0; i < totalGroups; i++) { + // 计算当前分组元素的起始索引 + int fromIndex = i * groupSize; + // 计算当前分组元素的结束索引，确保不超过总元素数 + int toIndex = Math.min((i + 1) * groupSize, list.size()); + // 根据索引范围获取当前分组的元素，并调用接口处理分组数据 + List group = list.subList(fromIndex, toIndex); + + physicalExaminationPush(group,token, "2"); + } + } else { + log.info("无体检人员数据"); + } + } + + private void physicalExaminationPush(List list, String token,String auth) throws Exception { String s = JSON.toJSONString(list); String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey); String params = "{'params':'" + encrypt + "'}"; JSONObject object = JSON.parseObject(params); -// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putOperaLog", object, token); - String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token); + String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token); +// String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token); //推送成功改推送状态 JSONObject jsonObject = JSONObject.parseObject(result); String code = jsonObject.getString("code"); @@ -168,7 +201,11 @@ public class UnifyTask { } } } - int i = userDao.updateUserPushStatus(list); + if (auth.equals("1")) { + int i = userDao.updateUserPushStatus(list); + } else { + int i = userDao.updateUserBackstagePushStatus(list); + } } } diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index 86465b2..ea0f55d 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -193,11 +193,8 @@ telep_number AS phone, '健康体检' AS systemName, CASE - WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') - AND EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台, 移动端' - WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台' - WHEN EXISTS (SQL:1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') THEN '移动端' - ELSE '不存在' + WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = telep_number AND is_active = '1') THEN '后台, 移动端' + ELSE '移动端' END AS auth, '0' AS isBlacklist, '1' AS accountStatus, @@ -206,13 +203,45 @@ WHERE is_active = '1' AND pushStatus != 1 + + @@ -278,5 +307,10 @@ UPDATE pm_base_physical SET `pushStatus`= #{user.status} WHERE telep_number = #{user.phone} and is_active = '1' + + + UPDATE sys_user SET `is_push`= #{user.status} WHERE phone = #{user.phone} and is_active = '1' + + \ No newline at end of file