#bug修改

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/HandleQueryVo.java

@@ -14,6 +14,9 @@ import java.util.Date;
 public class HandleQueryVo {
 
 	@ApiModelProperty("处理人")
+	private String stationCode;
+
+	@ApiModelProperty("处理人")
 	private Long handleUser;
 
 	@ApiModelProperty("开始时间")

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/AreaDutyVo.java

@@ -1,5 +1,7 @@
 package com.hnac.hzims.operational.main.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import com.hnac.hzims.operational.duty.vo.NextDutyInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,15 +20,19 @@ public class AreaDutyVo {
 	private String departName;
 
 	@ApiModelProperty(value = "任务总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer taskCount;
 
 	@ApiModelProperty(value = "完成任务数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer finishTaskCount;
 
 	@ApiModelProperty(value = "发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private double generatingCapacity;
 
 	@ApiModelProperty(value = "上班偷偷上网量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private double onlineCapacity;
 
 	@ApiModelProperty(value = "班次名称")
@@ -49,116 +55,144 @@ public class AreaDutyVo {
 
 	/**<!==========厂站运行==========>**/
 	@ApiModelProperty(value = "站点总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer stationSum;
 
 	@ApiModelProperty(value = "站点运行数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer stationRun;
 
 	/**<!==========当班双票==========>**/
 	@ApiModelProperty(value = "工作票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer workTicketCount;
 
 	@ApiModelProperty(value = "操作票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer operationTicketCount;
 
 	@ApiModelProperty(value = "移交票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer handoverTicketCount;
 
 	@ApiModelProperty(value = "结束票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer closeTicketCount;
 
 	@ApiModelProperty(value = "作废票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer voidTicketCount;
 
 	@ApiModelProperty(value = "延期票张数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer deferredTicketCount;
 
 
 	/**<!==========当班运行==========>**/
 	@ApiModelProperty(value = "巡检总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer inspectionSum;
 
 	@ApiModelProperty(value = "巡检任务Id,按逗号分隔")
 	private String inspectTaskIds;
 
 	@ApiModelProperty(value = "巡检完成数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer inspectionFinish;
 
 	@ApiModelProperty(value="巡检任务完成率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double inspectionFinishRate;
 
 	@ApiModelProperty(value = "消缺总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer shortagesSum;
 
 	@ApiModelProperty(value = "现象Ids")
 	private String phenomenonIds;
 
 	@ApiModelProperty(value = "消缺数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer shortages;
 
 	@ApiModelProperty(value = "消缺率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double shortagesRate;
 
 	@ApiModelProperty(value = "定期工作总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer workRegularlySum;
 
 	@ApiModelProperty(value = "定期工作任务总数")
 	private String mainTaskIds;
 
 	@ApiModelProperty(value = "定期工作数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer workRegularly;
 
 	@ApiModelProperty(value = "定期工作完成率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double workRegularlyRate;
 
 
 	/**<!==========当月任务执行情况==========>**/
 	@ApiModelProperty(value = "当月日常维护总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer maintainSumMoth;
 
 	@ApiModelProperty(value = "当月日常维护完成数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer maintainFinishSumMoth;
 
 	@ApiModelProperty(value = "当月日常维护完成率")
 	private String maintainRateMoth;
 
 	@ApiModelProperty(value = "当月消缺总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer shortagesSumMoth;
 
 	@ApiModelProperty(value = "当月消缺数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer shortagesMoth;
 
 	@ApiModelProperty(value = "当月消缺完成率")
 	private String shortagesRateMoth;
 
 	@ApiModelProperty(value = "当月检修总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer overhaulSumMoth;
 
 	@ApiModelProperty(value = "当月检修完成数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer overhaulFinishSumMoth;
 
 	@ApiModelProperty(value = "当月检修完成率")
 	private String overhaulRateMoth;
 
 	@ApiModelProperty(value = "当月操作票总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer operateSumMoth;
 
 	@ApiModelProperty(value = "当月操作票合格数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer operateQualifySumMoth;
 
 	@ApiModelProperty(value = "当月操作票合格率")
 	private String operateRateMoth;
 
 	@ApiModelProperty(value = "当月工作票总数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer workSumMoth;
 
 	@ApiModelProperty(value = "当月工作票合格数")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer workQualifySumMoth;
 
 	@ApiModelProperty(value = "当月工作票合格率")
 	private String workRateMoth;
 
 	@ApiModelProperty(value = "排序字段")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer sort;
 
 	@ApiModelProperty(value = "当班开始时间")

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/StationCountVo.java

@@ -1,5 +1,7 @@
 package com.hnac.hzims.operational.main.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,6 +21,7 @@ public class StationCountVo {
 	private String typeName;
 
 	@ApiModelProperty(value = "统计")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long count;
 
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml

@@ -17,6 +17,9 @@
         on d.access_id = a.id
         <where>
             h.is_deleted = 0
+            <if test="param.stationCode != null">
+                and h.station_code = #{param.stationCode}
+            </if>
             <if test="param.handleUser != null">
                 and h.create_user = #{param.handleUser}
             </if>
@@ -30,5 +33,6 @@
                 and h.handle_way = #{param.handleWay}
             </if>
         </where>
+        order by create_time desc
     </select>
 </mapper>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

@@ -268,7 +268,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 			record.setStationCode(alarm.getStation());
 			record.setContent(alarm.getSoeExplain());
 			record.setType(alarm.getSoeType());
-			record.setSoeType(AbnormalAlarmConstant.TYPE_NAMES[Integer.valueOf(alarm.getSoeType())]);
+			record.setSoeType(AbnormalAlarmConstant.TYPE_NAMES[Integer.parseInt(alarm.getSoeType())]);
 			List<StationEntity> filter = stations.stream().filter(station -> station.getCode().equals(alarm.getStation())).collect(Collectors.toList());
 			if (CollectionUtil.isEmpty(filter)) {
 				return record;
@@ -279,7 +279,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 		}).sorted(Comparator.comparing(AlarmDataVo::getIsHandle)
 			.thenComparing(AlarmDataVo::getTs, Comparator.reverseOrder())).collect(Collectors.toList());
 
-		response.setCount(datas.size());
+		response.setCount((int) datas.stream().filter(data-> !data.getIsBinding()).count());
 		response.setSoeList(datas);
 		response.setTotal(result.getData().getTotal());
 		return response;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/LevelAlarmServiceImpl.java

@@ -45,7 +45,10 @@ public class LevelAlarmServiceImpl implements LevelAlarmService {
         Map<String,String> map = new ConcurrentHashMap<>();
         map.put("projectIds",stations.stream().map(StationEntity::getCode).collect(Collectors.joining(",")));
         map.put("type", AbnormalAlarmConstant.LEVEL_TYPE_LIST);
-        map.put("startTime", DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME));
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.SECOND,-30);
+        map.put("startTime", DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME));
         return JSONObject.toJSONString(map);
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/TargetController.java

@@ -117,7 +117,7 @@ public class TargetController {
 	@ApiLog
 	@ApiOperation("水电集团、区域指标关联")
 	@GetMapping("/hydropower-target")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 11)
 	public R hydropowerTarget(@RequestParam(value = "stationName",required = false) String stationName, @RequestParam(value = "deptId",required = false) Long deptId,@RequestParam(value = "target") Integer target) {
 		return R.data(service.hydropowerTarget(stationName,deptId,target));
 	}
@@ -125,7 +125,7 @@ public class TargetController {
 	@ApiLog
 	@ApiOperation("水利集团、区域指标关联")
 	@GetMapping("/water-target")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 12)
 	public R waterTarget(@RequestParam(value = "stationName",required = false) String stationName, @RequestParam(value = "deptId",required = false) Long deptId,@RequestParam(value = "target") Integer target) {
 		return R.data(service.waterTarget(stationName,deptId,target));
 	}
@@ -133,7 +133,7 @@ public class TargetController {
 	@ApiLog
 	@ApiOperation("光伏集团、区域指标关联")
 	@GetMapping("/photovoltaic-target")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 13)
 	public R photovoltaicTarget(@RequestParam(value = "stationName",required = false) String stationName, @RequestParam(value = "deptId",required = false) Long deptId,@RequestParam(value = "target") Integer target) {
 		return R.data(service.photovoltaicTarget(stationName,deptId,target));
 	}
@@ -141,7 +141,7 @@ public class TargetController {
 	@ApiLog
 	@ApiOperation("集团操作票/工作票")
 	@GetMapping("/ticket-group")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 14)
 	public R ticketGroup(@RequestParam(value = "areaName",required = false) String areaName,@RequestParam(value = "type") Long type) {
 		return R.data(service.ticketGroup(areaName,type));
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HydropowerController.java

@@ -79,7 +79,7 @@ public class HydropowerController extends BladeController {
 	}
 
 	@ApiLog
-	@ApiOperation("app水电站集团")
+	@ApiOperation("app水电站区域")
 	@GetMapping("/app/area")
 	@ApiOperationSupport(order = 7)
 	public R<List<AppHydropowerStationVo>> area(@ApiParam(value = "站点机构ID") Long deptId) {
@@ -87,7 +87,7 @@ public class HydropowerController extends BladeController {
 	}
 
 	@ApiLog
-	@ApiOperation("app水电站集团")
+	@ApiOperation("app水电站区值班")
 	@GetMapping("/app/area-duty")
 	@ApiOperationSupport(order = 8)
 	public R<AppAreaDutyVo> areaDuty(@ApiParam(value = "站点机构ID") Long deptId) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java

@@ -1538,7 +1538,7 @@ public class HydropowerServiceImpl implements HydropowerService {
 					device.setDeviceCode(real.getDeviceCode());
 					device.setDeviceName(real.getDeviceName());
 					device.setState(real.getState());
-					device.setLoadUnit(Optional.ofNullable(real.getPowerUnit()).orElse("kw"));
+					device.setLoadUnit(Optional.ofNullable(real.getPowerUnit()).orElse("kW"));
 					device.setCapacity(real.getInstalledCapacity());
 					device.setLoad(real.getActivePower());
 					return device;