ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -334,6 +334,7 @@ // sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"); sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format); log.info("sendMagParam的值为：{}", sendMagParam); //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf） if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format); ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -71,6 +71,7 @@ // 用户验证 Authentication authentication = null; try { if (StringUtils.isEmpty(campusid)) campusid = "1"; UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password); AuthenticationContextHolder.setContext(authenticationToken); // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -20,8 +20,7 @@ * @author ruoyi */ @Service public class UserDetailsServiceImpl implements UserDetailsService { public class UserDetailsServiceImpl implements UserDetailsService { private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class); @Autowired @@ -34,27 +33,24 @@ private SysPermissionService permissionService; @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { String[] split = username.split("&"); SysUser user = userService.selectUserByUserName2(username); if (StringUtils.isNull(user)) { if (StringUtils.isNull(user)) { log.info("登录用户：{} 不存在.", username); throw new ServiceException("登录用户：" + split[0] + " 不存在,或机构不正确，请检查后重新登陆"); } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { log.info("登录用户：{} 已被删除.", username); throw new ServiceException("对不起，您的账号：" + split[0] + " 已被删除"); } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { log.info("登录用户：{} 已被停用.", username); throw new ServiceException("对不起，您的账号：" + split[0] + " 已停用"); }else if(!user.getOrgid().trim().equals(split[1].trim())){ log.info("登录用户：{} 不是本院帐号：{}", username,split[1]); throw new ServiceException("对不起，您的账号：" + split[0] + " 不是本院的"); } else if (StringUtils.isEmpty(user.getOrgid()) || StringUtils.isEmpty(split[1]) || !user.getOrgid().trim().equals(split[1].trim())) { log.info("登录用户：{} 不是本医院帐号：{}", username, split[1]); throw new ServiceException("对不起，您的账号：" + split[0] + " 不是本医院的"); } else if (StringUtils.isEmpty(user.getCampusid()) || StringUtils.isEmpty(split[2]) || !user.getCampusid().trim().equals(split[2].trim())) { log.info("登录用户：{} 不是本院区帐号：{}", username, split[1]); throw new ServiceException("对不起，您的账号：" + split[0] + " 不是本院区帐号"); } passwordService.validate(user); @@ -62,8 +58,7 @@ return createLoginUser(user); } public UserDetails createLoginUser(SysUser user) { public UserDetails createLoginUser(SysUser user) { return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); } } ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -337,7 +337,6 @@ serviceSLTDInhospReqVO.setStartHeadTime(nowTime); serviceSLTDInhospReqVO.setStartTailTime(nowTime); List<String> listStr = new ArrayList<>(); // list.add("FH0108.02"); listStr.add("FH0109.26"); serviceSLTDInhospReqVO.setStatusList(listStr); log.debug("【dealHisData】省立同德“入院”采集数据入参：{}", serviceSLTDInhospReqVO); @@ -374,9 +373,6 @@ serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO); log.debug("【dealHisData】省立同德“出院”束采集数据，院区：{}", cid); } // SysConfig sysConfig = sysConfigs.get(0); // sysConfig.setConfigValue(nowTime); // configService.updateConfig(sysConfig); } catch (Exception e) { log.error("【dealHisData】省立同德数据采集异常", e); } @@ -597,7 +593,8 @@ redisCache.setCacheListLeftAndDistinct("cache-0", list); log.info("【sfHandlle】电话任务已加入队列，数量：{}", list.size()); } } else if (descByCode.equals("微信小程序")) { } else if (descByCode.equals("微信小程序")) { //微信小程序 if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) { //说明该任务的患者是循环执行的 @@ -624,7 +621,8 @@ //将当前要执行的患者放到过滤患者集合中 serviceSubtaskListFilter.add(serviceSubtask); } } else if (descByCode.equals("短信")) { } else if (descByCode.equals("短信")) { RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key); log.info("【sfHandlle】处理短信长期任务，患者ID：{}", serviceSubtask.getPatid()); @@ -656,6 +654,9 @@ if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(localIP + ":" + req_path + "/sf?p=" + format); sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); if (active.equals("xh")) { sendMagParam.setContent("【新华医院】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); } } else { HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { @@ -1056,7 +1057,6 @@ serviceSubtaskPreachformMapper.updateSSPByCondition(serviceSubtaskPreachform); return true; } ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform(); serviceSubtaskPreachform.setSubid(serviceSubtask.getId()); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
@@ -136,9 +136,7 @@ } } log.info("-----------map的值为：{}", msgInfo); // // String url = configService.selectConfigByKey("token.360",orgid); // Map<String, String> map = MsgLSEnum.getAddressByCode(orgid); String token = LSHospTokenUtil.getToken(orgid,msgInfo.get("tokenUrl")); log.info("【sfHandlle】丽水短信发送，地址：{}，参数：{}，机构ID：{}", msgInfo.get("address"), orgid); String dxCode = getDXCode(msgInfo.get("address"), phone, content, msgInfo.get("sendPersonId"), msgInfo.get("sendPersonName"), MsgLSEnum.getHeaderByCode(msgInfo), token); smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -421,8 +421,7 @@ <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO" resultMap="ServiceSubtaskResult"> <include refid="selectServiceSubtaskVo"/> where 1=1 and del_flag = 0 where del_flag = 0 <if test="orgid != null and orgid != ''"> and orgid = #{orgid} </if> @@ -435,8 +434,7 @@ <select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.ServiceSubtaskVO" resultMap="ServiceSubtaskResult"> <include refid="selectServiceSubtaskVo"/> where 1=1 and del_flag = 0 where del_flag = 0 <if test="orgid != null and orgid != ''"> and orgid = #{orgid} </if>
