From 78cc285f739d97d117dd2199649715529c40a199 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 04 六月 2025 15:03:13 +0800
Subject: [PATCH] 修改nacos配置
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
similarity index 67%
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index 5716e2b..98b33a1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
@@ -10,30 +10,31 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineGroupService;
-import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
-
@Slf4j
@RestController
-@RequestMapping("/machinegroup")
-@Tag(name = "鏈哄簥缁�", description = "鏈哄簥缁�")
-public class MachineGroupController {
+@RequestMapping("/machine")
+@Tag(name = "鏈哄簥", description = "鏈哄簥")
+public class MachineController {
@Autowired
- private MachineGroupService grpService;
+ private MachineService service;
/**
* 鏂板
*/
@PostMapping("/save")
@Operation(summary = "鏂板", description = "鏈哄簥缁勪俊鎭�")
- public R<Boolean> save(@RequestBody MachineGroup grp) {
+ public R<Boolean> save(@RequestBody MachineSaveVO vo) {
- return R.<Boolean>status(grpService.save(grp));
+ service.saveMachine(vo);
+ return R.<Boolean>status(true);
}
/**
@@ -41,9 +42,9 @@
*/
@Operation(summary = "淇敼", description = "鏈哄簥缁勪俊鎭�")
@PostMapping("/update")
- public R<Boolean> update(@RequestBody MachineGroup grp) {
+ public R<Boolean> update(@RequestBody MachineSaveVO vo) {
- return R.<Boolean>status(grpService.updateById(grp));
+ return R.<Boolean>status(service.updateMachine(vo));
}
/**
@@ -53,7 +54,7 @@
@PostMapping("/remove")
public R<Void> remove(@RequestParam String ids) {
try {
- grpService.removeGroups(Func.toLongList(ids));
+ service.removeMachines(Func.toLongList(ids));
} catch (Exception e) {
log.error("鍒犻櫎寮傚父",e);
return R.fail(e.getMessage());
@@ -66,8 +67,8 @@
*/
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
- public R<IPage<MachineGroup>> page(String keyword, Query query) {
-
+ public R<IPage<MachineVO>> page(MachineQueryVO query) {
+ /*
LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
//wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
@@ -75,7 +76,9 @@
.or().like(MachineGroup::getCode,"%"+keyword+"%");
});
- IPage<MachineGroup> pages = grpService.page(Condition.getPage(query), wrapper);
+ */
+
+ IPage<MachineVO> pages = service.pageQuery(query);
return R.data(pages);
}
}
--
Gitblit v1.9.3