zcloud_gbs
/
zcloud_gbs_safety_supervision
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config): 更新配置文件并优化数据库查询逻辑

main
zhaokai 2026-06-30 15:08:50 +08:00
parent b40db77e67
commit 4549f18637
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/bootstrap.yml
View File

@ -4,6 +4,6 @@ spring:
# - classpath:nacos.yml # - classpath:nacos.yml
# - classpath:sdk.yml # - classpath:sdk.yml
- classpath:nacos-prod.yml - classpath:nacos-prod.yml
# - classpath:sdk-prod.yml - classpath:sdk-prod.yml
- classpath:sdk-prod-gwj.yml # - classpath:sdk-prod-gwj.yml
- classpath:swagger.yml - classpath:swagger.yml

1
web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
View File

@ -56,6 +56,7 @@ public class BusCalendarController {
} }
String decryptValue = EncryptAndDecryptUtil.decryptSm4(EncryptAndDecryptUtil.decryptSm2(key), value); String decryptValue = EncryptAndDecryptUtil.decryptSm4(EncryptAndDecryptUtil.decryptSm2(key), value);
log.info("接收数港安全月历审核结果成功，解密报文：{}", decryptValue);
SgCalendarAuditDTO auditDTO = JSON.parseObject(decryptValue, SgCalendarAuditDTO.class); SgCalendarAuditDTO auditDTO = JSON.parseObject(decryptValue, SgCalendarAuditDTO.class);
String validateMessage = validateAudit(auditDTO); String validateMessage = validateAudit(auditDTO);
if (validateMessage != null) { if (validateMessage != null) {

4
web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
View File

@ -39,10 +39,10 @@
AND duty_phone LIKE CONCAT('%', #{params.dutyPhone}, '%') AND duty_phone LIKE CONCAT('%', #{params.dutyPhone}, '%')
</if> </if>
<if test="params.startDutyTime != null and params.startDutyTime != ''"> <if test="params.startDutyTime != null and params.startDutyTime != ''">
AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)) &gt;= #{params.startDutyTime} AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)), 10) &gt;= LEFT(#{params.startDutyTime}, 10)
</if> </if>
<if test="params.endDutyTime != null and params.endDutyTime != ''"> <if test="params.endDutyTime != null and params.endDutyTime != ''">
AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)) &lt;= #{params.endDutyTime} AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)), 10) &lt;= LEFT(#{params.endDutyTime}, 10)
</if> </if>
</where> </where>
ORDER BY create_time DESC ORDER BY create_time DESC