添加推送设备功能

src/main/java/com/hzjt/config/ScheduleTaskConfig.java

@@ -60,16 +60,21 @@ public class ScheduleTaskConfig {
     }
 
 
-    @Scheduled(cron = "0 */2 * * * ?")//每2分钟执行一次
+//    @Scheduled(cron = "0 */2 * * * ?")//每2分钟执行一次
     private void sendToguangda() {
         //查询所有未推送的数据
         List<Traffalarmrecord> resultlist=traffalarmrecordService.getTraffalarmrecordBystatus();
         for(Traffalarmrecord record:resultlist)
         {
-            ResultObj obj = eventWriteService.updateAndAutoSendEvent(record);
-            if (obj.getStatus() != 200) {
-            log.error(record.getRecordid()+" send to guangda fail");
-
+            try {
+                ResultObj obj = eventWriteService.updateAndAutoSendEvent(record);
+                if (obj.getStatus() != 200) {
+                    log.error(record.getRecordid() + " send to guangda fail");
+                } else {
+                    log.info(record.getRecordid() + " send to guangda success");
+                }
+            }catch (Exception  ex){
+                log.error(record.getRecordid() + " send to guangda fail"+ex.toString());
             }
         }
 

src/main/java/com/hzjt/service/TraffdevicewriteresultService.java

@@ -62,17 +62,17 @@ public class TraffdevicewriteresultService {
             Traffdevicewriteresult param = new Traffdevicewriteresult();
 
             for (SbtdspsrParams val : sbtdspsrs) {
-                threadService.submit(() -> {
-//                    log.info("sendtoguangda"+val.toString());
+                //threadService.submit(() -> {
+                    log.info("sendtoguangda"+val.toString());
                     ResultObj obj = sendToGuangda(val, param);
-                    obj.setData(val.getSbbh() + "_" + val.getTdbh());
-                    return obj;
+                    obj.setData(val.getXh());
+                resultObj.add( obj);
 
-                });
-            }
-            for (int i = 0; i < sbtdspsrs.size(); i++) {
-                resultObj.add(threadService.poll(10, TimeUnit.SECONDS).get());
+               // });
             }
+//            for (int i = 0; i < sbtdspsrs.size(); i++) {
+//                resultObj.add(threadService.poll(10, TimeUnit.SECONDS).get());
+//            }
 
         } catch (Exception e) {
             log.error("devicewrite - sendEvent 异常:" + e.toString());
@@ -81,7 +81,7 @@ public class TraffdevicewriteresultService {
         return resultObj;
     }
 
-    public ResultObj sendToGuangda(SbtdspsrParams val, Traffdevicewriteresult param) throws Exception {
+    public ResultObj sendToGuangda(SbtdspsrParams val, Traffdevicewriteresult param){
         if (val.getXzbh() == null) {
             log.error("deviceWritePost  {} : regist remsg...", "设备所属单位机构编码必填");
             return ResultObj.error(ResponseEnum.E_1002.getCode(), "设备所属单位机构编码必填");

src/main/resources/mapper/TraffdevicewriteresultMapper.xml

@@ -2,25 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzjt.mapper.TraffdevicewriteresultMapper">
     <select id="querySbtdspsrByXh" resultType="com.hzjt.domain.SbtdspsrParams">
-        SELECT
-        TA.*,
-        A.CREATETIME,
-        A.PUSHSTATUS,
-        A.PUSHCOUNT,
-        A.REMARK,
-        A.PUSHDESC,
-        p.dept_name AS xztreename,
-        B.remark1 AS deviceconfig
-        FROM SBTDSPSR TA
-        LEFT JOIN TRAFFDEVICEWRITERESULT A ON A.SBBH = TA.SBBH AND A.TDBH = TA.TDBH
-        LEFT JOIN TRAFFDEVICECONFIG B ON B.FDID = TA.SBBH AND B.CHANNELID = TA.TDBH
-        LEFT JOIN dept P ON P .dept_id = TA.xzbh
-        WHERE 1=1
+        select
+        ta.*,
+        a.createtime,
+        a.pushstatus,
+        a.pushcount,
+        a.remark,
+        a.pushdesc,
+        p.dept_name as xztreename,
+        b.remark1 as deviceconfig
+        from sbtdspsr ta
+        left join traffdevicewriteresult a on a.sbbh = ta.sbbh and a.tdbh = ta.tdbh
+        left join traffdeviceconfig b on b.fdid = ta.sbbh and b.channelid = ta.tdbh
+        left join dept p on p .dept_id = ta.xzbh
+        <where>
         <if test="xhs !=null and xhs.size>0 ">
             and TA.XH IN
             <foreach item="xh" collection="xhs" open="(" separator="," close=")">
                 #{xh}
             </foreach>
         </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file