From 111b92e0fdb169ff40697564fe40c91e1565d744 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:12:27 +0800
Subject: [PATCH] 设备管理-油液基础数据维护
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamFluidMapper.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamFluid.java | 68 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamFluidService.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFluidServiceImpl.java | 30 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFluidMapper.java | 24 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml | 16 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFluidService.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamFluidServiceImpl.java | 19 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFluidController.java | 144 ++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamFluidController.java | 176 +++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamFluidMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java | 63 ++++++
12 files changed, 593 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFluidController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFluidController.java
new file mode 100644
index 0000000..7a69fae
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFluidController.java
@@ -0,0 +1,144 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.entity.EamEquipmentFluid;
+import org.jeecg.modules.eam.service.IEamEquipmentFluidService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: eam_equipment_fluid
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Api(tags="eam_equipment_fluid")
+@RestController
+@RequestMapping("/eam/eamEquipmentFluid")
+@Slf4j
+public class EamEquipmentFluidController extends JeecgController<EamEquipmentFluid, IEamEquipmentFluidService> {
+ @Autowired
+ private IEamEquipmentFluidService eamEquipmentFluidService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentId
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "eam_equipment_fluid-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="eam_equipment_fluid-鍒嗛〉鍒楄〃鏌ヨ", notes="eam_equipment_fluid-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<EamEquipmentFluid>> queryPageList(String equipmentId,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<EamEquipmentFluid> page = new Page<EamEquipmentFluid>(pageNo, pageSize);
+ IPage<EamEquipmentFluid> pageList = eamEquipmentFluidService.queryPageList(page, equipmentId);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamEquipmentFluid
+ * @return
+ */
+ @AutoLog(value = "eam_equipment_fluid-娣诲姞")
+ @ApiOperation(value="eam_equipment_fluid-娣诲姞", notes="eam_equipment_fluid-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:eam_equipment_fluid:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody EamEquipmentFluid eamEquipmentFluid) {
+ List<EamEquipmentFluid> list = eamEquipmentFluidService.list(new LambdaQueryWrapper<EamEquipmentFluid>()
+ .eq(EamEquipmentFluid::getEquipmentId, eamEquipmentFluid.getEquipmentId())
+ .eq(EamEquipmentFluid::getFluidId, eamEquipmentFluid.getFluidId()));
+ if (CollectionUtils.isNotEmpty(list)) {
+ return Result.error("娌规恫淇℃伅宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ eamEquipmentFluidService.save(eamEquipmentFluid);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamEquipmentFluid
+ * @return
+ */
+ @AutoLog(value = "eam_equipment_fluid-缂栬緫")
+ @ApiOperation(value="eam_equipment_fluid-缂栬緫", notes="eam_equipment_fluid-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:eam_equipment_fluid:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody EamEquipmentFluid eamEquipmentFluid) {
+ EamEquipmentFluid equipmentFluid = eamEquipmentFluidService.getById(eamEquipmentFluid.getId());
+ if (Objects.isNull(equipmentFluid)) {
+ return Result.error("瑕佺紪杈戠殑娌规恫淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+ }
+ eamEquipmentFluidService.updateById(eamEquipmentFluid);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "eam_equipment_fluid-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="eam_equipment_fluid-閫氳繃id鍒犻櫎", notes="eam_equipment_fluid-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_equipment_fluid:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ eamEquipmentFluidService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "eam_equipment_fluid-鎵归噺鍒犻櫎")
+ @ApiOperation(value="eam_equipment_fluid-鎵归噺鍒犻櫎", notes="eam_equipment_fluid-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_equipment_fluid:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.eamEquipmentFluidService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "eam_equipment_fluid-閫氳繃id鏌ヨ")
+ @ApiOperation(value="eam_equipment_fluid-閫氳繃id鏌ヨ", notes="eam_equipment_fluid-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<EamEquipmentFluid> queryById(@RequestParam(name="id",required=true) String id) {
+ EamEquipmentFluid eamEquipmentFluid = eamEquipmentFluidService.getById(id);
+ if(eamEquipmentFluid==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(eamEquipmentFluid);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamFluidController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamFluidController.java
new file mode 100644
index 0000000..de2d5c2
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamFluidController.java
@@ -0,0 +1,176 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.entity.EamFluid;
+import org.jeecg.modules.eam.service.IEamFluidService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 娌规恫淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Api(tags="娌规恫淇℃伅")
+@RestController
+@RequestMapping("/eam/eamFluid")
+@Slf4j
+public class EamFluidController extends JeecgController<EamFluid, IEamFluidService> {
+ @Autowired
+ private IEamFluidService eamFluidService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamFluid
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "娌规恫淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="娌规恫淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes="娌规恫淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<EamFluid>> queryPageList(EamFluid eamFluid,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamFluid> queryWrapper = QueryGenerator.initQueryWrapper(eamFluid, req.getParameterMap());
+ Page<EamFluid> page = new Page<EamFluid>(pageNo, pageSize);
+ IPage<EamFluid> pageList = eamFluidService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value = "娌规恫淇℃伅-鏌ヨ鎵�鏈�", notes = "娌规恫淇℃伅-鏌ヨ鎵�鏈�")
+ @GetMapping(value = "/listAll")
+ public Result<?> listAll() {
+ QueryWrapper<EamFluid> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ List<EamFluid> list = eamFluidService.list(queryWrapper);
+ return Result.OK(list);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamFluid
+ * @return
+ */
+ @AutoLog(value = "娌规恫淇℃伅-娣诲姞")
+ @ApiOperation(value="娌规恫淇℃伅-娣诲姞", notes="娌规恫淇℃伅-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:eam_fluid:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody EamFluid eamFluid) {
+ eamFluid.setFluidCode(businessCodeRuleService.generateBusinessCodeSeq("EamFluidCodeRule"));
+ eamFluid.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamFluidService.save(eamFluid);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamFluid
+ * @return
+ */
+ @AutoLog(value = "娌规恫淇℃伅-缂栬緫")
+ @ApiOperation(value="娌规恫淇℃伅-缂栬緫", notes="娌规恫淇℃伅-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:eam_fluid:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody EamFluid eamFluid) {
+ eamFluidService.updateById(eamFluid);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "娌规恫淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="娌规恫淇℃伅-閫氳繃id鍒犻櫎", notes="娌规恫淇℃伅-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_fluid:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ eamFluidService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "娌规恫淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value="娌规恫淇℃伅-鎵归噺鍒犻櫎", notes="娌规恫淇℃伅-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_fluid:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.eamFluidService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "娌规恫淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="娌规恫淇℃伅-閫氳繃id鏌ヨ", notes="娌规恫淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<EamFluid> queryById(@RequestParam(name="id",required=true) String id) {
+ EamFluid eamFluid = eamFluidService.getById(id);
+ if(eamFluid==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(eamFluid);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamFluid
+ */
+ //@RequiresPermissions("org.jeecg.modules:eam_fluid:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamFluid eamFluid) {
+ return super.exportXls(request, eamFluid, EamFluid.class, "娌规恫淇℃伅");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("eam_fluid:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamFluid.class);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java
new file mode 100644
index 0000000..01e4088
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentFluid.java
@@ -0,0 +1,63 @@
+package org.jeecg.modules.eam.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: eam_equipment_fluid
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_equipment_fluid")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_equipment_fluid瀵硅薄", description="eam_equipment_fluid")
+public class EamEquipmentFluid implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**娌规恫ID*/
+ @Excel(name = "娌规恫ID", width = 15)
+ @ApiModelProperty(value = "娌规恫ID")
+ private String fluidId;
+ /**娌规恫缂栫爜*/
+ @TableField(exist = false)
+ private String fluidCode;
+ /**娌规恫鍚嶇О*/
+ @TableField(exist = false)
+ private String fluidName;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamFluid.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamFluid.java
new file mode 100644
index 0000000..47a8ac8
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamFluid.java
@@ -0,0 +1,68 @@
+package org.jeecg.modules.eam.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 娌规恫淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_fluid")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_fluid瀵硅薄", description="娌规恫淇℃伅")
+public class EamFluid implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**娌规恫缂栫爜*/
+ @Excel(name = "娌规恫缂栫爜", width = 30)
+ @ApiModelProperty(value = "娌规恫缂栫爜")
+ private String fluidCode;
+ /**娌规恫鍚嶇О*/
+ @Excel(name = "娌规恫鍚嶇О", width = 20)
+ @ApiModelProperty(value = "娌规恫鍚嶇О")
+ private String fluidName;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 30)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFluidMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFluidMapper.java
new file mode 100644
index 0000000..0d15b85
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentFluidMapper.java
@@ -0,0 +1,24 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamEquipmentFluid;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: eam_equipment_fluid
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+public interface EamEquipmentFluidMapper extends BaseMapper<EamEquipmentFluid> {
+
+ IPage<EamEquipmentFluid> queryPageList(Page<EamEquipmentFluid> page,
+ @Param(Constants.WRAPPER) Wrapper<EamEquipmentFluid> queryWrapper);
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamFluidMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamFluidMapper.java
new file mode 100644
index 0000000..f950af8
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamFluidMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamFluid;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 娌规恫淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+public interface EamFluidMapper extends BaseMapper<EamFluid> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml
new file mode 100644
index 0000000..b31cee0
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentFluidMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentFluidMapper">
+
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentFluid">
+ SELECT
+ t1.id,
+ t1.equipment_id equipmentId,
+ t1.fluid_id fluidId,
+ t2.fluid_code fluidCode,
+ t2.fluid_name fluidName
+ FROM eam_equipment_fluid t1
+ INNER JOIN eam_fluid t2 ON t1.fluid_id = t2.id
+ ${ew.customSqlSegment}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamFluidMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamFluidMapper.xml
new file mode 100644
index 0000000..e474b1f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamFluidMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamFluidMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFluidService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFluidService.java
new file mode 100644
index 0000000..7ff3e6d
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentFluidService.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.eam.entity.EamEquipmentFluid;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: eam_equipment_fluid
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+public interface IEamEquipmentFluidService extends IService<EamEquipmentFluid> {
+
+ IPage<EamEquipmentFluid> queryPageList(Page<EamEquipmentFluid> page, String equipmentId);
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamFluidService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamFluidService.java
new file mode 100644
index 0000000..5b0dae7
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamFluidService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.service;
+
+import org.jeecg.modules.eam.entity.EamFluid;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 娌规恫淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+public interface IEamFluidService extends IService<EamFluid> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFluidServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFluidServiceImpl.java
new file mode 100644
index 0000000..8802f6e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentFluidServiceImpl.java
@@ -0,0 +1,30 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.eam.entity.EamEquipmentFluid;
+import org.jeecg.modules.eam.mapper.EamEquipmentFluidMapper;
+import org.jeecg.modules.eam.service.IEamEquipmentFluidService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: eam_equipment_fluid
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Service
+public class EamEquipmentFluidServiceImpl extends ServiceImpl<EamEquipmentFluidMapper, EamEquipmentFluid> implements IEamEquipmentFluidService {
+
+ @Override
+ public IPage<EamEquipmentFluid> queryPageList(Page<EamEquipmentFluid> page, String equipmentId) {
+ QueryWrapper<EamEquipmentFluid> queryWrapper = Wrappers.query();
+ queryWrapper.eq("t1.equipment_id", equipmentId);
+ queryWrapper.orderByDesc("t1.create_time");
+ return baseMapper.queryPageList(page, queryWrapper);
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamFluidServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamFluidServiceImpl.java
new file mode 100644
index 0000000..ba24f62
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamFluidServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.eam.service.impl;
+
+import org.jeecg.modules.eam.entity.EamFluid;
+import org.jeecg.modules.eam.mapper.EamFluidMapper;
+import org.jeecg.modules.eam.service.IEamFluidService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 娌规恫淇℃伅
+ * @Author: jeecg-boot
+ * @Date: 2025-06-17
+ * @Version: V1.0
+ */
+@Service
+public class EamFluidServiceImpl extends ServiceImpl<EamFluidMapper, EamFluid> implements IEamFluidService {
+
+}
--
Gitblit v1.9.3