diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java index 491fe160..a5a75bfc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java @@ -62,4 +62,5 @@ public interface IBsDosingRecService extends BaseService { void towerSosRec(List objList); + Object epDosingRecByCode(String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java index e1645b82..0f8055ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java @@ -62,4 +62,5 @@ public interface IBsTowerService extends BaseService { void generateData(List objList); + List list(String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java index c6b3b692..a4dd1343 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java @@ -52,7 +52,7 @@ import static org.springblade.desk.energy.pojo.entity.BsDosingRecEntity.HANDLE_R */ @Service public class BsDosingRecServiceImpl extends BaseServiceImpl implements IBsDosingRecService { -@Resource + @Resource IBsTowerService iBsTowerService; @Override public IPage selectBsDosingRecPage(IPage page, BsDosingRecVO bsDosingRec) { @@ -102,4 +102,28 @@ public class BsDosingRecServiceImpl extends BaseServiceImpl query = this.getSession().createQuery(hql); + query.setParameter("btCode", code); + query.setParameter("handleResult", EpDosingRec.HANDLE_RESULT_WAIT); + query.setMaxResults(1); + + return query.uniqueResult(); + * */ + List bsTowers = iBsTowerService.list(code); + List towerIds = bsTowers.stream().map(BsTowerEntity::getId).toList(); + + return list(Wrappers.lambdaQuery(BsDosingRecEntity.class) + .in(BsDosingRecEntity::getBtId,towerIds) + .orderByDesc(BsDosingRecEntity::getDosingTime) + .last("limit 1")); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java index 1ac8c9d3..b07cb738 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.energy.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import org.springblade.desk.energy.excel.BsTowerExcel; import org.springblade.desk.energy.mapper.BsTowerMapper; @@ -148,4 +149,11 @@ public class BsTowerServiceImpl extends BaseServiceImpl list(String code) { + return list(Wrappers.lambdaQuery(BsTowerEntity.class) + .eq(BsTowerEntity::getBtCode, code)); + } + } 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 87a87bb3..2b7751d1 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 @@ -13,6 +13,7 @@ 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.BsDosingRecEntity; import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; import org.springblade.desk.oldv1.constant.Constant; import org.springblade.desk.oldv1.pojo.ResultInfo; @@ -119,28 +120,9 @@ public class PdaLoadController { return ResultInfo.ok(pdaLoadService.getInspectionByEcCode(code, true,request)); } - @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 = "") + @Operation(summary = "根据巡检器编码查询环保巡检数据", description = "") @PostMapping("/getInspectionBySan") public ResultInfo getInspectionBySan(@RequestBody JSONObject data) throws Exception { @@ -150,13 +132,10 @@ public class PdaLoadController { 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(); + @Operation(summary = "根据酸雾塔编码查询数据", description = "") + @GetMapping("/epDosingRecByCode/{code}") + public ResultInfo epDosingRecByCode(@PathVariable String code) throws Exception { + return ResultInfo.ok(pdaLoadService.epDosingRecByCode(code)); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java index 9d7b66d8..e648144d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java @@ -1,12 +1,20 @@ package org.springblade.desk.produce.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.tool.api.R; import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +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.dto.DeviceBindDTO; import org.springblade.desk.produce.pojo.vo.MacToolUseVO; import org.springblade.desk.produce.pojo.vo.SjEcBingCardVo; @@ -25,6 +33,7 @@ import java.util.List; * @Version 1.0 * 注意：本内容仅限于内部传阅，禁止外泄及用于其他的商业目的 */ +@Slf4j @RestController @RequiredArgsConstructor @RequestMapping("/pdaSave") @@ -126,4 +135,39 @@ public class PdaSaveController { } + @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); + pdaSaveService.saveSafetyInspection(code, man, memo); + return ResultInfo.ok(); + } + + @Operation(summary = "环保巡检检验", description = "") + @RequestMapping(value = "/savePatrolIns", method = RequestMethod.POST) + public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection, HttpServletRequest request) { + + pdaSaveService.savePatrolIns(epPatrolInspection); + + return ResultInfo.ok(); + } + + @Operation(summary = "酸雾塔报警处理", description = "") + @PostMapping("/saveEpDosingRec") + public ResultInfo saveEpDosingRec(@RequestBody BsDosingRecEntity epDosingRec, HttpServletRequest request) throws Exception { + pdaSaveService.saveEpDosingRec(epDosingRec); + 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 ac29f902..238a1f6d 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 @@ -77,11 +77,11 @@ public interface IPdaLoadService extends BaseService { Object getInspectionByEcCode(String code,Boolean flag, HttpServletRequest request); - void saveSafetyInspection(String code, String man, String memo); Object getInspectionBySan(String code, Short eipType); - void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection); + + Object epDosingRecByCode(String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java index d2317613..d4258225 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java @@ -1,6 +1,8 @@ package org.springblade.desk.produce.service; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; import org.springblade.desk.produce.pojo.dto.DeviceBindDTO; import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO; import org.springblade.desk.produce.pojo.dto.ShiftTransferDTO; @@ -63,4 +65,11 @@ public interface IPdaSaveService extends BaseService { void shiftTransfer(ShiftTransferDTO shiftTransferDTO); boolean receiveNoProcessOrder(); + + void saveSafetyInspection(String code, String man, String memo); + + void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection); + + void saveEpDosingRec(BsDosingRecEntity epDosingRec); + } 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 8194604f..02c6336a 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 @@ -8,7 +8,6 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springblade.common.exception.BusinessException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; @@ -26,6 +25,7 @@ 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.IBsDosingRecService; import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; import org.springblade.desk.energy.service.IBsSafeInspectionPointService; import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; @@ -99,6 +99,7 @@ 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); + @Override + public Object epDosingRecByCode(String code) { + return bsDosingRecService.epDosingRecByCode(code); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java index f219c5c4..2291e130 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java @@ -1,5 +1,6 @@ package org.springblade.desk.produce.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -23,6 +24,14 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity; 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.BsDosingRecEntity; +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.IBsDosingRecService; +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.pojo.entity.YieldOrderCraft; import org.springblade.desk.order.pojo.enums.YieldOrderEnum; @@ -104,7 +113,10 @@ public class PdaSaveServiceImpl 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 void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection) { + if (Objects.isNull(epPatrolInspection.getId())) { + return; + } + bsEpciuPatrolInspectionService.savePatrolIns(epPatrolInspection); + } + + @Override + public void saveEpDosingRec(BsDosingRecEntity epDosingRec) { + if (Objects.isNull(epDosingRec.getId())){ + throw new RuntimeException("请选择加药记录"); + } + epDosingRec.setDosingMan(AuthUtil.getUserName()); + epDosingRec.setDosingTime(new Date()); + epDosingRec.setHandleResult(Long.valueOf(BsDosingRecEntity.HANDLE_RESULT_PDA)); + bsDosingRecService.updateById(epDosingRec); + } }