Commit 95690c91 by java-李谡

修改20分钟内梧桐花记录仍会预警bug

parent fceef1eb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.foc</groupId> <groupId>com.foc</groupId>
<artifactId>task</artifactId> <artifactId>task</artifactId>
<version>3.0-SNAPSHOT</version> <version>3.1-SNAPSHOT</version>
<properties> <properties>
<!-- log4j日志文件管理包版本 --> <!-- log4j日志文件管理包版本 -->
......
...@@ -28,11 +28,7 @@ ...@@ -28,11 +28,7 @@
LEFT JOIN foc_sound_phones ap ON ac.id = ap.record_id LEFT JOIN foc_sound_phones ap ON ac.id = ap.record_id
WHERE WHERE
ac.end_status = 'SUCCESS' ac.end_status = 'SUCCESS'
AND ac.start_time &lt;= #{date} AND ac.start_time &gt;= #{date}
AND (
ac.end_time &lt; #{date}
OR ac.end_time IS NULL
)
ORDER BY ORDER BY
beginTime DESC beginTime DESC
LIMIT 20 LIMIT 20
......
...@@ -47,22 +47,12 @@ ...@@ -47,22 +47,12 @@
<dataSource type="POOLED"> <dataSource type="POOLED">
<property name="driver" value="com.mysql.jdbc.Driver"/> <property name="driver" value="com.mysql.jdbc.Driver"/>
<property name="url" value="jdbc:mysql://106.75.97.50:3306/jd_foc?serverTimezone=CTT&amp;useUnicode=true&amp;characterEncoding=utf-8"/> <property name="url" value="jdbc:mysql://106.75.97.50:3306/jd_foc?serverTimezone=CTT&amp;useUnicode=true&amp;characterEncoding=utf-8"/>
<!--<property name="url" value="jdbc:mysql://mysql_server:3306/foc?useUnicode=true&amp;characterEncoding=utf-8"/>--> <!-- <property name="url" value="jdbc:mysql://mysql_server:3306/foc?serverTimezone=CTT&amp;useUnicode=true&amp;characterEncoding=utf-8"/>-->
<property name="username" value="focuser"/> <property name="username" value="focuser"/>
<property name="password" value="FOC@2016"/> <property name="password" value="FOC@2016"/>
</dataSource> </dataSource>
</environment> </environment>
<!--<environment id="prod">-->
<!--<transactionManager type="JDBC"/>-->
<!--&lt;!&ndash; 配置数据库连接信息 &ndash;&gt;-->
<!--<dataSource type="POOLED">-->
<!--<property name="driver" value="com.mysql.jdbc.Driver"/>-->
<!--<property name="url" value="jdbc:mysql://sms.db.com:3306/sms"/>-->
<!--<property name="username" value="sms_develop"/>-->
<!--<property name="password" value="Develop2018!@#"/>-->
<!--</dataSource>-->
<!--</environment>-->
</environments> </environments>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment