From 142ff0535515569cdb83f21e8556b19b940d4a33 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Thu, 8 Jul 2021 16:58:00 +0800 Subject: [PATCH] =?UTF-8?q?fetch:=E6=88=91=E7=9A=84=E6=9D=BF=E5=9D=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarMenuServiceImpl.java | 1 + .../impl/SarUserPersonalMenuServiceImpl.java | 3 ++ .../sarUrl/controller/TsUrlController.java | 8 ++++ .../com/adc/da/slrs/sarUrl/dao/TsUrlDao.java | 7 +++ .../adc/da/slrs/sarUrl/entity/OrderUrlVO.java | 9 ++++ .../da/slrs/sarUrl/service/ITsUrlService.java | 16 +++++++ .../sarUrl/service/impl/TsUrlServiceImpl.java | 43 +++++++++++++++++++ .../mybatis/mapper/sarRole/TsRoleMapper.xml | 2 +- 8 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/OrderUrlVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java index 609f7e67..87fdec48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java @@ -247,6 +247,7 @@ public class SarMenuServiceImpl extends ServiceImpl impleme if(menuIds!=null&&menuIds.size()>0){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.in("id",menuIds); + sarMenuQueryWrapper.isNull("parent_id"); return dao.selectList(sarMenuQueryWrapper); } return new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java index 79226046..5c12b642 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java @@ -118,7 +118,10 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl userIds=tsUserService.getUserIdsByRoleId(roleId); for(String userId:userIds){ List menus=tsUserService.getMenusByUserId(userId); + System.out.println("我的板块"); + System.out.println(menus); updateUserPersonalMenuForRole(menus,userId); } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index af718943..6289f618 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarUrl.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarUrl.entity.OrderUrlVO; import com.adc.da.slrs.sarUrl.entity.TsUrl; import com.adc.da.slrs.sarUrl.service.ITsUrlService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -50,6 +51,8 @@ public class TsUrlController{ @ApiOperation(value="第三方链接-添加", notes="第三方链接-添加") @PostMapping(value = "/add") public ResponseMessage add(@RequestBody TsUrl tsUrl) { + int orderBy=tsUrlService.getMaxOrderBy(); + tsUrl.setOrderBy(orderBy+1); tsUrlService.save(tsUrl); return Result.success(); } @@ -110,4 +113,9 @@ public class TsUrlController{ return Result.success(tsUrl); } + @ApiOperation("排序") + @PostMapping("/order") + public ResponseMessage orderUrl(@RequestBody List orderUrlVOList){ + return tsUrlService.orderUrl(orderUrlVOList); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java index 7c28a9ce..ab94703f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarUrl.dao; import com.adc.da.slrs.sarUrl.entity.TsUrl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; /** * @Description: 第三方链接 @@ -12,4 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsUrlDao extends BaseMapper { + /** + * 获取最大排序号 + * @return int + */ + @Select("select max(order_by) from ts_url") + int getMaxOrderBy(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/OrderUrlVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/OrderUrlVO.java new file mode 100644 index 00000000..8e0a32ef --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/OrderUrlVO.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.sarUrl.entity; + +import lombok.Data; + +@Data +public class OrderUrlVO { + private String urlId; + private Integer orderBy; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java index 3a5c0ff8..bfe81d66 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java @@ -1,9 +1,13 @@ package com.adc.da.slrs.sarUrl.service; +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarUrl.entity.OrderUrlVO; import com.adc.da.slrs.sarUrl.entity.TsUrl; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 第三方链接 * @Author: jeecg-boot @@ -12,4 +16,16 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ITsUrlService extends IService { + /** + * 获取最大排序号 + * @return int + */ + int getMaxOrderBy(); + + /** + * 排序 + * @param orderUrlVOList：id和orderBy + * @return ResponseMessage + */ + ResponseMessage orderUrl(List orderUrlVOList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java index b9709a61..0480a39b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java @@ -1,12 +1,20 @@ package com.adc.da.slrs.sarUrl.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; +import com.adc.da.slrs.sarUrl.entity.OrderUrlVO; import com.adc.da.slrs.sarUrl.entity.TsUrl; import com.adc.da.slrs.sarUrl.service.ITsUrlService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Comparator; +import java.util.List; + /** * @Description: 第三方链接 * @Author: jeecg-boot @@ -15,5 +23,40 @@ import org.springframework.stereotype.Service; */ @Service public class TsUrlServiceImpl extends ServiceImpl implements ITsUrlService { + @Autowired + private TsUrlDao tsUrlDao; + + /** + * 获取最大排序号 + * @return int + */ + @Override + public int getMaxOrderBy() { + return tsUrlDao.getMaxOrderBy(); + } + + /** + * 排序 + * @param orderUrlVOList：id和orderBy + * @return ResponseMessage + */ + @Override + public ResponseMessage orderUrl(List orderUrlVOList) { + List tsUrls=tsUrlDao.selectList(new QueryWrapper<>()); + if(orderUrlVOList.size()!=tsUrls.size()){ + return Result.error("请传入所有数据"); + } + orderUrlVOList.sort(Comparator.comparing(OrderUrlVO::getUrlId)); + tsUrls.sort(Comparator.comparing(TsUrl::getId)); + for(int i=0;i #{roleId} - ) and (parent_id is null or parent_id='') + )