Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TWorkOrderController.java

@@ -133,4 +133,11 @@ public class TWorkOrderController extends BaseController
     {
         return toAjax(tWorkOrderService.deleteTWorkOrderByIds(workIds));
     }
+
+    @GetMapping("/selectWorkOrderNum")
+    public AjaxResult selectWorkOrderNum(String enterpriseId)
+    {
+        return  AjaxResult.success(tWorkOrderService.selectWorkOrderNum(enterpriseId));
+    }
+
 }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java

@@ -6,10 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,16 +65,30 @@ public class PipeInterfaceController {
         DeviceList deviceList=new DeviceList();
         //调压箱数据循环
         for (int i=0;i<deviceData.size();i++){
-            //临时存下级数据id
-            List<PressureFlow> pressList=new ArrayList<>();
+            //临时存储压力表数据数组
+            List<PressureFlow> pressureList=new ArrayList<>();
+            //临时存储流量计数据数组
+            List<PressureFlow> flowmeterList=new ArrayList<>();
+            //存储全部数据
+            List<PressureFlow> List=new ArrayList<>();
             for (int s=0;s<pressureFlows1.size();s++){
                 //判断调压箱id与下级数据调压箱id是否相等
                 if (pressureFlows1.get(s).getDeviceId()==deviceData.get(i).getDeviceId()){
                     //下级数据添加进临时存储数据的数组中
-                    pressList.add(pressureFlows1.get(s));
+                    List.add(pressureFlows1.get(s));
+                    //判断是压力表还是流量计   1压力表  2流量计
+                    if (pressureFlows1.get(s).getDeviceType()=="1"){
+                        pressureList.add(pressureFlows1.get(s));
+                    }else {
+                        flowmeterList.add(pressureFlows1.get(s));
+                    }
                 }
             }
-            deviceData.get(i).setPressureFlows(pressList);
+            //压力表设备数量添加
+            deviceData.get(i).setNumberPressureGauges(pressureList.size());
+            deviceData.get(i).setPressureFlows(List);
+            //流量计设备数量添加
+            deviceData.get(i).setNumberEquipment(flowmeterList.size());
             deviceData.get(i).setIconType(2);
         }
         deviceList.setData(deviceData);
@@ -93,11 +104,32 @@ public class PipeInterfaceController {
     public TSiteStationInfoDataList selectTSiteStationInfoData(){
         //场站信息查询方法
         List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData();
+        //查询场站下级设备数据
+        List<PressureFlow> pressureFlows = iPipeInterfaceService.selecttSiteStationInfoDataList("1");
         TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
         for (int i=0;i<tSiteStationInfoData.size();i++){
-            //查询场站下级设备数据
-            List<PressureFlow> pressureFlows = iPipeInterfaceService.selecttSiteStationInfoDataList(tSiteStationInfoData.get(i).getSiteStationId());
-            tSiteStationInfoData.get(i).setPressureFlows(pressureFlows);
+            //临时存储压力表数据数组
+            List<PressureFlow> pressureList=new ArrayList<>();
+            //临时存储流量计数据数组
+            List<PressureFlow> flowmeterList=new ArrayList<>();
+            //存储全部数据
+            List<PressureFlow> List=new ArrayList<>();
+            for (int s=0;s<pressureFlows.size();s++){
+                 if (tSiteStationInfoData.get(i).getSiteStationId()==pressureFlows.get(s).getDeviceId()){
+                     List.add(pressureFlows.get(s));
+                     //判断是压力表还是流量计   1压力表  2流量计
+                     if (pressureFlows.get(s).getDeviceType()=="1"){
+                         pressureList.add(pressureFlows.get(s));
+                     }else {
+                         flowmeterList.add(pressureFlows.get(s));
+                     }
+                 }
+            }
+            //压力表设备数量添加
+            tSiteStationInfoData.get(i).setNumberPressureGauges(pressureList.size());
+            tSiteStationInfoData.get(i).setPressureFlows(List);
+            //流量计设备数量添加
+            tSiteStationInfoData.get(i).setNumberEquipment(flowmeterList.size());
             tSiteStationInfoData.get(i).setIconType(4);
         }
         tSiteStationInfoDataList.setData(tSiteStationInfoData);
@@ -164,16 +196,29 @@ public class PipeInterfaceController {
         DeviceDataList deviceDataList=new DeviceDataList();
         //调压箱数据循环
         for (int i=0;i<pipeDates.size();i++){
-            //临时存下级数据id
-            List<PressureFlow> pressList=new ArrayList<>();
+            //临时存储压力表数据数组
+            List<PressureFlow> pressureList=new ArrayList<>();
+            //临时存储流量计数据数组
+            List<PressureFlow> flowmeterList=new ArrayList<>();
+            //存储全部数据
+            List<PressureFlow> List=new ArrayList<>();
             for (int s=0;s<pressureFlows1.size();s++){
                 //判断调压箱id与下级数据调压箱id是否相等
                 if (pressureFlows1.get(s).getDeviceId()==pipeDates.get(i).getDeviceId()){
-                    //下级数据添加进临时存储数据的数组中
-                    pressList.add(pressureFlows1.get(s));
+                    List.add(pressureFlows1.get(s));
+                    //判断是压力表还是流量计   1压力表  2流量计
+                    if (pressureFlows1.get(s).getDeviceType()=="1"){
+                        pressureList.add(pressureFlows1.get(s));
+                    }else {
+                        flowmeterList.add(pressureFlows1.get(s));
+                    }
                 }
             }
-            pipeDates.get(i).setPressureFlows(pressList);
+            //压力表设备数量添加
+            pipeDates.get(i).setNumberPressureGauges(pressureList.size());
+            pipeDates.get(i).setPressureFlows(List);
+            //流量计设备数量添加
+            pipeDates.get(i).setNumberEquipment(flowmeterList.size());
             pipeDates.get(i).setIconType(3);
         }
             deviceDataList.setData(pipeDates);

gassafetyprogress-system/src/main/java/com/zehong/system/domain/DeviceData.java

@@ -30,6 +30,139 @@ public class DeviceData {
 
     private int iconType;
 
+    //压力表设备数量
+    private int numberPressureGauges;
+
+    //压力表在线设备
+    private int onlineEquipment;
+
+    //压力表离线设备
+    private int offlineEquipment;
+
+    //压力表历史报警
+    private int historicalAlarm;
+
+    //压力表已处理报警
+    private int alarmProcessed;
+
+    //压力表报警中
+    private int inAlarm;
+
+    //流量计设备数量
+    private int numberEquipment;
+
+    //流量计在线设备
+    private int numberOnlineEquipment;
+
+    //流量计离线设备
+    private int numberOfflineEquipment;
+
+    //流量计历史报警
+    private int numberHistoricalAlarm;
+
+    //流量计已处理报警
+    private int numberAlarmProcessed;
+
+    //流量计报警中
+    private int numberInAlarm;
+
+
+    public int getNumberPressureGauges() {
+        return numberPressureGauges;
+    }
+
+    public void setNumberPressureGauges(int numberPressureGauges) {
+        this.numberPressureGauges = numberPressureGauges;
+    }
+
+    public int getNumberOnlineEquipment() {
+        return numberOnlineEquipment;
+    }
+
+    public void setNumberOnlineEquipment(int numberOnlineEquipment) {
+        this.numberOnlineEquipment = numberOnlineEquipment;
+    }
+
+    public int getNumberOfflineEquipment() {
+        return numberOfflineEquipment;
+    }
+
+    public void setNumberOfflineEquipment(int numberOfflineEquipment) {
+        this.numberOfflineEquipment = numberOfflineEquipment;
+    }
+
+    public int getNumberHistoricalAlarm() {
+        return numberHistoricalAlarm;
+    }
+
+    public void setNumberHistoricalAlarm(int numberHistoricalAlarm) {
+        this.numberHistoricalAlarm = numberHistoricalAlarm;
+    }
+
+    public int getNumberAlarmProcessed() {
+        return numberAlarmProcessed;
+    }
+
+    public void setNumberAlarmProcessed(int numberAlarmProcessed) {
+        this.numberAlarmProcessed = numberAlarmProcessed;
+    }
+
+    public int getNumberInAlarm() {
+        return numberInAlarm;
+    }
+
+    public void setNumberInAlarm(int numberInAlarm) {
+        this.numberInAlarm = numberInAlarm;
+    }
+
+    public int getOnlineEquipment() {
+        return onlineEquipment;
+    }
+
+    public void setOnlineEquipment(int onlineEquipment) {
+        this.onlineEquipment = onlineEquipment;
+    }
+
+    public int getOfflineEquipment() {
+        return offlineEquipment;
+    }
+
+    public void setOfflineEquipment(int offlineEquipment) {
+        this.offlineEquipment = offlineEquipment;
+    }
+
+    public int getHistoricalAlarm() {
+        return historicalAlarm;
+    }
+
+    public void setHistoricalAlarm(int historicalAlarm) {
+        this.historicalAlarm = historicalAlarm;
+    }
+
+    public int getAlarmProcessed() {
+        return alarmProcessed;
+    }
+
+    public void setAlarmProcessed(int alarmProcessed) {
+        this.alarmProcessed = alarmProcessed;
+    }
+
+    public int getInAlarm() {
+        return inAlarm;
+    }
+
+    public void setInAlarm(int inAlarm) {
+        this.inAlarm = inAlarm;
+    }
+
+    public int getNumberEquipment() {
+        return numberEquipment;
+    }
+
+    public void setNumberEquipment(int numberEquipment) {
+        this.numberEquipment = numberEquipment;
+    }
+
     public int getIconType() {
         return iconType;
     }
@@ -126,6 +259,7 @@ public class DeviceData {
         this.pressureFlows = pressureFlows;
     }
 
+
     @Override
     public String toString() {
         return "DeviceData{" +
@@ -141,6 +275,18 @@ public class DeviceData {
                 ", pressureFlows=" + pressureFlows +
                 ", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
                 ", iconType=" + iconType +
+                ", numberPressureGauges=" + numberPressureGauges +
+                ", onlineEquipment=" + onlineEquipment +
+                ", offlineEquipment=" + offlineEquipment +
+                ", historicalAlarm=" + historicalAlarm +
+                ", alarmProcessed=" + alarmProcessed +
+                ", inAlarm=" + inAlarm +
+                ", numberEquipment=" + numberEquipment +
+                ", numberOnlineEquipment=" + numberOnlineEquipment +
+                ", numberOfflineEquipment=" + numberOfflineEquipment +
+                ", numberHistoricalAlarm=" + numberHistoricalAlarm +
+                ", numberAlarmProcessed=" + numberAlarmProcessed +
+                ", numberInAlarm=" + numberInAlarm +
                 '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSiteStationInfoData.java

 package com.zehong.system.domain;
-
 import java.util.List;
 
 public class TSiteStationInfoData {
@@ -23,13 +22,148 @@ public class TSiteStationInfoData {
     private String buildCompany;
 
     private String powerCompany;
-
+    //流量计数组
     private List<PressureFlow> pressureFlows;
 
     private int iconType;
 
     private String companyType;
 
+    //压力表设备数量
+    private int numberPressureGauges;
+
+    //压力表在线设备
+    private int onlineEquipment;
+
+    //压力表离线设备
+    private int offlineEquipment;
+
+    //压力表历史报警
+    private int historicalAlarm;
+
+    //压力表已处理报警
+    private int alarmProcessed;
+
+    //压力表报警中
+    private int inAlarm;
+
+    //流量计设备数量
+    private int numberEquipment;
+
+    //流量计在线设备
+    private int numberOnlineEquipment;
+
+    //流量计离线设备
+    private int numberOfflineEquipment;
+
+    //流量计历史报警
+    private int numberHistoricalAlarm;
+
+    //流量计已处理报警
+    private int numberAlarmProcessed;
+
+    //流量计报警中
+    private int numberInAlarm;
+
+
+    public int getNumberOnlineEquipment() {
+        return numberOnlineEquipment;
+    }
+
+    public void setNumberOnlineEquipment(int numberOnlineEquipment) {
+        this.numberOnlineEquipment = numberOnlineEquipment;
+    }
+
+    public int getNumberOfflineEquipment() {
+        return numberOfflineEquipment;
+    }
+
+    public void setNumberOfflineEquipment(int numberOfflineEquipment) {
+        this.numberOfflineEquipment = numberOfflineEquipment;
+    }
+
+    public int getNumberHistoricalAlarm() {
+        return numberHistoricalAlarm;
+    }
+
+    public void setNumberHistoricalAlarm(int numberHistoricalAlarm) {
+        this.numberHistoricalAlarm = numberHistoricalAlarm;
+    }
+
+    public int getNumberAlarmProcessed() {
+        return numberAlarmProcessed;
+    }
+
+    public void setNumberAlarmProcessed(int numberAlarmProcessed) {
+        this.numberAlarmProcessed = numberAlarmProcessed;
+    }
+
+    public int getNumberInAlarm() {
+        return numberInAlarm;
+    }
+
+    public void setNumberInAlarm(int numberInAlarm) {
+        this.numberInAlarm = numberInAlarm;
+    }
+
+    public int getNumberPressureGauges() {
+        return numberPressureGauges;
+    }
+
+    public void setNumberPressureGauges(int numberPressureGauges) {
+        this.numberPressureGauges = numberPressureGauges;
+    }
+
+
+
+    public int getNumberEquipment() {
+        return numberEquipment;
+    }
+
+    public void setNumberEquipment(int numberEquipment) {
+        this.numberEquipment = numberEquipment;
+    }
+
+    public int getOnlineEquipment() {
+        return onlineEquipment;
+    }
+
+    public void setOnlineEquipment(int onlineEquipment) {
+        this.onlineEquipment = onlineEquipment;
+    }
+
+    public int getOfflineEquipment() {
+        return offlineEquipment;
+    }
+
+    public void setOfflineEquipment(int offlineEquipment) {
+        this.offlineEquipment = offlineEquipment;
+    }
+
+    public int getHistoricalAlarm() {
+        return historicalAlarm;
+    }
+
+    public void setHistoricalAlarm(int historicalAlarm) {
+        this.historicalAlarm = historicalAlarm;
+    }
+
+    public int getAlarmProcessed() {
+        return alarmProcessed;
+    }
+
+    public void setAlarmProcessed(int alarmProcessed) {
+        this.alarmProcessed = alarmProcessed;
+    }
+
+    public int getInAlarm() {
+        return inAlarm;
+    }
+
+    public void setInAlarm(int inAlarm) {
+        this.inAlarm = inAlarm;
+    }
+
     public String getCompanyType() {
         return companyType;
     }
@@ -150,6 +284,18 @@ public class TSiteStationInfoData {
                 ", pressureFlows=" + pressureFlows +
                 ", iconType=" + iconType +
                 ", companyType='" + companyType + '\'' +
+                ", numberPressureGauges=" + numberPressureGauges +
+                ", onlineEquipment=" + onlineEquipment +
+                ", offlineEquipment=" + offlineEquipment +
+                ", historicalAlarm=" + historicalAlarm +
+                ", alarmProcessed=" + alarmProcessed +
+                ", inAlarm=" + inAlarm +
+                ", numberEquipment=" + numberEquipment +
+                ", numberOnlineEquipment=" + numberOnlineEquipment +
+                ", numberOfflineEquipment=" + numberOfflineEquipment +
+                ", numberHistoricalAlarm=" + numberHistoricalAlarm +
+                ", numberAlarmProcessed=" + numberAlarmProcessed +
+                ", numberInAlarm=" + numberInAlarm +
                 '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TWorkOrderMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TWorkOrder;
 import com.zehong.system.domain.vo.HomepageVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 燃气任务Mapper接口
@@ -66,4 +69,11 @@ public interface TWorkOrderMapper
      * @return 结果
      */
     public int deleteTWorkOrderByIds(Long[] workIds);
+
+    /**
+     * 查询任务完成率
+     * @param enterpriseId
+     * @return
+     */
+    public Map<String,Object> selectWorkOrderNum(@Param("enterpriseIds")String[] enterpriseIds);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITWorkOrderService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TWorkOrder;
 import com.zehong.system.domain.vo.HomepageVo;
 
@@ -66,4 +68,6 @@ public interface ITWorkOrderService
      * @return 结果
      */
     public int deleteTWorkOrderById(Long workId);
+
+    public Map<String,Object> selectWorkOrderNum(String enterpriseId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 燃气任务Service业务层处理
@@ -132,4 +133,15 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     {
         return tWorkOrderMapper.deleteTWorkOrderById(workId);
     }
+
+    /**
+     *
+     * @param enterpriseId
+     * @return
+     */
+
+    @Override
+    public Map<String,Object> selectWorkOrderNum(String enterpriseId){
+        return tWorkOrderMapper.selectWorkOrderNum(enterpriseId.split(","));
+    }
 }

gassafetyprogress-system/src/main/resources/mapper/system/PipeInterfaceMapper.xml

@@ -115,8 +115,8 @@
 
     <!--查询场站下级数据-->
     <select id="selecttSiteStationInfoDataList" parameterType="DeviceData" resultMap="PressureFlowResult">
-         select device_model,device_type,create_time from t_relation_device_detail_info
-         where relation_device_id=#{deviceId} and relation_device_type='2'
+         select device_model,device_type,create_time,relation_device_id from t_relation_device_detail_info
+         where  relation_device_type='2'
     </select>
 
     <!--监控信息查询-->

gassafetyprogress-system/src/main/resources/mapper/system/TWorkOrderMapper.xml

@@ -208,4 +208,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{workId}
         </foreach>
     </delete>
+    <select id="selectWorkOrderNum" resultType="java.util.HashMap">
+        SELECT  IFNULL(SUM(IF(work_status=3 AND work_type=1,1,0))/SUM(IF(work_type=1,1,0)),0) AS typeOne,
+        IFNULL(SUM(IF(work_status=3 AND work_type=2,1,0))/SUM(IF(work_type=2,1,0)),0) AS typeTwo,
+        IFNULL(SUM(IF(work_status=3 AND work_type=3,1,0))/SUM(IF(work_type=3,1,0)),0) AS typeThree,
+        IFNULL(SUM(IF(work_status=3 AND work_type=4,1,0))/SUM(IF(work_type=4,1,0)),0) AS typeFor,
+        (SELECT COUNT(employed_people_id)  FROM t_employed_people_info WHERE is_del = 0
+            AND beyond_enterprise_id IN
+            <foreach item="enterpriseId" collection="enterpriseIds" open="(" separator="," close=")">
+                #{enterpriseId}
+            </foreach>
+        ) AS peopleNum,
+        (SELECT CAST(SUM(pipe_length) AS  DECIMAL(20,0))  FROM t_pipe_info WHERE  is_del = 0
+                AND beyond_enterprise_id IN
+                <foreach item="enterpriseId" collection="enterpriseIds" open="(" separator="," close=")">
+                    #{enterpriseId}
+                </foreach>
+        )AS allPipeLength
+        FROM t_work_order WHERE  is_del = 0
+            AND work_assign_enterprose_id IN
+            <foreach item="enterpriseId" collection="enterpriseIds" open="(" separator="," close=")">
+                #{enterpriseId}
+            </foreach>
+    </select>
 </mapper>
\ No newline at end of file

gassafetyprogress-web/src/api/operationMonitor/order.js

@@ -50,4 +50,12 @@ export function exportOrder(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
+
+export function selectWorkOrderNum(query) {
+  return request({
+    url: '/system/order/selectWorkOrderNum',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/views/bigWindow/index.vue

@@ -321,7 +321,7 @@ export default {
     }
     this.currentTime();
     this.$refs.mychild.choice(0);
-    this.$refs.mychild2.choice(0);
+    this.$refs.mychild2.choice(this.selarr);
   },
   methods: {
     ...mapActions({
@@ -404,6 +404,7 @@ export default {
       this.map.allfilter(this.selarr, this.selarr1);
       this.map.infowindowClose();
       this.show = false;
+      this.$refs.mychild2.choice(this.selarr);
     },
     sel(index, item) {
       this.map.infowindowClose();
@@ -425,6 +426,7 @@ export default {
       }
       // this.map.companyFilter(this.selarr);
       this.map.allfilter(this.selarr, this.selarr1);
+      this.$refs.mychild2.choice(this.selarr);
     },
 
     sel1(index, item) {