From 366089899bf7babed365fb7e9deace9c4b894adf Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期一, 03 七月 2023 17:30:41 +0800
Subject: [PATCH] 修改扭矩配置管理2
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java | 7 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 88 +++++++++++++++++++++++++++++--------------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java | 9 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml | 3 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 12 +++++
5 files changed, 89 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
index c557d79..151f8ce 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -1,5 +1,7 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -33,104 +35,132 @@
/**
* 鏍规嵁id鏌ヨ
+ *
* @param id
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鏌ヨ")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鏌ヨ")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鏌ヨ", notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鏌ヨ")
@GetMapping("/queryById")
- public Result<?> queryById(@RequestParam(required = true,name = "id") String id){
- MdcTorqueConfig mdcTorqueConfig=mdcTorqueConfigService.queryById(id);
+ public Result<?> queryById(@RequestParam(required = true, name = "id") String id) {
+ MdcTorqueConfig mdcTorqueConfig = mdcTorqueConfigService.queryById(id);
//鏌ヨ涓嶄负绌哄垯杩斿洖鏁版嵁
- return null!=mdcTorqueConfig?Result.OK(mdcTorqueConfig):Result.error("鏈壘鍒板搴旀暟鎹�");
+ return null != mdcTorqueConfig ? Result.OK(mdcTorqueConfig) : Result.error("鏈壘鍒板搴旀暟鎹�");
}
/**
* 鏂板
+ *
* @param mdcTorqueConfig
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏂板")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏂板",notes = "鎵煩閰嶇疆绠＄悊-鏂板")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏂板", notes = "鎵煩閰嶇疆绠＄悊-鏂板")
@PostMapping("/addMdcTorqueConfig")
- public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig){
- boolean flag= mdcTorqueConfigService.addTorque(mdcTorqueConfig);
- return flag?Result.ok("鏂板鎴愬姛"):Result.error("鏂板澶辫触");
+ public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
+ boolean flag = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
+ return flag ? Result.ok("鏂板鎴愬姛") : Result.error("鏂板澶辫触");
}
/**
* 淇敼
+ *
* @param mdcTorqueConfig
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-淇敼")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-淇敼",notes = "鎵煩閰嶇疆绠＄悊-淇敼")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-淇敼", notes = "鎵煩閰嶇疆绠＄悊-淇敼")
@PutMapping("/editMdcTorqueConfig")
- public Result<?> editMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig){
- boolean flag= mdcTorqueConfigService.editTorque(mdcTorqueConfig);
- return flag?Result.ok("淇敼鎴愬姛"):Result.error("淇敼澶辫触");
+ public Result<?> editMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
+ boolean flag = mdcTorqueConfigService.editTorque(mdcTorqueConfig);
+ return flag ? Result.ok("淇敼鎴愬姛") : Result.error("淇敼澶辫触");
}
/**
* 鏍规嵁id鍒犻櫎鎵煩閰嶇疆
+ *
* @param id
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鍒犻櫎鎵煩閰嶇疆")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鍒犻櫎鎵煩閰嶇疆",notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鍒犻櫎鎵煩閰嶇疆")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鍒犻櫎鎵煩閰嶇疆", notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁id鍒犻櫎鎵煩閰嶇疆")
@DeleteMapping("/deleteMdcTorqueConfig")
- public Result<?> deleteMdcTorqueConfig(@RequestParam(name = "id",required = true) String id){
- boolean flag= mdcTorqueConfigService.deleteTorque(id);
- return flag?Result.ok("鍒犻櫎鎴愬姛"):Result.error("鍒犻櫎澶辫触");
+ public Result<?> deleteMdcTorqueConfig(@RequestParam(name = "id", required = true) String id) {
+ boolean flag = mdcTorqueConfigService.deleteTorque(id);
+ return flag ? Result.ok("鍒犻櫎鎴愬姛") : Result.error("鍒犻櫎澶辫触");
}
/**
* 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鎵归噺鍒犻櫎")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鎵归噺鍒犻櫎",notes = "鎵煩閰嶇疆绠＄悊-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鎵归噺鍒犻櫎", notes = "鎵煩閰嶇疆绠＄悊-鎵归噺鍒犻櫎")
@DeleteMapping("/deleteBatchMdcTorqueConfig")
- public Result<?> deleteBatchMdcTorqueConfig(@RequestParam(name = "ids",required = true) String ids){
- boolean flag= mdcTorqueConfigService.deleteBatchTorque(ids);
- return flag?Result.ok("鎵归噺鍒犻櫎鎴愬姛"):Result.error("鍒犻櫎澶辫触");
+ public Result<?> deleteBatchMdcTorqueConfig(@RequestParam(name = "ids", required = true) String ids) {
+ boolean flag = mdcTorqueConfigService.deleteBatchTorque(ids);
+ return flag ? Result.ok("鎵归噺鍒犻櫎鎴愬姛") : Result.error("鍒犻櫎澶辫触");
}
/**
* 瀵煎嚭excel
+ *
* @param request
* @param mdcTorqueConfig
* @return
*/
@RequestMapping("/exportXls")
- public ModelAndView exportXls(HttpServletRequest request,MdcTorqueConfig mdcTorqueConfig){
- return super.exportXls(request,mdcTorqueConfig,MdcTorqueConfig.class,"鎵煩閰嶇疆绠＄悊瀵煎嚭");
+ public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
+ return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
}
/**
* 瀵煎叆excel
+ *
* @param request
* @param response
* @return
*/
@RequestMapping("/importExcel")
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response){
- return super.importExcel(request,response,MdcTorqueConfig.class);
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcTorqueConfig.class);
}
/**
- *鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
+ * 鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
+ *
* @param torqueValue
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�")
- @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�",notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�", notes = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�")
@GetMapping("/findSpindleRunningCurve")
- public Result<List<MdcTorqueConfig>> findSpindleRunningCurve(@RequestParam(name = "torqueValue",required=true) float torqueValue,
- @RequestParam(name = "equipmentId",required = true) String equipmentId){
- List<MdcTorqueConfig> list= mdcTorqueConfigService.findSpindleRunningCurve(torqueValue, equipmentId);
+ public Result<List<MdcTorqueConfig>> findSpindleRunningCurve(@RequestParam(name = "torqueValue", required = true) float torqueValue,
+ @RequestParam(name = "equipmentId", required = true) String equipmentId) {
+ List<MdcTorqueConfig> list = mdcTorqueConfigService.findSpindleRunningCurve(torqueValue, equipmentId);
return Result.ok(list);
}
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param mdcTorqueConfig
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
+ @GetMapping("/queryWrapper")
+ public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize);
+ IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req);
+ return Result.ok(mdcTorqueConfigIPage);
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
index 9c375cf..c1f3430 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecgframework.minidao.annotation.Param;
@@ -21,4 +22,12 @@
* @return
*/
List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param pageData
+ * @param equipmentId
+ * @return
+ */
+ IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("equipmentId") String equipmentId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
index 4340f0f..260ec55 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -5,4 +5,7 @@
<select id="findSpindleRunningCurve" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig">
select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId}
</select>
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig">
+ select mtc.* from mdc_torque_config mtc,mdc_equipment me where mtc.equipment_id=me.equipment_id
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
index 602cedb..ea9f9bb 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -57,4 +57,11 @@
*/
List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId);
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param req
+ * @return
+ */
+ IPage<MdcTorqueConfig> queryPageList(Page page,HttpServletRequest req);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
index 513872c..1adec07 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -57,5 +57,15 @@
return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId);
}
-
+ @Override
+ public IPage<MdcTorqueConfig> queryPageList(Page page, HttpServletRequest req) {
+ QueryWrapper<MdcTorqueConfig> queryWrapper=new QueryWrapper();
+ //妫�鏌ヨ姹備綋涓槸鍚︽湁璁惧缂栧彿瀛楁锛屽瓨鍦ㄥ垯杩斿洖true
+ if (req.getParameterMap().containsKey("equipmentId")){
+ //鑾峰彇璁惧缂栧彿鐨勫�硷紝涓嶄负绌哄垯娣诲姞鍒版煡璇�
+ String equipmentId=req.getParameterMap().get("equipmentId")[0];
+ queryWrapper.eq(StringUtils.isNotBlank(equipmentId),"equipment_id",equipmentId);
+ }
+ return this.page(page,queryWrapper);
+ }
}
--
Gitblit v1.9.3