自动化需求开发

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

@@ -18,6 +18,7 @@ import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
 import com.yeejoin.equipmanage.common.entity.vo.IotIndexInfoVo;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.enums.EquipQrcodeColorEnum;
+import com.yeejoin.equipmanage.common.utils.CommonPageable;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
@@ -31,6 +32,7 @@ import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/CommonPage.java

+/**
+ * NewHeight.com Inc.
+ * Copyright (c) 2008-2010 All Rights Reserved.
+ */
+package com.yeejoin.equipmanage.dto;
+
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * <pre>
+ * 分页数据
+ * </pre>
+ *
+ * @author as-youjun
+ * @version $Id: CompanyPage.java, v 0.1 2017年4月13日 上午11:35:25 as-youjun Exp $
+ */
+public final class CommonPage<T> extends PageImpl<T> {
+
+	/**
+	 * <pre>
+	 * uid
+	 * </pre>
+	 */
+	private static final long serialVersionUID = -5533124806408380886L;
+
+	/**
+	 * 
+	 */
+	private String message;
+	
+	/**
+	 * 返回结果状态
+	 */
+	private String result;
+
+	public CommonPage(List<T> content, Pageable pageable, long total) {
+		super(content, pageable, total);
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getResult()
+	{
+		return result;
+	}
+
+	public void setResult(String result)
+	{
+		this.result = result;
+	}
+}

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

@@ -31,10 +31,12 @@ import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.exception.BaseException;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.CommonPageable;
 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.*;
+import com.yeejoin.equipmanage.dto.CommonPage;
 import com.yeejoin.equipmanage.fegin.IdxFeign;
 import com.yeejoin.equipmanage.fegin.IotFeign;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
@@ -2793,5 +2795,88 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         // 格式化并返回结果
         return roundedDateTime.format(formatterFive);
     }
-
+    //查询 消防设备历史数据
+    public org.springframework.data.domain.Page queryForFireEquipmentHistory(String fireEquipmentName,
+                                                                             String equipmentName,
+                                                                             String startTime,
+                                                                             String endTime,
+                                                                             CommonPageable commonPageable,
+                                                                             String equipmentCode) {
+
+        long total = equipmentSpecificMapper.queryForFireEquipmentHistoryCount(fireEquipmentName, equipmentName,
+                startTime,
+                endTime,
+                equipmentCode);
+
+        List<Map> content = equipmentSpecificMapper.queryForFireEquipmentHistory(fireEquipmentName,
+                equipmentName,
+                startTime,
+                endTime,
+                commonPageable.getOffset(),
+                commonPageable.getPageSize(),
+                equipmentCode);
+        org.springframework.data.domain.Page result = new CommonPage(content, commonPageable, total);
+        return result;
+    }
+
+    @Override
+    public List<Map<String, Object>> queryOperationMonitoring() {
+        ArrayList<Map<String, Object>> resultList = new ArrayList<>();
+        // 稳压泵信息
+        List<Map<String, Object>> pumpInfoList = equipmentSpecificMapper.getPumpInfoList();
+
+        if (CollUtil.isNotEmpty(pumpInfoList)) {
+            pumpInfoList.forEach(item -> {
+                String equipmentIndexKey = item.getOrDefault("equipmentIndexKey", "").toString();
+                item.put("indexValueName", "停止");
+                if (!ObjectUtils.isEmpty(equipmentIndexKey)) {
+                    if (equipmentIndexKey.equals("FHS_PressurePump_Start")) {
+                        item.put("indexValueName", "启动");
+                    }
+                    if (equipmentIndexKey.equals("FHS_PressurePump_Stop")) {
+                        item.put("indexValueName", "停止");
+                    }
+                    if (equipmentIndexKey.equals("FHS_PressurePump_ManualAutomaticSignal") &&
+                            item.getOrDefault("indexValue", "").toString().equals("true")) {
+                        item.put("indexValueName", "手动状态");
+                    } else {
+                        item.put("indexValueName", "自动状态");
+                    }
+                }
+            });
+            resultList.addAll(pumpInfoList);
+        }
+        // 消防泵信息
+        List<Map<String, Object>> fireInfoList = equipmentSpecificMapper.getFireInfoList();
+        if (CollUtil.isNotEmpty(fireInfoList)) {
+            fireInfoList.forEach(item -> {
+                String equipmentIndexKey = item.getOrDefault("equipmentIndexKey", "").toString();
+                item.put("indexValueName", "停止");
+                if (!ObjectUtils.isEmpty(equipmentIndexKey)) {
+                    if (equipmentIndexKey.equals("FHS_FirePump_Start")) {
+                        item.put("indexValueName", "启动");
+                    }
+                    if (equipmentIndexKey.equals("FHS_FirePump_Stop")) {
+                        item.put("indexValueName", "停止");
+                    }
+                }
+            });
+            resultList.addAll(fireInfoList);
+        }
+        // 控制柜信息
+        List<Map<String, Object>> conInfoList = equipmentSpecificMapper.getConInfoList();
+        if (CollUtil.isNotEmpty(conInfoList)) {
+            conInfoList.forEach(item -> {
+                String equipmentIndexKey = item.getOrDefault("equipmentIndexKey", "").toString();
+                item.put("indexValueName", "自动状态");
+                if (!ObjectUtils.isEmpty(equipmentIndexKey)) {
+                    if (item.getOrDefault("indexValue", "").toString().equals("true")) {
+                        item.put("indexValueName", "手动状态");
+                    }
+                }
+            });
+            resultList.addAll(conInfoList);
+        }
+        return resultList;
+    }
 }