From d9580f4c5b8717eb9f3943e4c7d3e14c87d471ae Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 29 Oct 2025 11:53:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(pocket):=20=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E7=9A=84CURD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为Klptcm1ProPlantStateCurrent实体增加完整的增删改查接口 - 实现按复合键(INSDATE+TYPE)查询、插入、更新和删除逻辑 - 在Mapper层添加对应的XML SQL映射支持 - 为Klptcm1ProPlantStateDefine增加ID查询、批量删除等功能 - 添加PlantStateWithValueVo视图对象及相关联查逻辑 - 提供根据名称获取带值的状态定义列表方法 - 控制器层新增RESTful API endpoints支持完整操作- 完善服务层实现并暴露统一的服务接口供调用 --- ...Klptcm1ProPlantStateCurrentController.java | 39 ++ .../Klptcm1ProPlantStateDefineController.java | 27 + .../domain/vo/PlantStateWithValueVo.java | 27 + .../Klptcm1ProPlantStateCurrentMapper.java | 15 + .../Klptcm1ProPlantStateDefineMapper.java | 22 + .../IKlptcm1ProPlantStateCurrentService.java | 9 + .../IKlptcm1ProPlantStateDefineService.java | 10 +- ...lptcm1ProPlantStateCurrentServiceImpl.java | 23 +- ...Klptcm1ProPlantStateDefineServiceImpl.java | 30 ++ .../Klptcm1ProPlantStateCurrentMapper.xml | 56 +++ .../Klptcm1ProPlantStateDefineMapper.xml | 472 ++++++++++++++++++ 11 files changed, 728 insertions(+), 2 deletions(-) create mode 100644 klp-pocket/src/main/java/com/klp/pocket/domain/vo/PlantStateWithValueVo.java diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateCurrentController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateCurrentController.java index d6bfd5ab..6bc56b72 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateCurrentController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateCurrentController.java @@ -9,6 +9,9 @@ import com.klp.pocket.service.IKlptcm1ProPlantStateCurrentService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; @RestController @RequestMapping("/pocket/proPlantStateCurrent") @@ -26,4 +29,40 @@ public class Klptcm1ProPlantStateCurrentController extends BaseController { } + /** + * 查询单条（按 INSDATE + TYPE） + */ + @GetMapping("/one") + public R getOne( + @RequestParam("type") BigDecimal type, + @RequestParam("insdate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date insdate) { + return R.ok(klptcm1ProPlantStateCurrentService.selectOne(insdate, type)); + } + + /** + * 新增一条 current 记录 + */ + @PostMapping + public R add(@RequestBody Klptcm1ProPlantStateCurrent entity) { + return toAjax(klptcm1ProPlantStateCurrentService.insert(entity)); + } + + /** + * 修改一条 current 记录（依据 INSDATE + TYPE） + */ + @PutMapping + public R edit(@RequestBody Klptcm1ProPlantStateCurrent entity) { + return toAjax(klptcm1ProPlantStateCurrentService.updateByKey(entity)); + } + + /** + * 删除一条 current 记录（按 INSDATE + TYPE） + */ + @DeleteMapping + public R remove( + @RequestParam("type") BigDecimal type, + @RequestParam("insdate") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date insdate) { + return toAjax(klptcm1ProPlantStateCurrentService.deleteByKey(insdate, type)); + } + } diff --git a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java index cb9a083e..a7049d25 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java +++ b/klp-pocket/src/main/java/com/klp/pocket/controller/Klptcm1ProPlantStateDefineController.java @@ -4,11 +4,13 @@ import com.klp.common.core.controller.BaseController; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.pocket.domain.Klptcm1ProPlantStateDefine; +import com.klp.pocket.domain.vo.PlantStateWithValueVo; import com.klp.pocket.service.IKlptcm1ProPlantStateDefineService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.List; +import com.klp.common.core.domain.R; /** * 工厂状态定义表Controller @@ -21,6 +23,10 @@ public class Klptcm1ProPlantStateDefineController extends BaseController { @Resource private IKlptcm1ProPlantStateDefineService defineService; + @GetMapping("/plant/state") + public List getTopByValue(@RequestParam String name) { + return defineService.selectByValue(name); + } /** * 分页查询状态定义列表 * @param pageQuery 分页参数（请求参数，如?pageNum=1&pageSize=10） @@ -31,4 +37,25 @@ public class Klptcm1ProPlantStateDefineController extends BaseController { return defineService.getDefinePage(pageQuery); } + @GetMapping("/{id}") + public R getInfo(@PathVariable BigDecimal id) { + return R.ok(defineService.selectById(id)); + } + + @PostMapping + public R add(@RequestBody Klptcm1ProPlantStateDefine entity) { + return toAjax(defineService.insert(entity)); + } + + @PutMapping + public R edit(@RequestBody Klptcm1ProPlantStateDefine entity) { + return toAjax(defineService.updateById(entity)); + } + + @DeleteMapping("/{ids}") + public R remove(@PathVariable List ids) { + return toAjax(defineService.deleteByIds(ids)); + } + } + diff --git a/klp-pocket/src/main/java/com/klp/pocket/domain/vo/PlantStateWithValueVo.java b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/PlantStateWithValueVo.java new file mode 100644 index 00000000..2cca2910 --- /dev/null +++ b/klp-pocket/src/main/java/com/klp/pocket/domain/vo/PlantStateWithValueVo.java @@ -0,0 +1,27 @@ +package com.klp.pocket.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + + +@Data +public class PlantStateWithValueVo { + // define表基础字段 + private BigDecimal id; + private String name; + private String units; + private String comments; + private Date insdate; + private BigDecimal modeltype; + + // current表关联字段（VALUE{ID} + 时间） + private BigDecimal currentValue; + private Date currentInsdate; + + // history表关联字段（VALUE{ID} + 时间） + private BigDecimal historyValue; + private Date historyInsdate; + +} diff --git a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateCurrentMapper.java b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateCurrentMapper.java index 38e532f4..c46d3dbb 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateCurrentMapper.java +++ b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateCurrentMapper.java @@ -6,10 +6,25 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.pocket.domain.Klptcm1ProPlantStateCurrent; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Date; +import java.math.BigDecimal; +import org.apache.ibatis.annotations.Param; @Mapper public interface Klptcm1ProPlantStateCurrentMapper { // 查询所有 Page selectAll(Page build); + + // 按复合键查询 + Klptcm1ProPlantStateCurrent selectOne(@Param("insdate") Date insdate, @Param("type") BigDecimal type); + + // 新增 + int insert(Klptcm1ProPlantStateCurrent entity); + + // 修改（按复合键） + int updateByKey(Klptcm1ProPlantStateCurrent entity); + + // 删除（按复合键） + int deleteByKey(@Param("insdate") Date insdate, @Param("type") BigDecimal type); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java index f4a28d62..d48a0652 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java +++ b/klp-pocket/src/main/java/com/klp/pocket/mapper/Klptcm1ProPlantStateDefineMapper.java @@ -2,6 +2,7 @@ package com.klp.pocket.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.pocket.domain.Klptcm1ProPlantStateDefine; +import com.klp.pocket.domain.vo.PlantStateWithValueVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,4 +23,25 @@ public interface Klptcm1ProPlantStateDefineMapper { */ Page selectPage(Page page); + List selectByValue(String name); + + /** + * 按ID查询 + */ + Klptcm1ProPlantStateDefine selectById(BigDecimal id); + + /** + * 新增 + */ + int insert(Klptcm1ProPlantStateDefine entity); + + /** + * 修改 + */ + int updateById(Klptcm1ProPlantStateDefine entity); + + /** + * 删除（批量） + */ + int deleteByIds(List ids); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateCurrentService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateCurrentService.java index 3a121072..49e10015 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateCurrentService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateCurrentService.java @@ -4,9 +4,18 @@ import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.pocket.domain.Klptcm1ProPlantStateCurrent; import java.util.List; +import java.util.Date; +import java.math.BigDecimal; public interface IKlptcm1ProPlantStateCurrentService { TableDataInfo selectAll(PageQuery pageQuery); + Klptcm1ProPlantStateCurrent selectOne(Date insdate, BigDecimal type); + + int insert(Klptcm1ProPlantStateCurrent entity); + + int updateByKey(Klptcm1ProPlantStateCurrent entity); + + int deleteByKey(Date insdate, BigDecimal type); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java index aab287f5..6d54aa98 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/IKlptcm1ProPlantStateDefineService.java @@ -3,7 +3,7 @@ package com.klp.pocket.service; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.pocket.domain.Klptcm1ProPlantStateDefine; - +import com.klp.pocket.domain.vo.PlantStateWithValueVo; import java.math.BigDecimal; @@ -23,5 +23,13 @@ public interface IKlptcm1ProPlantStateDefineService { */ TableDataInfo getDefinePage(PageQuery pageQuery); + List selectByValue(String name); + Klptcm1ProPlantStateDefine selectById(BigDecimal id); + + int insert(Klptcm1ProPlantStateDefine entity); + + int updateById(Klptcm1ProPlantStateDefine entity); + + int deleteByIds(List ids); } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateCurrentServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateCurrentServiceImpl.java index 03868c5c..3e9736a1 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateCurrentServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateCurrentServiceImpl.java @@ -10,6 +10,8 @@ import com.klp.pocket.service.IKlptcm1ProPlantStateCurrentService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Date; +import java.math.BigDecimal; @DS("slave") @Service @@ -18,11 +20,30 @@ public class Klptcm1ProPlantStateCurrentServiceImpl implements IKlptcm1ProPlantS @Resource private Klptcm1ProPlantStateCurrentMapper klptcm1ProPlantStateCurrentMapper; - @Override public TableDataInfo selectAll(PageQuery pageQuery) { Page result = klptcm1ProPlantStateCurrentMapper.selectAll(pageQuery.build()); return TableDataInfo.build(result); } + @Override + public Klptcm1ProPlantStateCurrent selectOne(Date insdate, BigDecimal type) { + return klptcm1ProPlantStateCurrentMapper.selectOne(insdate, type); + } + + @Override + public int insert(Klptcm1ProPlantStateCurrent entity) { + return klptcm1ProPlantStateCurrentMapper.insert(entity); + } + + @Override + public int updateByKey(Klptcm1ProPlantStateCurrent entity) { + return klptcm1ProPlantStateCurrentMapper.updateByKey(entity); + } + + @Override + public int deleteByKey(Date insdate, BigDecimal type) { + return klptcm1ProPlantStateCurrentMapper.deleteByKey(insdate, type); + } + } diff --git a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java index c1107936..8b35c3f4 100644 --- a/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java +++ b/klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProPlantStateDefineServiceImpl.java @@ -1,9 +1,11 @@ package com.klp.pocket.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.pocket.domain.Klptcm1ProPlantStateCurrent; import com.klp.pocket.domain.Klptcm1ProPlantStateDefine; +import com.klp.pocket.domain.vo.PlantStateWithValueVo; import com.klp.pocket.mapper.Klptcm1ProPlantStateDefineMapper; import com.klp.pocket.service.IKlptcm1ProPlantStateDefineService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,12 +13,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.Collections; import java.util.List; /** * 工厂状态定义表Service实现类 * 具体业务逻辑实现，依赖Mapper操作数据库 */ +@DS("slave") @Service public class Klptcm1ProPlantStateDefineServiceImpl implements IKlptcm1ProPlantStateDefineService { @@ -33,4 +37,30 @@ public class Klptcm1ProPlantStateDefineServiceImpl implements IKlptcm1ProPlantSt } + @Override + public List selectByValue(String name) { + return defineMapper.selectByValue(name); + } + + @Override + public Klptcm1ProPlantStateDefine selectById(BigDecimal id) { + return defineMapper.selectById(id); + } + + @Override + public int insert(Klptcm1ProPlantStateDefine entity) { + return defineMapper.insert(entity); + } + + @Override + public int updateById(Klptcm1ProPlantStateDefine entity) { + return defineMapper.updateById(entity); + } + + @Override + public int deleteByIds(List ids) { + return defineMapper.deleteByIds(ids); + } + } + diff --git a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateCurrentMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateCurrentMapper.xml index e232f660..78daa00f 100644 --- a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateCurrentMapper.xml +++ b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateCurrentMapper.xml @@ -134,4 +134,60 @@ FROM klptcm1_pro_plant_state_current + + + + + + INSERT INTO klptcm1_pro_plant_state_current + ( + + ) VALUES ( + #{insdate}, #{year}, #{month}, #{day}, #{hour}, #{minute}, #{type}, + #{value1}, #{value2}, #{value3}, #{value4}, #{value5}, #{value6}, #{value7}, #{value8}, #{value9}, #{value10}, + #{value11}, #{value12}, #{value13}, #{value14}, #{value15}, #{value16}, #{value17}, #{value18}, #{value19}, #{value20}, + #{value21}, #{value22}, #{value23}, #{value24}, #{value25}, #{value26}, #{value27}, #{value28}, #{value29}, #{value30}, + #{value31}, #{value32}, #{value33}, #{value34}, #{value35}, #{value36}, #{value37}, #{value38}, #{value39}, #{value40}, + #{value41}, #{value42}, #{value43}, #{value44}, #{value45}, #{value46}, #{value47}, #{value48}, #{value49}, #{value50}, + #{value51}, #{value52}, #{value53}, #{value54}, #{value55}, #{value56}, #{value57}, #{value58}, #{value59}, #{value60}, + #{value61}, #{value62}, #{value63}, #{value64}, #{value65}, #{value66}, #{value67}, #{value68}, #{value69}, #{value70}, + #{value71}, #{value72}, #{value73}, #{value74}, #{value75}, #{value76}, #{value77}, #{value78}, #{value79}, #{value80}, + #{value81}, #{value82}, #{value83}, #{value84}, #{value85}, #{value86}, #{value87}, #{value88}, #{value89}, #{value90}, + #{value91}, #{value92}, #{value93}, #{value94}, #{value95}, #{value96}, #{value97}, #{value98}, #{value99} + ) + + + + + UPDATE klptcm1_pro_plant_state_current + SET + YEAR=#{year}, MONTH=#{month}, DAY=#{day}, HOUR=#{hour}, MINUTE=#{minute}, + VALUE1=#{value1}, VALUE2=#{value2}, VALUE3=#{value3}, VALUE4=#{value4}, VALUE5=#{value5}, VALUE6=#{value6}, VALUE7=#{value7}, VALUE8=#{value8}, VALUE9=#{value9}, VALUE10=#{value10}, + VALUE11=#{value11}, VALUE12=#{value12}, VALUE13=#{value13}, VALUE14=#{value14}, VALUE15=#{value15}, VALUE16=#{value16}, VALUE17=#{value17}, VALUE18=#{value18}, VALUE19=#{value19}, VALUE20=#{value20}, + VALUE21=#{value21}, VALUE22=#{value22}, VALUE23=#{value23}, VALUE24=#{value24}, VALUE25=#{value25}, VALUE26=#{value26}, VALUE27=#{value27}, VALUE28=#{value28}, VALUE29=#{value29}, VALUE30=#{value30}, + VALUE31=#{value31}, VALUE32=#{value32}, VALUE33=#{value33}, VALUE34=#{value34}, VALUE35=#{value35}, VALUE36=#{value36}, VALUE37=#{value37}, VALUE38=#{value38}, VALUE39=#{value39}, VALUE40=#{value40}, + VALUE41=#{value41}, VALUE42=#{value42}, VALUE43=#{value43}, VALUE44=#{value44}, VALUE45=#{value45}, VALUE46=#{value46}, VALUE47=#{value47}, VALUE48=#{value48}, VALUE49=#{value49}, VALUE50=#{value50}, + VALUE51=#{value51}, VALUE52=#{value52}, VALUE53=#{value53}, VALUE54=#{value54}, VALUE55=#{value55}, VALUE56=#{value56}, VALUE57=#{value57}, VALUE58=#{value58}, VALUE59=#{value59}, VALUE60=#{value60}, + VALUE61=#{value61}, VALUE62=#{value62}, VALUE63=#{value63}, VALUE64=#{value64}, VALUE65=#{value65}, VALUE66=#{value66}, VALUE67=#{value67}, VALUE68=#{value68}, VALUE69=#{value69}, VALUE70=#{value70}, + VALUE71=#{value71}, VALUE72=#{value72}, VALUE73=#{value73}, VALUE74=#{value74}, VALUE75=#{value75}, VALUE76=#{value76}, VALUE77=#{value77}, VALUE78=#{value78}, VALUE79=#{value79}, VALUE80=#{value80}, + VALUE81=#{value81}, VALUE82=#{value82}, VALUE83=#{value83}, VALUE84=#{value84}, VALUE85=#{value85}, VALUE86=#{value86}, VALUE87=#{value87}, VALUE88=#{value88}, VALUE89=#{value89}, VALUE90=#{value90}, + VALUE91=#{value91}, VALUE92=#{value92}, VALUE93=#{value93}, VALUE94=#{value94}, VALUE95=#{value95}, VALUE96=#{value96}, VALUE97=#{value97}, VALUE98=#{value98}, VALUE99=#{value99} + WHERE INSDATE = #{insdate} + AND TYPE = #{type} + + + + + DELETE FROM klptcm1_pro_plant_state_current + WHERE INSDATE = #{insdate} + AND TYPE = #{type} + + diff --git a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml index ec36d002..81e1a1f2 100644 --- a/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml +++ b/klp-pocket/src/main/resources/mapper/pocket/Klptcm1ProPlantStateDefineMapper.xml @@ -23,5 +23,477 @@ ORDER BY INSDATE DESC + + + + INSERT INTO klptcm1_pro_plant_state_define + (ID, NAME, UNITS, COMMENTS, MODELTYPE) + VALUES + (#{id}, #{name}, #{units}, #{comments}, #{modeltype}) + + + + UPDATE klptcm1_pro_plant_state_define + SET + NAME = #{name}, + UNITS = #{units}, + COMMENTS = #{comments}, + MODELTYPE = #{modeltype} + WHERE ID = #{id} + + + + DELETE FROM klptcm1_pro_plant_state_define + WHERE ID IN + + #{id} + + + + + + + + + + + + + + + + + +