代码遗漏提交

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

@@ -668,5 +668,42 @@ public class EquipmentSpecificController extends AbstractBaseController {
         }
         return equipmentSpecificSerivce.getFireEquipListByDefineCode(code, equipStatus, bizOrgCode, pageBean);
     }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询消防设备历史数据", notes = "查询消防设备历史数据")
+    @RequestMapping(value = "/data/history-for-studio", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel queryForFireEquipmentHistoryForStudio(
+            @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
+            @ApiParam(value = "按保护对象名称", required = false) @RequestParam(required = false) String equipmentName,
+            @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
+            @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime,
+            @ApiParam(value = "当前页码", required = false) @RequestParam(required = true) int pageNumber,
+            @ApiParam(value = "每页大小", required = false) @RequestParam(required = true) int pageSize,
+            @ApiParam(value = "装备定义code", required = false) @RequestParam(required = false) String equipmentCode) {
+        if (pageNumber >= 1) {
+            --pageNumber;
+        }
+        org.springframework.data.domain.Page page;
+        try {
+            CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
+            page = equipmentSpecificSerivce.queryForFireEquipmentHistory(
+                    StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(equipmentName),
+                    StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable, equipmentCode);
+        } catch (Exception e) {
+            return CommonResponseUtil.failure(e.getMessage());
+        }
 
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
+        objectPage.setCurrent(page.getNumber());
+        objectPage.setRecords(page.getContent());
+        objectPage.setTotal(page.getTotalElements());
+        objectPage.setPages(page.getTotalPages());
+        return CommonResponseUtil.success(objectPage);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "稳压泵/消防泵运行监视", notes = "稳压泵/消防泵运行监视")
+    @RequestMapping(value = "/queryOperationMonitoring", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel queryOperationMonitoring() {
+        return CommonResponseUtil.success(equipmentSpecificSerivce.queryOperationMonitoring());
+    }
 }