查询物联日志

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -146,4 +146,8 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private String buildId;
 
+    @ApiModelProperty(value = "是否遥测")
+    @TableField(exist = false)
+    private Integer isTrend;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/IotIndexInfoVo.java

+package com.yeejoin.equipmanage.common.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 物联指标日志实体
+ * @author xxz
+ */
+
+@Data
+@ApiModel(description = "物联指标日志实体")
+public class IotIndexInfoVo {
+
+    /**
+     * 指标类型
+     */
+    private String type;
+
+    /**
+     * 上报内容
+     */
+    private String content;
+
+    /**
+     * 日志编号
+     */
+    private String number;
+
+    /**
+     * 上报时间
+     */
+    private String sendTime;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -3,8 +3,12 @@ package com.yeejoin.equipmanage.controller;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.yeejoin.equipmanage.common.constant.Constant;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
+import com.yeejoin.equipmanage.common.utils.HttpUtil;
+import com.yeejoin.equipmanage.common.utils.HttpUtils;
 import com.yeejoin.equipmanage.common.utils.SpringUtils;
+import com.yeejoin.equipmanage.fegin.IotFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -66,6 +70,8 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/equipSpecific")
 public class EquipmentSpecificController extends AbstractBaseController {
 
+    public static final int RESULT_SUCCESS_CODE = 200;
+
     @Autowired
     IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
@@ -81,6 +87,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @Autowired
     FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
 
+    @Autowired
+    IotFeign iotFeign;
+
     /**
      * 补码页面分页
      *
@@ -355,4 +364,41 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return equipmentSpecificSerivce.getListByEquipmentCode(code);
     }
 
+    @RequestMapping(value = "/equipment/iotIndexInfo/{equipSpeId}", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据装备id获取物联日志", notes = "根据装备id获取物联日志")
+    public ResponseModel getEquipmentIotIndexInfo(@PathVariable String equipSpeId, @RequestParam String beginDate,  @RequestParam String endDate,
+                                                  @RequestParam(required = false) Integer isTrend, @RequestParam(required = false) String fieldKey) {
+
+        // 1.根据 equipSpeId 查询装备iotCode
+        EquipmentSpecific equipmentSpecific = equipmentSpecificMapper.selectById(equipSpeId);
+        if (ObjectUtils.isEmpty(equipmentSpecific)) {
+            return CommonResponseUtil.failure("未查询到装备信息!");
+        }
+        String iotCode = equipmentSpecific.getIotCode();
+        String prefix = null;
+        String suffix = null;
+        if (iotCode.length() > 8) {
+            prefix = iotCode.substring(0, 8);
+            suffix = iotCode.substring(8);
+        } else {
+            return CommonResponseUtil.failure("装备物联编码错误，请确认！");
+        }
+        ResponseModel entity = null;
+        try {
+            entity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), beginDate, endDate, prefix, suffix);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("调用iot服务出错");
+            return CommonResponseUtil.failure("请求失败");
+        }
+
+        if (RESULT_SUCCESS_CODE != entity.getStatus() && ObjectUtils.isEmpty(entity.getResult())) {
+            log.error("查询物联日志数据为空或iotCode为 (" + iotCode + ") 的装备不存在于物联系统中！");
+            return CommonResponseUtil.failure("物联日志数据为空");
+        }
+
+        return CommonResponseUtil.success(equipmentSpecificSerivce.getIndexInfoList(iotCode, entity, isTrend, fieldKey));
+    }
+
 }

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

@@ -108,4 +108,6 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
     
     List<Map<String, Object>> getEquipSpecificIndexByUpdateDateDesc();
 
+    List<EquipmentSpecificIndex> getEquipmentSpeIndexByIotCodeTrend(String iotCode, Integer isTrend, String fieldKey);
+
 }

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

@@ -14,9 +14,11 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.entity.vo.IotIndexInfoVo;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.vo.*;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -224,4 +226,15 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      * @return 装备list
      */
     List<Map<String, Object>> getListByEquipmentCode(String code);
+
+    /**
+     * 根据装备id获取物联日志
+     * @param iotCode code
+     * @param entity 日志
+     * @param isTrend 是否遥测 不传默认查遥测遥信
+     * @param fieldKey 指标key 不传默认查全部指标
+     * @return 物联日志list
+     */
+    List<IotIndexInfoVo> getIndexInfoList(String iotCode, ResponseModel entity, Integer isTrend, String fieldKey);
+
 }

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

@@ -5,6 +5,13 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.IotFeign;
+import com.yeejoin.equipmanage.mapper.*;
+import org.apache.catalina.util.IOTools;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,25 +62,6 @@ import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.Warehouse;
 import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
-import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.AlarmInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.AlarmVO;
-import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.CurrAlaramVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
-import com.yeejoin.equipmanage.common.entity.vo.DevInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.DevOverviewVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSecificDetailVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.ManufacturerVO;
-import com.yeejoin.equipmanage.common.entity.vo.PartDetailVO;
-import com.yeejoin.equipmanage.common.entity.vo.ProductInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.SurrVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.TechInfoListVO;
-import com.yeejoin.equipmanage.common.entity.vo.TechInfoVO;
-import com.yeejoin.equipmanage.common.entity.vo.VideoVO;
 import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
 import com.yeejoin.equipmanage.common.enums.BillContentEnum;
 import com.yeejoin.equipmanage.common.enums.BitmapEnum;
@@ -85,21 +73,6 @@ import com.yeejoin.equipmanage.common.exception.BaseException;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.EquipFor3DVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentDate;
-import com.yeejoin.equipmanage.common.vo.EquipmentDetailVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentSpecific3dVo;
-import com.yeejoin.equipmanage.common.vo.VideoOnEquipmentSpecificVo;
-import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
-import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
-import com.yeejoin.equipmanage.mapper.UploadFileMapper;
-import com.yeejoin.equipmanage.mapper.VideoMapper;
-import com.yeejoin.equipmanage.mapper.WarehouseStructureMapper;
 import com.yeejoin.equipmanage.service.ICarService;
 import com.yeejoin.equipmanage.service.IEquPropertyService;
 import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
@@ -123,6 +96,10 @@ import com.yeejoin.equipmanage.service.IVideoService;
 import com.yeejoin.equipmanage.service.IWarehouseService;
 import com.yeejoin.equipmanage.service.IWarehouseStructureService;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
+import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import static org.typroject.tyboot.core.foundation.utils.DateTimeUtil.ISO8601_DATE_HOUR_MIN_SEC;
 
 /**
  * @author ZeHua Li
@@ -233,6 +210,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     FormInstanceMapper formInstanceMapper;
 
+    @Autowired
+    EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -1792,4 +1772,48 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return list;
     }
 
+    @Override
+    public List<IotIndexInfoVo> getIndexInfoList(String iotCode, ResponseModel entity, Integer isTrend, String fieldKey) {
+        List<IotIndexInfoVo> infoVoList = new ArrayList<>();
+        String json = JSON.toJSONString(entity.getResult());
+        List<Map<String, String>> listObject = (List<Map<String, String>>) JSONArray.parse(json);
+        List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCodeTrend(iotCode, isTrend, fieldKey);
+        if (!ObjectUtils.isEmpty(indexes)) {
+            Map<String, EquipmentSpecificIndex> collect = indexes.stream().collect(Collectors.toMap(EquipmentSpecificIndex::getNameKey, equipmentSpecificIndex -> equipmentSpecificIndex));
+            for(Map<String, String> mapList : listObject){
+                String dateStr = null;
+                String deviceName = String.valueOf(mapList.get("deviceName"));
+                try {
+                    String value =  String.valueOf(mapList.get("time"));
+                    String strDate = value.substring(0, 19);
+                    SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
+                    sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+                    Date date =sdf.parse(strDate);
+                    dateStr = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+                } catch (Exception e) {
+                    log.error("日期转换失败");
+                }
+                for (Map.Entry entry : mapList.entrySet()){
+                    if (!ObjectUtils.isEmpty(entry.getValue()) && !"null".equals(entry.getValue())) {
+                        EquipmentSpecificIndex equipmentSpecificIndex = collect.get(entry.getKey());
+                        if (!ObjectUtils.isEmpty(equipmentSpecificIndex)) {
+                            IotIndexInfoVo iotIndexInfoVo = new IotIndexInfoVo();
+                            iotIndexInfoVo.setType(equipmentSpecificIndex.getIndexName());
+                            iotIndexInfoVo.setNumber(deviceName);
+                            if (equipmentSpecificIndex.getIsTrend() == 1) {
+                                iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + entry.getValue() + equipmentSpecificIndex.getIndexUnitName());
+                            } else {
+                                iotIndexInfoVo.setContent(equipmentSpecificIndex.getEquipmentIndexName());
+                            }
+
+                            iotIndexInfoVo.setSendTime(dateStr);
+                            infoVoList.add(iotIndexInfoVo);
+                        }
+                    }
+                }
+            }
+        }
+        return infoVoList;
+    }
+
 }

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

@@ -456,4 +456,35 @@ WHERE wles.id=#{id}
 			esi.update_date DESC
 		LIMIT 50
 	</select>
+
+    <select id="getEquipmentSpeIndexByIotCodeTrend" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
+        SELECT
+        wei.id AS id,
+        wei.name_key AS nameKey,
+        wesi.value AS value,
+        wesi.equipment_specific_id AS equipmentSpecificId,
+        wesi.equipment_index_id AS equipmentIndexId,
+        wes.org_code AS code,
+        wes.iot_code AS iotCode,
+        wes.org_code AS orgCode,
+        wei.type_code AS typeCode,
+        wei.name AS indexName,
+        wei.unit AS indexUnitName,
+        wei.is_trend isTrend,
+        wesi.value_label,
+        wesi.equipment_index_name,
+        wesi.update_date AS updateDate
+        FROM
+        wl_equipment_specific_index AS wesi
+        LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
+        LEFT JOIN wl_equipment_index AS wei ON wei.id = wesi.equipment_index_id
+        WHERE
+        wes.iot_code = #{iotCode}
+        <if test="isTrend != null">
+            AND wei.is_trend = #{isTrend}
+        </if>
+        <if test="fieldKey != null">
+            AND wei.name_key = #{fieldKey}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file