| ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/smsVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -3,10 +3,8 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUserDept; import com.ruoyi.common.core.domain.entity.SysUserRole; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.quartz.mapper.CollectHISMapper; import com.ruoyi.quartz.mapper.UtilsMapper; import com.ruoyi.quartz.service.ICollectHISService; import com.smartor.domain.*; import com.smartor.mapper.*; @@ -22,6 +20,7 @@ import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @Slf4j @Service @@ -408,40 +407,39 @@ @Override public Integer selectUserList(SysUser sysUser) { List<SysUser> sysUserList = chMapper.selectUserList(sysUser); SysUser suerTemp=new SysUser(); List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp); log.info("sysUserList的采集到的数量为：{}", sysUserList.size()); int i =0;// sysUser2Mapper.batchUser(sysUserList); for (SysUser sysUser1 : sysUserList) { // log.info("sysUser1的ID为：{}", sysUser1.getUserId()); // log.info("sysUser1的HISUSERID为：{}", sysUser1.getHisUserId()); // //新增用户与角色 // SysUserRole yhyjsxx = chMapper.yhyjsxx(sysUser1); // if (yhyjsxx != null&&yhyjsxx.getUserId()!=null) { // yhyjsxx.setUserId(sysUser1.getUserId()); // List<SysUserRole> userRoleList = new ArrayList<>(); // userRoleList.add(yhyjsxx); // sysUserRoleMapper.batchUserRole(userRoleList); // } if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue; SysUser suTemp=new SysUser(); suTemp.setHisUserId(sysUser1.getHisUserId()); List<SysUser> usersTemp= sysUser2Mapper.selectUserList(suTemp); if (usersTemp.size()>0) { sysUser1.setUserId(usersTemp.get(0).getUserId()); sysUser1.setUserName(sysUser1.getHisUserId()); sysUser2Mapper.updateUser(sysUser1); }else{ sysUser1.setUserName(sysUser1.getHisUserId()); sysUser2Mapper.insertUser(sysUser1); usersTemp= sysUser2Mapper.selectUserList(suTemp); } //新增用户与部门 List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1); for(SysUserDept sud :sysUserDept) { if (usersTemp.size()>0) { sud.setUserId(usersTemp.get(0).getUserId()); sysUserDeptMapper.insertSysUserDept(sud); } //List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1); List<SysUserDept> sysUserDept=sysUserDeptAll.stream() .filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())) .collect(Collectors.toList()); } for (SysUserDept sud : sysUserDept) { if (usersTemp.size() > 0) { sud.setUserId(usersTemp.get(0).getUserId()); sysUserDeptMapper.insertSysUserDept(sud); } } } return i; ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.RSAPublicKeyExample; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.sms.smsUtils; import com.ruoyi.quartz.service.ICollectHISService; import com.smartor.common.LSHospTokenUtil; import com.smartor.domain.*; @@ -95,6 +96,12 @@ @Value("${xhsmsPath}") private String xhsmsPath; @Value("${xhsmsAccount}") private String xhsmsAccount; @Value("${xhsmsPwd}") private String xhsmsPwd; @Value("${pub_key}") private String pub_key; @@ -549,6 +556,9 @@ if (code.equals("0")) { isSuccess = "true"; } }else if (visitHosp == 3) {//市一医院 String content=sendMagParam.getContent().replace("【新华医院】",""); smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,sendMagParam.getPhone(),content); } //任务发送记录 ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord(); ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -7,7 +7,7 @@ <resultMap type="com.ruoyi.common.core.domain.entity.SysUserDept" id="SysUserDeptResult"> <result property="id" column="id"/> <result property="orgid" column="orgid"/> <result property="userId" column="user_id"/> <result property="userCode" column="user_code"/> <result property="deptId" column="dept_id"/> <result property="delFlag" column="del_flag"/> <result property="deptCode" column="dept_code"/> @@ -372,7 +372,7 @@ </select> <select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult"> select user_id, user_code, dept_type,dept_code as dept_id,dept_code,dept_name,deptparent,del_flag,orgid select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid FROM healthy_user_dept <where> user_id != 'admin' smartor/src/main/java/com/smartor/domain/smsVO.java
@@ -13,5 +13,13 @@ @ApiModelProperty(value = "短信内容") private String content; @ApiModelProperty(value = "问卷ID") private String taskId; @ApiModelProperty(value = "问卷名称") private String taskName; @ApiModelProperty(value = "患者ID") private String patId; } smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -106,6 +106,9 @@ <if test="orgid != null "> orgid, </if> <if test="userCode != null "> user_code, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="userId != null">#{userId}, @@ -133,6 +136,9 @@ <if test="orgid != null "> #{orgid}, </if> <if test="userCode != null "> #{userCode}, </if> </trim> </insert>
@@ -136,8 +136,8 @@ <if test="title != null and title != ''"> AND u.title = #{title} </if> <if test="job_phone != null and job_phone != ''"> AND u.job_phone = #{job_phone} <if test="jobPhone != null and jobPhone != ''"> AND u.job_phone = #{jobPhone} </if> <if test="birthday != null and birthday != ''"> AND u.birthday = #{birthday}
