From 833f11cfec2cec231ea3f89ebf64fe472415978c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 30 Dec 2022 11:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=90=91=E4=B8=8A=E6=88=96=E5=90=91=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitMenuEOController.java | 7 ++ .../service/ISarFileSplitMenuEOService.java | 4 ++ .../impl/SarFileSplitMenuEOServiceImpl.java | 67 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 2 +- 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index f01bb73d1..c51d7a573 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -1,5 +1,6 @@ package com.jero.modules.split.controller; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -76,4 +77,10 @@ public class SarFileSplitMenuEOController extends JeroController List queryByInfoId(String infoId); + + Result moveUpOrDown(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java index 81959ef91..fa2ebdc89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -1,13 +1,17 @@ package com.jero.modules.split.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -182,4 +186,67 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl updateList = new ArrayList<>(); + if(StringUtils.equals(moveFlag,"up")){ + page.setOrderBy("display_seq desc"); + List sarFileSplitMenuEOList = this.queryByList(page); + if(displaySeq != 0){ + // 计算后的当前数据排序号 + Long displaySeqAfter = displaySeq - 1; + + for (SarFileSplitMenuEO fileSplitMenuEO : sarFileSplitMenuEOList) { + if(StringUtils.equals(fileSplitMenuEO.getPId(),pId)){ + if(displaySeq > fileSplitMenuEO.getDisplaySeq()){ + fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + 1); + updateList.add(fileSplitMenuEO); + break; + } + } + } + + if(CollectionUtils.isNotEmpty(updateList)){ + this.baseMapper.updateByPrimaryKeySelective(updateList.get(0)); + } + + sarFileSplitMenuEO.setDisplaySeq(displaySeqAfter); + this.baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO); + } + + }else if(StringUtils.equals(moveFlag,"down")){ + page.setOrderBy("display_seq asc"); + List sarFileSplitMenuEOList = this.queryByList(page); + + // 计算后的当前数据排序号 + Long displaySeqAfter = displaySeq + 1; + + for (SarFileSplitMenuEO fileSplitMenuEO : sarFileSplitMenuEOList) { + if(StringUtils.equals(fileSplitMenuEO.getPId(),pId)){ + if(displaySeq < fileSplitMenuEO.getDisplaySeq()){ + fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() - 1); + updateList.add(fileSplitMenuEO); + break; + } + } + } + + if(CollectionUtils.isNotEmpty(updateList)){ + this.baseMapper.updateByPrimaryKeySelective(updateList.get(0)); + } + + sarFileSplitMenuEO.setDisplaySeq(displaySeqAfter); + this.baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO); + } + return Result.OK(); + } } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 7f098ef1c..7f35fb03c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -138,7 +138,7 @@ spring: # 10测试环境库 #url: jdbc:mysql://10.10.10.44:3306/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false #username: root - #password: 123456 + #password: hzwlsoft.com #driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置