Merge remote-tracking branch 'origin/master'

gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java

@@ -45,6 +45,18 @@ public class THiddenTroubleController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 地图初始化隐患
+     * @param tHiddenTrouble
+     * @return
+     */
+    @GetMapping("/getMapHiddenTroublelist")
+    public AjaxResult getMapHiddenTroublelist(THiddenTrouble tHiddenTrouble)
+    {
+        List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出隐患信息列表
      */
@@ -53,6 +65,7 @@ public class THiddenTroubleController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(THiddenTrouble tHiddenTrouble)
     {
+        tHiddenTrouble.setDealStatus("3");
         List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
         ExcelUtil<THiddenTrouble> util = new ExcelUtil<THiddenTrouble>(THiddenTrouble.class);
         return util.exportExcel(list, "隐患信息数据");

gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml

@@ -49,8 +49,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTDeviceReportDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
-        select t.report_time, t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time,
-               d.device_id, d.device_name, d.device_code, d.device_type, d.device_model
+        select
+            t.report_time,
+            t.device_report_data_id,
+            t.device_num,
+            t.standard_condition_accumulation,
+            t.working_condition_accumulation,
+            t.residual_quantity,
+            t.standard_condition_flow,
+            t.working_condition_flow,
+            t.temperature,
+            t.pressure,
+            t.communication_status,
+            t.create_time,
+            t.update_time,
+            d.device_id,
+            d.device_name,
+            d.device_code,
+            d.device_type,
+            d.device_model,
+            CASE (SELECT COUNT(DISTINCT alarm.device_id) FROM t_device_alarm alarm WHERE alarm.device_id = d.device_id AND alarm.end_time IS NULL)
+            WHEN 0 THEN '正常'
+            ELSE '报警'
+            END as device_status
         from t_device_report_data t
         left join t_device_info d on t.device_num = d.iot_no
         <where>  
@@ -64,10 +85,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
-        select max(t.report_time) report_time, t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time,
-               d.device_id, d.device_name, d.device_code, d.device_type, d.device_model
+        select
+            max(t.report_time) report_time,
+            t.device_report_data_id,
+            t.device_num,
+            t.standard_condition_accumulation,
+            t.working_condition_accumulation,
+            t.residual_quantity,
+            t.standard_condition_flow,
+            t.working_condition_flow,
+            t.temperature,
+            t.pressure,
+            t.communication_status,
+            t.create_time,
+            t.update_time,
+            d.device_id,
+            d.device_name,
+            d.device_code,
+            d.device_type,
+            d.device_model,
+            CASE (SELECT COUNT(DISTINCT alarm.device_id) FROM t_device_alarm alarm WHERE alarm.device_id = d.device_id AND alarm.end_time IS NULL)
+            WHEN 0 THEN '正常'
+            ELSE '报警'
+            END as device_status
         from t_device_report_data t
-        right join t_device_info d on t.device_num = d.iot_no
+        LEFT JOIN t_device_info d on t.device_num = d.iot_no
         <where>
             <if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if>
             <if test="deviceType != null "> and d.device_type = #{deviceType}</if>

gassafety-web/src/api/riskManagement/hiddenTrouble.js

@@ -9,6 +9,15 @@ export function listHiddenTrouble(query) {
   })
 }
 
+//地图隐患初始化
+export function getMapHiddenTroublelist(query) {
+  return request({
+    url: '/riskManagement/hiddenTrouble/getMapHiddenTroublelist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询隐患信息详细
 export function getHiddenTrouble(troubleId) {
   return request({

gassafety-web/src/router/index.js

@@ -106,19 +106,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/basicsInfo',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'detail',
-        component: (resolve) => require(['@/views/workOrder/basicsInfo/detail'], resolve),
-        name: 'basicsInfo-detail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/basicsInfo',
     component: Layout,
@@ -132,19 +119,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/feedback',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'feedbackdetail',
-        component: (resolve) => require(['@/views/workOrder/feedback/feedbackdetail'], resolve),
-        name: 'feedback-feedbackdetail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/feedback',
     component: Layout,
@@ -158,19 +132,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/inspectionPlan',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'inspectiondetail',
-        component: (resolve) => require(['@/views/deviceInspection/inspectionPlan/inspectiondetail'], resolve),
-        name: 'inspectionPlan-inspectiondetail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/inspectionPlan',
     component: Layout,
@@ -184,19 +145,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/deviceAlarm',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'alarmdetail',
-        component: (resolve) => require(['@/views/dataMonitoring/deviceAlarm/alarmdetail'], resolve),
-        name: 'deviceAlarm-alarmdetail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/deviceAlarm',
     component: Layout,
@@ -210,19 +158,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/realtimeData',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'realtimedetail',
-        component: (resolve) => require(['@/views/dataMonitoring/realtimeData/realtimedetail'], resolve),
-        name: 'realtimeData-realtimedetail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/realtimeData',
     component: Layout,
@@ -236,19 +171,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/reportData',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'reportdetail',
-        component: (resolve) => require(['@/views/dataMonitoring/reportData/reportdetail'], resolve),
-        name: 'reportData-reportdetail',
-        meta: { title: '详情' }
-      }
-    ],
-  },
   {
     path: '/reportData',
     component: Layout,

gassafety-web/src/views/dataMonitoring/deviceAlarm/alarmdetail.vue → gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -29,9 +29,6 @@
             <el-form-item label="设备编号:" prop="deviceCode">
               <font>{{form.deviceCode}}</font> 
             </el-form-item>
-            <el-form-item label="设备信息:" prop="alarmId">
-              <font>{{form.alarmId}}</font> 
-            </el-form-item>
           </el-form>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
             <el-form-item label="报警类型:" prop="alarmType">

gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue

@@ -349,7 +349,7 @@ export default {
     /** 详细信息跳转 */
     showDetail(row) {
       this.$router.push({
-        path: '/deviceAlarm/alarmdetail',
+        path: '/dataMonitoring/alarmdetail',
         query: {
           alarmId: row.alarmId
         }

gassafety-web/src/views/dataMonitoring/realtimeData/index.vue

@@ -175,7 +175,7 @@ export default {
     //详情按钮
     showDetail(row) {
       this.$router.push({
-        path: '/realtimeData/realtimedetail',
+        path: '/dataMonitoring/realtimedetail',
         query:{
           deviceId : row.deviceId
         }

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -302,7 +302,7 @@
       /** 详细信息跳转 */
       showDetail(row) {
         this.$router.push({
-          path: '/inspectionPlan/inspectiondetail',
+          path: '/deviceInspection/inspectiondetail',
           query:{
             planId : row.planId
           }

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -584,12 +584,12 @@ export default {
     },
     socket() {
       console.log("socket执行");
-      // this.ws = new WebSocket(
-      //   "ws://36.148.23.59:8901/gassafety/websocketServer"
-      // );
       this.ws = new WebSocket(
-        "ws://192.168.2.23:8903/gassafety/websocketServer"
+        "ws://36.148.23.59:8901/gassafety/websocketServer"
       );
+      // this.ws = new WebSocket(
+      //   "ws://192.168.2.23:8903/gassafety/websocketServer"
+      // );
       this.ws.onopen = (evt) => {
         console.log("WebSockets=======gogogog");
         // this.ws.send("WebSockets!=========================");

gassafety-web/src/views/workOrder/basicsInfo/index.vue

@@ -324,7 +324,7 @@ export default {
     /** 详细信息跳转 */
     showDetail(row) {
       this.$router.push({
-         path: '/basicsInfo/detail',
+         path: '/workOrder/detail',
          query:{
            orderId : row.orderId
          }

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -349,7 +349,7 @@
       /** 详细信息跳转 */
       showDetail(row) {
         this.$router.push({
-          path: '/feedback/feedbackdetail',
+          path: '/workOrder/feedbackdetail',
           query:{
             orderId : row.orderId
           }

gassafety-web/src/views/workOrder/feedback/feedbackdetail.vue → gassafety-web/src/views/workOrder/feedbackdetail/index.vue

@@ -493,9 +493,9 @@ export default {
         this.resetForm("form");
       },
       /** 反馈按钮操作 */
-      handleFeedback(row) {
+      handleFeedback(orderId) {
         this.open = true;
-        const orderId = row.orderId || this.ids
+        //const orderId = row.orderId || this.ids
         getBasicsInfo(orderId).then(response => {
           this.form = response.data;
           this.open = true;