From 2338940b7e1a220839c0cef3d10fd28127cb0b89 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Thu, 30 Oct 2025 10:49:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(pocket):=20=E6=96=B0=E5=A2=9E=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E4=B8=8E=E5=81=9C=E6=9C=BA=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD-=20=E5=9C=A8=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0insertByBo=E3=80=81updateByBo?= =?UTF-8?q?=E5=92=8CdeleteWithValidByIds=E6=96=B9=E6=B3=95=20-=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E4=B8=AD=E5=AE=9E=E7=8E=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0=E9=99=A4=E5=8F=8A?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3-=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8@Log=E6=B3=A8=E8=A7=A3=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=98=B2=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=20-=20=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=AE=9E=E4=BD=93=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E5=90=88=E6=B3=95=E6=80=A7=20-=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87=E4=B8=BB=E9=94=AE=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2=E4=B8=8E=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20-=20=E5=BC=95=E5=85=A5BeanUtil=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=AE=80=E5=8C=96BO=E5=88=B0=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=9A=84=E8=BD=AC=E6=8D=A2=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Klptcm1ProPlantStateHistoryController.java | 53 +++++++++++++++++++ .../Klptcm1ProStoppageController.java | 52 ++++++++++++++++++ .../IKlptcm1ProPlantStateHistoryService.java | 15 ++++++ .../service/IKlptcm1ProStoppageService.java | 16 ++++++ ...lptcm1ProPlantStateHistoryServiceImpl.java | 44 +++++++++++++++ .../impl/Klptcm1ProStoppageServiceImpl.java | 43 +++++++++++++++ 6 files changed, 223 insertions(+) diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateHistoryController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateHistoryController.java index 11e8e301..1a99ba23 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateHistoryController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateHistoryController.java @@ -1,5 +1,11 @@ package com.klp.pocket.controller; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -10,6 +16,11 @@ import com.klp.pocket.domain.bo.Klptcm1ProPlantStateHistoryBo; import com.klp.pocket.service.IKlptcm1ProPlantStateHistoryService; import com.klp.common.core.page.TableDataInfo; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.Date; + /** * 历史 * @@ -32,4 +43,46 @@ public class Klptcm1ProPlantStateHistoryController extends BaseController { return iKlptcm1ProPlantStateHistoryService.queryPageList(bo, pageQuery); } + /** + * 获取历史详细信息 + * + * @param INSDATE 主键 + */ + @GetMapping("/{INSDATE}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Date INSDATE) { + return R.ok(iKlptcm1ProPlantStateHistoryService.queryById(INSDATE)); + } + + /** + * 新增历史 + */ + @Log(title = "历史", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody Klptcm1ProPlantStateHistoryBo bo) { + return toAjax(iKlptcm1ProPlantStateHistoryService.insertByBo(bo)); + } + + /** + * 修改历史 + */ + @Log(title = "历史", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody Klptcm1ProPlantStateHistoryBo bo) { + return toAjax(iKlptcm1ProPlantStateHistoryService.updateByBo(bo)); + } + + /** + * 删除历史 + * + * @param INSDATEs 主键串 + */ + @Log(title = "历史", businessType = BusinessType.DELETE) + @DeleteMapping("/{INSDATEs}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Date[] INSDATEs) { + return toAjax(iKlptcm1ProPlantStateHistoryService.deleteWithValidByIds(Arrays.asList(INSDATEs), true)); + } } diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProStoppageController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProStoppageController.java index 91e6f97d..bbb7ca77 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProStoppageController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProStoppageController.java @@ -1,5 +1,11 @@ package com.klp.pocket.controller; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -10,6 +16,10 @@ import com.klp.pocket.domain.bo.Klptcm1ProStoppageBo; import com.klp.pocket.service.IKlptcm1ProStoppageService; import com.klp.common.core.page.TableDataInfo; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + /** * 停机 * @@ -32,4 +42,46 @@ public class Klptcm1ProStoppageController extends BaseController { return iKlptcm1ProStoppageService.queryPageList(bo, pageQuery); } + /** + * 获取停机详细信息 + * + * @param STOPID 主键 + */ + @GetMapping("/{STOPID}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long STOPID) { + return R.ok(iKlptcm1ProStoppageService.queryById(STOPID)); + } + + /** + * 新增停机 + */ + @Log(title = "停机", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody Klptcm1ProStoppageBo bo) { + return toAjax(iKlptcm1ProStoppageService.insertByBo(bo)); + } + + /** + * 修改停机 + */ + @Log(title = "停机", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody Klptcm1ProStoppageBo bo) { + return toAjax(iKlptcm1ProStoppageService.updateByBo(bo)); + } + + /** + * 删除停机 + * + * @param STOPIDs 主键串 + */ + @Log(title = "停机", businessType = BusinessType.DELETE) + @DeleteMapping("/{STOPIDs}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] STOPIDs) { + return toAjax(iKlptcm1ProStoppageService.deleteWithValidByIds(Arrays.asList(STOPIDs), true)); + } } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateHistoryService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateHistoryService.java index 640bdfb2..b33dc1d7 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateHistoryService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateHistoryService.java @@ -5,6 +5,7 @@ import com.klp.pocket.domain.bo.Klptcm1ProPlantStateHistoryBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; +import java.util.Collection; import java.util.Date; import java.util.List; @@ -31,4 +32,18 @@ public interface IKlptcm1ProPlantStateHistoryService { */ List queryList(Klptcm1ProPlantStateHistoryBo bo); + /** + * 新增历史 + */ + Boolean insertByBo(Klptcm1ProPlantStateHistoryBo bo); + + /** + * 修改历史 + */ + Boolean updateByBo(Klptcm1ProPlantStateHistoryBo bo); + + /** + * 校验并批量删除历史信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProStoppageService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProStoppageService.java index 048b5164..203d4d39 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProStoppageService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProStoppageService.java @@ -5,6 +5,7 @@ import com.klp.pocket.domain.bo.Klptcm1ProStoppageBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; +import java.util.Collection; import java.util.List; /** @@ -29,4 +30,19 @@ public interface IKlptcm1ProStoppageService { * 查询停机列表 */ List queryList(Klptcm1ProStoppageBo bo); + + /** + * 新增停机 + */ + Boolean insertByBo(Klptcm1ProStoppageBo bo); + + /** + * 修改停机 + */ + Boolean updateByBo(Klptcm1ProStoppageBo bo); + + /** + * 校验并批量删除停机信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateHistoryServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateHistoryServiceImpl.java index 50716c91..946b8105 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateHistoryServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateHistoryServiceImpl.java @@ -1,5 +1,6 @@ package com.klp.pocket.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; @@ -14,6 +15,7 @@ import com.klp.pocket.domain.Klptcm1ProPlantStateHistory; import com.klp.pocket.mapper.Klptcm1ProPlantStateHistoryMapper; import com.klp.pocket.service.IKlptcm1ProPlantStateHistoryService; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; @@ -169,4 +171,46 @@ public class Klptcm1ProPlantStateHistoryServiceImpl implements IKlptcm1ProPlantS lqw.eq(bo.getVALUE99() != null, Klptcm1ProPlantStateHistory::getValue99, bo.getVALUE99()); return lqw; } + + /** + * 新增历史 + */ + @Override + public Boolean insertByBo(Klptcm1ProPlantStateHistoryBo bo) { + Klptcm1ProPlantStateHistory add = BeanUtil.toBean(bo, Klptcm1ProPlantStateHistory.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setINSDATE(add.getInsdate()); + } + return flag; + } + + /** + * 修改历史 + */ + @Override + public Boolean updateByBo(Klptcm1ProPlantStateHistoryBo bo) { + Klptcm1ProPlantStateHistory update = BeanUtil.toBean(bo, Klptcm1ProPlantStateHistory.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(Klptcm1ProPlantStateHistory entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除历史 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java index 826a3254..a5c1f9fe 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java @@ -1,5 +1,6 @@ package com.klp.pocket.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; @@ -15,6 +16,7 @@ import com.klp.pocket.domain.Klptcm1ProStoppage; import com.klp.pocket.mapper.Klptcm1ProStoppageMapper; import com.klp.pocket.service.IKlptcm1ProStoppageService; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -77,4 +79,45 @@ public class Klptcm1ProStoppageServiceImpl implements IKlptcm1ProStoppageService return lqw; } + /** + * 新增停机 + */ + @Override + public Boolean insertByBo(Klptcm1ProStoppageBo bo) { + Klptcm1ProStoppage add = BeanUtil.toBean(bo, Klptcm1ProStoppage.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSTOPID(add.getStopid()); + } + return flag; + } + + /** + * 修改停机 + */ + @Override + public Boolean updateByBo(Klptcm1ProStoppageBo bo) { + Klptcm1ProStoppage update = BeanUtil.toBean(bo, Klptcm1ProStoppage.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(Klptcm1ProStoppage entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除停机 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } }