From 8861bf93f2b77fbde0b324df0500fb42d9c559d5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 18:50:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/mq/SendBussMQService.java | 60 ++++++++++++++++- .../com/adc/da/mq/SendStandMQService.java | 67 ++++++++++++++++++- 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index c2ee042c..74610dcb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -1,12 +1,17 @@ package com.adc.da.mq; import com.adc.da.slrs.otSvpps.service.IOtSvppsService; +import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; +import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.utils.util.InitStandAttrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -22,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.Message; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -33,6 +39,12 @@ public class SendBussMQService { @Autowired private ISarStandardsInfoService sarStandardsInfoService; + @Resource + private ISarBussStandMenuService sarBussMenusService; + + @Resource + private ITsResourceService tsResourceService; + @Autowired private SysInfoEOService sysInfoEOService; @@ -117,7 +129,13 @@ public class SendBussMQService { } } if (put_time_data != null) { - saveMap.put("put_time_data",put_time_data.getTime()); + // ES对比按照字符串比较，因此9位时间戳前加0 + String putTimeStr = String.valueOf(infoEO.getPutTime()); + if (putTimeStr.length() > 9) { + saveMap.put("put_time_data",putTimeStr); + } else { + saveMap.put("put_time_data","0" + putTimeStr); + } }else{ saveMap.put("put_time_data",-1000000000000000000L); } @@ -140,8 +158,10 @@ public class SendBussMQService { saveMap.put("id",infoEO.getId()); saveMap.put("standSortOrder",esStateOrder(String.valueOf(infoEO.getStandSort()),dicMap)); - saveMap.put("standSort",infoEO.getStandSort()); - saveMap.put("stand_sort",infoEO.getStandSort()); +// saveMap.put("standSort",infoEO.getStandSort()); +// saveMap.put("stand_sort",infoEO.getStandSort()); + saveMap.put("standSort",convertStandSort(infoEO.getId())); + saveMap.put("stand_sort",convertStandSort(infoEO.getId())); if(StringUtils.isNotEmpty(infoEO.getStandSort())){ String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandSort(),"JKSADFH564S"); saveMap.put("standSortShow",codeName); @@ -314,4 +334,38 @@ public class SendBussMQService { return saveMap; } + public String convertStandSort(String standId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("BUSS_STAND_ID", standId); + wrapper.gt("length(MENU_ID)", 0); + wrapper.select("MENU_ID"); + List sarStandMenuList = sarBussMenusService.list(wrapper); + if (sarStandMenuList.isEmpty()) { + return null; + } + List standMenuIdSet = sarStandMenuList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + List standMenuList = new ArrayList<>(); + for (String menuId : standMenuIdSet) { + List result = new ArrayList<>(); + recursivelyFetchParentNodes(menuId, result); + standMenuList.add(String.join("/", result)); + } + return String.join(",", standMenuList); + } + + private void recursivelyFetchParentNodes(String currentId, List result) { + TsResource menu = null; + try { + menu = tsResourceService.getById(currentId); + if (menu != null) { + result.add(0,menu.getMenuName()); + if (StringUtils.isNotEmpty(menu.getParentId())) { + recursivelyFetchParentNodes(menu.getParentId(), result); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 197d402b..80256a6d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -1,6 +1,10 @@ package com.adc.da.mq; import com.adc.da.slrs.otSvpps.service.IOtSvppsService; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; @@ -8,6 +12,7 @@ import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.Utils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -23,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.Message; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -34,6 +40,12 @@ public class SendStandMQService { @Autowired private ISarStandardsInfoService sarStandardsInfoService; + @Resource + private ISarStandMenuService sarStandMenuService; + + @Resource + private ITsResourceService tsResourceService; + @Autowired private SysInfoEOService sysInfoEOService; @@ -120,8 +132,10 @@ public class SendStandMQService { saveMap.put("countryShow",codeName); } saveMap.put("standSortOrder",esStateOrder(String.valueOf(infoEO.getStandSort()),dicMap)); - saveMap.put("standSort",infoEO.getStandSort()); - saveMap.put("stand_sort",infoEO.getStandSort()); +// saveMap.put("standSort",infoEO.getStandSort()); +// saveMap.put("stand_sort",infoEO.getStandSort()); + saveMap.put("standSort",convertStandSort(infoEO.getId())); + saveMap.put("stand_sort",convertStandSort(infoEO.getId())); if (StringUtils.isNotEmpty(infoEO.getStandSort())) { String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandSort(),"JKSADFH564S"); saveMap.put("standSortShow",codeName); @@ -301,12 +315,30 @@ public class SendStandMQService { if (!valArr.isEmpty()) { value = dicTypeEODao.getDicNamesByCodes(valArr, ""); } + if ("SSRQ".equals(name)) { + if (entry.getValue() != null && StringUtils.isNotBlank(entry.getValue().toString())) { + try { + Date parse = sdf.parse(entry.getValue().toString()); + value = String.valueOf(parse.getTime() / 1000); + // ES中的排序问题，时间戳需要补0 + if (value.length() <= 9) { + value = "0" + value; + } + } catch (ParseException e) { + value = ""; + } + } + } } saveMap.put(name + "Name",value); } } } } + if (saveMap.get("SSRQName") != null) { + + saveMap.put("SSRQName", saveMap.get("SSRQName").toString().replace(" ", "")); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { @@ -379,5 +411,36 @@ public class SendStandMQService { return saveMap; } + public String convertStandSort(String standId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarStandMenu::getStandId,standId); + wrapper.select(SarStandMenu::getMenuId); + List sarStandMenuList = sarStandMenuService.list(wrapper); + if (sarStandMenuList.isEmpty()) { + return null; + } + List standMenuIdSet = sarStandMenuList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList()); + List standMenuList = new ArrayList<>(); + for (String menuId : standMenuIdSet) { + List result = new ArrayList<>(); + recursivelyFetchParentNodes(menuId, result); + standMenuList.add(String.join("/", result)); + } + return String.join(",", standMenuList); + } + private void recursivelyFetchParentNodes(String currentId, List result) { + TsResource menu = null; + try { + menu = tsResourceService.getById(currentId); + if (menu != null) { + result.add(0,menu.getMenuName()); + if (StringUtils.isNotEmpty(menu.getParentId())) { + recursivelyFetchParentNodes(menu.getParentId(), result); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } } From a9cbca0c002cdc270a0642c125d879aad456f72c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 19:47:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/mq/SendBussMQService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 74610dcb..6d24d3fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -130,11 +130,17 @@ public class SendBussMQService { } if (put_time_data != null) { // ES对比按照字符串比较，因此9位时间戳前加0 - String putTimeStr = String.valueOf(infoEO.getPutTime()); - if (putTimeStr.length() > 9) { - saveMap.put("put_time_data",putTimeStr); - } else { - saveMap.put("put_time_data","0" + putTimeStr); + Date putTime = null; + try { + putTime = sdf.parse(infoEO.getPutTime()); + String putTimeStr = String.valueOf(putTime.getTime() / 1000); + if (putTimeStr.length() > 9) { + saveMap.put("put_time_data",putTimeStr); + } else { + saveMap.put("put_time_data","0" + putTimeStr); + } + } catch (ParseException e) { + saveMap.put("put_time_data",-1000000000000000000L); } }else{ saveMap.put("put_time_data",-1000000000000000000L); From d8a4a763b83cd493e01406e4f5814ea32d110b55 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 20:04:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 4 ++-- .../src/main/java/com/adc/da/mq/SendStandMQService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 6d24d3fd..ccf787c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -133,8 +133,8 @@ public class SendBussMQService { Date putTime = null; try { putTime = sdf.parse(infoEO.getPutTime()); - String putTimeStr = String.valueOf(putTime.getTime() / 1000); - if (putTimeStr.length() > 9) { + String putTimeStr = String.valueOf(putTime.getTime()); + if (putTimeStr.length() > 12) { saveMap.put("put_time_data",putTimeStr); } else { saveMap.put("put_time_data","0" + putTimeStr); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 80256a6d..f0e8b79f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -319,9 +319,9 @@ public class SendStandMQService { if (entry.getValue() != null && StringUtils.isNotBlank(entry.getValue().toString())) { try { Date parse = sdf.parse(entry.getValue().toString()); - value = String.valueOf(parse.getTime() / 1000); + value = String.valueOf(parse.getTime()); // ES中的排序问题，时间戳需要补0 - if (value.length() <= 9) { + if (value.length() <= 12) { value = "0" + value; } } catch (ParseException e) { From 705fd9c31bca26116a34355c90d75a934c6098e6 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 14 Nov 2023 10:47:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug:=20=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8B=A5=E7=94=A8=E6=88=B7=E5=B7=B2=E7=A6=81=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/sys/controller/UserEOController.java | 15 +++++++++++++++ .../main/java/com/adc/da/sys/dao/UserEODao.java | 5 +++++ .../com/adc/da/sys/service/IUserEOService.java | 2 ++ .../da/sys/service/impl/UserEOServiceImpl.java | 10 ++++++++++ .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++++++ 5 files changed, 44 insertions(+) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 377c6226..51a39bc9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -92,6 +92,21 @@ public class UserEOController extends BaseController { return Result.success(userVO); } + @ApiOperation(value = "|UserEO|详情接口包含被禁用用户") + @GetMapping("/getByIdWithDisabled") + public ResponseMessage getByIdFeignClientWithDisabled(String id) throws Exception { + UserEO userEO = userEOService.getUserWithRolesWithDisabled(id); + UserVO userVO= new UserVO(); + if(userEO!=null){ + userVO = BeanUtil.toBean(userEO,UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + userVO.setPassword(userEO.getPassword()); + } + return Result.success(userVO); + } + /** * @return com.adc.da.util.http.ResponseMessage> * @Author liwenxuan diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java index e2e8a56f..3d07f90e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java @@ -96,6 +96,11 @@ public interface UserEODao extends BaseMapper { */ public UserEO getUserWithRoles(String id); + /** + * 查询用户及用户所对应的角色包含已禁用的用户 + */ + public UserEO getUserWithRolesWithDisabled(String id); + public UserEO getUserWithRolesAll(String id); public UserEO get(String id); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java index 133c493e..fa8f0f80 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -30,6 +30,8 @@ public interface IUserEOService extends IService { public UserEO getUserWithRoles(String id); + public UserEO getUserWithRolesWithDisabled(String id); + public UserEO getUserWithRolesAll(String id); public int saveUserRole(UserEO userEO); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java index e6cb41ea..2c3ba906 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -248,6 +248,16 @@ public class UserEOServiceImpl extends ServiceImpl implements return this.baseMapper.getUserWithRoles(id); } + /** + * 查询用户及用户所对应的角色，包含已禁用用户 + * @param id + * @return + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO getUserWithRolesWithDisabled(String id) { + return this.baseMapper.getUserWithRolesWithDisabled(id); + } + @Transactional(readOnly = true, rollbackFor = Exception.class) public UserEO getUserWithRolesAll(String id) { return this.baseMapper.getUserWithRolesAll(id); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 256369c5..0e9ed209 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -427,6 +427,18 @@ where u.usid = #{id} and u.DISABLE_FLAG = '0' + + +