任务 14551

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java

@@ -51,5 +51,16 @@ public interface IotFeign {
             @RequestParam("FHS_PressurePump_Start") String key,
             @RequestParam(required = false, value = "fieldKey") String fieldKey);
 
+    @RequestMapping(value = "v1/livedata/common/list", method = RequestMethod.GET, consumes = "application/json")
+    ResponseModel selectListNew(
+            @RequestHeader("appKey") String appKey,
+            @RequestHeader("product") String product,
+            @RequestHeader("token") String token,
+            @RequestParam(value = "measurement") String measurement,
+            @RequestParam(value = "timeStart") String beginDate,
+            @RequestParam(value = "timeEnd") String endDate,
+            @RequestParam("FHS_PressurePump_Start") String key,
+            @RequestParam(required = false, value = "fieldKey") String fieldKey);
+
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -48,6 +48,13 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<EquipmentSpecificVo> getEquipmentSpecificIotCode();
 
     /**
+     * 获取稳压泵  iot_code
+     *
+     * @return
+     */
+    List<EquipmentSpecificVo> getEquipmentSpecificIotCodeWYB();
+
+    /**
      * @Return: List<String>
      * @Throws
      * @Date 2020/11/13 9:19

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,12 +15,14 @@ import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
 import com.yeejoin.equipmanage.common.entity.vo.VideoVO;
 import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.IotFeign;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.*;
@@ -31,6 +35,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.net.Inet4Address;
@@ -90,10 +95,17 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
     @Autowired
     JcsFeign jcsFeign;
 
     @Autowired
+    private IotFeign iotFeign;
+
+
+    @Autowired
     MqttSendGateway mqttSendGateway;
 
     @Override
@@ -772,9 +784,21 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Override
     public Map<String, Object> pressureMessage(String orgCode, String startTime, String endTime) {
         Map<String, Object> stringObjectMap = equipmentSpecificAlarmMapper.pressureMessage(orgCode, startTime, endTime);
+        EquipmentSpecificVo vo = null;
+        if(equipmentSpecificMapper.getEquipmentSpecificIotCodeWYB().get(0) != null) {
+            vo = equipmentSpecificMapper.getEquipmentSpecificIotCodeWYB().get(0);
+        }
+        int startNum = Integer.parseInt(stringObjectMap.get("startNum").toString());
+        ResponseModel start = iotFeign.selectListNew(remoteSecurityService.getServerToken().getAppKey(), remoteSecurityService.getServerToken().getProduct(), remoteSecurityService.getServerToken().getToke(), vo.getIotCode().substring(0,8), startTime, endTime,"true", pressurePumpStart);
+        if (200 == start.getStatus() && !ObjectUtils.isEmpty(start.getResult())) {
+            String json1 = JSON.toJSONString(start.getResult());
+            List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
+            startNum = listObject1.size();
+        }
+
         Map<String, Object> retMap = new HashMap<>();
         int allNum = Integer.parseInt(stringObjectMap.get("allNum").toString());
-        int startNum = Integer.parseInt(stringObjectMap.get("startNum").toString());
+
         // 计算平均每小时打压频率
         try {
             int hour = DateUtils.dateBetweenNew(DateUtils.dateParse(startTime, null),DateUtils.dateParse(endTime, null));

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2206,5 +2206,10 @@
             where s.`code` = b.`code`) u
             where LOCATE(u.biz_org_code, (SELECT  wl_equipment_specific.biz_org_code   FROM  wl_equipment_specific   WHERE  wl_equipment_specific.id=#{id})) > 0
     </select>
+    <select id="getEquipmentSpecificIotCodeWYB"
+            resultType="com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo">
+            select iot_code from wl_equipment_specific where equipment_code = '92010800KAL44' and iot_code is not null
+
+    </select>
 
 </mapper>
\ No newline at end of file