From b36c53b1ff6e6eee74be0f84ffc9257d651c37b7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 04 六月 2025 22:02:27 +0800
Subject: [PATCH] 增加swagger注解
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java | 8 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java | 2 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 32 ++++++++-------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineSpec.java | 19 +++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 10 ----
5 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
index f4594ab..567179e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -1,22 +1,18 @@
package org.springblade.mdm.basesetting.machine;
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.core.toolkit.Constants;
-import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.entity.MachineSpec;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@@ -33,27 +29,33 @@
Machine machine = this.getById(vo.getId());
machine.setMachineSpec(vo.getMachineSpec());
-
+ machine.setName(vo.getName());
+ machine.setMachineGroupId(vo.getMachineGroupId());
return this.updateById(machine);
}
- @Transactional
- public void removeMachines(List<Long> ids) {
- for(Long id : ids){
- this.removeById(id);
- }
- }
-
-
-
+ /**
+ * 鏌ヨ鍒嗛〉
+ * @param query 鏌ヨ鍙傛暟
+ * @return 鍒嗛〉鏁版嵁
+ */
public IPage<MachineVO> pageQuery(MachineQueryVO query) {
LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(query.getMachineGroupId()!=null, Machine::getMachineGroupId, query.getMachineGroupId());
IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
+
+ //MachineSpec.valueOf()
+ for (MachineVO record : page.getRecords()) {
+ if(record.getMachineSpec() != null){
+ MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
+ record.setMachineSpecName(spec.getText());
+ }
+
+ }
return page;
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index 98b33a1..a201526 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
@@ -54,7 +54,7 @@
@PostMapping("/remove")
public R<Void> remove(@RequestParam String ids) {
try {
- service.removeMachines(Func.toLongList(ids));
+ service.removeBatchByIds(Func.toLongList(ids));
} catch (Exception e) {
log.error("鍒犻櫎寮傚父",e);
return R.fail(e.getMessage());
@@ -68,15 +68,7 @@
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
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)->{
- w1.like(MachineGroup::getName,"%"+keyword+"%")
- .or().like(MachineGroup::getCode,"%"+keyword+"%");
- });
- */
IPage<MachineVO> pages = service.pageQuery(query);
return R.data(pages);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineSpec.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineSpec.java
new file mode 100644
index 0000000..4dc348f
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineSpec.java
@@ -0,0 +1,19 @@
+package org.springblade.mdm.basesetting.machine.entity;
+
+import lombok.Getter;
+@Getter
+public enum MachineSpec {
+
+ TURNING("杞﹀簥"),
+ /**
+ * 閫氱煡绫诲瀷
+ */
+ MILLING("閾ｅ簥");
+
+ MachineSpec(String text){
+ this.text = text;
+ }
+
+ private final String text;
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
index 1472a36..654c29f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
@@ -1,13 +1,21 @@
package org.springblade.mdm.basesetting.machine.vo;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;
+/**
+ * 鍒嗛〉鎷嗙嚎鍛�
+ */
+
+@Schema(description = "鏈哄簥鏌ヨ瀵硅薄")
@Setter
@Getter
public class MachineQueryVO extends Query {
+ @Schema(description = "鍚嶇О鎴栫紪鐮�")
private String keyword;
+ @Schema(description = "鏈哄簥缁刬d")
private Long machineGroupId;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
index b900103..9d7b9f7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
@@ -18,6 +18,8 @@
* 鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
*/
private String machineSpec;
+
+ private String machineSpecName;
/**
* 鎿嶄綔鍛橈紝鏂囨湰褰曞叆
*/
--
Gitblit v1.9.3