From 96a33df75fe629083dc44d51f46df1f31ffac8d7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 01 七月 2025 20:06:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 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 bd70b6f..2049898 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
@@ -13,14 +13,12 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
-import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* @Description: 鎵煩閰嶇疆绠＄悊
@@ -54,17 +52,17 @@
/**
* 鎵煩閰嶇疆绠＄悊-鏂板
*
- * @param torqueVo
+ * @param mdcTorqueConfig
* @return
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏂板")
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏂板", notes = "鎵煩閰嶇疆绠＄悊-鏂板")
@PostMapping("/addMdcTorqueConfig")
- public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfigVo torqueVo) {
- if (StringUtils.isBlank(torqueVo.getEquipmentIds())) {
+ public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
+ if (StringUtils.isBlank(mdcTorqueConfig.getEquipmentIds())) {
return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
}
- boolean result = mdcTorqueConfigService.addTorque(torqueVo);
+ boolean result = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
if (!result) {
return Result.error("鏃堕棿娈垫暟鎹凡瀛樺湪锛岃鎺掓煡");
}
@@ -125,7 +123,9 @@
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭", notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
- return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return this.mdcTorqueConfigService.exportXls(userId, mdcTorqueConfig);
}
/**
@@ -140,21 +140,6 @@
@RequestMapping("/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, MdcTorqueConfig.class);
- }
-
- /**
- * 鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
- *
- * @param torqueValue
- * @return
- */
- @AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�")
- @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);
- return Result.ok(list);
}
/**
--
Gitblit v1.9.3