任务 24813 统计当前告警数量

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

@@ -14,9 +14,11 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.Map;
 
 /**
  * 
@@ -59,7 +61,7 @@ public class AlarmController {
 
 	/**
 	 * 修改
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@@ -128,4 +130,19 @@ public class AlarmController {
 		page = iAlarmService.page(pageBean, alarmQueryWrapper);
 		return page;
 	}
+
+	/**
+	 * 设备平台告警数量统计，按系统
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/updateById", method = RequestMethod.GET)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "修改", notes = "修改")
+	public ResponseModel<Map<String, Object>> updateByIdAlarm(String bizOrgCode, String systemId) {
+		ResponseModel responseModel  = new ResponseModel();
+//		responseModel.setResult();
+
+		return iAlarmService.updateById(alarm);
+	}
 }

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

@@ -707,7 +707,9 @@ public class EmergencyController extends AbstractBaseController {
 								   @RequestParam(required = false) Integer handleStatus,
 								   @RequestParam(required = false) String bizOrgCode,
 								   @RequestParam(required = false) String systemCode,
-								   @RequestParam(required = false) String createDate
+								   @RequestParam(required = false) String createDate,
+								   @RequestParam(required = false) String startDate,
+								   @RequestParam(required = false) String endDate
 								   ) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		if (StringUtils.isEmpty(bizOrgCode)) {
@@ -720,7 +722,7 @@ public class EmergencyController extends AbstractBaseController {
 				}
 			}
 		}
-		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate));
+		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

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

@@ -107,7 +107,7 @@ public interface EmergencyMapper extends BaseMapper{
      * @param name 设备名称
      * @return
      */
-    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate);
+    Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode, @Param("types") List<String> types, @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name, @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus , @Param("createDate") String createDate , @Param("startDate") String startDate , @Param("endDate") String endDate);
 
     IPage<EquipTypeImgAmountVO> getEmergencyEquipList(@Param("page") IPage page, @Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage, @Param("list") List<String> list);
 

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

@@ -69,7 +69,7 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
-    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate);
+    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate,String startDate,String endDate);
 
     Map<String, List<PressurePumpCountVo>> getPressurePumpDay();
 

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

@@ -627,8 +627,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
 
     @Override
-    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate) {
-        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate);
+    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,String createDate,String startDate,String endDate) {
+        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate);
     }
 
     //稳压泵定时向缓存中存昨日启动次数任务

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

@@ -1453,6 +1453,12 @@
             <if test='createDate != null and createDate == "1"'>
                 AND wlesal.create_date LIKE CONCAT( DATE_FORMAT( NOW( ), '%Y-%m-%d' ), '%' )
             </if>
+            <if test='startDate != null and startDate == ""'>
+                AND wlesal.create_date >= DATE_FORMAT( ${startDate}, '%Y-%m-%d %H:%i:%s' )
+            </if>
+            <if test='endDate != null and endDate == ""'>
+                AND DATE_FORMAT( ${endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesal.create_date
+            </if>
             <if test="systemCode != null and systemCode != ''">
                 and fs.code = #{systemCode}
             </if>