From 450add9755c2f379150967409d1d04b870f48194 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 14:41:30 +0800
Subject: [PATCH] 工艺路线排序
---
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 8 ++++
src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java | 4 ++
src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java | 25 ++++++++++--
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 1
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 3 +
src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java | 3 +
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 65 ++++++++++++++++++++++++++++++++
7 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
index 495ac52..31ff3fb 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -1,9 +1,12 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteDto;
import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.service.ProcessRouteItemService;
import com.ruoyi.production.service.ProcessRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +22,9 @@
@Autowired
private ProcessRouteService processRouteService;
+
+ @Autowired
+ private ProcessRouteItemService processRouteItemService;
@GetMapping("page")
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -39,6 +45,8 @@
@ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
@DeleteMapping("/{ids}")
public R delete(@PathVariable("ids") Long[] ids) {
+ //鍒犻櫎宸ヨ壓璺嚎璇︽儏
+ processRouteItemService.remove(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId,Arrays.asList(ids)));
return R.ok(processRouteService.removeBatchByIds(Arrays.asList(ids)));
}
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
index 4fec36e..451548d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -1,14 +1,20 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteItemDto;
+import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProcessRouteItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -26,11 +32,22 @@
return R.ok(processRouteItemService.listProcessRouteItemDto(processRouteItemDto));
}
-
@PostMapping ()
@ApiOperation("鏂板淇敼")
- public R addOrUpdate(@RequestBody ProcessRouteItemDto processRouteItemDto) {
- processRouteItemService.remove(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRouteItemDto.getRouteId()));
- return R.ok(processRouteItemService.saveBatch(processRouteItemDto.getProcessRouteItem()));
+ public R addOrUpdate(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.saveOrUpdate(processRouteItem));
+ }
+
+ @PostMapping ("/sort")
+ @ApiOperation("鎺掑簭")
+ public R sort(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.sort(processRouteItem));
+ }
+
+ @ApiOperation("鍒犻櫎宸ヨ壓璺嚎鏄庣粏")
+ @DeleteMapping("/batchDelete/{id}")
+ @Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult batchDelete(@PathVariable("id") Long id) {
+ return AjaxResult.success(processRouteItemService.batchDelete(id));
}
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 450d586..705354c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -27,6 +27,5 @@
private Long productId;
- private List<ProcessRouteItem> processRouteItem;
private String model;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
index ffd1ee4..f2ebd44 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
@@ -34,5 +34,8 @@
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value ="鎷栧姩鎺掑簭")
+ private Integer dragSort;
+
}
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
index 1872eee..3299048 100644
--- a/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
@@ -11,4 +11,8 @@
public interface ProcessRouteItemService extends IService<ProcessRouteItem> {
List<ProcessRouteItemDto> listProcessRouteItemDto( ProcessRouteItemDto processRouteItemDto);
+
+ int sort(ProcessRouteItem processRouteItem);
+
+ String batchDelete(Long id);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
index 86df76a..4834dcc 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.production.dto.ProcessRouteItemDto;
@@ -10,11 +11,13 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class ProcessRouteItemServiceImpl extends ServiceImpl<ProcessRouteItemMapper, ProcessRouteItem> implements ProcessRouteItemService {
@Autowired
@@ -24,4 +27,66 @@
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
}
+
+ //鎺掑簭
+ @Override
+ public int sort(ProcessRouteItem processRouteItem) {
+ //鏌ヨ琚敼鍔ㄧ殑杩欐潯鏁版嵁
+ ProcessRouteItem oldProcessRouteItem = processRouteItemMapper.selectById(processRouteItem.getId());
+ //鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
+ .eq(ProcessRouteItem::getRouteId, oldProcessRouteItem.getRouteId())
+ .orderByAsc(ProcessRouteItem::getDragSort));
+ //鏌ヨ琚洿鏀圭殑閭ｆ潯鏁版嵁鍘熸潵鏄鍑犳潯
+ int oldIndex = processRouteItems.indexOf(oldProcessRouteItem);
+ // 鑾峰彇鐩爣浣嶇疆锛堢Щ鍔ㄥ埌绗嚑涓箣鍚庯級
+ Integer targetPosition = processRouteItem.getDragSort();
+ if (targetPosition != null && targetPosition >= 0) {
+ // 绉诲姩鍏冪礌鍒版柊鐨勪綅缃�
+ processRouteItems.remove(oldProcessRouteItem);
+ processRouteItems.add(targetPosition-1, oldProcessRouteItem);
+ // 鏇存柊鎵�鏈夊彈褰卞搷鐨勬帓搴忓瓧娈�
+ for (int i = 0; i < processRouteItems.size(); i++) {
+ ProcessRouteItem item = processRouteItems.get(i);
+ if (!item.getId().equals(oldProcessRouteItem.getId())) {
+ // 妫�鏌ユ槸鍚﹂渶瑕佹洿鏂版帓搴忓��
+ if (item.getDragSort() != i+1) {
+ item.setDragSort(i+1);
+ processRouteItemMapper.updateById(item);
+ }
+ } else {
+ // 鏇存柊鍘熻褰曠殑鏂版帓搴忎綅缃�
+ oldProcessRouteItem.setDragSort(targetPosition);
+ processRouteItemMapper.updateById(oldProcessRouteItem);
+ }
+ }
+ return 1;
+ }
+ return 0;
+ }
+
+ @Override
+ public String batchDelete(Long id) {
+ // 鏌ヨ瑕佸垹闄ょ殑鏁版嵁
+ ProcessRouteItem deleteProcessRouteItem = processRouteItemMapper.selectById(id);
+ if (deleteProcessRouteItem == null) {
+ return "鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鏁版嵁";
+ }
+ Long routeId = deleteProcessRouteItem.getRouteId();
+ // 鍒犻櫎鎸囧畾鏁版嵁
+ processRouteItemMapper.deleteById(id);
+ // 鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
+ .eq(ProcessRouteItem::getRouteId, routeId)
+ .orderByAsc(ProcessRouteItem::getDragSort));
+ // 閲嶆柊璁剧疆鎺掑簭鍊硷紝浣垮簭鍙疯繛缁�
+ for (int i = 0; i < processRouteItems.size(); i++) {
+ ProcessRouteItem item = processRouteItems.get(i);
+ if (!item.getDragSort().equals(i+1)) {
+ item.setDragSort(i+1);
+ processRouteItemMapper.updateById(item);
+ }
+ }
+ return "鍒犻櫎鎴愬姛";
+ }
}
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 3814aeb..1b5e2b4 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -10,6 +10,7 @@
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="dragSort" column="drag_sort"/>
</resultMap>
<select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
@@ -29,6 +30,6 @@
left join process_route pr on pr.id = pri.route_id
where
pri.route_id = #{c.routeId}
- order by pri.id
+ order by pri.drag_sort
</select>
</mapper>
--
Gitblit v1.9.3