From 86190b949fc5493704149d586f970b857dd3656d Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 19 Mar 2026 14:30:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=81=A5=E5=BA=B7=E5=92=A8=E8=AF=A2):?= =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=20clientSign=20=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E5=8F=8A=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ConDepartmentApiServiceImpl.java | 2 +- .../renkang/consultation/task/HelperSchedulingHistoryJob.java | 4 ---- .../java/com/renkang/consultation/task/SyncScheduleJob.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDepartmentApiServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDepartmentApiServiceImpl.java index ff80956..22d43e9 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDepartmentApiServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDepartmentApiServiceImpl.java @@ -253,7 +253,7 @@ public class ConDepartmentApiServiceImpl implements ConDepartmentApiService { String allChildKey = "consulation:departmentHaveDoctor:AllLevelTwo"; - if(!CollectionUtils.isEmpty(list)){ + if(!CollectionUtils.isEmpty(list)){ redisUtil.del(key); redisUtil.del(allChildKey); for (ConDepartmentDO conDepartmentDO : list) { diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java index 7e978c6..7f69628 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java @@ -31,11 +31,7 @@ public class HelperSchedulingHistoryJob { @XxlJob(value = "helperSchedulingHistoryJob") public ReturnT helperSchedulingHistory() { - String param = XxlJobHelper.getJobParam(); - JSONObject jsonObject = JSONObject.parseObject(param); - String clientSign = jsonObject.getString("clientSign"); - ClientSignThreadLocal.setClientSign(clientSign); XxlJobHelper.log("开始记录全科医生排班历史"); log.info("开始记录全科医生排班历史"); try { diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java index 7319091..40b1dc9 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java @@ -32,7 +32,7 @@ public class SyncScheduleJob { @XxlJob(value = "endUserAndProfessiorHelper") - public ReturnT endUserAndProfessiorHelper(String time) { + public ReturnT endUserAndProfessiorHelper() { String expireHour = "168"; String param = XxlJobHelper.getJobParam(); From 96e82801e0a1526ac7416644431271a754f4e891 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 19 Mar 2026 14:30:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=BE=BE=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93=20SQL=20?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E7=BC=BA=E5=B0=91=E5=8F=8C=E5=BC=95=E5=8F=B7?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/system/mapper/xml/SysLogMapper.xml | 8 ++++---- .../org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml index 00970fe..c6be2aa 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml @@ -38,10 +38,10 @@ order by tian asc - select count(*) as visit - ,count(distinct(ip)) as ip - ,to_char(create_time, 'yyyy-mm-dd') as tian - ,to_char(create_time, 'mm-dd') as type + select count(*) as "visit" + ,count(distinct(ip)) as "ip" + ,to_char(create_time, 'yyyy-mm-dd') as "tian" + ,to_char(create_time, 'mm-dd') as "type" from QH_SYS_LOG where log_type = 1 and create_time >= #{dayStart} and create_time < #{dayEnd} group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd') diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index ed3cd12..9798af9 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -403,7 +403,7 @@ where INSTR(',' || #{userIds} || ',', ',' || id || ',') > 0