From f9aacc433427d9100b07f041e2dc4dc84a086580 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 29 四月 2025 14:12:59 +0800
Subject: [PATCH] art: 设备管理-设备精度参数-接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java | 27 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java | 247 +++++++++++++++++++++-------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPrecisionParametersMapper.java | 10 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java | 25 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java | 18 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.xml | 7 +
7 files changed, 203 insertions(+), 132 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
index db1d86f..9321f6a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -26,7 +25,7 @@
@Slf4j
@Api(tags="璁惧绮惧害鍙傛暟")
@RestController
-@RequestMapping("/eam/eamEquipmentPrecisionParameters")
+@RequestMapping("/eam/equipmentPrecisionParameters")
public class EamEquipmentPrecisionParametersController extends JeecgController<EamEquipmentPrecisionParameters, IEamEquipmentPrecisionParametersService> {
@Autowired
private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
@@ -46,38 +45,44 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("equipment_id", equipmentId);
Page<EamEquipmentPrecisionParameters> page = new Page<EamEquipmentPrecisionParameters>(pageNo, pageSize);
- IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.page(page, queryWrapper);
+ IPage<EamEquipmentPrecisionParameters> pageList = eamEquipmentPrecisionParametersService.queryPageList(equipmentId, page);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamEquipmentPrecisionParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧绮惧害鍙傛暟-娣诲姞")
@ApiOperation(value="璁惧绮惧害鍙傛暟-娣诲姞", notes="璁惧绮惧害鍙傛暟-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
- eamEquipmentPrecisionParametersService.save(eamEquipmentPrecisionParameters);
+ public Result<?> add(@RequestBody EamEquipmentPrecisionParameters req) {
+ EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.queryByEquipmentIdAndParameterId(req.getEquipmentId(), req.getParameterId());
+ if(entity != null){
+ return Result.error("鍙傛暟宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
+ eamEquipmentPrecisionParametersService.save(req);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param eamEquipmentPrecisionParameters
+ * @param req
* @return
*/
@AutoLog(value = "璁惧绮惧害鍙傛暟-缂栬緫")
@ApiOperation(value="璁惧绮惧害鍙傛暟-缂栬緫", notes="璁惧绮惧害鍙傛暟-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters eamEquipmentPrecisionParameters) {
- eamEquipmentPrecisionParametersService.updateById(eamEquipmentPrecisionParameters);
+ public Result<?> edit(@RequestBody EamEquipmentPrecisionParameters req) {
+ EamEquipmentPrecisionParameters entity = eamEquipmentPrecisionParametersService.getById(req.getId());
+ if(entity == null){
+ return Result.error("瑕佺紪杈戠殑鍙傛暟涓嶅瓨鍦紝璇峰埛鏂伴噸璇�!");
+ }
+ eamEquipmentPrecisionParametersService.updateById(req);
return Result.OK("缂栬緫鎴愬姛!");
}
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 7c4645b..a2688aa 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
@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
index 1b6d19c..e213f3f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java
@@ -13,6 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamPrecisionParameters;
+import org.jeecg.modules.eam.entity.EamProcessParameters;
import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,135 +23,145 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
- /**
+/**
* @Description: 绮惧害鍙傛暟缁存姢
* @Author: jeecg-boot
- * @Date: 2025-03-17
+ * @Date: 2025-03-17
* @Version: V1.0
*/
@Slf4j
-@Api(tags="绮惧害鍙傛暟缁存姢")
+@Api(tags = "绮惧害鍙傛暟缁存姢")
@RestController
@RequestMapping("/eam/precisionParameters")
public class EamPrecisionParametersController extends JeecgController<EamPrecisionParameters, IEamPrecisionParametersService> {
- @Autowired
- private IEamPrecisionParametersService eamPrecisionParametersService;
+ @Autowired
+ private IEamPrecisionParametersService eamPrecisionParametersService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamPrecisionParameters
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @ApiOperation(value="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionParameters, req.getParameterMap());
- Page<EamPrecisionParameters> page = new Page<EamPrecisionParameters>(pageNo, pageSize);
- queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
- IPage<EamPrecisionParameters> pageList = eamPrecisionParametersService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamPrecisionParameters
- * @return
- */
- @ApiOperation(value="绮惧害鍙傛暟缁存姢-娣诲姞", notes="绮惧害鍙傛暟缁存姢-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PRECISION_PARAMETERS_RULE);
- eamPrecisionParameters.setParameterCode(codeSeq);
- eamPrecisionParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
- eamPrecisionParametersService.save(eamPrecisionParameters);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamPrecisionParameters
- * @return
- */
- @ApiOperation(value="绮惧害鍙傛暟缁存姢-缂栬緫", notes="绮惧害鍙傛暟缁存姢-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
- eamPrecisionParametersService.updateById(eamPrecisionParameters);
- 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) {
- eamPrecisionParametersService.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.eamPrecisionParametersService.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) {
- EamPrecisionParameters eamPrecisionParameters = eamPrecisionParametersService.getById(id);
- return Result.OK(eamPrecisionParameters);
- }
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamPrecisionParameters
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamPrecisionParameters eamPrecisionParameters) {
- return super.exportXls(request, eamPrecisionParameters, EamPrecisionParameters.class, "绮惧害鍙傛暟缁存姢");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamPrecisionParameters
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes = "绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionParameters, req.getParameterMap());
+ Page<EamPrecisionParameters> page = new Page<EamPrecisionParameters>(pageNo, pageSize);
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ IPage<EamPrecisionParameters> pageList = eamPrecisionParametersService.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, EamPrecisionParameters.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param eamPrecisionParameters
+ * @return
+ */
+ @ApiOperation(value = "绮惧害鍙傛暟缁存姢-娣诲姞", notes = "绮惧害鍙傛暟缁存姢-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.PRECISION_PARAMETERS_RULE);
+ eamPrecisionParameters.setParameterCode(codeSeq);
+ eamPrecisionParameters.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamPrecisionParametersService.save(eamPrecisionParameters);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamPrecisionParameters
+ * @return
+ */
+ @ApiOperation(value = "绮惧害鍙傛暟缁存姢-缂栬緫", notes = "绮惧害鍙傛暟缁存姢-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) {
+ eamPrecisionParametersService.updateById(eamPrecisionParameters);
+ 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) {
+ eamPrecisionParametersService.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.eamPrecisionParametersService.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) {
+ EamPrecisionParameters eamPrecisionParameters = eamPrecisionParametersService.getById(id);
+ return Result.OK(eamPrecisionParameters);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamPrecisionParameters
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamPrecisionParameters eamPrecisionParameters) {
+ return super.exportXls(request, eamPrecisionParameters, EamPrecisionParameters.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, EamPrecisionParameters.class);
+ }
+
+ @ApiOperation(value = "绮惧害鍙傛暟缁存姢-鏌ヨ鎵�鏈�", notes = "绮惧害鍙傛暟缁存姢-鏌ヨ鎵�鏈�")
+ @GetMapping(value = "/listAll")
+ public Result<?> listAll() {
+ QueryWrapper<EamPrecisionParameters> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ List<EamPrecisionParameters> list = eamPrecisionParametersService.list(queryWrapper);
+ return Result.OK(list);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPrecisionParametersMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPrecisionParametersMapper.java
index 4e437b8..c798714 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPrecisionParametersMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPrecisionParametersMapper.java
@@ -1,6 +1,9 @@
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.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
/**
@@ -11,4 +14,11 @@
*/
public interface EamEquipmentPrecisionParametersMapper extends BaseMapper<EamEquipmentPrecisionParameters> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamEquipmentPrecisionParameters> queryPageList(Page<EamEquipmentPrecisionParameters> page, QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.xml
index 4e4b876..955d277 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentPrecisionParametersMapper.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.EamEquipmentPrecisionParametersMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters">
+ select wmo.*, e.parameter_code
+ from eam_equipment_precision_parameters wmo
+ inner join eam_precision_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/IEamEquipmentPrecisionParametersService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
index dc6a4bf..62daac0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.eam.service;
-import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
/**
* @Description: 璁惧绮惧害鍙傛暟
@@ -10,5 +12,19 @@
* @Version: V1.0
*/
public interface IEamEquipmentPrecisionParametersService extends IService<EamEquipmentPrecisionParameters> {
+ /**
+ * 鏌ヨ璁惧绮惧害鍙傛暟
+ * @param equipmentId 璁惧ID
+ * @param parameterId 鍙傛暟ID
+ * @return
+ */
+ EamEquipmentPrecisionParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId);
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param equipmentId
+ * @param page
+ * @return
+ */
+ IPage<EamEquipmentPrecisionParameters> queryPageList(String equipmentId, Page<EamEquipmentPrecisionParameters> page);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
index c7a75ff..59aeb20 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
@@ -1,11 +1,16 @@
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
import org.jeecg.modules.eam.mapper.EamEquipmentPrecisionParametersMapper;
import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
/**
* @Description: 璁惧绮惧害鍙傛暟
@@ -16,4 +21,22 @@
@Service
public class EamEquipmentPrecisionParametersServiceImpl extends ServiceImpl<EamEquipmentPrecisionParametersMapper, EamEquipmentPrecisionParameters> implements IEamEquipmentPrecisionParametersService {
+ @Resource
+ private EamEquipmentPrecisionParametersMapper eamEquipmentPrecisionParametersMapper;
+
+ @Override
+ public EamEquipmentPrecisionParameters queryByEquipmentIdAndParameterId(String equipmentId, String parameterId) {
+ LambdaQueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamEquipmentPrecisionParameters::getEquipmentId, equipmentId);
+ queryWrapper.eq(EamEquipmentPrecisionParameters::getParameterId, parameterId);
+ return eamEquipmentPrecisionParametersMapper.selectOne(queryWrapper);
+ }
+
+ @Override
+ public IPage<EamEquipmentPrecisionParameters> queryPageList(String equipmentId, Page<EamEquipmentPrecisionParameters> page) {
+ QueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.equipment_id", equipmentId);
+ queryWrapper.orderByDesc("wmo.create_time");
+ return eamEquipmentPrecisionParametersMapper.queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3