FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-06-24 10:04:30 +08:00
parent 4177a19406 611db02e6e
commit 340615ad26
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
+4 -19
View File
@@ -4,7 +4,7 @@
<insert id="ignoreInsert" parameterType="java.util.LinkedList"> <insert id="ignoreInsert" parameterType="java.util.LinkedList">
REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER) REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEM_ID,POLICY_ID,MARK,POWER)
VALUES VALUES
<if test="warningEOS !=null and warningEOS.size()!=0"> <if test="warningEOS !=null and warningEOS.size()!=0">
<foreach collection="warningEOS" item="item" index="index" separator=","> <foreach collection="warningEOS" item="item" index="index" separator=",">
@@ -21,26 +21,11 @@
</insert> </insert>
<delete id="autoCancelWarning"> <delete id="autoCancelWarning">
UPDATE sar_stand_warning UPDATE sar_stand_warning
SET POWER ='0' SET POWER ='0'
WHERE WHERE
STAND_ID IN ( STAND_ID IN ( SELECT law_id FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d'))
SELECT
law_id
FROM
warning_date
WHERE
DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
)
OR OR
ITEMS_ID IN ( ITEM_ID IN ( SELECT ITEM_ID FROM warning_date WHERE DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d') AND ITEM_ID IS NOT NULL )
SELECT
ITEM_ID
FROM
warning_date
WHERE
DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
)
</delete> </delete>
doc/sql/20220623_定时任务执行管理表添加预警信息.sql
+1 -1
View File
@@ -1 +1 @@
INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '*/5 * * * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32'); INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '0 0 0 * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32');