From 6411620eaf6cae9881be91a20084bfbf6dec2b0f Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 4 Jul 2024 09:26:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=A7=93=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/residentinfo/ResidentInfoMapper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java index cceea607..fa2b0598 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java @@ -70,6 +70,12 @@ public interface ResidentInfoMapper { */ ResidentInfo getResidentInfoByPhoneAndOpenId(@Param("phone") String phone, @Param("openId") String openId); - + /** + * 根据电话号码和居民姓名查询居民基本信息 + * + * @param phone 手机号 + * @param patientName 姓名 + * @return 居民基本信息 + */ List getResidentInfoByPhoneAndName(@Param("phone") String phone, @Param("patientName") String patientName); } From 6ff4bd900cd735e1791d620df03d44f2e19fad76 Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 4 Jul 2024 09:43:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/AppletPersonCenterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java index bad9c76b..990adb2b 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java @@ -256,12 +256,12 @@ public class AppletPersonCenterServiceImpl implements AppletPersonCenterService String storedCode = valueOperations.get(cacheKey); if (storedCode == null) { - log.info("验证码已过期，手机号：{}", verifySmsCodeDTO.getPhoneNum()); + log.error("验证码已过期，手机号：{}", verifySmsCodeDTO.getPhoneNum()); return AjaxResult.error("验证码已过期，请重新获取！"); } if (!storedCode.equals(smsCode)) { - log.info("验证码验证失败，手机号：{}，输入的验证码：{}，获取的验证码：{}", verifySmsCodeDTO.getPhoneNum(), smsCode, storedCode); + log.error("验证码验证失败，手机号：{}，输入的验证码：{}，获取的验证码：{}", verifySmsCodeDTO.getPhoneNum(), smsCode, storedCode); return AjaxResult.error("验证码错误，请重新输入！"); } From ee6cf0ea7760970f4906cfe4e01905e241b02113 Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 4 Jul 2024 10:17:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E6=97=B6=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=97=A5=E5=BF=97=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/AppletPersonCenterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java index 990adb2b..3d786427 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java @@ -232,7 +232,7 @@ public class AppletPersonCenterServiceImpl implements AppletPersonCenterService // 更新验证码和冷却键 valueOperations.set(cacheKey, code, 5, TimeUnit.MINUTES); valueOperations.set(coolDownKey, Constants.SMS_COOL_DOWN_VALUE, 60, TimeUnit.SECONDS); - log.info("手机号为{}的验证码已经生成", phoneNum); + log.info("手机号为{}的验证码已经生成，验证码:{}", phoneNum, code); return AjaxResult.success("短信发送成功"); } catch (ClientException e) { log.error("短信发送失败，手机号：{}，错误原因：{}", phoneNum, e.getMessage(), e); @@ -265,7 +265,7 @@ public class AppletPersonCenterServiceImpl implements AppletPersonCenterService return AjaxResult.error("验证码错误，请重新输入！"); } - log.info("验证码验证成功，手机号：{}", verifySmsCodeDTO.getPhoneNum()); + log.info("验证码验证成功，手机号：{}，输入的验证码：{}，获取的验证码：{}", verifySmsCodeDTO.getPhoneNum(), smsCode, storedCode); List residentInfos = residentInfoMapper.getResidentInfoByPhoneAndName(verifySmsCodeDTO.getPhoneNum(), verifySmsCodeDTO.getPatientName()); if (residentInfos == null || residentInfos.isEmpty()) { From d89006ccc3504d30fd047414bb6c851727d1236d Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 4 Jul 2024 15:45:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelfieldinfo/LabelFieldInfoController.java | 4 ++-- .../mapper/labelfieldinfo/LabelFieldInfoMapper.java | 6 +++--- .../labelfieldinfo/ILabelFieldInfoService.java | 2 +- .../impl/LabelFieldInfoServiceImpl.java | 4 ++-- .../labelfieldcontent/LabelFieldContentMapper.xml | 3 ++- .../manage/labelfieldinfo/LabelFieldInfoMapper.xml | 6 +++++- .../taskpartitiondict/TaskPartitionDictMapper.xml | 1 + .../mobile/utils/WeChatOfficialAccountUtils.java | 11 ++++++----- .../vo/wechatofficialaccountcallback/PatientVO.java | 2 +- .../main/resources/mapper/homepage/HomePageMapper.xml | 5 ++++- .../quartz/service/impl/subscribeTaskServiceImpl.java | 10 +++++----- 11 files changed, 32 insertions(+), 22 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java index a83e7042..404b88b2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java @@ -56,8 +56,8 @@ public class LabelFieldInfoController extends BaseController { * 查询标签字段信息列表树图 */ @GetMapping("/labelFieldList") - public List labelFieldList(String fieldType) { - return labelFieldInfoService.labelFieldList(fieldType); + public List labelFieldList(Long taskPartitionDictId, String fieldType) { + return labelFieldInfoService.labelFieldList(taskPartitionDictId, fieldType); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java index eee9fdf6..4ae3c2a4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java @@ -36,7 +36,7 @@ public interface LabelFieldInfoMapper { * @param fieldType 标签字段信息 * @return 标签字段信息集合 */ - List selectLabelFieldList(String fieldType); + List selectLabelFieldList(@Param("taskPartitionDictId") Long taskPartitionDictId, @Param("fieldType") String fieldType); /** * 新增标签字段信息 @@ -90,7 +90,7 @@ public interface LabelFieldInfoMapper { /** * 查询标签 * - * @param taskPartitionDictId 标签 + * @param taskPartitionDictId 标签 * @return GroupingValue */ List selectLabelFieldInfoByTaskPartitionDictId(Long taskPartitionDictId); @@ -98,7 +98,7 @@ public interface LabelFieldInfoMapper { /** * 查询标签 * - * @param taskPartitionDictIds 标签 + * @param taskPartitionDictIds 标签 * @return LabelFieldVO */ List selectLabelFieldNameByTaskPartitionDictIds(@Param("taskPartitionDictIds") List taskPartitionDictIds); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java index 161964c5..e57a1330 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java @@ -36,7 +36,7 @@ public interface ILabelFieldInfoService { * @param fieldType 字段类型 * @return AjaxResult */ - List labelFieldList(String fieldType); + List labelFieldList(Long taskPartitionDictId, String fieldType); /** * 新增标签字段信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index 4a21119a..aa9ccd40 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -70,10 +70,10 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { * @return AjaxResult */ @Override - public List labelFieldList(String fieldType) { + public List labelFieldList(Long taskPartitionDictId, String fieldType) { int i = 1; //查询细分 - List labelFieldList = labelFieldInfoMapper.selectLabelFieldList(fieldType); + List labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType); List taskPartitionDictIds = labelFieldList.stream().filter(Objects::nonNull).map(LabelFieldVO::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); if (taskPartitionDictIds.size() == 0) { return new ArrayList<>(); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml index 14bbac09..69e92f3c 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -347,6 +347,7 @@ from label_field_info lfi LEFT JOIN label_field_content lfc ON lfi.id =lfc.field_id LEFT JOIN task_partition_dict tpd on tpd.id = lfi.task_partition_dict_id + LEFT JOIN task_type_dict ttd on ttd.id = tpd.task_type_id where 1=1 and lfi.task_partition_dict_id = #{taskPartitionDictId} @@ -360,7 +361,7 @@ and lfc.portrait_status = #{portraitStatus} - Order by tpd.task_partition_sort,lfc.portrait_sn,lfi.field_sort + Order by ttd.task_type_sort, tpd.task_partition_sort,lfc.portrait_sn,lfi.field_sort diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml index d8de48b8..354cbdd4 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml @@ -68,13 +68,17 @@ lfi.task_partition_dict_name label from label_field_info lfi LEFT JOIN task_partition_dict tpd ON tpd.id = lfi.task_partition_dict_id + LEFT JOIN task_type_dict ttd ON ttd.id = tpd.task_type_id lfi.field_type = #{fieldType} + + tpd.id = #{taskPartitionDictId} + group by task_partition_dict_id - order by tpd.task_partition_sort + order by ttd.task_type_sort,tpd.task_partition_sort