任务 7881 7859

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

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IotIndexItemVo {
+
+    private String id;
+    private String key;
+    private String name;
+}

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

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IotIndexResItemVo {
+
+    private String key;
+    private String name;
+    private int[]  data;
+}

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

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IotIndexResMinotFinalVo {
+
+    private Long id;
+
+    private String[] name;
+
+    private String[] nameKey;
+
+    private  String unit;
+
+    private List<String> times;
+
+    private List<IotIndexItemVo> items;
+
+    private List<IotIndexResItemVo> iotData;
+}

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

+package com.yeejoin.equipmanage.common.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IotIndexResMinotVo {
+
+
+    private Long id;
+
+    private String name;
+
+    private String nameKey;
+
+    private  String unit;
+
+    private List<String> times;
+
+    private List<IotDataVO> iotData;
+}

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

@@ -22,6 +22,7 @@ public interface IotFeign {
             @RequestParam(value = "timeStart") String beginDate,
             @RequestParam(value = "timeEnd") String endDate,
             @RequestParam(value = "productKey") String productKey,
-            @RequestParam(value = "deviceName") String deviceName);
+            @RequestParam(value = "deviceName") String deviceName,
+            @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/EquipmentIndexMapper.java

@@ -63,5 +63,7 @@ public interface EquipmentIndexMapper extends BaseMapper<EquipmentIndex> {
 
     List<EquipmentIndexVO> getEquipmentIndexByIot();
 
+    List<EquipmentIndex> getPerfQutoaIotList(Long id);
+
     List<String> getGruopName(Long equipmentId);
 }

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

@@ -63,4 +63,12 @@ public interface IEquipmentIndexService extends IService<EquipmentIndex> {
 
     List<String> getGruopName(Long equipmentId);
 
+
+    /**
+     * 分页查询
+     * @param id
+     * @return
+     */
+    List<EquipmentIndex> getPerfQutoaIotList(Long id);
+
 }

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

@@ -77,6 +77,11 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
     }
 
     @Override
+    public List<EquipmentIndex> getPerfQutoaIotList(Long id) {
+        return this.baseMapper.getPerfQutoaIotList(id);
+    }
+
+    @Override
     public EquipmentIndexVO getOnePrefQuota(Long id) {
         return this.baseMapper.getOnePrefQuota(id);
     }

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

@@ -223,4 +223,10 @@
 		GROUP BY
 			group_name
 	</select>
+    <select id="getPerfQutoaIotList" resultType="com.yeejoin.equipmanage.common.entity.EquipmentIndex">
+		select id,name as perfQuotaName, name_key as perfQuotaDefinitionId,is_trend as isTrend  from wl_equipment_index s where equipment_id  = (
+			select equipment_id from wl_equipment_detail wei where id = (
+				select equipment_detail_id from wl_equipment_specific where id = #{id})
+		)
+	</select>
 </mapper>