diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java index 6774e0c4..0bb5af81 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java @@ -112,25 +112,51 @@ public class BsSafePatrolInspectionEntity extends BaseEntity { @Schema(description = "任务状态:1、已检，2、待检，3、未准时完成") private String taskStatus; + ///** + // * 待检 + // */ + //public static Short PREPARE_TEXT = 1; + ///** + // * 未检 + // */ + //public static Short NO_CHECK = 2; + ///** + // * 已检 + // */ + //public static Short CHECKED = 3; + // + //public static Map taskStatusMap = new HashMap(2); + // + //static { + // taskStatusMap.put(CHECKED, "已检"); + // taskStatusMap.put(PREPARE_TEXT, "待检"); + // taskStatusMap.put(NO_CHECK, "未检"); + //} + + + /** + * 已检 + */ + public static Short CHECKED = 1; /** * 待检 */ - public static Short PREPARE_TEXT = 1; + public static Short PREPARE_TEXT = 2; /** - * 未检 + * 未准时完成 */ - public static Short NO_CHECK = 2; + public static Short NOT_ON_TIME = 3; /** - * 已检 + * 缺卡(默认处理) */ - public static Short CHECKED = 3; + public static Short NO_CHECK = 4; public static Map taskStatusMap = new HashMap(2); static { taskStatusMap.put(CHECKED, "已检"); taskStatusMap.put(PREPARE_TEXT, "待检"); - taskStatusMap.put(NO_CHECK, "未检"); + taskStatusMap.put(NOT_ON_TIME, "未准时完成"); + taskStatusMap.put(NO_CHECK, "缺卡"); } - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java index d94b3d56..62dd3dec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java @@ -60,4 +60,6 @@ public interface IBsEpciuInspectionPointService extends BaseService exportBsEpciuInspectionPoint(Wrapper queryWrapper); List getByCode(String code); + + List listByCode(String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java index 70bf92ed..06c3195d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java @@ -62,6 +62,8 @@ public interface IBsEpciuPatrolInspectionService extends BaseService ListPi(String code, Long userId); + List ListPi(String code,Short eipType); + + void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java index 68d9a0e9..c65e04ba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java @@ -62,6 +62,8 @@ public interface IBsSafeInspectionPointService extends BaseService listByCode(String code); + BsSafeInspectionPointEntity getByKey(Long ipId); + /** * 导出pdf * @param list diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java index 32ebeba8..453e9ff2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java @@ -32,6 +32,7 @@ import org.springblade.desk.energy.excel.BsSafePatrolInspectionExcel; import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; +import java.util.Date; import java.util.List; /** @@ -62,4 +63,8 @@ public interface IBsSafePatrolInspectionService extends BaseService getByCode(String code); + + void updateOldPatrol(Long ipId, Date launchTime, Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java index 0e5ee5b9..ac344048 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java @@ -69,4 +69,9 @@ public class BsEpciuInspectionPointServiceImpl extends BaseServiceImpl listByCode(String code) { + return getByCode(code); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java index e8d64991..c044092f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel; import org.springblade.desk.energy.mapper.BsEpciuPatrolInspectionMapper; import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; @@ -49,6 +50,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; /** @@ -63,10 +65,6 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl selectBsEpciuPatrolInspectionPage(IPage page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection) { if(bsEpciuPatrolInspection.getQueryLaunchTime()!=null){ @@ -157,12 +155,56 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl ListPi(String code, Long userId) { - List safeInspectionPointList = iBsSafeInspectionPointService.listByCode(code); - List safeInspectionPointIdList = safeInspectionPointList.stream().map(BsSafeInspectionPointEntity::getId).toList(); + public List ListPi(String code, Short eipType) { + //String sql = "select*from(SELECT a.* FROM EP_PATROL_INSPECTION a INNER join " + + // "EP_INSPECTION_POINT b ON a.ip_id = b.eip_id WHERE b.patrol_register =:code AND a.task_status =:taskStatus AND b.eip_type =:eipType " + + // "ORDER BY a.launch_time DESC )where rownum<2 "; + //Query query = this.getSession().createSQLQuery(sql).addEntity(EpPatrolInspection.class); + //query.setParameter("code", code); + //query.setParameter("eipType", eipType); + //query.setParameter("taskStatus", EpPatrolInspection.PREPARE_TEXT); + //return query.uniqueResult(); + + List safeInspectionPointList = bsEpciuInspectionPointService.listByCode(code); + List safeInspectionPointIdList = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).toList(); return list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class) .in(BsEpciuPatrolInspectionEntity::getEpcId, safeInspectionPointIdList) - .eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.NO_CHECK.toString())); - } + .eq(BsEpciuPatrolInspectionEntity::getInsType, eipType) + //旧mes中查询待检状态任务 + .eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString()) + .orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime) + .last("rownum<2")); + } + + @Override + public void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection) { + //epPatrolInspection.setTestTime(new Date()); + //epPatrolInspection.setInsMan(pfUserInfo); + //epPatrolInspection.setTaskStatus(EpPatrolInspection.CHECKED); + //epPatrolInspectionDao.update(epPatrolInspection); + ////将其他同类的巡检任务置为未检 + //// + //epPatrolInspectionDao.updateTaskStatus(epPatrolInspection.getEpInspectionPoint().getPatrolRegister()); + //String sql = " update EP_PATROL_INSPECTION a set a.TASK_STATUS =:taskStatusNo where a.epi_id in " + + // "(select a.epi_id from EP_PATROL_INSPECTION a inner join EP_INSPECTION_POINT b on a.ip_id = b.eip_id " + + // "where a.TASK_STATUS=:taskStatusText and b.patrol_register =:code) "; + //Query query = this.getSession().createSQLQuery(sql); + //query.setParameter("taskStatusNo", EpPatrolInspection.NO_CHECK); + //query.setParameter("taskStatusText", EpPatrolInspection.PREPARE_TEXT); + //query.setParameter("code", code); + //query.executeUpdate(); + BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection = getById(epPatrolInspection.getId()); + bsEpciuPatrolInspection.setTaskStatus(BsEpciuPatrolInspectionEntity.CHECKED.toString()); + bsEpciuPatrolInspection.setTestTime(new Date()); + bsEpciuPatrolInspection.setInsMan(AuthUtil.getUserId().toString()); + updateById(bsEpciuPatrolInspection); + // 将其他同类的巡检任务置为未检 + List safeInspectionPointList = bsEpciuInspectionPointService.listByCode(bsEpciuPatrolInspection.getInsNum()); + Set pointIds = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).collect(Collectors.toSet()); + update(Wrappers.lambdaUpdate(BsEpciuPatrolInspectionEntity.class) + .in(BsEpciuPatrolInspectionEntity::getEpcId, pointIds) + .eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString()) + .set(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.NO_CHECK.toString())); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java index 811f680e..456ad308 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java @@ -173,4 +173,9 @@ public class BsSafeInspectionPointServiceImpl extends BaseServiceImplupdate().lambda().set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK).eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT)); } + @Override + public List getByCode(String code) { + //String sql = "select a.* from safe_patrol_inspection a " + + // "INNER join safe_inspection_point b on a.IP_ID = b.IP_ID " + + // "where b.patrol_register=:code and a.task_status =:taskStatus order by a.launch_time desc"; + //Query query = this.getSession().createSQLQuery(sql).addEntity(SafePatrolInspection.class); + //query.setParameter("code", code); + //query.setParameter("taskStatus", SafePatrolInspection.PREPARE_TEXT); + //return query.list(); + + List bsSafeInspectionPointEntities = bsSafeInspectionPointService.listByCode(code); + List ipIds = bsSafeInspectionPointEntities.stream().map(BsSafeInspectionPointEntity::getId).toList(); + return list(Wrappers.lambdaQuery(BsSafePatrolInspectionEntity.class) + .in(BsSafePatrolInspectionEntity::getIpId, ipIds) + .eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT) + .orderByDesc(BsSafePatrolInspectionEntity::getLaunchTime)); + } + + @Override + public void updateOldPatrol(Long ipId, Date launchTime, Long id) { + update(Wrappers.lambdaUpdate(BsSafePatrolInspectionEntity.class) + .eq(BsSafePatrolInspectionEntity::getIpId, id) + .lt(BsSafePatrolInspectionEntity::getLaunchTime, launchTime) + .eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT) + .set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK) + .set(BsSafePatrolInspectionEntity::getInsMan, id)); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java index f3e838ce..87a87bb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java @@ -6,11 +6,15 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.BusinessException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.oldv1.constant.Constant; import org.springblade.desk.oldv1.pojo.ResultInfo; import org.springblade.desk.produce.pojo.vo.BindModelVO; import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO; @@ -28,6 +32,7 @@ import java.util.List; * @Version 1.0 * 注意：本内容仅限于内部传阅，禁止外泄及用于其他的商业目的 */ +@Slf4j @RestController @RequiredArgsConstructor @RequestMapping("/pdaLoad") @@ -108,15 +113,49 @@ public class PdaLoadController { } @ApiOperationSupport(order = 11) - @Operation(summary = "根据巡检器编码查询数据", description = "") + @Operation(summary = "根据巡检器编码查询数据，查询安全巡检任务", description = "") @GetMapping("/getInspectionByEcCode/{code}") public ResultInfo getInspectionByEcCode(@PathVariable String code, HttpServletRequest request) throws Exception { return ResultInfo.ok(pdaLoadService.getInspectionByEcCode(code, true,request)); } - @Operation(summary = "安全巡检保存", description = "") - @PostMapping("/saveByInspection") - public ResultInfo saveByInspection(@RequestBody JSONObject data, HttpServletRequest request) throws Exception { - pdaLoadService.saveByInspection(data,true); + + @Operation(summary = "安全巡检处理，修改安全巡检任务", description = "") + @PostMapping(value = "/saveByInspection") + public ResultInfo saveSafetyInspection(HttpServletRequest request) throws Exception { + JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS); + if (params == null || params.size() == 0) { + throw new BusinessException("参数传递异常!"); + } + String code = params.getString("code"); + String man = params.getString("reviewMan"); + String memo = params.getString("memo"); + + if (code == null || man == null) { + throw new BusinessException("参数传递异常!"); + } + + log.info("安全巡检处理传递参数---编码:" + code + " 人员:" + man + " 备注:" + memo); + pdaLoadService.saveSafetyInspection(code, man, memo); + return ResultInfo.ok(); + } + + + @Operation(summary = "根据巡检器编码查询环保巡检数据（PDA废水巡检））", description = "") + @PostMapping("/getInspectionBySan") + public ResultInfo getInspectionBySan(@RequestBody JSONObject data) throws Exception { + + Short eipType = data.getShort("eipType"); + String code = data.getString("code"); + + return ResultInfo.ok(pdaLoadService.getInspectionBySan(code, eipType)); + } + + @Operation(summary = "环保巡检检验", description = "") + @RequestMapping(value = "/savePatrolIns", method = RequestMethod.POST) + public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection, HttpServletRequest request) { + + pdaLoadService.savePatrolIns(epPatrolInspection); + return ResultInfo.ok(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java index 636d651f..ac29f902 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java @@ -6,6 +6,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.desk.produce.pojo.entity.WorkPlan; @@ -76,5 +77,11 @@ public interface IPdaLoadService extends BaseService { Object getInspectionByEcCode(String code,Boolean flag, HttpServletRequest request); - void saveByInspection(JSONObject data, boolean b); + void saveSafetyInspection(String code, String man, String memo); + + Object getInspectionBySan(String code, Short eipType); + + + void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection); + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 0b2ca7ae..8194604f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -1,5 +1,6 @@ package org.springblade.desk.produce.service.impl; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -23,8 +24,11 @@ import org.springblade.desk.device.service.IEquipmentService; import org.springblade.desk.device.service.IFeiBaSetService; import org.springblade.desk.device.service.IRackSetService; import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; +import org.springblade.desk.energy.service.IBsSafeInspectionPointService; +import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.mapper.WorkPlanMapper; @@ -38,6 +42,8 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.IWorkPlanItemService; import org.springblade.scheduling.pojo.entity.CraftAbilityEntity; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -90,6 +96,10 @@ public class PdaLoadServiceImpl extends BaseServiceImpl piList = bsEpciuPatrolInspectionService.ListPi(code, userId); + //安全 - 巡检 + List piList = inspectionService.getByCode(code); piList = piList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> - new TreeSet<>(Comparator.comparing(BsEpciuPatrolInspectionEntity::getEpcId))), ArrayList::new)); + new TreeSet<>(Comparator.comparing(BsSafePatrolInspectionEntity::getIpId))), ArrayList::new)); if (piList == null || piList.size() == 0) { if (flag) { throw new RuntimeException("product.noPatrolCheckTask", null); @@ -450,7 +461,66 @@ public class PdaLoadServiceImpl extends BaseServiceImpl spiList = inspectionService.getByCode(code); + if (spiList == null || spiList.size() == 0) { + throw new RuntimeException("根据编码未找到需要处理数据"); + } + + List users = userClient.listByNameNolike(man); + + if (CollUtil.isEmpty(users)) { + throw new RuntimeException("根据域账号未找到对应的处理人"); + } + User user = users.get(0); + + Date date = new Date(); + + for (BsSafePatrolInspectionEntity safePatrolInspection : spiList) { + // 不超过一个小时算正常检验 + if (new Date().getTime() - safePatrolInspection.getLaunchTime().getTime() <= 60 * 60 * 1000) { + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.CHECKED.toString()); + } else { + // 超过一个小时但是下个任务并没有触发 + int hours = safePatrolInspection.getLaunchTime().getHours(); + int hours1 = new Date().getHours(); + if (hours == 0 && hours1 < 2) { + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString()); + } else if (hours == 2 && hours1 < 5) { + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString()); + } else if (hours == 5 && hours1 < 7) { + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString()); + } else if (hours == 7 && hours1 < 8) { + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString()); + } else { + // 超过一个小时但是下个任务已触发 + safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NO_CHECK.toString()); + } + } + safePatrolInspection.setTestTime(date); + safePatrolInspection.setInsMan(man); + safePatrolInspection.setParMemo(memo); + BsSafeInspectionPointEntity safeInspectionPoint = bsSafeInspectionPointService.getByKey(safePatrolInspection.getIpId()); + safeInspectionPoint.setLastInsCycle(date); + inspectionService.updateOldPatrol(safePatrolInspection.getIpId(), safePatrolInspection.getLaunchTime(), user.getId()); + } + } + + @Override + public Object getInspectionBySan(String code, Short eipType) { + return bsEpciuPatrolInspectionService.ListPi(code, eipType); + } + + @Override + public void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection) { + //if (epPatrolInspection.getEpiId() != null) { + // + //} + if (Objects.isNull(epPatrolInspection.getId())) { + return; + } + bsEpciuPatrolInspectionService.savePatrolIns(epPatrolInspection); }