diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ApifoxUploaderProjectSetting.xml b/.idea/ApifoxUploaderProjectSetting.xml new file mode 100644 index 0000000..ec13faa --- /dev/null +++ b/.idea/ApifoxUploaderProjectSetting.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..d0bacab --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..369bb5a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..323e0a6 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,22 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5cd614 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/bonus/boot/manager/basic/entity/MapBean.java b/src/main/java/com/bonus/boot/manager/basic/entity/MapBean.java index e261f70..803d8c7 100644 --- a/src/main/java/com/bonus/boot/manager/basic/entity/MapBean.java +++ b/src/main/java/com/bonus/boot/manager/basic/entity/MapBean.java @@ -17,4 +17,5 @@ public class MapBean { private String reservationTime; private String personName; private String phone; + private String userId; } diff --git a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java index e362061..bdcc5cb 100644 --- a/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java +++ b/src/main/java/com/bonus/boot/manager/basic/entity/PersonnelLibraryBean.java @@ -114,4 +114,6 @@ public class PersonnelLibraryBean extends HospitalBean{ */ private String personnelType; + private String userId; + } 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 e8581db..4ffcf53 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 @@ -342,25 +342,27 @@ public class UserController { public static String login() throws Exception { String phone = "15955081965"; String phones = AESCBCUtils.encrypt(phone, AESCBCUtils.sKey); - String password = "CCW1998@yyt"; + String password = "ccw1998@YYT"; String passwords = AESCBCUtils.encrypt(password, AESCBCUtils.sKey); 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://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); JSONObject jsonObject = JSONObject.parseObject(result); String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token"); return string; } - //统一平台新增接口 获取token - public static String addUser(String userName , String phone,String token) throws Exception { + //统一平台后台新增接口 获取token + public String addUser(String userName, String phone, String token) throws Exception { String isActive = ""; List list = new ArrayList<>(); UnifyBean userVo = new UnifyBean(); userVo.setUserName(userName); userVo.setPhone(phone); userVo.setSystemName("健康体检"); - userVo.setAuth("后台"); + String permissionQuery = userService.getPermissionQuery(userVo); + userVo.setAuth(permissionQuery); userVo.setIsBlacklist("0"); userVo.setAccountStatus("1"); list.add(userVo); @@ -368,11 +370,12 @@ public class UserController { 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/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"); System.err.println("新增code="+code); - if(code.equals("200")){ + if("200".equals(code)){ JSONArray data = jsonObject.getJSONArray("data"); System.err.println("新增data="+data); if(data.size() == 0){ @@ -432,7 +435,8 @@ public class UserController { 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/delUser", object, token); +// 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); 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/controller/UtilController.java b/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java index dd4e407..b19e920 100644 --- a/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java +++ b/src/main/java/com/bonus/boot/manager/manager/controller/UtilController.java @@ -45,6 +45,13 @@ public class UtilController { List list = service.getHospitalSelect(o); return list.size() > 0 ? R.okTable(list, list.size()):R.failTable("暂无数据"); } + @LogAnnotation + @PostMapping("getNewHospitalSelect") + @ApiOperation(value = "医院select列表") + public R getNewHospitalSelectv(MapBean o){ + List list = service.getNewHospitalSelect(o); + return list.size() > 0 ? R.okTable(list, list.size()):R.failTable("暂无数据"); + } @LogAnnotation @PostMapping(value = "/getPackageType") 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 43b2755..910f26d 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 @@ -72,6 +72,12 @@ public interface UserDao { int updateRoleUser(SysUser bean); + List getPhysicalExamination(); + + int updateUserPushStatus(@Param("list") List list); + + String getPermissionQuery(UnifyBean userVo); + //统一权限新增 diff --git a/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java b/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java index a1c0cd1..777b60f 100644 --- a/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java +++ b/src/main/java/com/bonus/boot/manager/manager/dao/UtilDao.java @@ -60,4 +60,6 @@ public interface UtilDao { List getExaminationHospital(); + + List getNewHospitalSelect(MapBean bean); } diff --git a/src/main/java/com/bonus/boot/manager/manager/entity/UnifyBean.java b/src/main/java/com/bonus/boot/manager/manager/entity/UnifyBean.java index 5a60251..5685cfc 100644 --- a/src/main/java/com/bonus/boot/manager/manager/entity/UnifyBean.java +++ b/src/main/java/com/bonus/boot/manager/manager/entity/UnifyBean.java @@ -33,5 +33,7 @@ public class UnifyBean { private String description; private String createDate; private String result; + private int status; + } 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 1cea67b..034082b 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 @@ -1,6 +1,7 @@ package com.bonus.boot.manager.manager.service; import com.bonus.boot.manager.basic.entity.PersonnelLibraryBean; +import com.bonus.boot.manager.manager.entity.UnifyBean; import com.bonus.boot.manager.manager.entity.UserDto; import com.bonus.boot.manager.manager.model.SysUser; @@ -31,4 +32,6 @@ public interface UserService { int resetPasswordForOne(SysUser bean); void updateUnify(Long id); + + String getPermissionQuery(UnifyBean userVo); } diff --git a/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java b/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java index a7fcc3b..d4453fe 100644 --- a/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java +++ b/src/main/java/com/bonus/boot/manager/manager/service/UtilService.java @@ -42,4 +42,6 @@ public interface UtilService { List getHazard(); List getExaminationHospital(); + + List getNewHospitalSelect(MapBean o); } 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 3e731ee..471bcea 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 @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.boot.manager.basic.entity.PersonnelLibraryBean; import com.bonus.boot.manager.manager.dao.UtilDao; +import com.bonus.boot.manager.manager.entity.UnifyBean; import com.bonus.boot.manager.manager.utils.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,4 +163,13 @@ public class UserServiceImpl implements UserService { userDao.updateUnify(id); } + /** + * @param userVo + * @return + */ + @Override + public String getPermissionQuery(UnifyBean userVo) { + return userDao.getPermissionQuery(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 27e99cf..14b74d7 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 @@ -64,4 +64,13 @@ public class UtilServiceImpl implements UtilService { public List getExaminationHospital() { return utilDao.getExaminationHospital(); } + + /** + * @param bean + * @return + */ + @Override + public List getNewHospitalSelect(MapBean bean) { + return utilDao.getNewHospitalSelect(bean); + } } diff --git a/src/main/java/com/bonus/boot/manager/statistics/service/Impl/ResStatisticsServiceImpl.java b/src/main/java/com/bonus/boot/manager/statistics/service/Impl/ResStatisticsServiceImpl.java index 4be29e7..196b0ca 100644 --- a/src/main/java/com/bonus/boot/manager/statistics/service/Impl/ResStatisticsServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/statistics/service/Impl/ResStatisticsServiceImpl.java @@ -24,7 +24,8 @@ public class ResStatisticsServiceImpl implements ResStatisticsService { @Override public List getList(MapBean bean) { - + String userId = String.valueOf(UserUtil.getLoginUser().getId()); + bean.setUserId(userId); return dao.getList(bean); } @@ -37,6 +38,8 @@ public class ResStatisticsServiceImpl implements ResStatisticsService { LoginUser loginUser = UserUtil.getLoginUser(); String hospid = UserUtil.getLoginUser().getHospitalId(); bean.setHospId(hospid); + String userId = String.valueOf(UserUtil.getLoginUser().getId()); + bean.setUserId(userId); return dao.getChildList(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 4dd0933..f0fc704 100644 --- a/src/main/java/com/bonus/boot/manager/task/UnifyTask.java +++ b/src/main/java/com/bonus/boot/manager/task/UnifyTask.java @@ -1,6 +1,7 @@ package com.bonus.boot.manager.task; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bonus.boot.manager.basic.controller.AESCBCUtils; import com.bonus.boot.manager.manager.controller.HttpClientUtils; @@ -13,6 +14,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; +import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -112,4 +114,62 @@ public class UnifyTask { String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putOperaLog", object, token); log.info("操作日志数据="+result); } + +// @Scheduled(fixedRate = 1000*60*60) + @PostConstruct + @Async + public void physicalExaminationPersonnel() throws Exception { + log.info("--------定时统一体检人员数据扫描器启动------"); + //查询某日登录日志数据 + List list = userDao.getPhysicalExamination(); + 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); + } + } else { + log.info("无体检人员数据"); + } + } + + private void physicalExaminationPush(List list, String token) 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); + //推送成功改推送状态 + JSONObject jsonObject = JSONObject.parseObject(result); + String code = jsonObject.getString("code"); + System.err.println("新增code="+code); + if(code.equals("200")){ + JSONArray data = jsonObject.getJSONArray("data"); + System.err.println("新增data="+data); + for (int i = 0; i < data.size(); i++) { + String phone = data.getString(i); + for (int j = 0; j < list.size(); j++) { + if (phone.equals(list.get(j).getPhone())) { + list.get(j).setStatus(0); + break; + } + } + } + int i = userDao.updateUserPushStatus(list); + } + } + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 275f5a2..bfb5d8a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,17 +8,17 @@ server.port=18088 #\u8BBF\u95EE\u8DEF\u5F84 server.servlet.context-path=/YSpeaManager #\u6B63\u5F0F\u5E93 -spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true -spring.datasource.username=root -spring.datasource.password=Bonus@yntj123! +#spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true +#spring.datasource.username=root +#spring.datasource.password=Bonus@yntj123! #\u6D4B\u8BD5\u5E93 -#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/cs_yn?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai -#spring.datasource.username=root -#spring.datasource.password=xbzadmin@szedu14! +spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.username=root +spring.datasource.password=xbzadmin@szedu14! #\u672C\u5730\u5E93 -#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai #spring.datasource.username=root -#spring.datasource.password=xbzadmin@szedu14! +#spring.datasource.password=ljj@bonus spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.max-idle=10 @@ -36,13 +36,13 @@ mybatis.type-aliases-package=com.bonus.boot.manager.*.entity #spring.redis.port=6379 #spring.redis.password=Ynsmz@186redis! #\u6D4B\u8BD5 -spring.redis.host=192.168.1.8 -spring.redis.port=23347 -spring.redis.password=Bonus@yntj123! +#spring.redis.host=192.168.1.8 +#spring.redis.port=23347 +#spring.redis.password=Bonus@yntj123! #\u672C\u5730 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= #spring.redis.password=Ynsmz@186redis! # \u65E5\u5FD7 diff --git a/src/main/resources/mappers/basic/UtilMapper.xml b/src/main/resources/mappers/basic/UtilMapper.xml index 999e004..3d53e5f 100644 --- a/src/main/resources/mappers/basic/UtilMapper.xml +++ b/src/main/resources/mappers/basic/UtilMapper.xml @@ -66,6 +66,9 @@ select count(1) from pm_base_physical where telep_number=#{0} and is_active='1' + diff --git a/src/main/resources/mappers/statistics/resStatistcsMapper.xml b/src/main/resources/mappers/statistics/resStatistcsMapper.xml index 5cd0f1e..1600817 100644 --- a/src/main/resources/mappers/statistics/resStatistcsMapper.xml +++ b/src/main/resources/mappers/statistics/resStatistcsMapper.xml @@ -7,20 +7,23 @@ FROM pm_base_phy_appont a LEFT JOIN pm_base_physical b on b.id = a.user_id WHERE a.if_cancel ='2' and b.is_active = '1' and a.if_career_appoint = '2' - - - - and a.hospital_id = '35' AND (check_content_id != "" OR check_content_id IS NOT NULL) - - - and a.hospital_id = #{hospitalId} - - - - and a.hospital_id = '35' AND a.is_special != '0' - - + + + + + and a.hospital_id = '35' AND (check_content_id != "" OR check_content_id IS NOT NULL) + + + + and a.hospital_id = #{hospitalId} + + + + + and a.hospital_id = '35' AND a.is_special != '0' + + and b.phy_name like concat ('%',#{personName},'%') @@ -92,8 +95,10 @@ and b.phy_appont_time between #{phyTimeStart} and #{phyTimeEnd} - - and b.hospital_id = #{hospId} + + + and b.hospital_id = #{hospId} + diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index 566ea38..86465b2 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -187,6 +187,33 @@ AND l.module NOT LIKE '%退出%' + + insert into sys_user(username,password,id_card,phone,sex,age,department,role,is_active,hospital_id) @@ -246,5 +273,10 @@ UPDATE sys_user SET is_push = '0' WHERE id = #{id} + + + UPDATE pm_base_physical SET `pushStatus`= #{user.status} WHERE telep_number = #{user.phone} and is_active = '1' + + \ No newline at end of file diff --git a/src/main/resources/static/js/select.js b/src/main/resources/static/js/select.js index 08306f3..1d7949b 100644 --- a/src/main/resources/static/js/select.js +++ b/src/main/resources/static/js/select.js @@ -174,7 +174,7 @@ function gethospital(form,hospitalId) { $("#hospitalId").html(""); $.ajax({ type: 'post', - url: ctxPath + '/utilConnection/getHospitalSelect', + url: ctxPath + '/utilConnection/getNewHospitalSelect', data: { value:hospitalId }, diff --git a/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js b/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js index cbff729..ef67ee4 100644 --- a/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js +++ b/src/main/resources/static/js/work/statistics/reservation/resStatisticsChildList.js @@ -114,7 +114,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { case "searchBt": personName = $("#personName").val(); oldStatus = $("#name").val(); - hospitalName = $("#name").val(); + // hospitalName = $("#name").val(); timeStart = $("#phyTimeStart").val(); timeEnd = $("#phyTimeEnd").val(); table.reload('menuTable', { @@ -129,9 +129,9 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () { } //设定异步数据接口的额外参数 }); initTime(); - console.log(hospitalName) + // console.log(hospitalName) $("#personName").val(personName); - $("#oldStatus").val(hospitalName); + $("#name").val(oldStatus); $("#phyTimeStart").val(timeStart); $("#phyTimeEnd").val(timeEnd); break; diff --git a/src/main/resources/static/pages/user/addUserForm.html b/src/main/resources/static/pages/user/addUserForm.html index 1ea8879..610be6d 100644 --- a/src/main/resources/static/pages/user/addUserForm.html +++ b/src/main/resources/static/pages/user/addUserForm.html @@ -165,7 +165,8 @@ form.verify({}); /** * 人员角色下拉框 - */hospitalId + */ + // hospitalId getRole(form, null); /** * 选择医院