添加设备推送时状态管理

src/main/java/im/zhaojun/system/model/SbtdspsrResult.java

@@ -9,39 +9,40 @@ import java.util.Date;
 @Setter
 public class SbtdspsrResult extends Sbtdspsr {
     /**
-     * 创建时间
+     * ����ʱ��
      */
     private Date createtime;
 
     /**
-     * 推送状态(0成功1失败)
+     * ����״̬(0�ɹ�1ʧ��)
      */
     private Long pushstatus;
 
     /**
-     * 推送描述
+     * ��������
      */
     private String pushdesc;
 
 
     /**
-     * 推送次数
+     * ���ʹ���
      */
     private Long pushcount;
 
     /**
-     * 行政编号
+     * �������
      */
     private String xzbh;
 
     /**
-     * 备注
+     * ��ע
      */
     private String remark;
 
     /**
-     * 行政名称
+     * ��������
      */
     private String xztreename;
+    private String  devicetype;
 
 }

src/main/resources/mapper/traffdevicewriteresult.xml

@@ -9,13 +9,15 @@
         a.pushcount,
         a.remark,
         a.pushdesc,
-        p.dept_name as xztreename
+        p.dept_name as xztreename,
+        b.devicechecktype devicetype
         from sbtdspsr ta
         inner join traffdevicewriteresult a
         on a.sbbh = ta.sbbh
         and a.tdbh = ta.tdbh
         left join dept p
         on p.dept_id = ta.xzbh
+        inner join traffdeviceconfig b on b.fdid = ta.sbbh and b.channelid = ta.tdbh
        <where>
         <if test="sbbh !=null and sbbh != ''">
             and (TA.sbbh like '%'||#{sbbh}||'%' OR TA.tdmc like '%'||#{sbbh}||'%' OR TA.tdmcpy like '%'||#{sbbh}||'%' )

src/main/resources/static/js/sjcx/sjcx.js

@@ -207,10 +207,35 @@ let vue_sjcx = new Vue({
                         let a_sum = result.count;
                         vue_sjcx.count = result.count;
                         vue_sjcx.data_table_wfpz = result.data;
-
+                        if (items) {
+                            $("#fy4").bootstrapPaginator({
+                                bootstrapMajorVersion: 3, //版本，这里设置为3，大于2即可
+                                currentPage: 1,//当前页
+                                totalPages: Math.ceil(((a_sum > 0) ? a_sum : 1) / vue_sjcx.fy_select),//总页数
+                                // numberofPages: 10,//显示的页数
+                                itemTexts: function (type, page, current) { //修改显示文字
+                                    switch (type) {
+                                        case "first":
+                                            return "首页";
+                                        case "prev":
+                                            return "上一页";
+                                        case "next":
+                                            return "下一页";
+                                        case "last":
+                                            return "末页";
+                                        case "page":
+                                            return page;
+                                    }
+                                }, onPageClicked: function (event, originalEvent, type, page) { //异步换页
+                                    //请求加载数据
+                                    vue_sjcx.query(page, false);
+                                }
+                            });
+                        }
                     }
                 }
             });
+
             }
             else if(exportornot==1){
               var xhr = new XMLHttpRequest();

src/main/resources/templates/page/sbts.html

@@ -45,9 +45,11 @@
                                     <td>通道编号</td>
                                     <td>辖区名称</td>
                                     <td>行政编号</td>
+                                    <td>设备状态</td>
                                     <td>推送次数</td>
                                     <td>推送描述</td>
                                     <td>推送状态</td>
+
                                     <td>设备检测类型</td>
                                     <td>所在地类型</td>
                                 </tr>
@@ -62,6 +64,7 @@
                                     <td v-text="item.tdbh"></td>
                                     <td v-text="item.xztreename"></td>
                                     <td v-text="item.xzbh"></td>
+                                    <td v-text="item.devicetype=='1'?'不在线':'在线'"></td>
                                     <td v-text="item.pushcount==null?'0':item.pushcount"></td>
                                     <td v-text="item.pushdesc==null?'':item.pushdesc"></td>
                                     <td v-text="item.pushstatus==null||item.pushstatus=='9'?'待推送':item.pushstatus=='0'?'推送成功':'推送失败'"></td>