#集中监控消息bug解决

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

@@ -0,0 +1,16 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author ysj
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AccessAssociationVo extends  BusinessQueryVo {
+
+	@ApiModelProperty("任务名称")
+	private String name;
+}

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

@@ -0,0 +1,22 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author ysj
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaintenanceAssociationVo extends  BusinessQueryVo {
+
+	@ApiModelProperty("项目名称")
+	private String title;
+
+	@ApiModelProperty("内容")
+	private String content;
+
+	@ApiModelProperty("任务类型")
+	private String taskType;
+}

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

@@ -0,0 +1,25 @@
+package com.hnac.hzims.operational.census.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author ysj
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaintenancePhenomenonVo extends  BusinessQueryVo {
+
+	@ApiModelProperty("缺陷名称")
+	private String name;
+
+	@ApiModelProperty("是否为缺陷")
+	private Integer isDefect;
+
+	@ApiModelProperty("发现开始时间")
+	private String findStartTime;
+
+	@ApiModelProperty("发现结束时间")
+	private String findEndTime;
+}

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

@@ -184,23 +184,23 @@ public class TargetController {
 	}
 
 	@ApiOperation("日常维护-数据关联")
-	@PostMapping("/maintenance")
+	@GetMapping("/maintenance")
 	@ApiOperationSupport(order = 15)
-	public R<IPage<MaintenanceTaskVo>> maintenance(BusinessQueryVo business,Query query) {
+	public R<IPage<MaintenanceTaskVo>> maintenance(MaintenanceAssociationVo business,Query query) {
 		return R.data(service.maintenance(Condition.getPage(query),business));
 	}
 
 	@ApiOperation("缺陷-数据关联")
-	@PostMapping("/phenomenon")
+	@GetMapping("/phenomenon")
-	@ApiOperationSupport(order = 17)
+	@ApiOperationSupport(order = 16)
-	public R<IPage<OperPhenomenonVO>> phenomenon(BusinessQueryVo business, Query query) {
+	public R<IPage<OperPhenomenonVO>> phenomenon(MaintenancePhenomenonVo business, Query query) {
 		return R.data(service.phenomenon(Condition.getPage(query),business));
 	}
 
 	@ApiOperation("检修任务-数据关联")
-	@PostMapping("/access")
+	@GetMapping("/access")
 	@ApiOperationSupport(order = 17)
-	public R<IPage<OperAccessTaskVO>> access(BusinessQueryVo business,Query query) {
+	public R<IPage<OperAccessTaskVO>> access(AccessAssociationVo business,Query query) {
 		return R.data(service.access(Condition.getPage(query),business));
 	}
 

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

@@ -66,9 +66,9 @@ public interface TargetService {
 	// 集团工作牌/操作票
 	IPage<DutyGroupVo> dutyGroup(IPage<DutyGroupVo> page,String areaName, Long type);
 
-    IPage<MaintenanceTaskVo> maintenance(IPage<OperMaintenanceTaskEntity> page, BusinessQueryVo business);
+    IPage<MaintenanceTaskVo> maintenance(IPage<OperMaintenanceTaskEntity> page, MaintenanceAssociationVo business);
 
-	IPage<OperPhenomenonVO> phenomenon(IPage<OperPhenomenonEntity> page, BusinessQueryVo business);
+	IPage<OperPhenomenonVO> phenomenon(IPage<OperPhenomenonEntity> page, MaintenancePhenomenonVo business);
 
-	IPage<OperAccessTaskVO> access(IPage<OperAccessTaskEntity> page, BusinessQueryVo business);
+	IPage<OperAccessTaskVO> access(IPage<OperAccessTaskEntity> page, AccessAssociationVo business);
 }

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

@@ -21,7 +21,6 @@ import com.hnac.hzims.operational.census.vo.WaterTargetVo;
 import com.hnac.hzims.operational.census.vo.*;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
 import com.hnac.hzims.operational.defect.service.IOperPhenomenonService;
-import com.hnac.hzims.operational.defect.service.impl.OperPhenomenonServiceImpl;
 import com.hnac.hzims.operational.defect.vo.OperPhenomenonVO;
 import com.hnac.hzims.operational.defect.wrapper.OperPhenomenonWrapper;
 import com.hnac.hzims.operational.fill.entity.*;
@@ -1105,9 +1104,18 @@ public class TargetServiceImpl implements TargetService {
 	 * @return
 	 */
 	@Override
-	public IPage<MaintenanceTaskVo> maintenance(IPage<OperMaintenanceTaskEntity> page, BusinessQueryVo business) {
+	public IPage<MaintenanceTaskVo> maintenance(IPage<OperMaintenanceTaskEntity> page, MaintenanceAssociationVo business) {
 		Wrapper<OperMaintenanceTaskEntity> queryWrapper = new LambdaQueryWrapper<OperMaintenanceTaskEntity>() {{
 			orderByDesc(OperMaintenanceTaskEntity::getDisposeTime);
+			if (!StringUtil.isEmpty(business.getTitle())) {
+				like(OperMaintenanceTaskEntity::getTitle, business.getTitle());
+			}
+			if (!StringUtil.isEmpty(business.getTaskType())) {
+				eq(OperMaintenanceTaskEntity::getTaskType, business.getTaskType());
+			}
+			if (!StringUtil.isEmpty(business.getContent())) {
+				like(OperMaintenanceTaskEntity::getContent, business.getContent());
+			}
 			if (!StringUtil.isEmpty(business.getStartTime())) {
 				ge(OperMaintenanceTaskEntity::getDisposeTime,business.getStartTime());
 			}
@@ -1118,7 +1126,7 @@ public class TargetServiceImpl implements TargetService {
 				eq(OperMaintenanceTaskEntity::getFlowTaskName,"结束");
 			}
 			if(!StringUtil.isEmpty(business.getDeptIds())){
-				in(OperMaintenanceTaskEntity::getCreateDept, Func.toLongList(business.getDeptIds(),","));
+				in(OperMaintenanceTaskEntity::getCreateDept, Func.toLongList(",",business.getDeptIds()));
 			}
 		}};
 		IPage pages = maintenanceTaskService.page(page,queryWrapper);
@@ -1133,9 +1141,22 @@ public class TargetServiceImpl implements TargetService {
 	 * @return
 	 */
 	@Override
-	public IPage<OperPhenomenonVO> phenomenon(IPage<OperPhenomenonEntity> page, BusinessQueryVo business) {
+	public IPage<OperPhenomenonVO> phenomenon(IPage<OperPhenomenonEntity> page, MaintenancePhenomenonVo business) {
 		Wrapper<OperPhenomenonEntity> queryWrapper = new LambdaQueryWrapper<OperPhenomenonEntity>() {{
 			orderByDesc(OperPhenomenonEntity::getCreateTime);
+			if (!StringUtil.isEmpty(business.getName())) {
+				like(OperPhenomenonEntity::getName,business.getName());
+			}
+			if (!ObjectUtil.isEmpty(business.getIsDefect())) {
+				eq(OperPhenomenonEntity::getIsDefect,business.getIsDefect());
+			}
+
+			if (!StringUtil.isEmpty(business.getFindStartTime())) {
+				ge(OperPhenomenonEntity::getFindTime,business.getFindStartTime());
+			}
+			if (!StringUtil.isEmpty(business.getFindEndTime())) {
+				le(OperPhenomenonEntity::getFindTime,business.getFindEndTime());
+			}
 			if (!StringUtil.isEmpty(business.getStartTime())) {
 				ge(OperPhenomenonEntity::getCreateTime,business.getStartTime());
 			}
@@ -1146,7 +1167,7 @@ public class TargetServiceImpl implements TargetService {
 				isNotNull(OperPhenomenonEntity::getHandleTaskId);
 			}
 			if(!StringUtil.isEmpty(business.getDeptIds())){
-				in(OperPhenomenonEntity::getCreateDept, Func.toLongList(business.getDeptIds(),","));
+				in(OperPhenomenonEntity::getCreateDept, Func.toLongList(",",business.getDeptIds()));
 			}
 		}};
 		IPage pages = phenomenonService.page(page, queryWrapper);
@@ -1161,9 +1182,12 @@ public class TargetServiceImpl implements TargetService {
 	 * @return
 	 */
 	@Override
-	public IPage<OperAccessTaskVO> access(IPage<OperAccessTaskEntity> page, BusinessQueryVo business) {
+	public IPage<OperAccessTaskVO> access(IPage<OperAccessTaskEntity> page, AccessAssociationVo business) {
 		Wrapper<OperAccessTaskEntity> queryWrapper = new LambdaQueryWrapper<OperAccessTaskEntity>() {{
 			orderByDesc(OperAccessTaskEntity::getPlanStartTime);
+			if (!StringUtil.isEmpty(business.getName())) {
+				like(OperAccessTaskEntity::getName,business.getName());
+			}
 			if (!StringUtil.isEmpty(business.getStartTime())) {
 				ge(OperAccessTaskEntity::getPlanStartTime,business.getStartTime());
 			}
@@ -1174,7 +1198,7 @@ public class TargetServiceImpl implements TargetService {
 				eq(OperAccessTaskEntity::getStatus,4);
 			}
 			if(!StringUtil.isEmpty(business.getDeptIds())){
-				in(OperAccessTaskEntity::getCreateDept, Func.toLongList(business.getDeptIds(),","));
+				in(OperAccessTaskEntity::getCreateDept, Func.toLongList(",",business.getDeptIds()));
 			}
 		}};
 		IPage pages = accessTaskService.page(page, queryWrapper);