From 0f46c5c167303c10c81b25790b300477e5f4b185 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 9 Oct 2024 15:46:25 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=92=B8=E6=B1=BD=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E6=94=B9=E4=B8=BA=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E6=96=B0=E5=A2=9E=E8=92=B8=E6=B1=BD?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=85=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmsRecordSteamInstantController.java | 36 +++++++++------ .../record/domain/EmsRecordSteamInstant.java | 2 +- .../mapper/EmsRecordSteamInstantMapper.java | 31 +++++++------ .../IEmsRecordSteamInstantService.java | 33 +++++++------- .../EmsRecordSteamInstantServiceImpl.java | 44 ++++++++++++------- .../record/EmsRecordSteamInstantMapper.xml | 25 +++++++++++ 6 files changed, 113 insertions(+), 58 deletions(-) diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java index c67e12e..ce834e5 100644 --- a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java +++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java @@ -23,7 +23,7 @@ import com.os.common.utils.poi.ExcelUtil; import com.os.common.core.page.TableDataInfo; /** - * 蒸汽实时数据Controller + * 蒸汽历史数据Controller * * @author Yinq * @date 2024-05-22 @@ -35,7 +35,7 @@ public class EmsRecordSteamInstantController extends BaseController { private IEmsRecordSteamInstantService emsRecordSteamInstantService; /** - * 查询蒸汽实时数据列表 + * 查询蒸汽历史数据列表 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')") @GetMapping("/list") @@ -47,19 +47,19 @@ public class EmsRecordSteamInstantController extends BaseController { } /** - * 导出蒸汽实时数据列表 + * 导出蒸汽历史数据列表 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:export')") - @Log(title = "蒸汽实时数据", businessType = BusinessType.EXPORT) + @Log(title = "蒸汽历史数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, EmsRecordSteamInstant emsRecordSteamInstant) { List list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant); ExcelUtil util = new ExcelUtil(EmsRecordSteamInstant.class); - util.exportExcel(response, list, "蒸汽实时数据数据"); + util.exportExcel(response, list, "蒸汽历史数据数据"); } /** - * 获取蒸汽实时数据详细信息 + * 获取蒸汽历史数据详细信息 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:query')") @GetMapping(value = "/{objId}") @@ -68,10 +68,10 @@ public class EmsRecordSteamInstantController extends BaseController { } /** - * 新增蒸汽实时数据 + * 新增蒸汽历史数据 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:add')") - @Log(title = "蒸汽实时数据", businessType = BusinessType.INSERT) + @Log(title = "蒸汽历史数据", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) { emsRecordSteamInstant.setCreateBy(getUsername()); @@ -79,10 +79,10 @@ public class EmsRecordSteamInstantController extends BaseController { } /** - * 修改蒸汽实时数据 + * 修改蒸汽历史数据 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:edit')") - @Log(title = "蒸汽实时数据", businessType = BusinessType.UPDATE) + @Log(title = "蒸汽历史数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) { emsRecordSteamInstant.setUpdateBy(getUsername()); @@ -90,24 +90,34 @@ public class EmsRecordSteamInstantController extends BaseController { } /** - * 删除蒸汽实时数据 + * 删除蒸汽历史数据 */ @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:remove')") - @Log(title = "蒸汽实时数据", businessType = BusinessType.DELETE) + @Log(title = "蒸汽历史数据", businessType = BusinessType.DELETE) @DeleteMapping("/{objIds}") public AjaxResult remove(@PathVariable Long[] objIds) { return toAjax(emsRecordSteamInstantService.deleteEmsRecordSteamInstantByObjIds(objIds)); } /** - * 查询蒸汽实时数据 + * 查询蒸汽历史数据曲线 * @param emsRecordSteamInstant * @return */ + @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')") @GetMapping("/steamInstantList") public AjaxResult steamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) { List list = emsRecordSteamInstantService .selectEmsRecordSteamInstantList(emsRecordSteamInstant); return success(list); } + + @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')") + @GetMapping("/latestSteamInstantList") + public AjaxResult latestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) { + List list = emsRecordSteamInstantService + .selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant); + return success(list); + } + } diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java index 89d9742..88c0103 100644 --- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java @@ -10,7 +10,7 @@ import com.os.common.annotation.Excel; import com.os.common.core.domain.BaseEntity; /** - * 蒸汽实时数据对象 ems_record_steam_instant + * 蒸汽历史数据对象 ems_record_steam_instant * * @author Yinq * @date 2024-05-22 diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java index f1f3048..4b83544 100644 --- a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java +++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java @@ -5,57 +5,60 @@ import java.util.List; import com.os.ems.record.domain.EmsRecordSteamInstant; /** - * 蒸汽实时数据Mapper接口 + * 蒸汽历史数据Mapper接口 * * @author Yinq * @date 2024-05-22 */ public interface EmsRecordSteamInstantMapper { /** - * 查询蒸汽实时数据 + * 查询蒸汽历史数据 * - * @param objId 蒸汽实时数据主键 - * @return 蒸汽实时数据 + * @param objId 蒸汽历史数据主键 + * @return 蒸汽历史数据 */ public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId); /** - * 查询蒸汽实时数据列表 + * 查询蒸汽历史数据列表 * - * @param emsRecordSteamInstant 蒸汽实时数据 - * @return 蒸汽实时数据集合 + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据集合 */ public List selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 新增蒸汽实时数据 + * 新增蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ public int insertEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 修改蒸汽实时数据 + * 修改蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ public int updateEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 删除蒸汽实时数据 + * 删除蒸汽历史数据 * - * @param objId 蒸汽实时数据主键 + * @param objId 蒸汽历史数据主键 * @return 结果 */ public int deleteEmsRecordSteamInstantByObjId(Long objId); /** - * 批量删除蒸汽实时数据 + * 批量删除蒸汽历史数据 * * @param objIds 需要删除的数据主键集合 * @return 结果 */ public int deleteEmsRecordSteamInstantByObjIds(Long[] objIds); + + public List selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); + } diff --git a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java index a59ba9b..73ec47f 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java +++ b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java @@ -5,57 +5,60 @@ import java.util.List; import com.os.ems.record.domain.EmsRecordSteamInstant; /** - * 蒸汽实时数据Service接口 + * 蒸汽历史数据Service接口 * * @author Yinq * @date 2024-05-22 */ public interface IEmsRecordSteamInstantService { /** - * 查询蒸汽实时数据 + * 查询蒸汽历史数据 * - * @param objId 蒸汽实时数据主键 - * @return 蒸汽实时数据 + * @param objId 蒸汽历史数据主键 + * @return 蒸汽历史数据 */ public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId); /** - * 查询蒸汽实时数据列表 + * 查询蒸汽历史数据列表 * - * @param emsRecordSteamInstant 蒸汽实时数据 - * @return 蒸汽实时数据集合 + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据集合 */ public List selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 新增蒸汽实时数据 + * 新增蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ public int insertEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 修改蒸汽实时数据 + * 修改蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ public int updateEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant); /** - * 批量删除蒸汽实时数据 + * 批量删除蒸汽历史数据 * - * @param objIds 需要删除的蒸汽实时数据主键集合 + * @param objIds 需要删除的蒸汽历史数据主键集合 * @return 结果 */ public int deleteEmsRecordSteamInstantByObjIds(Long[] objIds); /** - * 删除蒸汽实时数据信息 + * 删除蒸汽历史数据信息 * - * @param objId 蒸汽实时数据主键 + * @param objId 蒸汽历史数据主键 * @return 结果 */ public int deleteEmsRecordSteamInstantByObjId(Long objId); + + + public List selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); } diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java index 16362ea..8fd3a67 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java @@ -9,7 +9,7 @@ import com.os.ems.record.domain.EmsRecordSteamInstant; import com.os.ems.record.service.IEmsRecordSteamInstantService; /** - * 蒸汽实时数据Service业务层处理 + * 蒸汽历史数据Service业务层处理 * * @author Yinq * @date 2024-05-22 @@ -20,10 +20,10 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS private EmsRecordSteamInstantMapper emsRecordSteamInstantMapper; /** - * 查询蒸汽实时数据 + * 查询蒸汽历史数据 * - * @param objId 蒸汽实时数据主键 - * @return 蒸汽实时数据 + * @param objId 蒸汽历史数据主键 + * @return 蒸汽历史数据 */ @Override public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId) { @@ -31,10 +31,10 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS } /** - * 查询蒸汽实时数据列表 + * 查询蒸汽历史数据列表 * - * @param emsRecordSteamInstant 蒸汽实时数据 - * @return 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据 */ @Override public List selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) { @@ -42,9 +42,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS } /** - * 新增蒸汽实时数据 + * 新增蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ @Override @@ -53,9 +53,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS } /** - * 修改蒸汽实时数据 + * 修改蒸汽历史数据 * - * @param emsRecordSteamInstant 蒸汽实时数据 + * @param emsRecordSteamInstant 蒸汽历史数据 * @return 结果 */ @Override @@ -64,9 +64,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS } /** - * 批量删除蒸汽实时数据 + * 批量删除蒸汽历史数据 * - * @param objIds 需要删除的蒸汽实时数据主键 + * @param objIds 需要删除的蒸汽历史数据主键 * @return 结果 */ @Override @@ -75,13 +75,27 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS } /** - * 删除蒸汽实时数据信息 + * 删除蒸汽历史数据信息 * - * @param objId 蒸汽实时数据主键 + * @param objId 蒸汽历史数据主键 * @return 结果 */ @Override public int deleteEmsRecordSteamInstantByObjId(Long objId) { return emsRecordSteamInstantMapper.deleteEmsRecordSteamInstantByObjId(objId); } + + + /** + * 查询蒸汽实时最后一条数据列表 + * + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽实时数据 + */ + @Override + public List selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant){ +/* return emsRecordSteamInstantMapper.selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant);*/ + //只返回第一条数据 + return emsRecordSteamInstantMapper.selectEmsRecordSteamInstantList(emsRecordSteamInstant).subList(0,1); + } } diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml index 4ee4d51..d9c720f 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml @@ -65,6 +65,31 @@ where ersi.obj_id = #{objId} + + insert into ems_record_steam_instant