From bff7dd282aa2f1ab1cea9452a6c7d7fc0864f731 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 29 四月 2025 13:49:49 +0800
Subject: [PATCH] art: 设备管理-设备工艺参数-接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java | 248 +++++++++++++++++++++-------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentProcessParametersService.java | 17 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentProcessParameters.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentProcessParametersMapper.java | 12 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java | 26 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentProcessParametersServiceImpl.java | 24 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentProcessParametersMapper.xml | 7 +
7 files changed, 211 insertions(+), 128 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
index 5df6d68..7c4645b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
@@ -47,38 +47,44 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamEquipmentProcessParameters> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("equipment_id", equipmentId);
- Page<EamEquipmentProcessParameters> page = new Page<EamEquipmentProcessParameters>(pageNo, pageSize);
- IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.page(page, queryWrapper);
+ Page<EamEquipmentProcessParameters> page = new Page<>(pageNo, pageSize);
+ IPage<EamEquipmentProcessParameters> pageList = eamEquipmentProcessParametersService.queryPageList(equipmentId, page);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamEquipmentProcessParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧宸ヨ壓鍙傛暟-娣诲姞")
@ApiOperation(value="璁惧宸ヨ壓鍙傛暟-娣诲姞", notes="璁惧宸ヨ壓鍙傛暟-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
- eamEquipmentProcessParametersService.save(eamEquipmentProcessParameters);
+ public Result<?> add(@RequestBody EamEquipmentProcessParameters req) {
+ EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
+ if(entity != null){
+ return Result.error("鍙傛暟宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ eamEquipmentProcessParametersService.save(req);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param eamEquipmentProcessParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧宸ヨ壓鍙傛暟-缂栬緫")
@ApiOperation(value="璁惧宸ヨ壓鍙傛暟-缂栬緫", notes="璁惧宸ヨ壓鍙傛暟-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentProcessParameters eamEquipmentProcessParameters) {
- eamEquipmentProcessParametersService.updateById(eamEquipmentProcessParameters);
+ public Result<?> edit(@RequestBody EamEquipmentProcessParameters req) {
+ EamEquipmentProcessParameters entity = eamEquipmentProcessParametersService.getById(req.getId());
+ if(entity == null){
+ return Result.error("瑕佺紪杈戠殑鍙傛暟涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+ }
+ eamEquipmentProcessParametersService.updateById(req);
return Result.OK("缂栬緫鎴愬姛!");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
index 15627fa..e125fd0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java
@@ -1,8 +1,10 @@
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;
@@ -23,134 +25,144 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
- /**
+/**
* @Description: 宸ュ簭鍙傛暟缁存姢
* @Author: jeecg-boot
- * @Date: 2025-03-17
+ * @Date: 2025-03-17
* @Version: V1.0
*/
@Slf4j
-@Api(tags="宸ュ簭鍙傛暟缁存姢")
+@Api(tags = "宸ュ簭鍙傛暟缁存姢")
@RestController
@RequestMapping("/eam/processParameters")
public class EamProcessParametersController extends JeecgController<EamProcessParameters, IEamProcessParametersService> {
- @Autowired
- private IEamProcessParametersService eamProcessParametersService;
+ @Autowired
+ private IEamProcessParametersService eamProcessParametersService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamProcessParameters
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamProcessParameters eamProcessParameters,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamProcessParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamProcessParameters, req.getParameterMap());
- queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
- Page<EamProcessParameters> page = new Page<EamProcessParameters>(pageNo, pageSize);
- IPage<EamProcessParameters> pageList = eamProcessParametersService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamProcessParameters
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-娣诲姞", notes="宸ュ簭鍙傛暟缁存姢-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) {
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PROCESS_PARAMETERS_RULE);
- eamProcessParameters.setParameterCode(codeSeq);
- eamProcessParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
- eamProcessParametersService.save(eamProcessParameters);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamProcessParameters
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-缂栬緫", notes="宸ュ簭鍙傛暟缁存姢-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) {
- eamProcessParametersService.updateById(eamProcessParameters);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamProcessParametersService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamProcessParametersService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamProcessParameters eamProcessParameters = eamProcessParametersService.getById(id);
- return Result.OK(eamProcessParameters);
- }
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamProcessParameters
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamProcessParameters eamProcessParameters) {
- return super.exportXls(request, eamProcessParameters, EamProcessParameters.class, "宸ュ簭鍙傛暟缁存姢");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamProcessParameters
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes = "宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamProcessParameters eamProcessParameters,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamProcessParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamProcessParameters, req.getParameterMap());
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ Page<EamProcessParameters> page = new Page<EamProcessParameters>(pageNo, pageSize);
+ IPage<EamProcessParameters> pageList = eamProcessParametersService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamProcessParameters.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param eamProcessParameters
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-娣诲姞", notes = "宸ュ簭鍙傛暟缁存姢-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) {
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PROCESS_PARAMETERS_RULE);
+ eamProcessParameters.setParameterCode(codeSeq);
+ eamProcessParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamProcessParametersService.save(eamProcessParameters);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamProcessParameters
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-缂栬緫", notes = "宸ュ簭鍙傛暟缁存姢-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) {
+ eamProcessParametersService.updateById(eamProcessParameters);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎", notes = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ eamProcessParametersService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎", notes = "宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamProcessParametersService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ", notes = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamProcessParameters eamProcessParameters = eamProcessParametersService.getById(id);
+ return Result.OK(eamProcessParameters);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamProcessParameters
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamProcessParameters eamProcessParameters) {
+ return super.exportXls(request, eamProcessParameters, EamProcessParameters.class, "宸ュ簭鍙傛暟缁存姢");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamProcessParameters.class);
+ }
+
+
+ @ApiOperation(value = "宸ュ簭鍙傛暟缁存姢-鏌ヨ鎵�鏈�", notes = "宸ュ簭鍙傛暟缁存姢-鏌ヨ鎵�鏈�")
+ @GetMapping(value = "/listAll")
+ public Result<?> listAll() {
+ QueryWrapper<EamProcessParameters> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ List<EamProcessParameters> list = eamProcessParametersService.list(queryWrapper);
+ return Result.OK(list);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentProcessParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentProcessParameters.java
index 35a089f..19ecfc1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentProcessParameters.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentProcessParameters.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -55,4 +56,8 @@
@Excel(name = "鍙傛暟鑼冨洿", width = 15)
@ApiModelProperty(value = "鍙傛暟鑼冨洿")
private String parameterPeriod;
+ @TableField(exist = false)
+ private String parameterCode;
+ @TableField(exist = false)
+ private String parameterUnit;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentProcessParametersMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentProcessParametersMapper.java
index 9e755a7..d569156 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentProcessParametersMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentProcessParametersMapper.java
@@ -1,6 +1,11 @@
package org.jeecg.modules.eam.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.EamEquipmentProcessParameters;
/**
@@ -11,4 +16,11 @@
*/
public interface EamEquipmentProcessParametersMapper extends BaseMapper<EamEquipmentProcessParameters> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param queryWrapper
+ * @param page
+ * @return
+ */
+ IPage<EamEquipmentProcessParameters> queryPageList(Page<EamEquipmentProcessParameters> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentProcessParameters> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentProcessParametersMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentProcessParametersMapper.xml
index 181e6fd..b8c7f5b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentProcessParametersMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentProcessParametersMapper.xml
@@ -2,4 +2,11 @@
<!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.EamEquipmentProcessParametersMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentProcessParameters">
+ select wmo.*, e.parameter_code, e.parameter_unit
+ from eam_equipment_process_parameters wmo
+ inner join eam_process_parameters e
+ on wmo.parameter_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentProcessParametersService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentProcessParametersService.java
index c4ae450..4f70bec 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentProcessParametersService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentProcessParametersService.java
@@ -1,5 +1,7 @@
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.EamEquipmentProcessParameters;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -11,4 +13,19 @@
*/
public interface IEamEquipmentProcessParametersService extends IService<EamEquipmentProcessParameters> {
+ /**
+ * 鏌ヨ璁惧宸ヨ壓鍙傛暟
+ * @param equipmentId 璁惧缂栧彿
+ * @param parameterId 鍙傛暟缂栧彿
+ * @return
+ */
+ EamEquipmentProcessParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param equipmentId
+ * @param page
+ * @return
+ */
+ IPage<EamEquipmentProcessParameters> queryPageList(String equipmentId, Page<EamEquipmentProcessParameters> page);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentProcessParametersServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentProcessParametersServiceImpl.java
index 448febb..fe89c60 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentProcessParametersServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentProcessParametersServiceImpl.java
@@ -1,11 +1,17 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamEquipmentProcessParameters;
import org.jeecg.modules.eam.mapper.EamEquipmentProcessParametersMapper;
import org.jeecg.modules.eam.service.IEamEquipmentProcessParametersService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import javax.annotation.Resource;
/**
* @Description: 璁惧宸ヨ壓鍙傛暟
@@ -16,4 +22,22 @@
@Service
public class EamEquipmentProcessParametersServiceImpl extends ServiceImpl<EamEquipmentProcessParametersMapper, EamEquipmentProcessParameters> implements IEamEquipmentProcessParametersService {
+ @Resource
+ private EamEquipmentProcessParametersMapper eamEquipmentProcessParametersMapper;
+
+ @Override
+ public EamEquipmentProcessParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId) {
+ LambdaQueryWrapper<EamEquipmentProcessParameters> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamEquipmentProcessParameters::getEquipmentId, equipmentId);
+ queryWrapper.eq(EamEquipmentProcessParameters::getParameterId, parameterId);
+ return eamEquipmentProcessParametersMapper.selectOne(queryWrapper);
+ }
+
+ @Override
+ public IPage<EamEquipmentProcessParameters> queryPageList(String equipmentId, Page<EamEquipmentProcessParameters> page) {
+ QueryWrapper<EamEquipmentProcessParameters> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.equipment_id", equipmentId);
+ queryWrapper.orderByDesc("wmo.create_time");
+ return eamEquipmentProcessParametersMapper.queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3