From a890f7f678b35b8d44133bfbb0026443a35c9244 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 13 Nov 2023 17:55:11 +0800 Subject: [PATCH 001/105] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarMenuStandardNewController.java | 9 +++- .../service/ISarMenuStandardNewService.java | 4 +- .../SarMenuStandardNewServiceNewImpl.java | 41 ++++++++++++++++--- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index 95a63b1f..f90674f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -86,6 +86,13 @@ public class SarMenuStandardNewController extends BaseController standardSystemTree() { + return Result.success(iSarMenuStandardNewService.standardSystemTree()); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index bbd48c1b..1488dc39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -26,7 +26,9 @@ public interface ISarMenuStandardNewService extends IService Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew); - Integer deleteMenuStandard(String menuId); + void deleteMenuStandard(String menuId); SarMenuStandard getMenuStandardById(String menuId); + + Object standardSystemTree(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 630b7970..c09ca14f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -1,20 +1,27 @@ package com.adc.da.slrs.sarMenuStandard.service.impl; +import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; +import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarRole.dao.TsRoleDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -28,6 +35,7 @@ import java.util.stream.Collectors; * @author super_liu * @since 2021-07-07 */ +@Slf4j @Service public class SarMenuStandardNewServiceNewImpl extends ServiceImpl implements ISarMenuStandardNewService { @@ -37,7 +45,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl menuUpdateWrapper = new LambdaUpdateWrapper<>(); + menuUpdateWrapper.eq(SarMenuStandard::getId, menuId); + this.dao.delete(menuUpdateWrapper); + log.info("删除主表中的节点成功"); + // 删除国标外标体系关联关系 + LambdaUpdateWrapper gbWrapper = new LambdaUpdateWrapper<>(); + gbWrapper.eq(SarStandMenu::getMenuId, menuId); + sarStandMenuService.remove(gbWrapper); + log.info("删除国标外标主表中的相应字段成功"); + // 删除企标体系关联关系 + LambdaUpdateWrapper esWrapper = new LambdaUpdateWrapper<>(); + esWrapper.eq(SarBussStandMenu::getMenuId, menuId); + sarBussStandMenuService.remove(esWrapper); + log.info("删除企标主表中的相应字段成功"); + // TODO 理论上这里应该删除国标外标企标主表中的中文字段 } /** From 0ec7236ead4b032bd66f0d0c069a410c39a26be9 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 13 Nov 2023 18:09:51 +0800 Subject: [PATCH 002/105] =?UTF-8?q?ci:=20=E8=AE=A1=E5=88=92=E6=9C=89?= =?UTF-8?q?=E5=8F=98=20=E5=85=88=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index c09ca14f..6657ac3e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -125,6 +125,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl Date: Mon, 13 Nov 2023 18:50:28 +0800 Subject: [PATCH 003/105] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=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 004/105] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=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 005/105] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=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 006/105] =?UTF-8?q?bug:=20=E7=9B=91=E6=8E=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=8B=A5=E7=94=A8=E6=88=B7=E5=B7=B2=E7=A6=81=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=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' + + + + + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index 7cea639d..6b9c6fa4 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -107,4 +107,38 @@ public class SarMenuStandard extends BaseEntity { @TableField(exist = false) private String treeType; + @TableField(exist = false) + private Integer gbStandCount; + + @TableField(exist = false) + private Integer fbStandCount; + + @TableField(exist = false) + private Integer esStandCount; + + // 添加用于计算和设置关联关系数量的方法 + // 添加用于计算和设置关联关系数量的方法 + public void calculateAndSetCounts(List gbStandMenu, List fbStandMenu, List esStandMenu) { + this.gbStandCount = countMatches(gbStandMenu, this.id); + this.fbStandCount = countMatches(fbStandMenu, this.id); + this.esStandCount = countMatches(esStandMenu, this.id); + + for (SarMenuStandard child : children) { + child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu); + this.gbStandCount += child.gbStandCount; + this.fbStandCount += child.fbStandCount; + this.esStandCount += child.esStandCount; + } + } + + private int countMatches(List standMenuList, String menuId) { + int count = 0; + // 计算与menuId匹配的项的数量 + for (StandMenuRelation standMenu : standMenuList) { + if (standMenu.getMenuId().equals(menuId)) { + count++; + } + } + return count; + } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java new file mode 100644 index 00000000..79ba70ec --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java @@ -0,0 +1,16 @@ +package com.adc.da.sys.sarMenuStandard.entity; + +import lombok.Data; + +/** + * @author: Mzaxd + * @Date: 2023/11/14 16:31 + */ +@Data +public class StandMenuRelation { + + private String standId; + + private String menuId; + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/util/BeanCopyUtils.java b/adc-da-sys/src/main/java/com/adc/da/sys/util/BeanCopyUtils.java new file mode 100644 index 00000000..a0018525 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/util/BeanCopyUtils.java @@ -0,0 +1,36 @@ +package com.adc.da.sys.util; + +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author Mzaxd + * @since 2022-11-22 15:36 + */ +public class BeanCopyUtils { + + private BeanCopyUtils() { + } + + public static V copyBean(Object source, Class clazz){ + V result = null; + //创建目标对象 + try { + result = clazz.newInstance(); + //实现属性copy + BeanUtils.copyProperties(source, result); + } catch (Exception e) { + e.printStackTrace(); + } + //返回结果 + return result; + } + + public static List copyBeanList(List list, Class clazz) { + return list.stream() + .map(o -> copyBean(o, clazz)) + .collect(Collectors.toList()); + } +} From 47b1e65de3f79095a9b29f5c7974eb2d1173ae2a Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 14 Nov 2023 18:30:28 +0800 Subject: [PATCH 013/105] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=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 | 10 ++++++++-- .../com/adc/da/mq/SendStandMQService.java | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 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 ccf787c4..f8f7b47a 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 @@ -140,12 +140,18 @@ public class SendBussMQService { saveMap.put("put_time_data","0" + putTimeStr); } } catch (ParseException e) { - saveMap.put("put_time_data",-1000000000000000000L); + saveMap.put("put_time_data",-1000000000L); } }else{ - saveMap.put("put_time_data",-1000000000000000000L); + saveMap.put("put_time_data",-1000000000L); } saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime())); // 入库时间 + if (infoEO.getCreationTime().getTime() > 12) { + saveMap.put("warehousingTimeStamp",infoEO.getCreationTime().getTime()); // 入库时间戳 + }else { + saveMap.put("warehousingTimeStamp", "0" + infoEO.getCreationTime().getTime()); // 入库时间戳 + } + //查询字典表,形成Hash映射提升速度 List dicInfo = dicTypeEODao.getDicInfo("dic_id","dic_type_code", "dic_type_name","show_index"); 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 f0e8b79f..dda3b84e 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 @@ -210,6 +210,11 @@ public class SendStandMQService { saveMap.put("CHJL",infoEO.getCHJL()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime())); // 入库时间 + if (infoEO.getCreationTime().getTime() > 12) { + saveMap.put("warehousingTimeStamp",infoEO.getCreationTime().getTime()); // 入库时间戳 + }else { + saveMap.put("warehousingTimeStamp", "0" + infoEO.getCreationTime().getTime()); // 入库时间戳 + } String fieldInfo = InitStandAttrUtil.queryField; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); @@ -231,6 +236,20 @@ public class SendStandMQService { if(fieldValue.contains("null")){ fieldValue = fieldValue.replace("null",""); } + if ("SSRQ".equals(field)) { + if (infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())) { + try { + Date parse = sdf.parse(infoMap.get(field).toString()); + fieldValue = String.valueOf(parse.getTime()); + // ES中的排序问题，时间戳需要补0 + if (fieldValue.length() <= 12) { + fieldValue = "0" + fieldValue; + } + } catch (ParseException e) { + fieldValue = ""; + } + } + } } saveMap.put(field+"Name",fieldValue); }catch (Exception e){ From a3f6748a36503b628506d21c4f9016396ea6a71b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 10:53:26 +0800 Subject: [PATCH 014/105] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=A0=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=82=E7=BA=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 2 +- .../da/sys/sarMenuStandard/entity/SarMenuStandard.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 4ec4634f..d608537c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -161,7 +161,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl esStandMenu = sarBussStandMenuService.list().stream().filter(sarBussStandMenu -> sarBussStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); List esRelations = BeanCopyUtils.copyBeanList(esStandMenu, StandMenuRelation.class); // 计算每个节点的数值 - TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations); + TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0); // 拼接返回 return TsResources; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index 6b9c6fa4..de532370 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -107,6 +107,10 @@ public class SarMenuStandard extends BaseEntity { @TableField(exist = false) private String treeType; + @ApiModelProperty(value = "树层级") + @TableField(exist = false) + private Integer level; + @TableField(exist = false) private Integer gbStandCount; @@ -118,13 +122,14 @@ public class SarMenuStandard extends BaseEntity { // 添加用于计算和设置关联关系数量的方法 // 添加用于计算和设置关联关系数量的方法 - public void calculateAndSetCounts(List gbStandMenu, List fbStandMenu, List esStandMenu) { + public void calculateAndSetCounts(List gbStandMenu, List fbStandMenu, List esStandMenu, Integer curLevel) { + this.level = curLevel; this.gbStandCount = countMatches(gbStandMenu, this.id); this.fbStandCount = countMatches(fbStandMenu, this.id); this.esStandCount = countMatches(esStandMenu, this.id); for (SarMenuStandard child : children) { - child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu); + child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1); this.gbStandCount += child.gbStandCount; this.fbStandCount += child.fbStandCount; this.esStandCount += child.esStandCount; From 43eb0769e1c6996a79d11a84649a3315cefb0528 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 14:31:18 +0800 Subject: [PATCH 015/105] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=20preview=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarBussionessStandDao.java | 3 + .../SarMenuStandardNewController.java | 20 +++- .../entity/StandSystemDTO.java | 98 +++++++++++++++++++ .../service/ISarMenuStandardNewService.java | 7 ++ .../SarMenuStandardNewServiceNewImpl.java | 44 +++++++++ .../sarStandMenu/dao/SarStandMenuDao.java | 3 + .../SarStandMenu/SarStandMenuMapper.xml | 53 ++++++++++ .../SarBussionessStandMapper.xml | 6 ++ .../entity/SarMenuStandard.java | 2 +- 9 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index c4508960..0dc6cea4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.dao; import com.adc.da.slrs.sarBussionessStand.entity.OldSystem; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; +import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; @@ -138,5 +139,7 @@ public interface SarBussionessStandDao extends BaseMapper { List selectAllStandStatus(); String selectMaxStandSn(String standSort); + + List getESSystemData(@Param("param") StandSystemDTO standSystemDTO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index 6a9ecc8a..447b82e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -5,10 +5,12 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; +import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.util.LoginUserUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ObjectUtils; @@ -16,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -29,7 +32,7 @@ import java.util.List; @RestController @Api(tags = "福田标准法规--标准法规库-菜单标准体系") @RequestMapping("/${restPath}/lawss/sarMenuStandardLimit") -public class SarMenuStandardNewController extends BaseController { +public class SarMenuStandardNewController extends BaseController { @Autowired private ISarMenuStandardNewService iSarMenuStandardNewService; @@ -95,4 +98,19 @@ public class SarMenuStandardNewController extends BaseController standardSystemTree() { return Result.success(iSarMenuStandardNewService.standardSystemTree()); } + + @ApiOperation("法规弹窗列表") + @PostMapping("/standardSystemList") + public ResponseMessage standardSystemList(@RequestBody StandSystemDTO standSystemDTO) { + List standSystemDTOS = iSarMenuStandardNewService.standardSystemList(standSystemDTO); + return Result.success(getPageInfo(standSystemDTO.getPager(), standSystemDTOS)); + } + + @ApiOperation("法规列表弹窗Excel导出") + @GetMapping("/standardSystemListExport") + public ResponseMessage standardSystemListExport(@RequestBody StandSystemDTO standSystemDTO, + HttpServletResponse response) { + iSarMenuStandardNewService.standardSystemListExport(standSystemDTO, response); + return Result.success(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java new file mode 100644 index 00000000..40fb30bd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -0,0 +1,98 @@ +package com.adc.da.slrs.sarMenuStandard.entity; + +import com.adc.da.base.page.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +/** + * @author: Mzaxd + * @Date: 2023/11/14 17:20 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class StandSystemDTO extends BasePage { + + @ApiModelProperty(value = "节点Id") + private String menuId; + + @ApiModelProperty(value = "体系结构") + private String standSystem; + + @ApiModelProperty(value = "标准Id") + private String standId; + + @ApiModelProperty(value = "标准编号") + private String standNo; + + @ApiModelProperty(value = "标准名称") + private String standName; + + @ApiModelProperty(value = "标准状态") + private String standState; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "开始发布日期") + private Date startReleaseDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "结束发布日期") + private Date endReleaseDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "开始实施日期") + private Date startImplementDate; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "结束实施日期") + private Date endImplementDate; + + @ApiModelProperty(value = "代替标准") + private String replaceStandardNo; + + @ApiModelProperty(value = "编制单位Id") + private String deptId; + + @ApiModelProperty(value = "编制单位") + private String dept; + + @ApiModelProperty(value = "起草人Id") + private String draftUserId; + + @ApiModelProperty(value = "起草人") + private String draftUserName; + + @ApiModelProperty(value = "数据来源") + private String dataSource; + + @ApiModelProperty(value = "发布日期排序规则") + private String orderReleaseDate; + + @ApiModelProperty(value = "实施日期排序规则") + private String orderImplementDate; + + private String selectIds; + + private List selectIdList; + + public void setSelectIds(String selectIds) { + this.selectIds = selectIds; + this.selectIdList = java.util.Arrays.asList(selectIds.split(",")); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index 60046a91..67c74d9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -1,9 +1,12 @@ package com.adc.da.slrs.sarMenuStandard.service; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; +import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -31,4 +34,8 @@ public interface ISarMenuStandardNewService extends IService SarMenuStandard getMenuStandardById(String menuId); List standardSystemTree(); + + List standardSystemList(StandSystemDTO standSystemDTO); + + void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index d608537c..42b85671 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -1,9 +1,13 @@ package com.adc.da.slrs.sarMenuStandard.service.impl; +import com.adc.da.exception.AdcDaBaseException; +import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; +import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarRole.dao.TsRoleDao; @@ -18,6 +22,7 @@ import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -27,6 +32,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; @@ -54,6 +60,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl standardSystemList(StandSystemDTO standSystemDTO) { + String menuId = standSystemDTO.getMenuId(); + // 校验menuId不能为空 + if (StringUtils.isBlank(menuId)) { + throw new AdcDaBaseException("menuId不能为空"); + } + // 查国标 + List gbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "INLAND"); + // 查外标 + List fbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "FOREIGN"); + // 查企标 +// List esList = sarBussionessStandDao.getESSystemData(standSystemDTO); + // 数据转换后整合 + List resultList = new ArrayList<>(); + resultList.addAll(gbList); + resultList.addAll(fbList); +// resultList.addAll(esList); + // 构造体系路径 + + // TODO 排序 + // 按照标准体系排序 + // 体系内部按照国内/海外/企业排序 + // 每个类别的标准内部按照搜索中心设定的类别排序 + standSystemDTO.getPager().setRowCount(resultList.size()); + return resultList; + } + + @Override + public void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response) { +// List exportList = this.standardSystemList(standSystemDTO); +// // TODO 导出 + } + @Override public Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew) { SarMenuStandard menuStandarddb = dao.selectById(sarMenuStandardNew.getId()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java index 7d0c9b55..2c845073 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java @@ -1,7 +1,9 @@ package com.adc.da.slrs.sarStandMenu.dao; +import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import javax.annotation.Resource; import java.util.List; @@ -35,4 +37,5 @@ public interface SarStandMenuDao extends BaseMapper { List getFBStandMenu(); + List getStandInfoSystemData(@Param("param") StandSystemDTO standSystemDTO, @Param("dataSource") String dataSource); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 0b950d39..af741769 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -156,5 +156,58 @@ where stand.STAND_TYPE = 'FOREIGN' + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 2846dfb0..2fd0df3e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1267,4 +1267,10 @@ where id = #{attfId} + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index de532370..bf5c609b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -110,8 +110,8 @@ public class SarMenuStandard extends BaseEntity { @ApiModelProperty(value = "树层级") @TableField(exist = false) private Integer level; - @TableField(exist = false) + private Integer gbStandCount; @TableField(exist = false) From ac9bf76ab215c505edaddde96e570dc285004ff3 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 14:46:58 +0800 Subject: [PATCH 016/105] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SarStandMenu/SarStandMenuMapper.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index af741769..d6c10e17 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -185,29 +185,35 @@ AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - + AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate} - + AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} - + AND gb.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%') - + AND o.ORG_NAME LIKE CONCAT('%',#{param.dept},'%') - + AND u.UNAME LIKE CONCAT('%',#{param.draftUserName},'%') - + AND gb.STAND_TYPE = #{dataSource} + + AND gb.ID IN + + #{item} + + From e0918cf94acdf4affcad0e3818e86bdb036b3154 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 15:11:47 +0800 Subject: [PATCH 017/105] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarMenuStandardNewController.java | 5 +- .../entity/StandSystemDTO.java | 11 +++- .../service/ISarMenuStandardNewService.java | 2 +- .../SarMenuStandardNewServiceNewImpl.java | 26 ++++++++- .../SarBussionessStandMapper.xml | 56 +++++++++++++++++-- 5 files changed, 87 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index 447b82e1..f9899042 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -32,7 +32,7 @@ import java.util.List; @RestController @Api(tags = "福田标准法规--标准法规库-菜单标准体系") @RequestMapping("/${restPath}/lawss/sarMenuStandardLimit") -public class SarMenuStandardNewController extends BaseController { +public class SarMenuStandardNewController extends BaseController { @Autowired private ISarMenuStandardNewService iSarMenuStandardNewService; @@ -102,8 +102,7 @@ public class SarMenuStandardNewController extends BaseController @ApiOperation("法规弹窗列表") @PostMapping("/standardSystemList") public ResponseMessage standardSystemList(@RequestBody StandSystemDTO standSystemDTO) { - List standSystemDTOS = iSarMenuStandardNewService.standardSystemList(standSystemDTO); - return Result.success(getPageInfo(standSystemDTO.getPager(), standSystemDTOS)); + return Result.success(iSarMenuStandardNewService.standardSystemList(standSystemDTO)); } @ApiOperation("法规列表弹窗Excel导出") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 40fb30bd..67c9f471 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -10,6 +10,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -18,12 +20,11 @@ import java.util.List; * @author: Mzaxd * @Date: 2023/11/14 17:20 */ -@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) -public class StandSystemDTO extends BasePage { +public class StandSystemDTO { @ApiModelProperty(value = "节点Id") private String menuId; @@ -91,6 +92,12 @@ public class StandSystemDTO extends BasePage { private List selectIdList; + @NotNull(message = "页码不能为空") + private int page; + + @NotEmpty(message = "每页条数不能为空") + private int pageSize; + public void setSelectIds(String selectIds) { this.selectIds = selectIds; this.selectIdList = java.util.Arrays.asList(selectIds.split(",")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index 67c74d9a..f6b9f7ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -35,7 +35,7 @@ public interface ISarMenuStandardNewService extends IService List standardSystemTree(); - List standardSystemList(StandSystemDTO standSystemDTO); + IPage> standardSystemList(StandSystemDTO standSystemDTO); void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 42b85671..f875f7ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -177,7 +178,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl standardSystemList(StandSystemDTO standSystemDTO) { + public IPage> standardSystemList(StandSystemDTO standSystemDTO) { String menuId = standSystemDTO.getMenuId(); // 校验menuId不能为空 if (StringUtils.isBlank(menuId)) { @@ -200,8 +201,27 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl pageList = resultList.subList(start, end); + + // 使用MyBatis Plus的Page类来构造分页对象 + Page> page = new Page<>(pageNum, pageSize, total); + page.setRecords(Collections.singletonList(pageList)); // 设置当前页面的记录 + page.setTotal(total); // 设置总记录数 + page.setPages(totalPages); // 设置总页数 + return page; } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 2fd0df3e..ccf86224 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1268,9 +1268,57 @@ From d881d5cfc7bce0628dec93512186dca7e8159625 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 15:19:42 +0800 Subject: [PATCH 018/105] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarMenuStandardNewServiceNewImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index f875f7ea..4a6bb852 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -178,7 +178,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl> standardSystemList(StandSystemDTO standSystemDTO) { + public IPage standardSystemList(StandSystemDTO standSystemDTO) { String menuId = standSystemDTO.getMenuId(); // 校验menuId不能为空 if (StringUtils.isBlank(menuId)) { @@ -201,9 +201,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl pageList = resultList.subList(start, end); // 使用MyBatis Plus的Page类来构造分页对象 - Page> page = new Page<>(pageNum, pageSize, total); - page.setRecords(Collections.singletonList(pageList)); // 设置当前页面的记录 + Page page = new Page<>(pageNum, pageSize, total); + page.setRecords(pageList); // 设置当前页面的记录 page.setTotal(total); // 设置总记录数 page.setPages(totalPages); // 设置总页数 return page; From 23190a0b96327e2b1d24ab500aa2ed3bd157c474 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 15 Nov 2023 15:21:34 +0800 Subject: [PATCH 019/105] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarMenuStandard/service/ISarMenuStandardNewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index f6b9f7ee..a206e8cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -35,7 +35,7 @@ public interface ISarMenuStandardNewService extends IService List standardSystemTree(); - IPage> standardSystemList(StandSystemDTO standSystemDTO); + IPage standardSystemList(StandSystemDTO standSystemDTO); void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response); } From d4b2f09ca9e9caeaf439cb1b3b8a2e9e0d32eb62 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 15 Nov 2023 18:36:08 +0800 Subject: [PATCH 020/105] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=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 --- .../service/impl/SearchCenterServiceImpl.java | 34 +++++++++++-------- .../java/com/adc/da/mq/SendBussMQService.java | 11 ++++-- .../com/adc/da/mq/SendStandMQService.java | 28 ++++++++++++--- 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 61597413..f11eb9d5 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -246,15 +246,15 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField2 = "lawsYear"; sortField3 = "lawsType.keyword"; } else if("bussstand".equals(searchInfoEO.getSelectIndex())) { - sortField1 = "put_time_data"; - sortField2 = "standNumber"; - sortField3 = "standYear"; - sortField4 = "standSort.keyword"; +// sortField1 = "put_time_data"; + sortField1 = "standNumber"; + sortField2 = "standYear"; + sortField3 = "standSort.keyword"; } else if ("stand".equals(searchInfoEO.getSelectIndex())) { sortField1 = "SSRQName"; - sortField2 = "standNumber"; - sortField3 = "standYear"; - sortField4 = "standSort.keyword"; +// sortField2 = "standNumber"; +// sortField3 = "standYear"; +// sortField4 = "standSort.keyword"; } else { sortField1 = "standNumber"; sortField2 = "standYear"; @@ -305,15 +305,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) - .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) - .addSort(sortField1, SortOrder.DESC) + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH); + if ("stand".equals(searchInfoEO.getSelectIndex())) { + searchRequestBuilder.addSort(sortField1,SortOrder.DESC); + } else { + searchRequestBuilder.addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standSortOrder", SortOrder.ASC) - .addSort(sortField2, SortOrder.ASC) - .addSort(sortField3, SortOrder.DESC) - .addSort(sortField4, SortOrder.ASC) - .addSort("issue_time_data", SortOrder.DESC) - .setFrom((searchInfoEO.getPage()-1) * searchInfoEO.getPageSize()) + .addSort(sortField1, SortOrder.ASC) + .addSort(sortField2, SortOrder.DESC) + .addSort(sortField3, SortOrder.ASC) + .addSort("issue_time_data", SortOrder.DESC); + } + + searchRequestBuilder.setFrom((searchInfoEO.getPage()-1) * searchInfoEO.getPageSize()) .setSize(searchInfoEO.getPageSize()); if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ 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 f8f7b47a..851df083 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 @@ -115,7 +115,7 @@ public class SendBussMQService { if (issue_time_data != null) { saveMap.put("issue_time_data",issue_time_data.getTime()); }else{ - saveMap.put("issue_time_data",-1000000000000000000L); + saveMap.put("issue_time_data",-100000000L); } //实施日期 高级查询 @@ -134,17 +134,22 @@ public class SendBussMQService { try { putTime = sdf.parse(infoEO.getPutTime()); String putTimeStr = String.valueOf(putTime.getTime()); + saveMap.put("putDate",sdf.format(putTime)); if (putTimeStr.length() > 12) { saveMap.put("put_time_data",putTimeStr); } else { saveMap.put("put_time_data","0" + putTimeStr); + logger.info("前面加零的put_time_data："+saveMap.get("put_time_data")); } } catch (ParseException e) { - saveMap.put("put_time_data",-1000000000L); + saveMap.put("put_time_data",-100000000L); + saveMap.put("putDate",null); } }else{ - saveMap.put("put_time_data",-1000000000L); + saveMap.put("put_time_data",-100000000L); + saveMap.put("putDate",null); } + logger.info("saveMap实施日期："+saveMap.get("put_time_data")); saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime())); // 入库时间 if (infoEO.getCreationTime().getTime() > 12) { saveMap.put("warehousingTimeStamp",infoEO.getCreationTime().getTime()); // 入库时间戳 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 dda3b84e..57c2ee7f 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 @@ -168,7 +168,7 @@ public class SendStandMQService { if (issue_time_data != null) { saveMap.put("issue_time_data",issue_time_data.getTime()); }else{ - saveMap.put("issue_time_data",-1000000000000000000L); + saveMap.put("issue_time_data",-100000000L); } String standNatureName = ""; if(infoEO.getStandNature() != null && StringUtils.isNotBlank(infoEO.getStandNature())){ @@ -354,10 +354,30 @@ public class SendStandMQService { } } } - if (saveMap.get("SSRQName") != null) { - - saveMap.put("SSRQName", saveMap.get("SSRQName").toString().replace(" ", "")); + // 确保SSRQ字段加入ES中 + Map attrInfoCaseMap = infoEO.getAttrInfoCaseMap(); + logger.info("saveMap.get(SSRQ) = " + saveMap.get("SSRQ")); + if (attrInfoCaseMap.get("SSRQ") != null && StringUtils.isNotBlank(attrInfoCaseMap.get("SSRQ").toString())) { + String ssrqName = ""; + try { + Date parse = sdf.parse(attrInfoCaseMap.get("SSRQ").toString()); + ssrqName = String.valueOf(parse.getTime()); + saveMap.put("putDate", sdf.format(parse)); + // ES中的排序问题，时间戳需要补0 + if (ssrqName.length() <= 12) { + ssrqName = "0" + ssrqName; + } + } catch (ParseException e) { + saveMap.put("putDate", null); + ssrqName = ""; + } + logger.info("SSRQName="+ ssrqName); + saveMap.put("SSRQName", ssrqName); + }else { + saveMap.put("putDate", null); } + logger.info("attrInfoCaseMap:"+ attrInfoCaseMap); + logger.info("SSRQName转换结束"); if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { From b9f3d09346ad256efef7b380b4a569eb0930268d Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 16 Nov 2023 11:06:18 +0800 Subject: [PATCH 021/105] =?UTF-8?q?bug:=2078295=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/InsideOntSideMeeting/entity/MeetingTopic.java | 10 ++++++++++ .../service/impl/InsideOutsideMeetingServiceImpl.java | 2 +- .../InsideOntSideMeeting/InsideOntSideMeeting.xml | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java index dd9435f5..fa77fe1a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java @@ -12,6 +12,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.util.Date; + /** * @author tjzdw * @description @@ -55,4 +57,12 @@ public class MeetingTopic extends BaseEntity { @TableField("AGENDA_CONTENT") @Excel(name = "议题主要内容") private String agendaContent; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private Date modifyTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index f2b90b2b..e0703eb0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -81,7 +81,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MeetingTopic::getMeetingId, meetingId); - wrapper.orderByAsc(MeetingTopic::getAgendaName); + wrapper.orderByAsc(MeetingTopic::getCreateTime); List meetingTopicList = meetingTopicService.list(wrapper); insideOutsideMeeting.setMeetingTopicList(meetingTopicList); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index 0d663ed3..9773ed28 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -26,6 +26,8 @@ + + From c48b663c50fc288fbeebb4d10e4ead3c2a02c310 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 16 Nov 2023 13:33:33 +0800 Subject: [PATCH 022/105] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarMenuStandardNewController.java | 1 + .../entity/StandCategoryEnum.java | 85 ++++++++++++++++ .../entity/StandSystemDTO.java | 49 +++++---- .../SarMenuStandardNewServiceNewImpl.java | 99 ++++++++++++++++++- .../SarStandMenu/SarStandMenuMapper.xml | 36 ++++--- .../SarBussionessStandMapper.xml | 65 ++++++++---- .../entity/SarMenuStandard.java | 55 +++++++++++ 7 files changed, 338 insertions(+), 52 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandCategoryEnum.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index f9899042..4033213f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandCategoryEnum.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandCategoryEnum.java new file mode 100644 index 00000000..ce8c946d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandCategoryEnum.java @@ -0,0 +1,85 @@ +package com.adc.da.slrs.sarMenuStandard.entity; + +import com.adc.da.exception.AdcDaBaseException; + +/** + * @author: Mzaxd + * @Date: 2023/11/15 17:36 + */ +public enum StandCategoryEnum { + // INLAND 类型的枚举实例 + INLAND_GB("INLAND", "GB", 0), + INLAND_GBT("INLAND", "GB/T", 1), + INLAND_QCT("INLAND", "QC/T", 2), + INLAND_JT("INLAND", "JT", 3), + INLAND_JB("INLAND", "JB", 4), + INLAND_GA("INLAND", "GA", 5), + INLAND_GJB("INLAND", "GJB", 6), + INLAND_HJ("INLAND", "HJ", 7), + + // FOREIGN 类型的枚举实例 + FOREIGN_ECE("FOREIGN", "ECE", 0), + FOREIGN_EU("FOREIGN", "EU", 1), + FOREIGN_EC("FOREIGN", "EC", 2), + FOREIGN_EEC("FOREIGN", "EEC", 3), + FOREIGN_ISO("FOREIGN", "ISO", 4), + FOREIGN_IEC("FOREIGN", "IEC", 5), + FOREIGN_GTR("FOREIGN", "GTR", 6), + FOREIGN_CFR("FOREIGN", "CFR", 7), + FOREIGN_JASO("FOREIGN", "JASO", 8), + FOREIGN_JIS("FOREIGN", "JIS", 9), + FOREIGN_GSO("FOREIGN", "GSO", 10), + FOREIGN_GOST("FOREIGN", "GOST", 11), + FOREIGN_ΓOCT("FOREIGN", "ΓOCT", 12), + FOREIGN_TP("FOREIGN", "TP", 13), + FOREIGN_SASO("FOREIGN", "SASO", 14), + FOREIGN_UAE("FOREIGN", "UAE", 15), + FOREIGN_CONTRAN("FOREIGN", "CONTRAN", 16), + FOREIGN_DENATRAN("FOREIGN", "DENATRAN", 17), + FOREIGN_ABNT_NBR("FOREIGN", "ABNT NBR", 18), + FOREIGN_NBR("FOREIGN", "NBR", 19), + FOREIGN_INMETRO("FOREIGN", "INMETRO", 20), + FOREIGN_CONAMA("FOREIGN", "CONAMA", 21), + FOREIGN_Normative_Instruction("FOREIGN", "Normative Instruction", 22), + FOREIGN_ADR("FOREIGN", "ADR", 23), + ; + + private final String standType; + private final String standSort; + private final int sortValue; + + StandCategoryEnum(String standType, String standSort, int sortValue) { + this.standType = standType; + this.standSort = standSort; + this.sortValue = sortValue; + } + + // 根据 standSort 返回 value 的静态方法 + public static int getSortByStandType(String standType, String standSort) { + for (StandCategoryEnum category : StandCategoryEnum.values()) { + if (category.getStandType().equals(standType) && category.getStandSort().equals(standSort)) { + return category.getSortValue(); + } + // 给国标 外标默认值 + if (category.getStandType().equals("INLAND")) { + return 8; + } else if (category.getStandType().equals("FOREIGN")) { + return 24; + } + } + throw new AdcDaBaseException("标准类型错误"); + } + + // Getter 方法 + public String getStandType() { + return standType; + } + + public String getStandSort() { + return standSort; + } + + public int getSortValue() { + return sortValue; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 67c9f471..d4be4c8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -1,18 +1,14 @@ package com.adc.da.slrs.sarMenuStandard.entity; -import com.adc.da.base.page.BasePage; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -49,6 +45,11 @@ public class StandSystemDTO { @ApiModelProperty(value = "开始发布日期") private Date startReleaseDate; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "发布日期") + private Date releaseDate; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "结束发布日期") @@ -59,6 +60,11 @@ public class StandSystemDTO { @ApiModelProperty(value = "开始实施日期") private Date startImplementDate; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + private Date implementDate; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "结束实施日期") @@ -67,37 +73,46 @@ public class StandSystemDTO { @ApiModelProperty(value = "代替标准") private String replaceStandardNo; - @ApiModelProperty(value = "编制单位Id") - private String deptId; - @ApiModelProperty(value = "编制单位") private String dept; - @ApiModelProperty(value = "起草人Id") - private String draftUserId; - @ApiModelProperty(value = "起草人") private String draftUserName; @ApiModelProperty(value = "数据来源") private String dataSource; - @ApiModelProperty(value = "发布日期排序规则") - private String orderReleaseDate; + @ApiModelProperty(value = "排序字段") + private String sortField; - @ApiModelProperty(value = "实施日期排序规则") - private String orderImplementDate; + @ApiModelProperty(value = "排序规则") + private String sortMode; + + @ApiModelProperty(value = "标准类型（数据排序用）") + private String standSort; private String selectIds; private List selectIdList; - @NotNull(message = "页码不能为空") + @ApiModelProperty(value = "页码") private int page; - @NotEmpty(message = "每页条数不能为空") + @ApiModelProperty(value = "每页数量") private int pageSize; + @ApiModelProperty(value = "体系排序顺序号") + private int systemSort; + + @ApiModelProperty(value = "国标外表企标排序号") + private int standTypeSort; + + @ApiModelProperty(value = "标准类别排序号") + private int standCategorySort; + + @ApiModelProperty(value = "相关联的节点ID列表（数据库查询用）") + private List menuIdList; + public void setSelectIds(String selectIds) { this.selectIds = selectIds; this.selectIdList = java.util.Arrays.asList(selectIds.split(",")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 4a6bb852..6e097342 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; +import com.adc.da.slrs.sarMenuStandard.entity.StandCategoryEnum; import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO; import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarResource.dao.TsResourceDao; @@ -14,6 +15,9 @@ import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; +import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; +import com.adc.da.slrs.tsDictionaryType.service.ITsDictionaryService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.entity.StandMenuRelation; @@ -66,6 +70,12 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStandMenu = sarStandMenuDao.getGBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); List gbRelations = BeanCopyUtils.copyBeanList(gbStandMenu, StandMenuRelation.class); @@ -184,23 +195,77 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl childIds = new ArrayList<>(); + targetNode.collectChildIds(childIds); + standSystemDTO.setMenuIdList(childIds); + // 查国标 List gbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "INLAND"); // 查外标 List fbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "FOREIGN"); // 查企标 -// List esList = sarBussionessStandDao.getESSystemData(standSystemDTO); + List esList = sarBussionessStandDao.getESSystemData(standSystemDTO); // 数据转换后整合 List resultList = new ArrayList<>(); resultList.addAll(gbList); resultList.addAll(fbList); -// resultList.addAll(esList); - // 构造体系路径 + resultList.addAll(esList); - // TODO 排序 + // 构造体系路径映射 + Map pathMap = new HashMap<>(); + sarMenuStandard.buildPathMap(pathMap, ""); + + // 为树设置systemSort + SarMenuStandard.setSystemSort(sarMenuStandard, ""); + + // 国标外标标准状态字典 + List gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); + // 企标标准状态字典 + List esStateDictList = dicItemService.selectAllDicTypeNameByDicCode("TEXTSTATUSBUSS"); + + // 构造体系路径 && 设置标准内部类别排序号 && 翻译 + for (StandSystemDTO dto : resultList) { + String fullPath = pathMap.get(dto.getMenuId()); + dto.setStandSystem(fullPath); + dto.setStandCategorySort(StandCategoryEnum.getSortByStandType(dto.getDataSource(), dto.getStandSort())); + // 设置体系排序号 + SarMenuStandard node = SarMenuStandard.findNodeById(targetNode, dto.getMenuId()); + dto.setSystemSort(node.getSystemSort()); + // 翻译 + this.translateStandardSystemDTO(dto, gbStateDictList, esStateDictList); + } + + // 根据排序字段对 resultList 进行排序 // 按照标准体系排序 // 体系内部按照国内/海外/企业排序 - // 每个类别的标准内部按照搜索中心设定的类别排序 + // 每个类别的标准内部按照类别排序 + resultList.sort(Comparator.comparingInt(StandSystemDTO::getSystemSort) + .thenComparingInt(StandSystemDTO::getStandTypeSort) + .thenComparingInt(StandSystemDTO::getStandCategorySort)); + // 两个时间排序 + String sortField = standSystemDTO.getSortField(); + if (StringUtils.isNotBlank(sortField)) { + String sortMode = standSystemDTO.getSortMode(); + if (sortField.equals("releaseDate") && sortMode.equals("desc")) { + resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate)); + } else { + resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate).reversed()); + } + if (sortField.equals("implementDate") && sortMode.equals("desc")) { + resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate)); + } else { + resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate).reversed()); + } + } + // 手动分页 int pageNum = standSystemDTO.getPage(); int pageSize = standSystemDTO.getPageSize(); @@ -224,6 +289,30 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList, List esStateDictList) { + // 翻译数据来源、标准状态 + switch (dto.getDataSource()) { + case "INLAND": + dto.setDataSource("国内标准库"); + dto.setStandState(gbStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + .findFirst().orElse(new TsDicType()).getDicTypeName()); + break; + case "FOREIGN": + dto.setDataSource("海外标准库"); + dto.setStandState(gbStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + .findFirst().orElse(new TsDicType()).getDicTypeName()); + break; + case "ENTERPRISE": + dto.setDataSource("企业标准库"); + dto.setStandState(esStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + .findFirst().orElse(new TsDicType()).getDicTypeName()); + break; + } + } + @Override public void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response) { // List exportList = this.standardSystemList(standSystemDTO); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index d6c10e17..3e1cb7c5 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -159,23 +159,37 @@ SELECT es.ID AS standId, - es.STAND_NUMBER AS standNo, + es.STAND_CODE AS standNo, es.STAND_NAME AS standName, - es.STAND_STATE AS standState, + es.TEXT_STATUS_BUSS AS standState, es.ISSUE_TIME AS releaseDate, es.PUT_TIME AS implementDate, es.REPLACE_STAND_NUM AS replaceStandardNo, esa.QCDW AS dept, - esa.WSSMR AS draftUserName, + esa.QCRBUSS AS draftUserName, + 'ENTERPRISE' AS dataSource, + m.MENU_ID AS menuId, + 3 AS standTypeSort, + CASE + when es.stand_code like concat('%', 'Q/FT A', '%') THEN 0 + when es.stand_code like concat('%', 'Q/FT B', '%') THEN 1 + when es.stand_code like concat('%', 'Q/FT E', '%') THEN 2 + when es.stand_code like concat('%', 'Q/FT F', '%') THEN 3 + when es.stand_code like concat('%', 'Q/FT G', '%') THEN 4 + when es.stand_code like concat('%', 'Q/FT M', '%') THEN 5 + when es.stand_code like concat('%', 'Q/FT Q', '%') THEN 6 + when es.stand_code like concat('%', 'Q/FT R', '%') THEN 7 + when es.stand_code like concat('%', 'Q/FT S', '%') THEN 8 + when es.stand_code like concat('%', 'Q/FT T', '%') THEN 9 + when es.stand_code like concat('%', 'Q/FT V', '%') THEN 10 + when es.stand_code like concat('%', 'Q/FT X', '%') THEN 11 + when es.stand_code like concat('%', 'Q/FT Y', '%') THEN 12 + when es.stand_code like concat('%', 'Q/FT Z', '%') THEN 13 + when es.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14 + when es.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15 + when es.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16 + ELSE 17 + END AS standCategorySort FROM `sar_bussioness_stand` AS es LEFT JOIN `sar_buss_stand_attr_info` AS esa ON es.ID = esa.STAND_ID - WHERE gb.STAND_TYPE = 'INLAND' + LEFT JOIN `sar_buss_stand_menu` AS m ON es.ID = m.BUSS_STAND_ID AND LENGTH(m.MENU_ID) > 30 + WHERE 1 = 1 - AND gb.STAND_NUMBER LIKE CONCAT('%',#{param.standNo},'%') + AND es.STAND_CODE LIKE CONCAT('%',#{param.standNo},'%') + + + + AND m.MENU_ID IN + + #{item} + - AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') + AND es.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate} + AND es.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate} - AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} + AND es.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} - - AND gb.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%') + + AND es.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%') - - AND gba.QCDW LIKE CONCAT('%',#{param.dept},'%') + + AND esa.QCDW LIKE CONCAT('%',#{param.dept},'%') - - AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%') - - - - AND gb.STAND_TYPE = #{dataSource} + + AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%') - AND gb.ID IN + AND es.ID IN #{item} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index bf5c609b..3b8dfec4 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; +import java.util.Map; /** *

@@ -64,6 +65,10 @@ public class SarMenuStandard extends BaseEntity { @TableField("DISPLAY_SEQ") private Integer displaySeq; + @ApiModelProperty(value = "排序") + @TableField(exist = false) + private Integer systemSort; + @ApiModelProperty(value = "路径") @TableField("HREF") private String href; @@ -146,4 +151,54 @@ public class SarMenuStandard extends BaseEntity { } return count; } + + // 添加用于构建映射的方法 + public void buildPathMap(Map pathMap, String parentPath) { + String currentPath = parentPath.isEmpty() ? this.menuName : parentPath + "/" + this.menuName; + pathMap.put(this.id, currentPath); + for (SarMenuStandard child : children) { + child.buildPathMap(pathMap, currentPath); + } + } + + // 添加用于收集子节点ID的方法 + public void collectChildIds(List childIds) { + childIds.add(this.id); + for (SarMenuStandard child : children) { + child.collectChildIds(childIds); + } + } + + public static SarMenuStandard findNodeById(SarMenuStandard node, String menuId) { + if (node == null) { + return null; + } + // 检查当前节点的ID是否匹配 + if (menuId.equals(node.getId())) { + return node; + } + // 在子节点中递归搜索 + for (SarMenuStandard child : node.getChildren()) { + SarMenuStandard found = findNodeById(child, menuId); + if (found != null) { + return found; + } + } + // 如果在当前节点及其子节点中都没有找到，返回null + return null; + } + + // 递归方法来设置每个节点的 systemSort + public static void setSystemSort(SarMenuStandard node, String parentSort) { + // 计算当前节点的 systemSort + String currentSort = parentSort.isEmpty() ? String.valueOf(node.getDisplaySeq()) : parentSort + node.getDisplaySeq(); + + // 设置当前节点的 systemSort + node.setSystemSort(Integer.parseInt(currentSort)); + + // 递归设置子节点的 systemSort + for (SarMenuStandard child : node.getChildren()) { + setSystemSort(child, currentSort); + } + } } From 55ba8d09e8c23465133426813f8300a4fab8ae45 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 16 Nov 2023 13:45:51 +0800 Subject: [PATCH 023/105] =?UTF-8?q?perf:=20=E5=A4=A7=E5=B9=85=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 9 +++++---- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 6e097342..18bfa191 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -170,17 +170,18 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStandMenu = sarStandMenuDao.getGBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + List gbStandMenu = sarStandMenuDao.getGBStandMenu(); List gbRelations = BeanCopyUtils.copyBeanList(gbStandMenu, StandMenuRelation.class); // 外标 - List fbStandMenu = sarStandMenuDao.getFBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + List fbStandMenu = sarStandMenuDao.getFBStandMenu(); List fbRelations = BeanCopyUtils.copyBeanList(fbStandMenu, StandMenuRelation.class); // 企标 - List esStandMenu = sarBussStandMenuService.list().stream().filter(sarBussStandMenu -> sarBussStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + LambdaQueryWrapper bussWrapper = new LambdaQueryWrapper<>(); + bussWrapper.apply("LENGTH(menu_id) > {0}", 30); + List esStandMenu = sarBussStandMenuService.list(bussWrapper); List esRelations = BeanCopyUtils.copyBeanList(esStandMenu, StandMenuRelation.class); // 计算每个节点的数值 TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 3e1cb7c5..fa7d9c2d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -147,13 +147,13 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml index 2d1f6a2b..39abea45 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml @@ -203,6 +203,24 @@ where buss_stand_id = #{bussStandId} and valid_flag=0 + + delete from SAR_BUSS_STAND_MENU where buss_stand_id = #{bussStandId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index f271b2f1..793f870e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1269,6 +1269,7 @@ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index 3b8dfec4..a6393c0b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -15,6 +15,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -125,28 +126,44 @@ public class SarMenuStandard extends BaseEntity { @TableField(exist = false) private Integer esStandCount; + @TableField(exist = false) + private List gbStandIdList; + + @TableField(exist = false) + private List fbStandIdList; + + @TableField(exist = false) + private List esStandIdList; + // 添加用于计算和设置关联关系数量的方法 // 添加用于计算和设置关联关系数量的方法 public void calculateAndSetCounts(List gbStandMenu, List fbStandMenu, List esStandMenu, Integer curLevel) { + this.gbStandIdList = new ArrayList<>(); + this.fbStandIdList = new ArrayList<>(); + this.esStandIdList = new ArrayList<>(); this.level = curLevel; - this.gbStandCount = countMatches(gbStandMenu, this.id); - this.fbStandCount = countMatches(fbStandMenu, this.id); - this.esStandCount = countMatches(esStandMenu, this.id); + this.gbStandCount = countMatches(gbStandMenu, this.id, gbStandIdList); + this.fbStandCount = countMatches(fbStandMenu, this.id, fbStandIdList); + this.esStandCount = countMatches(esStandMenu, this.id, esStandIdList); for (SarMenuStandard child : children) { child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1); this.gbStandCount += child.gbStandCount; + this.gbStandIdList.addAll(child.gbStandIdList); this.fbStandCount += child.fbStandCount; + this.fbStandIdList.addAll(child.fbStandIdList); this.esStandCount += child.esStandCount; + this.esStandIdList.addAll(child.esStandIdList); } } - private int countMatches(List standMenuList, String menuId) { + private int countMatches(List standMenuList, String menuId, List standIdList) { int count = 0; // 计算与menuId匹配的项的数量 for (StandMenuRelation standMenu : standMenuList) { if (standMenu.getMenuId().equals(menuId)) { count++; + standIdList.add(standMenu.getStandId()); } } return count; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java index 79ba70ec..6b1b24b2 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/StandMenuRelation.java @@ -1,12 +1,16 @@ package com.adc.da.sys.sarMenuStandard.entity; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * @author: Mzaxd * @Date: 2023/11/14 16:31 */ @Data +@AllArgsConstructor +@NoArgsConstructor public class StandMenuRelation { private String standId; From 3467371f6966686d922ea110f85bf4f071927f92 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 17 Nov 2023 10:16:52 +0800 Subject: [PATCH 030/105] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/login/security/WebMvcConfig.java | 3 ++ .../SarMenuStandardNewController.java | 36 ++++++++-------- .../entity/StandSystemDTO.java | 14 ++++++- .../service/ISarMenuStandardNewService.java | 3 +- .../SarMenuStandardNewServiceNewImpl.java | 41 +++++++++++++++++-- .../impl/SarStandardsInfoServiceImpl.java | 2 +- 6 files changed, 74 insertions(+), 25 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index ffd39451..a16dbe18 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -208,6 +208,9 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策资料模板下载 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportTemplateFile"); + // 标准体系列表导出 + addInterceptor.excludePathPatterns("/api/lawss/sarMenuStandardLimit/standardSystemListExport"); + // // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java index 4033213f..86e8a179 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarMenuStandard.controller; - import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -10,29 +9,30 @@ import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.util.LoginUserUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.util.List; /** -*

- * 前端控制器 - *

-* -* @author super_liu -* @since 2021-07-07 -*/ + *

+ * 前端控制器 + *

+ * + * @author super_liu + * @since 2021-07-07 + */ @RestController @Api(tags = "福田标准法规--标准法规库-菜单标准体系") @RequestMapping("/${restPath}/lawss/sarMenuStandardLimit") +@Slf4j public class SarMenuStandardNewController extends BaseController { @Autowired @@ -43,16 +43,16 @@ public class SarMenuStandardNewController extends BaseController getTopMenu(SarMenuStandardNew sarMenuStandardNew){ - String tsResources= iSarMenuStandardNewService.getTopMenu(sarMenuStandardNew); + public ResponseMessage getTopMenu(SarMenuStandardNew sarMenuStandardNew) { + String tsResources = iSarMenuStandardNewService.getTopMenu(sarMenuStandardNew); return Result.success(tsResources); } @ApiOperation("查询有权限资源") @GetMapping("/getListStandLimit") - public ResponseMessage> getListStandLimit(SarMenuStandardNew sarMenuStandardNew){ + public ResponseMessage> getListStandLimit(SarMenuStandardNew sarMenuStandardNew) { List access = tsUserService.getResourceUserId(LoginUserUtil.getUserId()); - List tsResources= iSarMenuStandardNewService.getListStandLimit(sarMenuStandardNew,access); + List tsResources = iSarMenuStandardNewService.getListStandLimit(sarMenuStandardNew, access); return Result.success(tsResources); } @@ -68,7 +68,7 @@ public class SarMenuStandardNewController extends BaseController getMenuStandardById(@RequestParam String menuId){ + public ResponseMessage getMenuStandardById(@RequestParam String menuId) { if (StringUtils.isBlank(menuId)) { return Result.error("获取失败，菜单ID为空"); } @@ -108,9 +108,9 @@ public class SarMenuStandardNewController extends BaseController standardSystemListExport(@RequestBody StandSystemDTO standSystemDTO, - HttpServletResponse response) { - iSarMenuStandardNewService.standardSystemListExport(standSystemDTO, response); + public ResponseMessage standardSystemListExport(StandSystemDTO standSystemDTO, + HttpServletResponse response, HttpServletRequest request) { + iSarMenuStandardNewService.standardSystemListExport(standSystemDTO, response, request); return Result.success(); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 7a755235..7e6f6b19 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarMenuStandard.entity; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -9,7 +10,6 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -26,15 +26,18 @@ public class StandSystemDTO { @ApiModelProperty(value = "节点Id") private String menuId; + @Excel(name = "体系结构", width = 40, orderNum = "1") @ApiModelProperty(value = "体系结构") private String standSystem; @ApiModelProperty(value = "标准Id") private String standId; + @Excel(name = "标准编号", width = 25, orderNum = "2") @ApiModelProperty(value = "标准编号") private String standNo; + @Excel(name = "标准名称", width = 25, orderNum = "3") @ApiModelProperty(value = "标准名称") private String standName; @@ -51,6 +54,7 @@ public class StandSystemDTO { @ApiModelProperty(value = "开始发布日期字符串") private String startReleaseDateString; + @Excel(name = "发布日期", width = 25, orderNum = "4", exportFormat = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") @@ -71,6 +75,7 @@ public class StandSystemDTO { @ApiModelProperty(value = "开始实施日期") private Date startImplementDate; + @Excel(name = "实施日期", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "实施日期") @@ -81,15 +86,19 @@ public class StandSystemDTO { @ApiModelProperty(value = "结束实施日期") private Date endImplementDate; + @Excel(name = "代替标准", width = 25, orderNum = "5") @ApiModelProperty(value = "代替标准") private String replaceStandardNo; + @Excel(name = "编制单位", width = 25, orderNum = "5") @ApiModelProperty(value = "编制单位") private String dept; + @Excel(name = "起草人", width = 25, orderNum = "5") @ApiModelProperty(value = "起草人") private String draftUserName; + @Excel(name = "数据来源", width = 25, orderNum = "5") @ApiModelProperty(value = "数据来源") private String dataSource; @@ -124,6 +133,9 @@ public class StandSystemDTO { @ApiModelProperty(value = "相关联的节点ID列表（数据库查询用）") private List menuIdList; + @ApiModelProperty(value = "导出文件名称") + private String exportName; + public void setSelectIds(String selectIds) { this.selectIds = selectIds; this.selectIdList = java.util.Arrays.asList(selectIds.split(",")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java index a206e8cf..6e2a0472 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java @@ -6,6 +6,7 @@ import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -37,5 +38,5 @@ public interface ISarMenuStandardNewService extends IService IPage standardSystemList(StandSystemDTO standSystemDTO); - void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response); + void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response, HttpServletRequest request); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 4ecbef9f..07d16275 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -1,11 +1,17 @@ package com.adc.da.slrs.sarMenuStandard.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.util.StrUtil; +import com.adc.da.common.ReadExcel; import com.adc.da.exception.AdcDaBaseException; import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicVO; import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao; import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew; import com.adc.da.slrs.sarMenuStandard.entity.StandCategoryEnum; @@ -18,7 +24,6 @@ import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; -import com.adc.da.slrs.tsDictionaryType.service.ITsDictionaryService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.entity.StandMenuRelation; @@ -32,13 +37,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.util.IOUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; import java.util.*; import java.util.stream.Collectors; @@ -327,9 +337,32 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl exportList = this.standardSystemList(standSystemDTO); -// // TODO 导出 + public void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response, HttpServletRequest request) { + OutputStream os = null; + Workbook workbook; + List dataList; + standSystemDTO.setPage(1); + standSystemDTO.setPageSize(Integer.MAX_VALUE); + try { + response.setHeader("Content-Disposition", + "attachment; filename=" + ReadExcel.encodeFileName(standSystemDTO.getExportName()+".xlsx", + request)); + // 导出数据，若指定了值则使用ids字段条件导出，否则根据条件导出 + IPage page = this.standardSystemList(standSystemDTO); + dataList = page.getRecords(); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + exportParams.setSheetName(standSystemDTO.getExportName()); + workbook = ExcelExportUtil.exportExcel(exportParams, StandSystemDTO.class, dataList); + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + log.error(e.getMessage(), e); + throw new AdcDaBaseException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + } } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 30059b17..3284c365 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1996,7 +1996,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl */ public int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception { - + // TODO 体系 /** * 加入对应"国家/地区"的清单列表 */ From 7c4b855f0ddd1a32224832aa4e627a1bb4a2edd7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 17 Nov 2023 17:41:01 +0800 Subject: [PATCH 031/105] =?UTF-8?q?feat:=20=E5=9B=BD=E6=A0=87=E5=A4=96?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarStandMenuService.java | 3 +++ .../service/impl/SarStandMenuServiceImpl.java | 18 ++++++++++++++++++ .../entity/SarStandardsInfo.java | 2 ++ .../impl/SarStandardsInfoServiceImpl.java | 8 +++++++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java index c96f9818..f163580b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java @@ -19,4 +19,7 @@ public interface ISarStandMenuService extends IService { List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + void deleteStandSystemByStandId(String id); + + void addStandSystemRelation(String standSystem, String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index 889b796e..c8893e01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -5,6 +5,8 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,4 +42,20 @@ public class SarStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>(); + sarStandMenuWrapper.eq(SarStandMenu::getStandId, id); + remove(sarStandMenuWrapper); + } + + @Override + public void addStandSystemRelation(String standSystem, String id) { + SarStandMenu sarStandMenu = new SarStandMenu(); + // 生成不带横杠的UUID + sarStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", "")); + sarStandMenu.setStandId(id).setMenuId(standSystem).setValidFlag(0); + save(sarStandMenu); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 2ba4759f..86e8879f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -243,6 +243,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standSystemName; + @TableField(exist = false) + private String standSystemId; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 3284c365..676b1ec5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -114,6 +114,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -1996,7 +1997,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl */ public int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception { - // TODO 体系 + // 标准体系 + sarStandMenuService.deleteStandSystemByStandId(sarStandardsInfoEO.getId()); + if (StringUtils.isNotEmpty(sarStandardsInfoEO.getStandSystemId())) { + sarStandMenuService.addStandSystemRelation(sarStandardsInfoEO.getStandSystemId(), sarStandardsInfoEO.getId()); + } + /** * 加入对应"国家/地区"的清单列表 */ From 31a775e2d0ad1d2c5bd0e924f27f4aae8c90e2fc Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 20 Nov 2023 08:59:03 +0800 Subject: [PATCH 032/105] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=AE=A1=E6=8E=A7=E6=9B=B4=E5=90=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 42 +++++++++++-------- .../adc/da/login/security/WebMvcConfig.java | 1 + 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index e3fc6633..6b07ccdf 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1484,7 +1484,8 @@ public class WorkFlowController extends BaseController { String s = ""; if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) { return Result.error("参数为空"); - } else { + } + else { prcName = sort + "-" + prcName + "-计划立项"; } JSONObject jsonObject = JSON.parseObject(json); @@ -1515,26 +1516,31 @@ public class WorkFlowController extends BaseController { } } }else { - s = workFlowFeignClient.endPrcName(prcName, esId); - String[] split = s.split("-"); - List asList = Arrays.asList(split); - if(split[0].equals("成功")){ - if(asList.size()>1){ + if ("4".equals(jsonObject.getString("type")) || "3".equals(jsonObject.getString("type"))) { + s = workFlowFeignClient.endPrcName(prcName, esId); + if (StringUtils.isBlank(s)) { + return Result.error(); + } + String[] split = s.split("-"); + List asList = Arrays.asList(split); + if(split[0].equals("成功")){ + if(asList.size()>1){ + EndPrcName endPrcName = new EndPrcName(); + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("ids",split[1]); + objectObjectMap.put("prcCreateUser","xxx"); + String s1 = JSONObject.toJSONString(objectObjectMap); + endPrcName.setIds(s1); + endPrcName.setIsNot("1"); + return Result.success(endPrcName); + } EndPrcName endPrcName = new EndPrcName(); - Map objectObjectMap = new HashMap<>(); - objectObjectMap.put("ids",split[1]); - objectObjectMap.put("prcCreateUser","xxx"); - String s1 = JSONObject.toJSONString(objectObjectMap); - endPrcName.setIds(s1); - endPrcName.setIsNot("1"); + endPrcName.setIsNot("2"); + endPrcName.setIds("xxx"); return Result.success(endPrcName); + }else { + return Result.error(); } - EndPrcName endPrcName = new EndPrcName(); - endPrcName.setIsNot("2"); - endPrcName.setIds("xxx"); - return Result.success(endPrcName); - }else { - return Result.error(); } } return Result.success(); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 6a5cfee7..df594ac1 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -154,6 +154,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/OtConvert/convertFileToFileId"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); + addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNewOnlyOffice"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); From 5f1032a92bb0fdf8ded4633e43e2526869fdc135 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 20 Nov 2023 10:32:13 +0800 Subject: [PATCH 033/105] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussStandFileController.java | 7 +++ .../service/ISarBussStandFileService.java | 1 + .../impl/SarBussStandFileServiceImpl.java | 60 +++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java index d9e266bf..b956fd27 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java @@ -91,4 +91,11 @@ public class SarBussStandFileController extends BaseController String result = sarBussStandFileEOService.batchUpdateSarBussFileRepeat(); return Result.success(result); } + + @ApiOperation(value = "企标发布稿重复问题，去重处理，产品标准下划线和斜杠问题") + @GetMapping("/batchUpdateSarBussFileRepeat2") + public ResponseMessage batchUpdateSarBussFileRepeat2() throws Exception { + String result = sarBussStandFileEOService.batchUpdateSarBussFileRepeat2(); + return Result.success(result); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java index 9225ee69..aaa764a4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java @@ -23,4 +23,5 @@ public interface ISarBussStandFileService extends IService { ResponseMessage> batchUpdateSarBussFileMQ(); String batchUpdateSarBussFileRepeat(); + String batchUpdateSarBussFileRepeat2(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java index bc40f93a..09aa109e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java @@ -191,6 +191,66 @@ public class SarBussStandFileServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarBussStandAttrInfo::getValidFlag,"0"); + wrapper.isNotNull(SarBussStandAttrInfo::getFbgbuss); + wrapper.ne(SarBussStandAttrInfo::getFbgbuss,""); + wrapper.select(SarBussStandAttrInfo::getStandId,SarBussStandAttrInfo::getFbgbuss); + List allStand = standAttrInfoService.list(wrapper); + + // 转换为Map + Map fbBussMap = new HashMap<>(); + allStand.forEach(each -> fbBussMap.put(each.getStandId(),each.getFbgbuss())); + // 循环每条数据 + for (Map.Entry entry : fbBussMap.entrySet()) { + // 把发布告文件做分割 + List attIdList = Arrays.asList(entry.getValue().split(",")); + // 根据发布稿文件查询发布告的具体信息，获取原文件名 + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SarBussStandFile::getValidFlag,"0"); + wrapper1.in(SarBussStandFile::getAttId, attIdList); + List sarBussStandFileList = sarStandFileEODao.selectList(wrapper1); + sarBussStandFileList.forEach(each -> { + String fileName = each.getFileName().replace("/", "").replace("_", ""); + each.setFileName(fileName); + }); + // 使用 HashMap 记录已经出现过的 fileName + Map fileNameMap = new HashMap<>(); + // 最终的结果列表 + List deduplicatedList = new ArrayList<>(); + // 遍历原始列表 + for (SarBussStandFile file : sarBussStandFileList) { + String fileName = file.getFileName(); + + // 如果 fileName 已经在 map 中 + if (fileNameMap.containsKey(fileName)) { + // 比较 createTime，保留更新时间较新的对象 + SarBussStandFile existingFile = fileNameMap.get(fileName); + if (file.getCreationTime().after(existingFile.getCreationTime())) { + fileNameMap.put(fileName, file); + } + } else { + // 如果 fileName 不存在，将该 fileName 加入 map，并将当前对象加入结果列表 + fileNameMap.put(fileName, file); + deduplicatedList.add(file); + } + } + // 如果长度不相等，说明执行了去重，需要修改，重新放回企标详情表中 + String fbgbuss = deduplicatedList.stream().map(SarBussStandFile::getAttId).collect(Collectors.joining(",")); + if (fbgbuss.length() != entry.getValue().length()) { + LambdaUpdateWrapper wrapper2 = new LambdaUpdateWrapper<>(); + wrapper2.eq(SarBussStandAttrInfo::getStandId,entry.getKey()); + wrapper2.set(SarBussStandAttrInfo::getFbgbuss,fbgbuss); + standAttrInfoService.update(wrapper2); + logger.info("出现重复的企标："+ entry.getKey() + "，去重后发布稿包含：" + fbgbuss + "---去重前发布稿包含：" + entry.getValue()); + } + } + return "去重成功"; + } public static Predicate distinctByKey(Function keyExtractor) { Set seen = ConcurrentHashMap.newKeySet(); return t -> seen.add(keyExtractor.apply(t)); From 518270aec2a956bf132a8c17787ccd0090284a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 20 Nov 2023 03:53:07 +0000 Subject: [PATCH 034/105] Revert "Merge branch 'fix_foton_20231031' into 'dev_20230829_change'" This reverts merge request !138 --- .../controller/WorkFlowController.java | 68 +++++-------------- .../adc/da/login/security/WebMvcConfig.java | 6 +- .../impl/SarBussionessStandServiceImpl.java | 4 -- .../impl/SarStandardsInfoServiceImpl.java | 14 ---- .../att/controller/AttFileEOController.java | 37 ---------- 5 files changed, 19 insertions(+), 110 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 6b07ccdf..ac49000e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -47,7 +47,6 @@ import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.entity.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -1149,31 +1148,6 @@ public class WorkFlowController extends BaseController { return Result.success(); } - @ApiOperation(value = "根据在线文件Id查询所有onlyoffice历史文件") - @GetMapping("/getAllOnlyOfficeHisFileById") - public ResponseMessage>> getAllOnlyOfficeHisFileById(String fileId, String fileName) { - List> fileList = new ArrayList<>(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(OnlineFileLog::getHisId,fileId); - wrapper.eq(OnlineFileLog::getValidFlag, "0"); - wrapper.orderByDesc(OnlineFileLog::getCreateTime); - List onlineFileLogList = onlineFileLogDao.selectList(wrapper); - if (onlineFileLogList.size() > 0) { - for (OnlineFileLog onlineFileLog : onlineFileLogList) { - Map map = new HashMap<>(); - map.put("id", onlineFileLog.getId()); - map.put("fileName", fileName); - map.put("attFileId", onlineFileLog.getAttFileId()); - map.put("createTime", sdf.format(onlineFileLog.getCreateTime())); - map.put("fileKey", onlineFileLog.getFilekey()); - fileList.add(map); - } - return Result.success(fileList); - } - return Result.error("历史文件为空"); - } - @ApiOperation(value = "查询问题和回答") @GetMapping("/selectWenDan") public Map selectWenDan(@RequestParam("taskId") String taskId) { @@ -1484,8 +1458,7 @@ public class WorkFlowController extends BaseController { String s = ""; if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) { return Result.error("参数为空"); - } - else { + } else { prcName = sort + "-" + prcName + "-计划立项"; } JSONObject jsonObject = JSON.parseObject(json); @@ -1516,31 +1489,26 @@ public class WorkFlowController extends BaseController { } } }else { - if ("4".equals(jsonObject.getString("type")) || "3".equals(jsonObject.getString("type"))) { - s = workFlowFeignClient.endPrcName(prcName, esId); - if (StringUtils.isBlank(s)) { - return Result.error(); - } - String[] split = s.split("-"); - List asList = Arrays.asList(split); - if(split[0].equals("成功")){ - if(asList.size()>1){ - EndPrcName endPrcName = new EndPrcName(); - Map objectObjectMap = new HashMap<>(); - objectObjectMap.put("ids",split[1]); - objectObjectMap.put("prcCreateUser","xxx"); - String s1 = JSONObject.toJSONString(objectObjectMap); - endPrcName.setIds(s1); - endPrcName.setIsNot("1"); - return Result.success(endPrcName); - } + s = workFlowFeignClient.endPrcName(prcName, esId); + String[] split = s.split("-"); + List asList = Arrays.asList(split); + if(split[0].equals("成功")){ + if(asList.size()>1){ EndPrcName endPrcName = new EndPrcName(); - endPrcName.setIsNot("2"); - endPrcName.setIds("xxx"); + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("ids",split[1]); + objectObjectMap.put("prcCreateUser","xxx"); + String s1 = JSONObject.toJSONString(objectObjectMap); + endPrcName.setIds(s1); + endPrcName.setIsNot("1"); return Result.success(endPrcName); - }else { - return Result.error(); } + EndPrcName endPrcName = new EndPrcName(); + endPrcName.setIsNot("2"); + endPrcName.setIds("xxx"); + return Result.success(endPrcName); + }else { + return Result.error(); } } return Result.success(); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 95249a3c..a16dbe18 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -154,7 +154,6 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/OtConvert/convertFileToFileId"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); - addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNewOnlyOffice"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); @@ -200,9 +199,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策资料导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportLawsInformationInfo"); - // 获取onlyOffice历史文件接口 - addInterceptor.excludePathPatterns("/api/lawss/activiti/getAllOnlyOfficeHisFileById"); - // 内外部会议模板下载 addInterceptor.excludePathPatterns("/api/lawss/insideOutsideMeeting/exportTemplateFile"); @@ -215,7 +211,7 @@ public class WebMvcConfig implements WebMvcConfigurer { // 标准体系列表导出 addInterceptor.excludePathPatterns("/api/lawss/sarMenuStandardLimit/standardSystemListExport"); - // 添加自定义拦截器，并拦截对应 url +// // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 250c4a57..38650130 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -53,7 +53,6 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; @@ -348,9 +347,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); - bussMap.put("ONLINEID",fileId); - String id = createOnlineAttIdFileMQUtil.CreateOnlineAttIdFileMQ(bussMap); - if(StringUtils.isNotBlank(id)) { - fileId = id; - } - } - } - - AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); - InputStream is = null; - OutputStream os = null; - response.reset(); - try { - String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); - response.setCharacterEncoding(StandardCharsets.UTF_8.name()); - response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); - response.setContentType("application/octet-stream"); - File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); - is = new FileInputStream(file); - os = response.getOutputStream(); - IOUtils.copy(is, os); - os.flush(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } finally { - IOUtils.closeQuietly(is); - IOUtils.closeQuietly(os); - } - } - @ApiOperation(value = "|File|下载文件加水印") @GetMapping("/downloadFileForSarWaterMark") // @RequiresPermissions("sys:file:downloadFileForSar") From 8ed946635bc815e80e4b1c15c551f7be5aa8280c Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 20 Nov 2023 11:58:39 +0800 Subject: [PATCH 035/105] Revert "Revert "Merge branch 'fix_foton_20231031' into 'dev_20230829_change'"" This reverts commit 518270aec2a956bf132a8c17787ccd0090284a89. --- .../controller/WorkFlowController.java | 68 ++++++++++++++----- .../adc/da/login/security/WebMvcConfig.java | 6 +- .../impl/SarBussionessStandServiceImpl.java | 4 ++ .../impl/SarStandardsInfoServiceImpl.java | 14 ++++ .../att/controller/AttFileEOController.java | 37 ++++++++++ 5 files changed, 110 insertions(+), 19 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index ac49000e..6b07ccdf 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -47,6 +47,7 @@ import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.entity.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -1148,6 +1149,31 @@ public class WorkFlowController extends BaseController { return Result.success(); } + @ApiOperation(value = "根据在线文件Id查询所有onlyoffice历史文件") + @GetMapping("/getAllOnlyOfficeHisFileById") + public ResponseMessage>> getAllOnlyOfficeHisFileById(String fileId, String fileName) { + List> fileList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(OnlineFileLog::getHisId,fileId); + wrapper.eq(OnlineFileLog::getValidFlag, "0"); + wrapper.orderByDesc(OnlineFileLog::getCreateTime); + List onlineFileLogList = onlineFileLogDao.selectList(wrapper); + if (onlineFileLogList.size() > 0) { + for (OnlineFileLog onlineFileLog : onlineFileLogList) { + Map map = new HashMap<>(); + map.put("id", onlineFileLog.getId()); + map.put("fileName", fileName); + map.put("attFileId", onlineFileLog.getAttFileId()); + map.put("createTime", sdf.format(onlineFileLog.getCreateTime())); + map.put("fileKey", onlineFileLog.getFilekey()); + fileList.add(map); + } + return Result.success(fileList); + } + return Result.error("历史文件为空"); + } + @ApiOperation(value = "查询问题和回答") @GetMapping("/selectWenDan") public Map selectWenDan(@RequestParam("taskId") String taskId) { @@ -1458,7 +1484,8 @@ public class WorkFlowController extends BaseController { String s = ""; if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) { return Result.error("参数为空"); - } else { + } + else { prcName = sort + "-" + prcName + "-计划立项"; } JSONObject jsonObject = JSON.parseObject(json); @@ -1489,26 +1516,31 @@ public class WorkFlowController extends BaseController { } } }else { - s = workFlowFeignClient.endPrcName(prcName, esId); - String[] split = s.split("-"); - List asList = Arrays.asList(split); - if(split[0].equals("成功")){ - if(asList.size()>1){ + if ("4".equals(jsonObject.getString("type")) || "3".equals(jsonObject.getString("type"))) { + s = workFlowFeignClient.endPrcName(prcName, esId); + if (StringUtils.isBlank(s)) { + return Result.error(); + } + String[] split = s.split("-"); + List asList = Arrays.asList(split); + if(split[0].equals("成功")){ + if(asList.size()>1){ + EndPrcName endPrcName = new EndPrcName(); + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("ids",split[1]); + objectObjectMap.put("prcCreateUser","xxx"); + String s1 = JSONObject.toJSONString(objectObjectMap); + endPrcName.setIds(s1); + endPrcName.setIsNot("1"); + return Result.success(endPrcName); + } EndPrcName endPrcName = new EndPrcName(); - Map objectObjectMap = new HashMap<>(); - objectObjectMap.put("ids",split[1]); - objectObjectMap.put("prcCreateUser","xxx"); - String s1 = JSONObject.toJSONString(objectObjectMap); - endPrcName.setIds(s1); - endPrcName.setIsNot("1"); + endPrcName.setIsNot("2"); + endPrcName.setIds("xxx"); return Result.success(endPrcName); + }else { + return Result.error(); } - EndPrcName endPrcName = new EndPrcName(); - endPrcName.setIsNot("2"); - endPrcName.setIds("xxx"); - return Result.success(endPrcName); - }else { - return Result.error(); } } return Result.success(); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index a16dbe18..95249a3c 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -154,6 +154,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/OtConvert/convertFileToFileId"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); + addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNewOnlyOffice"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); @@ -199,6 +200,9 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策资料导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportLawsInformationInfo"); + // 获取onlyOffice历史文件接口 + addInterceptor.excludePathPatterns("/api/lawss/activiti/getAllOnlyOfficeHisFileById"); + // 内外部会议模板下载 addInterceptor.excludePathPatterns("/api/lawss/insideOutsideMeeting/exportTemplateFile"); @@ -211,7 +215,7 @@ public class WebMvcConfig implements WebMvcConfigurer { // 标准体系列表导出 addInterceptor.excludePathPatterns("/api/lawss/sarMenuStandardLimit/standardSystemListExport"); -// // 添加自定义拦截器，并拦截对应 url + // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 38650130..250c4a57 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -53,6 +53,7 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; @@ -347,6 +348,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); + bussMap.put("ONLINEID",fileId); + String id = createOnlineAttIdFileMQUtil.CreateOnlineAttIdFileMQ(bussMap); + if(StringUtils.isNotBlank(id)) { + fileId = id; + } + } + } + + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + is = new FileInputStream(file); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + } + } + @ApiOperation(value = "|File|下载文件加水印") @GetMapping("/downloadFileForSarWaterMark") // @RequiresPermissions("sys:file:downloadFileForSar") From 9c1e8b45fdff64c6abf4fd767d334da7e2e8ee97 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 22 Nov 2023 15:56:27 +0800 Subject: [PATCH 036/105] =?UTF-8?q?bug:=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=88=86=E9=A1=B5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/InsideOutsideMeetingDao.java | 2 +- .../entity/InsideOutsideMeetingVO.java | 7 ++-- .../impl/InsideOutsideMeetingServiceImpl.java | 9 ++--- .../InsideOntSideMeeting.xml | 38 ++++++++++--------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java index 4dca1bcb..98537ae7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java @@ -16,7 +16,7 @@ import java.util.List; @Mapper public interface InsideOutsideMeetingDao extends BaseMapper { - List queryByPageCount(InsideOutsideMeetingVO page); + Integer queryByPageCount(InsideOutsideMeetingVO page); List queryByPage(InsideOutsideMeetingVO page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java index 8d95f88f..211f2cc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java @@ -40,9 +40,10 @@ public class InsideOutsideMeetingVO extends BasePage { @Excel(name = "会议地点", needMerge = true) private String meetingAddress; + private String agendaNameStr; + @Excel(name = "参会人员", needMerge = true) private String participants; - private List participantsList; private String meetingMinutes; @@ -82,9 +83,9 @@ public class InsideOutsideMeetingVO extends BasePage { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date modifyTime; - private String sortField = "ID"; + private String sortField = "meetingTime"; - private String sortMode = "asc"; + private String sortMode = "desc"; // 会议时间查询字段 private String meetingTimeBegin; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index e0703eb0..92ec22ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -176,19 +176,16 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl queryByPage(InsideOutsideMeetingVO page){ - if (StringUtils.isNotBlank(page.getParticipants())) { - page.setParticipantsList(Arrays.asList(page.getParticipants().split(","))); - } // 设置排序字段 if (StringUtils.isNotBlank(page.getSortField())) { // 小驼峰变成 ABC_DEF String sortField = StringUtils.join(StringUtils.splitByCharacterTypeCamelCase(page.getSortField()),"_").toUpperCase(); page.setSortField(sortField); } else { - page.setSortField("ID"); - page.setSortMode("asc"); + page.setSortField("MEETING_TIME"); + page.setSortMode("desc"); } - int rowCount = this.baseMapper.queryByPageCount(page).size(); + int rowCount = this.baseMapper.queryByPageCount(page); page.getPager().setRowCount(rowCount); List insideOutsideMeetingVOList = this.baseMapper.queryByPage(page); for (InsideOutsideMeetingVO insideOutsideMeeting : insideOutsideMeetingVOList) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index 9773ed28..239e92b8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -10,6 +10,7 @@ + @@ -39,7 +40,8 @@ iom.PARTICIPANTS,iom.MEETING_MINUTES,iom.MEETING_CONTENT,iom.FIRST_MEETING_TYPE,iom.SECOND_MEETING_TYPE, mt.ID as mtId,mt.MEETING_ID,mt.AGENDA_NAME,mt.AGENDA_MATERIALS,mt.REPORTER,mt.REPORTING_UNIT, mt.AGENDA_CONTENT, - iom.VALID_FLAG,iom.CREATE_TIME,iom.MODIFY_TIME + iom.VALID_FLAG,iom.CREATE_TIME,iom.MODIFY_TIME, + iom.agendaNameStr @@ -58,11 +60,8 @@ and MEETING_ADDRESS like concat('%',#{meetingAddress},'%') - - and PARTICIPANTS in - - #{participant} - + + and PARTICIPANTS like concat('%',#{participants},'%') and MEETING_CONTENT like concat('%',#{meetingContent},'%') @@ -90,30 +89,35 @@ select count(1) from ( - select count(1) from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID + select count(1) + from (select * from inside_outside_meeting where VALID_FLAG = 0 ) iom + left join meeting_topic mt on iom.ID = mt.MEETING_ID where iom.VALID_FLAG = 0 - - group by iom.ID - ) subquery + group by iom.ID + ) a - select count(slt.ID) from sar_laws_topic slt left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID - left join sar_laws_contact_information slci1 on slt.ID = slci1.LAWS_TOPIC_ID and slci1.GROUP_TYPE = 'topicGroup' - left join sar_laws_contact_information slci2 on slt.ID = slci2.LAWS_TOPIC_ID and slci2.GROUP_TYPE = 'inside' - where slt.VALID_FLAG = 0 - - - - group by slt.ID + select count(1) from ( + select count(slt.ID) from (select * from sar_laws_topic where VALID_FLAG = 0 ) slt + left join sar_laws_topic_meeting sltm on slt.ID = sltm.LAWS_TOPIC_ID + left join sar_laws_contact_information slci1 on slt.ID = slci1.LAWS_TOPIC_ID and slci1.GROUP_TYPE = 'topicGroup' + left join sar_laws_contact_information slci2 on slt.ID = slci2.LAWS_TOPIC_ID and slci2.GROUP_TYPE = 'inside' + where slt.VALID_FLAG = 0 + + + group by slt.ID + ) a SELECT count(ts_user.USID) from ts_user left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID - LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id - WHERE ts_user_position.position_id in ( - SELECT ts_position_role.position_id from ts_position_role - WHERE ts_position_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' + LEFT JOIN ts_user_role on ts_user.USID = ts_user_role.user_id + WHERE ts_user_role.role_id in ( + SELECT ts_user_role.role_id from ts_user_role + WHERE ts_user_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' and ts_user.USID like concat(concat('%',#{role.userId}),'%') @@ -174,10 +174,10 @@ \ No newline at end of file From abc5e3b6666996fa5a76d6ccc197cb55b9edb6af Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 23 Nov 2023 23:00:37 +0800 Subject: [PATCH 050/105] =?UTF-8?q?bug:=20=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E3=80=81=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84=E8=B5=84?= =?UTF-8?q?=E6=96=99=E6=8C=89=E7=85=A7=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarLawsInformation/SarLawsInformationMapper.xml | 2 +- .../mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml index f0ed5924..eaf9a5a0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInformation/SarLawsInformationMapper.xml @@ -94,6 +94,6 @@ from sar_laws_information where VALID_FLAG = 0 - order by ID asc + order by UPLOAD_TIME desc diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml index 18a8f657..a486a128 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsTopic/SarLawsTopicMapper.xml @@ -214,7 +214,7 @@ #{id} - order by slt.ID asc + order by slt.START_TIME desc From a1bd733db2587d87eab75da618921878ba062d56 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 24 Nov 2023 09:13:14 +0800 Subject: [PATCH 051/105] fix: 78644 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中表头字段发布日期和实施日期的排序不对 --- .../SarMenuStandardNewServiceNewImpl.java | 127 ++++++++++-------- 1 file changed, 71 insertions(+), 56 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 07d16275..3d554ccd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -54,7 +54,7 @@ import java.util.stream.Collectors; /** *

- * 服务实现类 + * 服务实现类 *

* * @author super_liu @@ -88,27 +88,27 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl list = dao.selectList(qw); - if(!list.isEmpty()){ - if(StringUtils.isNotBlank(list.get(0).getParentIds())){ + if (!list.isEmpty()) { + if (StringUtils.isNotBlank(list.get(0).getParentIds())) { List topIdList = Arrays.stream(list.get(0).getParentIds().split(",")).map(String::trim).collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper(); - wrapper.in("ID",topIdList); - List topList = dao.selectTopList(wrapper,list.get(0).getParentIds()); + wrapper.in("ID", topIdList); + List topList = dao.selectTopList(wrapper, list.get(0).getParentIds()); List filterList = topList.stream().map(SarMenuStandard::getMenuName).collect(Collectors.toList()); - if(!filterList.isEmpty()){ - return StringUtils.join(filterList, "/")+'/'+list.get(0).getMenuName(); + if (!filterList.isEmpty()) { + return StringUtils.join(filterList, "/") + '/' + list.get(0).getMenuName(); } - }else { + } else { return list.get(0).getMenuName(); } @@ -121,7 +121,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl roleIdList = tsRoleDao.getRoleByUserId(LoginUserUtil.getUserId()); for (String roleId : roleIdList) { HashMap map = new HashMap<>(); - map.put("resourceId",sarMenuStandard.getId()); - map.put("roleId",roleId); + map.put("resourceId", sarMenuStandard.getId()); + map.put("roleId", roleId); resourceDao.insertTsRoleResource(map); } } @@ -148,11 +148,11 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SarMenuStandard::getId,Arrays.asList(sarMenuStandard.getParentIds().split(","))); + wrapper.in(SarMenuStandard::getId, Arrays.asList(sarMenuStandard.getParentIds().split(","))); List menuStandards = dao.selectList(wrapper); - if(!menuStandards.isEmpty()){ + if (!menuStandards.isEmpty()) { String parentIdsName = menuStandards.stream().map(SarMenuStandard::getMenuName).collect(Collectors.joining(",")); sarMenuStandard.setParentIdsName(parentIdsName); } @@ -186,7 +186,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbRelations = BeanCopyUtils.copyBeanList(gbStandMenu, StandMenuRelation.class); // 外标 - List fbStandMenu = sarStandMenuDao.getFBStandMenu().stream().filter(item -> item.getStandId() != null).collect(Collectors.toList());; + List fbStandMenu = sarStandMenuDao.getFBStandMenu().stream().filter(item -> item.getStandId() != null).collect(Collectors.toList()); + ; List fbRelations = BeanCopyUtils.copyBeanList(fbStandMenu, StandMenuRelation.class); // 企标 @@ -204,6 +205,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl standardSystemList(StandSystemDTO standSystemDTO) { + boolean timeSort = StrUtil.isNotBlank(standSystemDTO.getSortField()); boolean select = standSystemDTO.getSelectIdList() != null; String menuId = standSystemDTO.getMenuId(); // 校验menuId不能为空 @@ -242,6 +244,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl pathMap = new HashMap<>(); sarMenuStandard.buildPathMap(pathMap, ""); @@ -266,27 +269,37 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl comparatorReleaseDate = Comparator.comparing(StandSystemDTO::getReleaseDate + , Comparator.nullsLast(Comparator.naturalOrder())); + if (sortField.equals("releaseDate")) { + if (sortMode.equals("desc")) { + resultList.sort(comparatorReleaseDate.reversed()); + } else { + resultList.sort(comparatorReleaseDate); + } } - if (sortField.equals("implementDate") && sortMode.equals("desc")) { - resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate)); - } else { - resultList.sort(Comparator.comparing(StandSystemDTO::getStartImplementDate).reversed()); + Comparator comparatorImplementDate = Comparator.comparing(StandSystemDTO::getImplementDate + , Comparator.nullsLast(Comparator.naturalOrder())); + if (sortField.equals("implementDate")) { + if (sortMode.equals("desc")) { + resultList.sort(comparatorImplementDate.reversed()); + } else { + resultList.sort(comparatorImplementDate); + } } + } else { + // 根据排序字段对 resultList 进行排序 + // 按照标准体系排序 + // 体系内部按照国内/海外/企业排序 + // 每个类别的标准内部按照类别排序 + resultList.sort(Comparator.comparingInt(StandSystemDTO::getSystemSort) + .thenComparingInt(StandSystemDTO::getStandTypeSort) + .thenComparingInt(StandSystemDTO::getStandCategorySort)); } // 手动分页 @@ -345,7 +358,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl page = this.standardSystemList(standSystemDTO); @@ -398,39 +411,40 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl getListStandLimit(SarMenuStandardNew sarMenuStandardNew, List access) { List TsResources = new ArrayList<>(); - QueryWrapper queryWrapper =new QueryWrapper<>(); - if(sarMenuStandardNew.getSorDivide()!=null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (sarMenuStandardNew.getSorDivide() != null) { queryWrapper.eq("sor_divide", sarMenuStandardNew.getSorDivide()); } - if(sarMenuStandardNew.getDicId()!=null){ + if (sarMenuStandardNew.getDicId() != null) { queryWrapper.eq("DIC_ID", sarMenuStandardNew.getDicId()); } - if(access!=null && !access.isEmpty()){ - queryWrapper.in(null!=access && !access.isEmpty(),"ID",access); + if (access != null && !access.isEmpty()) { + queryWrapper.in(null != access && !access.isEmpty(), "ID", access); } - queryWrapper.eq("VALID_FLAG",0); + queryWrapper.eq("VALID_FLAG", 0); queryWrapper.isNull("PARENT_ID"); queryWrapper.orderByAsc("DISPLAY_SEQ"); - TsResources=dao.selectList(queryWrapper); + TsResources = dao.selectList(queryWrapper); - for(SarMenuStandard resource:TsResources){ + for (SarMenuStandard resource : TsResources) { resource.setTreeType("sarMs"); - QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); - if(access!=null && !access.isEmpty()){ - TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access); + QueryWrapper TsResourceQueryWrapper = new QueryWrapper<>(); + TsResourceQueryWrapper.like("PARENT_IDS", resource.getId()); + if (access != null && !access.isEmpty()) { + TsResourceQueryWrapper.in(null != access && !access.isEmpty(), "ID", access); } - TsResourceQueryWrapper.eq("VALID_FLAG",0); + TsResourceQueryWrapper.eq("VALID_FLAG", 0); TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); - List children=dao.selectList(TsResourceQueryWrapper); - resource.setChildren(recursionGetListChildrenStand((resource),(children))); + List children = dao.selectList(TsResourceQueryWrapper); + resource.setChildren(recursionGetListChildrenStand((resource), (children))); } return TsResources; @@ -438,17 +452,18 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl */ - private List recursionGetListChildrenStand(SarMenuStandard resource, List children){ + private List recursionGetListChildrenStand(SarMenuStandard resource, List children) { List tsResources = children.stream() .filter(resource1 -> resource1.getParentId().equals(resource.getId())) .collect(Collectors.toList()); - if(!tsResources.isEmpty()){ + if (!tsResources.isEmpty()) { tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); tsResources.forEach(resource1 -> { resource1.setTreeType("sarMs"); - resource1.setChildren(recursionGetListChildrenStand((resource1),(children))); + resource1.setChildren(recursionGetListChildrenStand((resource1), (children))); }); } return tsResources; From 24746a13c1607f37cd271aebe9e302ad987724b9 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 24 Nov 2023 09:26:16 +0800 Subject: [PATCH 052/105] fix: 78641 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中实施日期的查询结果不对 --- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 0fcb4fc5..fe134425 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -226,7 +226,7 @@ AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString} - + AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} From cd8645bab9aac809a30de7145905bfe5b6b2b4a5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 21:20:00 +0800 Subject: [PATCH 053/105] fix: 78639 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中缺少体系结构查询字段 --- .../entity/StandSystemDTO.java | 13 ++++++++++ .../SarStandMenu/SarStandMenuMapper.xml | 26 ++++++++++++++----- .../SarBussionessStandMapper.xml | 23 ++++++++++++---- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 7e6f6b19..dec2730b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -30,6 +30,12 @@ public class StandSystemDTO { @ApiModelProperty(value = "体系结构") private String standSystem; + @ApiModelProperty(value = "体系结构ID(树状结构选取)") + private String standSystemId; + + @ApiModelProperty(value = "体系结构IDList(树状结构选取)") + private List standSystemIdList; + @ApiModelProperty(value = "标准Id") private String standId; @@ -156,4 +162,11 @@ public class StandSystemDTO { this.endReleaseDateString = sdf.format(endReleaseDate); } } + + public void setStandSystemIdList(String standSystemId) { + this.standSystemId = standSystemId; + if (standSystemId != null) { + this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(",")); + } + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index fe134425..bf223dfb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -220,14 +220,19 @@ AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - - - AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString} + + + AND gb.ISSUE_TIME >= #{param.startReleaseDateString} - - - AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} + + AND gb.ISSUE_TIME <= CONCAT(#{param.endReleaseDateString}, ' 23:59:59') + + + + AND gb.PUT_TIME >= #{param.startImplementDate} + + + AND gb.PUT_TIME <= CONCAT(#{param.endImplementDate}, ' 23:59:59') @@ -249,6 +254,13 @@ AND gb.STAND_TYPE = #{dataSource} + + + AND gb.ID IN + + #{item} + + AND gb.ID IN diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 793f870e..ebd6d7cf 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1328,12 +1328,18 @@ AND es.STAND_NAME LIKE CONCAT('%',#{param.standName},'%') - - AND es.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate} + + AND es.ISSUE_TIME >= #{param.startImplementDate} - - - AND es.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate} + + AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDate}, ' 23:59:59') + + + + AND es.PUT_TIME >= #{param.startImplementDate} + + + AND es.PUT_TIME <= CONCAT(#{param.endImplementDate}, ' 23:59:59') @@ -1351,6 +1357,13 @@ AND 'ENTERPRISE' = #{param.dataSource} + + + AND es.ID IN + + #{item} + + AND es.ID IN From acc790d8a6295897e6760f1eccce0464c8502b6d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 22:08:53 +0800 Subject: [PATCH 054/105] fix: 78640 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中发布日期的查询范围为当天时，查询结果不对 --- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 2 +- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index bf223dfb..8ac1f67e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -200,7 +200,7 @@ LEFT JOIN `sar_stand_menu` AS m ON gb.ID = m.STAND_ID AND LENGTH(m.MENU_ID) > 30 LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID WHERE gb.VALID_FLAG = '0' - AND sms.id in (select id from sar_menu_standard where valid_flag = 0) + AND sms.id in (select id from sar_menu_standard where valid_flag = 0 ) AND gb.STAND_TYPE = #{dataSource} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index ebd6d7cf..abfac3da 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1329,10 +1329,10 @@ - AND es.ISSUE_TIME >= #{param.startImplementDate} + AND es.ISSUE_TIME >= #{param.startReleaseDateString} - AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDate}, ' 23:59:59') + AND es.ISSUE_TIME <= CONCAT(#{param.endReleaseDateString}, ' 23:59:59') From e7a7085cae88e2614661002bb783ae2321bc0f62 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 22:44:31 +0800 Subject: [PATCH 055/105] fix: 78646 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业/国内/海外标准---标准体系字段选择的数据在配置管理中删除了，标准的该字段的数据没有置空显示 --- .../java/com/adc/da/scheduled/dao/SarStandardInfoDao.java | 1 + .../slrs/sarBussionessStand/dao/SarBussionessStandDao.java | 2 ++ .../da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java | 2 ++ .../service/impl/SarMenuStandardNewServiceNewImpl.java | 7 ++++++- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 5 +++++ .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 6 ++++++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 5fcefabf..b25a4db6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -15,4 +15,5 @@ public interface SarStandardInfoDao{ public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); + int deleteStandSystem(@Param("menuName") String menuName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0dc6cea4..84bc1350 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -141,5 +141,7 @@ public interface SarBussionessStandDao extends BaseMapper { String selectMaxStandSn(String standSort); List getESSystemData(@Param("param") StandSystemDTO standSystemDTO); + + void deleteStandSystem(String menuName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java index 452e55ae..9a067161 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java @@ -7,6 +7,7 @@ import com.adc.da.sys.utils.treetool.annotation.TreeNodeParentId; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="SarMenuStandard对象", description="") +@TableName("sar_menu_standard") public class SarMenuStandardNew extends BaseEntity { public interface update{ } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 3d554ccd..283d9975 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -22,6 +22,7 @@ import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; 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.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; @@ -391,6 +392,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl menuUpdateWrapper = new LambdaUpdateWrapper<>(); menuUpdateWrapper.eq(SarMenuStandard::getId, menuId); @@ -406,7 +409,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl + + update sar_buss_stand_attr_info + set TXLBBUSS = null + where TXLBBUSS like #{menuName} + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml index 39abea45..9852e679 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml @@ -218,7 +218,6 @@ AND sm.VALID_FLAG = 0 AND sm.TREE_TYPE is null AND sms.id in (select id from sar_menu_standard where valid_flag = 0) - group by stand.ID diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 7dfd1a7e..5df8ba31 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1375,6 +1375,5 @@ #{item} - group by es.ID From ef7a1c2eb36f35d320d620ee45f22e0fadaed945 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sat, 25 Nov 2023 23:55:02 +0800 Subject: [PATCH 057/105] fix: 78672 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准---给标准设置了体系标准后删掉，在体系搜索统计中没有更新统计数据 --- .../service/ISarBussStandMenuService.java | 4 +++ .../impl/SarBussStandMenuServiceImpl.java | 28 +++++++++++++++++++ .../SarBussionessStandController.java | 12 ++++++++ .../impl/SarBussionessStandServiceImpl.java | 1 + .../service/impl/SarStandMenuServiceImpl.java | 11 ++++++++ 5 files changed, 56 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java index 85587e22..001e0e99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java @@ -18,4 +18,8 @@ public interface ISarBussStandMenuService extends IService { List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO); int deleteByMenuId (SarBussStandMenu sarStandMenuEO); + + void deleteStandSystemByStandId(String id); + + void addStandSystemRelation(String standSystemId, String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java index ba1309d8..713f8f63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java @@ -1,15 +1,20 @@ package com.adc.da.slrs.sarBussStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -30,6 +35,7 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl menuIds = new ArrayList<>(); @@ -42,6 +48,28 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>(); + sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id); + remove(sarStandMenuWrapper); + } + + @Override + public void addStandSystemRelation(String standSystem, String id) { + // 校验standSystem是否有效 + SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem); + if (standMenu == null) { + throw new AdcDaBaseException("无效的标准体系"); + } + SarBussStandMenu sarBussStandMenu = new SarBussStandMenu(); + // 生成不带横杠的UUID + sarBussStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", "")); + sarBussStandMenu.setBussStandId(id).setMenuId(standSystem).setValidFlag(0); + save(sarBussStandMenu); + } + @Override public List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){ return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index cd45358c..d70fa400 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; @@ -11,6 +12,7 @@ import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; @@ -52,6 +54,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -105,6 +108,9 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { + // 标准体系 + String standSystemId = sarBussionessStandEO.getTxlbId(); + sarBussStandMenuService.deleteStandSystemByStandId(sarBussionessStandEO.getId()); + if (StrUtil.isNotBlank(standSystemId)) { + sarBussStandMenuService.addStandSystemRelation(standSystemId, sarBussionessStandEO.getId()); + } //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 250c4a57..4533ad40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -49,6 +49,7 @@ import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index c8893e01..ddbabb3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -1,10 +1,13 @@ package com.adc.da.slrs.sarStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,6 +33,9 @@ public class SarStandMenuServiceImpl extends ServiceImpl menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId()); @@ -51,6 +57,11 @@ public class SarStandMenuServiceImpl extends ServiceImpl Date: Sun, 26 Nov 2023 10:40:00 +0800 Subject: [PATCH 058/105] fix: 78645 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中列表中的数据的默认排序未按需求文档中描述的进行排序 --- .../impl/SarMenuStandardNewServiceNewImpl.java | 5 ++++- .../sys/sarMenuStandard/entity/SarMenuStandard.java | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 283d9975..52f025a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -251,7 +252,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index a6393c0b..356328b5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** *

@@ -218,4 +219,15 @@ public class SarMenuStandard extends BaseEntity { setSystemSort(child, currentSort); } } + + // 新增的深度优先遍历方法 + public static void setSystemSortDFS(SarMenuStandard node, AtomicInteger currentNumber) { + if (node == null) { + return; + } + node.setSystemSort(currentNumber.getAndIncrement()); + for (SarMenuStandard child : node.getChildren()) { + setSystemSortDFS(child, currentNumber); + } + } } From 804f48be13c7248f28a62ebb352cf161dcf46356 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 26 Nov 2023 11:58:19 +0800 Subject: [PATCH 059/105] fix: 78648 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准---点击左侧技术体系结构中的节点，右侧列表数据展示的不对 --- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 8 ++++++++ .../adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java | 4 ++++ .../mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 52f025a0..e46d8788 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -25,6 +25,8 @@ import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; +import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao; +import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService; import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.entity.StandMenuRelation; @@ -89,6 +91,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl map = new HashMap<>(); map.put("resourceId", sarMenuStandard.getId()); map.put("roleId", roleId); + map.put("menuId", sarMenuStandard.getId()); resourceDao.insertTsRoleResource(map); + // 添加权限 + roleMenuDataDao.insertResourceMenuData(map); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java index b7ee9949..46616443 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; + /** *

* Mapper 接口 @@ -17,4 +19,6 @@ public interface TsRoleMenuDataDao extends BaseMapper { @Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})") void save(@Param("roleId") String roleId,@Param("id") String id); + + void insertResourceMenuData(HashMap map); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml index dacec7b5..c448940f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsRoleMeunData/TsRoleMenuDataMapper.xml @@ -2,4 +2,8 @@ + + INSERT INTO ts_role_menu_data + VALUES(#{roleId},#{menuId} ) + From 94352fdfaa09b3506cbf682d19415e51b274a5a5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 26 Nov 2023 12:40:19 +0800 Subject: [PATCH 060/105] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index b2622e2a..62eeccad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -180,7 +180,10 @@ CONCAT(gb.STAND_SORT, ' ', gb.STAND_NUMBER) AS standNo, gb.STAND_NAME AS standName, gb.STAND_STATE AS standState, - gb.ISSUE_TIME AS releaseDate, + CASE + WHEN gb.ISSUE_TIME = '' THEN NULL + ELSE gb.ISSUE_TIME + END AS releaseDate, gb.PUT_TIME AS implementDate, gb.REPLACE_STAND_NUM AS replaceStandardNo, gba.QCDW AS dept, From b43b4fe103f10f531c840f491458536c147c8b42 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 26 Nov 2023 12:43:28 +0800 Subject: [PATCH 061/105] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsTopic/entity/SarLawsTopic.java | 22 ++++++ .../entity/SarLawsTopicMeeting.java | 6 ++ .../service/SarLawsTopicMeetingService.java | 4 + .../impl/SarLawsTopicMeetingServiceImpl.java | 35 ++++++++ .../service/impl/SarLawsTopicServiceImpl.java | 79 ++++++++++++------- .../adc/da/utils/annotation/CompareField.java | 13 +++ 6 files changed, 131 insertions(+), 28 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/annotation/CompareField.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java index de104c22..35cd30c3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsTopic.entity; import com.adc.da.att.entity.AttFileEO; +import com.adc.da.utils.annotation.CompareField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -30,6 +31,7 @@ public class SarLawsTopic implements Serializable { /** * 课题名称 */ + @CompareField(fieldName = "课题名称") @ApiModelProperty(value = "课题名称") @TableField(value = "TOPIC_NAME") private String topicName; @@ -37,6 +39,7 @@ public class SarLawsTopic implements Serializable { /** * 课题承办单位 */ + @CompareField(fieldName = "课题承办单位") @ApiModelProperty(value = "课题承办单位") @TableField(value = "ORGANIZER") private String organizer; @@ -44,6 +47,7 @@ public class SarLawsTopic implements Serializable { /** * 课题指导单位 */ + @CompareField(fieldName = "课题指导单位") @ApiModelProperty(value = "课题指导单位") @TableField(value = "GUIDANCE_UNIT") private String guidanceUnit; @@ -51,6 +55,7 @@ public class SarLawsTopic implements Serializable { /** * 课题参与单位 */ + @CompareField(fieldName = "课题参与单位") @ApiModelProperty(value = "课题参与单位") @TableField(value = "PARTICIPATING_UNIT") private String participatingUnit; @@ -58,6 +63,7 @@ public class SarLawsTopic implements Serializable { /** * 开始时间 */ + @CompareField(fieldName = "启动时间") @ApiModelProperty(value = "启动时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @TableField(value = "START_TIME") @@ -66,6 +72,7 @@ public class SarLawsTopic implements Serializable { /** * 结题时间 */ + @CompareField(fieldName = "结题时间") @ApiModelProperty(value = "结题时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @TableField(value = "CLOSE_TIME") @@ -74,6 +81,7 @@ public class SarLawsTopic implements Serializable { /** * 课题状态 */ + @CompareField(fieldName = "课题状态") @ApiModelProperty(value = "课题状态") @TableField(value = "TOPIC_STATUS") private String topicStatus; @@ -81,6 +89,7 @@ public class SarLawsTopic implements Serializable { /** * 课题费用（万元） */ + @CompareField(fieldName = "课题费用") @ApiModelProperty(value = "课题费用") @TableField(value = "TOPIC_COST") private String topicCost; @@ -88,6 +97,7 @@ public class SarLawsTopic implements Serializable { /** * 协议 */ + @CompareField(fieldName = "协议文件") @ApiModelProperty("协议文件") @TableField(value = "AGREEMENT") private String agreement; @@ -99,6 +109,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组会议列表 */ + @CompareField(fieldName = "课题组会议列表") @ApiModelProperty(value = "课题组会议列表") @TableField(exist = false) private List meetingList; @@ -106,6 +117,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组研究方案 */ + @CompareField(fieldName = "researchPlan") @ApiModelProperty(value = "课题研究方案") @TableField(value = "RESEARCH_PLAN") private String researchPlan; @@ -117,6 +129,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组研究成果 */ + @CompareField(fieldName = "课题组研究成果") @ApiModelProperty(value = "课题组研究成果") @TableField(value = "RESEARCH_FINDINGS") private String researchFindings; @@ -131,6 +144,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组其他 */ + @CompareField(fieldName = "课题组其他文件") @ApiModelProperty(value = "课题组其他文件") @TableField(value = "RESEARCH_GROUP_OTHER") private String researchGroupOther; @@ -142,6 +156,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组会议资料 */ + @CompareField(fieldName = "课题组会议资料") @ApiModelProperty(value = "课题组会议资料") @TableField(value = "CONFERENCE_MATERIALS") private String conferenceMaterials; @@ -153,6 +168,7 @@ public class SarLawsTopic implements Serializable { /** * 课题组联系方式 */ + @CompareField(fieldName = "课题组联系方式") @ApiModelProperty(value = "课题组联系方式列表") @TableField(exist = false) private List topicContactInformationList; @@ -160,6 +176,7 @@ public class SarLawsTopic implements Serializable { /** * 内部资料立项报告 */ + @CompareField(fieldName = "内部资料立项报告") @ApiModelProperty(value = "内部资料立项报告") @TableField(value = "INSIDE_PROJECT_PROPOSAL_REPORT") private String insideProjectProposalRepost; @@ -171,6 +188,7 @@ public class SarLawsTopic implements Serializable { /** * 内部资料研究方案 */ + @CompareField(fieldName = "内部资料研究方案") @ApiModelProperty(value = "内部资料研究方案") @TableField(value = "INSIDE_RESEARCH_PLAN") private String insideResearchPlan; @@ -182,6 +200,7 @@ public class SarLawsTopic implements Serializable { /** * 内部资料会议资料 */ + @CompareField(fieldName = "内部资料会议资料") @ApiModelProperty(value = "内部资料会议资料") @TableField(value = "INSIDE_CONFERENCE_MATERIALS") private String insideConferenceMaterials; @@ -193,6 +212,7 @@ public class SarLawsTopic implements Serializable { /** * 内部会议研究成果 */ + @CompareField(fieldName = "内部会议研究成果") @ApiModelProperty(value = "内部会议研究成果") @TableField(value = "INSIDE_RESEARCH_FINDINGS") private String insideResearchFindings; @@ -204,6 +224,7 @@ public class SarLawsTopic implements Serializable { /** * 内部会议其他 */ + @CompareField(fieldName = "内部会议其他文件") @ApiModelProperty(value = "内部会议其他文件") @TableField(value = "INSIDE_OTHER") private String insideOther; @@ -215,6 +236,7 @@ public class SarLawsTopic implements Serializable { /** * 内部联系方式 */ + @CompareField(fieldName = "内部联系方式列表") @ApiModelProperty(value = "内部联系方式列表") @TableField(exist = false) private List insideContactInformationList; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java index cd7d6cde..fcb1ff22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopicMeeting.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsTopic.entity; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.adc.da.utils.annotation.CompareField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -31,6 +32,7 @@ public class SarLawsTopicMeeting implements Serializable { /** * 会议名称 */ + @CompareField(fieldName = "会议名称") @TableField(value = "MEETING_NAME") @Excel(name = "会议名称", orderNum = "0", type = 1) private String meetingName; @@ -38,6 +40,7 @@ public class SarLawsTopicMeeting implements Serializable { /** * 会议时间 */ + @CompareField(fieldName = "会议时间") @TableField(value = "MEETING_TIME") @Excel(name = "会议时间", orderNum = "1", type = 1) private String meetingTime; @@ -45,6 +48,7 @@ public class SarLawsTopicMeeting implements Serializable { /** * 会议地点 */ + @CompareField(fieldName = "会议地点") @TableField(value = "MEETING_ADDRESS") @Excel(name = "会议地点", orderNum = "2", type = 1) private String meetingAddress; @@ -52,6 +56,7 @@ public class SarLawsTopicMeeting implements Serializable { /** * 参会人员（内部） */ + @CompareField(fieldName = "参会人员（内部）") @TableField(value = "PARTICIPANTS") @Excel(name = "参会人员（内部）", orderNum = "3", type = 1) private String participants; @@ -59,6 +64,7 @@ public class SarLawsTopicMeeting implements Serializable { /** * 会议主要内容 */ + @CompareField(fieldName = "会议主要内容") @TableField(value = "MEETING_CONTENT") @Excel(name = "会议主要内容", orderNum = "4", type = 1) private String meetingContent; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicMeetingService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicMeetingService.java index 0b79192f..e449f900 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicMeetingService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicMeetingService.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarLawsTopic.service; import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicMeeting; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author tjzdw * @description 针对表【sar_laws_topic_meeting(政策课题组会议)】的数据库操作Service @@ -10,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface SarLawsTopicMeetingService extends IService { + public List compareTopicMeeting(SarLawsTopicMeeting oldTopicMeeting, SarLawsTopicMeeting newTopicMeeting); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicMeetingServiceImpl.java index c694e6ba..7d9e7683 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicMeetingServiceImpl.java @@ -1,11 +1,17 @@ package com.adc.da.slrs.sarLawsTopic.service.impl; +import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic; +import com.adc.da.utils.annotation.CompareField; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicMeeting; import com.adc.da.slrs.sarLawsTopic.service.SarLawsTopicMeetingService; import com.adc.da.slrs.sarLawsTopic.dao.SarLawsTopicMeetingMapper; import org.springframework.stereotype.Service; +import java.lang.reflect.Field; +import java.text.SimpleDateFormat; +import java.util.*; + /** * @author tjzdw * @description 针对表【sar_laws_topic_meeting(政策课题组会议)】的数据库操作Service实现 @@ -15,6 +21,35 @@ import org.springframework.stereotype.Service; public class SarLawsTopicMeetingServiceImpl extends ServiceImpl implements SarLawsTopicMeetingService{ + public List compareTopicMeeting(SarLawsTopicMeeting oldTopicMeeting, SarLawsTopicMeeting newTopicMeeting) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List changes = new ArrayList<>(); + // 获取TopicMeeting类的所有字段 + Field[] fields = SarLawsTopic.class.getDeclaredFields(); + for (Field field : fields) { + boolean annotationPresent = field.isAnnotationPresent(CompareField.class); + if (annotationPresent) { + try { + field.setAccessible(true); + Object oldValue = field.get(oldTopicMeeting); + Object newValue = field.get(newTopicMeeting); + if (oldValue instanceof Date && newValue instanceof Date) { + oldValue = sdf.format((Date)oldValue); + newValue = sdf.format((Date)newValue); + } + if (!Objects.equals(oldValue, newValue)) { + // 对比其他字段 + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); + } + } catch (IllegalAccessException e) { + // 处理异常 + e.printStackTrace(); + } + } + } + return changes; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index ba03c0d9..bd73fb58 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -17,6 +17,7 @@ import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.annotation.CompareField; import com.adc.da.utils.util.FieldConvertUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -168,6 +169,9 @@ public class SarLawsTopicServiceImpl extends ServiceImpl compareLawsTopic(SarLawsTopic oldLawsTopic, SarLawsTopic newLawsTopic) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List changes = new ArrayList<>(); - // 不需要比较的字段 - String[] ignoreFields = {"id","validFlag","createTime","modifyTime","agreementList","researchPlanList", - "researchFindingsList","researchGroupOtherList","conferenceMaterialsList","insideProjectProposalRepostList", - "insideResearchPlanList","insideConferenceMaterialsList","insideResearchFindingsList","insideOtherList","serialVersionUID"}; + // 文件字段 String[] fileAttIdFields = {"agreement","researchPlan","researchFindings","researchGroupOther","conferenceMaterials", "insideProjectProposalRepost","insideResearchPlan","insideConferenceMaterials","insideResearchFindings","insideOther"}; - List ignoreFieldList = Arrays.asList(ignoreFields); List fileAttIdFieldList = Arrays.asList(fileAttIdFields); // 获取SarLawsTopic类的所有字段 Field[] fields = SarLawsTopic.class.getDeclaredFields(); for (Field field : fields) { - if (!ignoreFieldList.contains(field.getName())) { + boolean annotationPresent = field.isAnnotationPresent(CompareField.class); + if (annotationPresent) { try { field.setAccessible(true); Object oldValue = field.get(oldLawsTopic); Object newValue = field.get(newLawsTopic); + if (oldValue instanceof Date && newValue instanceof Date) { + oldValue = sdf.format((Date)oldValue); + newValue = sdf.format((Date)newValue); + } if (!Objects.equals(oldValue, newValue)) { // 对比文件字段 if (fileAttIdFieldList.contains(field.getName())) { @@ -555,31 +561,27 @@ public class SarLawsTopicServiceImpl extends ServiceImpl oldLawsTopicList = (List) oldInvoke; + List newLawsTopicList = (List) newInvoke; + isListEqual(oldLawsTopicList, newLawsTopicList); + } else if ("topicContactInformationList".equals(field.getName()) || "insideContactInformationList".equals(field.getName())) { + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "被变更"); + } else { // 对比其他字段 - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); } } } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { @@ -635,6 +637,27 @@ public class SarLawsTopicServiceImpl extends ServiceImpl Date: Sun, 26 Nov 2023 12:51:51 +0800 Subject: [PATCH 062/105] fix: 78639 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中缺少体系结构查询字段 --- .../com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java | 2 +- .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml | 2 +- .../mapper/sarBussionessStand/SarBussionessStandMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index dec2730b..29676a8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -163,7 +163,7 @@ public class StandSystemDTO { } } - public void setStandSystemIdList(String standSystemId) { + public void setStandSystemId(String standSystemId) { this.standSystemId = standSystemId; if (standSystemId != null) { this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(",")); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 62eeccad..9ad53d50 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -257,7 +257,7 @@ - AND gb.ID IN + AND m.MENU_ID IN #{item} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 5df8ba31..836ed914 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1364,7 +1364,7 @@ - AND es.ID IN + AND m.MENU_ID IN #{item} From f0277ac7305caa3b7c8ea87e4e801925fa5498e7 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 26 Nov 2023 16:55:49 +0800 Subject: [PATCH 063/105] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsTopicServiceImpl.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index bd73fb58..d225211e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -531,8 +531,10 @@ public class SarLawsTopicServiceImpl extends ServiceImpl oldList = (List) oldInvoke; + List newList = (List) newInvoke; + if (!isListEqual(oldList, newList)) { + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "被变更"); } - List oldLawsTopicList = (List) oldInvoke; - List newLawsTopicList = (List) newInvoke; - isListEqual(oldLawsTopicList, newLawsTopicList); - } else if ("topicContactInformationList".equals(field.getName()) || "insideContactInformationList".equals(field.getName())) { - CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; - changes.add(annotationsByType.fieldName() + "被变更"); } else { // 对比其他字段 CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; From 7fb7fe9d674d4917dca97a083e6d50f0c758a5b9 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 27 Nov 2023 10:34:22 +0800 Subject: [PATCH 064/105] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=B2=A1=E6=95=B0=E6=8D=AEBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 29676a8f..34ed449e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarMenuStandard.entity; import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -165,7 +166,7 @@ public class StandSystemDTO { public void setStandSystemId(String standSystemId) { this.standSystemId = standSystemId; - if (standSystemId != null) { + if (StrUtil.isNotBlank(standSystemId)) { this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(",")); } } From 30cd5bf35ebde1fba8fa9e30fa24fd69c8bb4c16 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 27 Nov 2023 11:36:18 +0800 Subject: [PATCH 065/105] =?UTF-8?q?bug:=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/InsideOutsideMeeting.java | 12 +++ .../impl/InsideOutsideMeetingServiceImpl.java | 81 ++++++++++++++----- 2 files changed, 71 insertions(+), 22 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeeting.java index 324b3b84..13583910 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeeting.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.InsideOntSideMeeting.entity; import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.entity.BaseEntity; +import com.adc.da.utils.annotation.CompareField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -35,6 +36,7 @@ public class InsideOutsideMeeting extends BaseEntity { @TableId(value = "ID", type = IdType.ID_WORKER_STR) private String id; + @CompareField(fieldName = "会议名称") @ApiModelProperty(value = "会议名称") @TableField("MEETING_NAME") private String meetingName; @@ -42,27 +44,33 @@ public class InsideOutsideMeeting extends BaseEntity { /** * 课题名称，可通过调取功能从政策课题模块中获取 */ + @CompareField(fieldName = "课题名称") @ApiModelProperty(value = "课题名称") @TableField("TOPIC_NAME") private String topicName; + @CompareField(fieldName = "会议主办单位") @ApiModelProperty(value = "会议主办单位") @TableField("MEETING_ORGANIZER") private String meetingOrganizer; + @CompareField(fieldName = "会议时间") @ApiModelProperty(value = "会议时间") @TableField("MEETING_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date meetingTime; + @CompareField(fieldName = "会议地点") @ApiModelProperty(value = "会议地点") @TableField("MEETING_ADDRESS") private String meetingAddress; + @CompareField(fieldName = "参会人员") @ApiModelProperty(value = "参会人员") @TableField("PARTICIPANTS") private String participants; + @CompareField(fieldName = "会议纪要") @ApiModelProperty(value = "会议纪要") @TableField("MEETING_MINUTES") private String meetingMinutes; @@ -71,10 +79,12 @@ public class InsideOutsideMeeting extends BaseEntity { @TableField(exist = false) private List meetingMinutesList; + @CompareField(fieldName = "会议主要内容") @ApiModelProperty(value = "会议主要内容") @TableField("MEETING_CONTENT") private String meetingContent; + @CompareField(fieldName = "1级会议分类") @ApiModelProperty(value = "1级会议分类") @TableField("FIRST_MEETING_TYPE") private String firstMeetingType; @@ -83,6 +93,7 @@ public class InsideOutsideMeeting extends BaseEntity { @TableField(exist = false) private String firstMeetingTypeName; + @CompareField(fieldName = "2级会议分类") @ApiModelProperty(value = "2级会议分类") @TableField("SECOND_MEETING_TYPE") private String secondMeetingType; @@ -91,6 +102,7 @@ public class InsideOutsideMeeting extends BaseEntity { @TableField(exist = false) private String secondMeetingTypeName; + @CompareField(fieldName = "会议议题") @ApiModelProperty(value = "会议议题") @TableField(exist = false) private List meetingTopicList; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index b5664e4f..72a87f96 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -13,12 +13,14 @@ import com.adc.da.slrs.InsideOntSideMeeting.entity.MeetingTopic; import com.adc.da.slrs.InsideOntSideMeeting.service.InsideOutsideMeetingService; import com.adc.da.slrs.InsideOntSideMeeting.service.MeetingTopicService; import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation; +import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.annotation.CompareField; import com.adc.da.utils.util.FieldConvertUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -527,34 +529,43 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl compareInsideOutsideMeeting(InsideOutsideMeeting oldMeeting, InsideOutsideMeeting newMeeting) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List changes = new ArrayList<>(); - // 不需要比较的字段 - String[] ignoreFields = {"id","validFlag","createTime","modifyTime","meetingMinutesList", "firstMeetingTypeName", "secondMeetingTypeName"}; - List ignoreFieldList = Arrays.asList(ignoreFields); // 获取SarLawsInformation类的所有字段 Field[] fields = InsideOutsideMeeting.class.getDeclaredFields(); for (Field field : fields) { - if (!ignoreFieldList.contains(field.getName())) { + boolean annotationPresent = field.isAnnotationPresent(CompareField.class); + if (annotationPresent) { try { field.setAccessible(true); - String oldValue = String.valueOf(field.get(oldMeeting)); - String newValue = String.valueOf(field.get(newMeeting)); + Object oldValue = field.get(oldMeeting); + Object newValue = field.get(newMeeting); + if (oldValue instanceof Date){ + oldValue = sdf.format((Date)oldValue); + } + if( newValue instanceof Date) { + newValue = sdf.format((Date)newValue); + } if (!Objects.equals(oldValue, newValue)) { if ("firstMeetingType".equals(field.getName()) || "secondMeetingType".equals(field.getName())) { + String oldValueStr = String.valueOf(oldValue); + String newValueStr = String.valueOf(newValue); String typeName = ""; - if (StringUtils.isNotBlank(newValue)) { - typeName = dicTypeService.getDicTypeNameByDicCode(newValue); + if (StringUtils.isNotBlank(newValueStr)) { + typeName = dicTypeService.getDicTypeNameByDicCode(newValueStr); } // 获取资料类型名称 String fieldName = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1); Method method = InsideOutsideMeeting.class.getMethod("get" + fieldName + "Name"); Object oldTypeName = method.invoke(oldMeeting); - ApiModelProperty annotationsByType = field.getAnnotationsByType(ApiModelProperty.class)[0]; - changes.add(annotationsByType.value() + "由\"" + oldTypeName + "\"改为\"" + typeName + "\""); + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "由\"" + oldTypeName + "\"改为\"" + typeName + "\""); } else if ("meetingMinutes".equals(field.getName())) { + String oldValueStr = String.valueOf(oldValue); + String newValueStr = String.valueOf(newValue); List fileNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(newValue)) { - String[] split = newValue.split(","); + if (StringUtils.isNotBlank(newValueStr)) { + String[] split = newValueStr.split(","); for (String attId : split) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); fileNameList.add(fileInfo.getOldFileName()); @@ -572,16 +583,22 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl oldList = (List) oldInvoke; + List newList = (List) newInvoke; + if (!isListEqual(oldList, newList)) { + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "被变更"); + } + } else { + CompareField annotationsByType = field.getAnnotationsByType(CompareField.class)[0]; + changes.add(annotationsByType.fieldName() + "由\"" + oldValue + "\"改为\"" + newValue + "\""); } } } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { @@ -640,4 +657,24 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl Date: Mon, 27 Nov 2023 11:58:59 +0800 Subject: [PATCH 066/105] =?UTF-8?q?bug:=2078394=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=A6=E6=83=85=E4=B8=AD=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsStandInfoServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index 767f5ade..976284cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -242,6 +242,28 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl list = new ArrayList<>(); + if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsTypeFirstLevel())) { + list = Arrays.asList(sarLawsStandInfo.getLawsTypeFirstLevel().split(",")); + levelName = dicTypeEODao.getDicNamesByCodes(list, "xf1g55oztafkxisxie1i"); + sarLawsStandInfo.setLawTypeFirstLevelName(levelName); + } + if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsTypeSecondLevel())) { + list = Arrays.asList(sarLawsStandInfo.getLawsTypeSecondLevel().split(",")); + levelName = dicTypeEODao.getDicNamesByCodes(list, "r09bcearrmv0qoqoc8w4"); + sarLawsStandInfo.setLawTypeSecondLevelName(levelName); + } + if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsTypeThirdLevel())) { + list = Arrays.asList(sarLawsStandInfo.getLawsTypeThirdLevel().split(",")); + levelName = dicTypeEODao.getDicNamesByCodes(list, "h05q1gegpth2jbp9k447"); + sarLawsStandInfo.setLawTypeThirdLevelName(levelName); + } + if (StringUtils.isNotBlank(sarLawsStandInfo.getLawsTypeFourthLevel())) { + list = Arrays.asList(sarLawsStandInfo.getLawsTypeFourthLevel().split(",")); + levelName = dicTypeEODao.getDicNamesByCodes(list, "5pl1o1zufypbyiqapssf"); + sarLawsStandInfo.setLawTypeFourthLevelName(levelName); + } } return sarLawsStandInfo; } From 4684ec8dbc76db816fad9434ddaaa92563226cc5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 27 Nov 2023 14:10:15 +0800 Subject: [PATCH 067/105] =?UTF-8?q?bug:=2078237=E6=94=BF=E7=AD=96=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E8=B5=84=E6=96=99=E5=8F=AF=E4=B8=8B=E8=BD=BD=E8=80=85?= =?UTF-8?q?=E4=B8=80=E5=AE=9A=E5=8F=AF=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarLawsInformation.java | 27 ++++++++++++++----- .../impl/SarLawsInformationServiceImpl.java | 21 +++++++-------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java index bb17782b..c65142bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/entity/SarLawsInformation.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsInformation.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.page.BasePage; +import com.adc.da.utils.annotation.CompareField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -37,6 +38,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 一级资料类别 */ + @CompareField(fieldName = "1级资料分类") @ApiModelProperty("1级资料分类") @TableField(value = "FIRST_TYPE") private String firstType; @@ -44,7 +46,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 一级资料类别名称 */ - @ApiModelProperty(value = "一级资料类别名称") + @ApiModelProperty(value = "1级资料分类名称") // @TableField(exist = false) @Excel(name = "*1级资料分类", orderNum = "0") private String firstTypeName; @@ -52,14 +54,15 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 二级资料类别 */ - @ApiModelProperty(value = "二级资料类别") + @CompareField(fieldName = "2级资料分类") + @ApiModelProperty(value = "2级资料分类") @TableField(value = "SECOND_TYPE") private String secondType; /** * 二级资料类别名称 */ - @ApiModelProperty(value = "二级资料类别名称") + @ApiModelProperty(value = "2级资料分类名称") // @TableField(exist = false) @Excel(name = "*2级资料分类", orderNum = "1") private String secondTypeName; @@ -67,14 +70,15 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 三级资料类别 */ - @ApiModelProperty(value = "三级资料类别") + @CompareField(fieldName = "3级资料分类") + @ApiModelProperty(value = "3级资料分类") @TableField(value = "THIRD_TYPE") private String thirdType; /** * 三级资料类别名称 */ - @ApiModelProperty(value = "三级资料类别名称") + @ApiModelProperty(value = "3级资料分类名称") // @TableField(exist = false) @Excel(name = "*3级资料分类", orderNum = "2") private String thirdTypeName; @@ -82,14 +86,15 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 四级资料类别 */ - @ApiModelProperty(value = "四级资料类别") + @CompareField(fieldName = "4级资料分类") + @ApiModelProperty(value = "4级资料分类") @TableField(value = "FOURTH_TYPE") private String fourthType; /** * 四级资料类别名称 */ - @ApiModelProperty(value = "四级资料类别名称") + @ApiModelProperty(value = "四级资料分类名称") // @TableField(exist = false) @Excel(name = "*4级资料分类", orderNum = "3") private String fourthTypeName; @@ -97,6 +102,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 资料名称 */ + @CompareField(fieldName = "资料名称") @ApiModelProperty(value = "资料名称") @TableField(value = "NAME") @Excel(name = "*资料名称", orderNum = "4") @@ -105,6 +111,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 资料归属部门 */ + @CompareField(fieldName = "资料归属部门") @ApiModelProperty(value = "资料归属部门") @TableField(value = "DEPARTMENT") @Excel(name = "*资料归属部门", orderNum = "5") @@ -113,6 +120,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 作者 */ + @CompareField(fieldName = "作者") @ApiModelProperty(value = "作者") @TableField(value = "AUTHOR") @Excel(name = "作者", orderNum = "6") @@ -121,6 +129,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 上传时间 */ + @CompareField(fieldName = "上传时间") @ApiModelProperty(value = "上传时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -131,6 +140,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 资料说明 */ + @CompareField(fieldName = "资料说明") @ApiModelProperty(value = "资料说明") @TableField(value = "DESCRIPTION") @Excel(name = "资料说明", orderNum = "8") @@ -139,6 +149,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 资料文件 */ + @CompareField(fieldName = "资料文件") @ApiModelProperty(value = "资料文件") @TableField(value = "INFORMATION_FILE") @Excel(name = "资料文件", orderNum = "9") @@ -154,6 +165,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 可查看者，若设置为空则所有用户均可查看，若设置人员后，仅有可查看者可以查看文件信息。 */ + @CompareField(fieldName = "可查看者") @ApiModelProperty(value = "可查看者") @TableField(exist = false) private String viewableBy; @@ -161,6 +173,7 @@ public class SarLawsInformation extends BasePage implements Serializable { /** * 可下载者，若设置为空则仅有上传人和审批人可以查看，若设置人员后，仅有可下载者可下载文件信息。 */ + @CompareField(fieldName = "可下载者") @ApiModelProperty(value = "可下载者") @TableField(exist = false) private String downloadableBy; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 664a2532..1f0604d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -21,6 +21,7 @@ import com.adc.da.slrs.tsDictionaryType.entity.TsDicType; import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.annotation.CompareField; import com.adc.da.utils.util.FieldConvertUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -28,7 +29,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation; import com.adc.da.slrs.sarLawsInformation.service.SarLawsInformationService; import com.adc.da.slrs.sarLawsInformation.dao.SarLawsInformationDao; -import io.swagger.annotations.ApiModelProperty; import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -161,7 +161,8 @@ public class SarLawsInformationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SarLawsInformationAuth::getUserId, userId); wrapper.and(each -> each.eq(SarLawsInformationAuth::getAuthType, "viewableBy") - .or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy")); + .or().eq(SarLawsInformationAuth::getAuthType, "createAndApproveBy") + .or().eq(SarLawsInformationAuth::getAuthType, "downloadableBy")); wrapper.select(SarLawsInformationAuth::getLawsInformationId); List informationAuthList = authService.list(wrapper); if (informationAuthList.size() > 0) { @@ -625,15 +626,13 @@ public class SarLawsInformationServiceImpl extends ServiceImpl compareSarLawsInformation(SarLawsInformation oldInfo, SarLawsInformation newInfo) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List changes = new ArrayList<>(); - // 需要比较的字段 - String[] fieldArr = {"firstType","secondType","thirdType","fourthType","name", - "department","author","description","informationFile","treeNodeId","viewableBy","downloadableBy"}; - List fieldList = Arrays.asList(fieldArr); // 获取SarLawsInformation类的所有字段 Field[] fields = SarLawsInformation.class.getDeclaredFields(); for (Field field : fields) { - if (fieldList.contains(field.getName())) { + boolean annotationPresent = field.isAnnotationPresent(CompareField.class); + if (annotationPresent) { try { field.setAccessible(true); String oldValue = String.valueOf(field.get(oldInfo)); @@ -681,13 +680,13 @@ public class SarLawsInformationServiceImpl extends ServiceImpl Date: Mon, 27 Nov 2023 14:50:00 +0800 Subject: [PATCH 068/105] fix: 78639 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体系搜索--弹窗中缺少体系结构查询字段 --- .../impl/SarMenuStandardNewServiceNewImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index e46d8788..7531283c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -228,11 +228,20 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl childIds = new ArrayList<>(); targetNode.collectChildIds(childIds); standSystemDTO.setMenuIdList(childIds); + + // 找到standSystemId对应的节点 + String standSystemId = standSystemDTO.getStandSystemId(); + if (StrUtil.isNotBlank(standSystemId)) { + SarMenuStandard findNode = SarMenuStandard.findNodeById(sarMenuStandard, standSystemDTO.getStandSystemId()); + // 收集目标节点及其所有子节点的ID + List standSystemChildIds = new ArrayList<>(); + findNode.collectChildIds(standSystemChildIds); + standSystemDTO.setStandSystemIdList(standSystemChildIds); + } if (!select) { standSystemDTO.setSelectIdList(targetNode.getGbStandIdList()); } From 0fa83c5063b927d6ecce20bed75183922eebe54e Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 27 Nov 2023 15:40:31 +0800 Subject: [PATCH 069/105] =?UTF-8?q?fix:=2078646=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=92=8C=E6=B5=B7=E5=A4=96=E7=9A=84=E5=B7=B2=E7=BD=AE=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=BC=81=E6=A0=87=E7=9A=84=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=A5=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=AF=A5=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E4=B9=9F=E6=9F=A5?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=BA=86=E7=9C=8B=E7=9C=8B=E6=98=AF=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E5=88=A0=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarBussionessStand/dao/SarBussionessStandDao.java | 2 +- .../service/impl/SarMenuStandardNewServiceNewImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 84bc1350..9ad242f4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -142,6 +142,6 @@ public interface SarBussionessStandDao extends BaseMapper { List getESSystemData(@Param("param") StandSystemDTO standSystemDTO); - void deleteStandSystem(String menuName); + void deleteStandSystem(@Param("menuName") String menuName); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 7531283c..9213a8d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -425,9 +425,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl esWrapper = new LambdaUpdateWrapper<>(); - esWrapper.eq(SarBussStandMenu::getMenuId, menuId); - sarBussStandMenuService.remove(esWrapper); + // 企标的不用删 删了标准法规库里面就搜不到这条企标了 +// LambdaUpdateWrapper esWrapper = new LambdaUpdateWrapper<>(); +// esWrapper.eq(SarBussStandMenu::getMenuId, menuId); +// sarBussStandMenuService.remove(esWrapper); log.info("删除企标主表中的相应字段成功"); // 删除国标外标企标主表中的中文字段 sarStandardInfoDao.deleteStandSystem(menuName); From 098077e325efc175c3ccb78bf3af576b98e11e10 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 24 Nov 2023 10:17:20 +0800 Subject: [PATCH 070/105] =?UTF-8?q?add:=20=E6=9C=BA=E6=9E=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 1 + .../adc/da/slrs/sarRole/service/ITsRoleService.java | 3 +++ .../slrs/sarRole/service/impl/TsRoleServiceImpl.java | 10 ++++++++++ .../java/com/adc/da/slrs/sarUser/entity/TsUser.java | 5 +++++ .../slrs/sarUser/service/impl/TsUserServiceImpl.java | 7 +++++++ .../resources/mybatis/mapper/sarRole/TsRoleMapper.xml | 4 ++++ 6 files changed, 30 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index c0cf74e5..bc9e4ee3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -110,4 +110,5 @@ public interface TsRoleDao extends BaseMapper { @Select("select role_id from ts_role_resource where resource_id =#{oldResourceIds}") List getResourceId(String oldResourceIds); + List getRoleDataByUserId(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index a13a8c41..33f71f64 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -94,4 +94,7 @@ public interface ITsRoleService extends IService { * @return */ IPage getRole(TsRole tsRole); + + + List getRoleDataByUserId(String userId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index a3f7c711..8aef6017 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableAsync; @@ -294,6 +295,15 @@ public class TsRoleServiceImpl extends ServiceImpl implements return null; } + + @Override + public List getRoleDataByUserId(String userId) { + if(StringUtils.isNotBlank(userId)){ + return tsRoleDao.getRoleDataByUserId(userId); + } + return null; + } + @Override public IPage getRole(TsRole tsRole) { IPage page = new Page<>(tsRole.getCurrent(), tsRole.getPageSize()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index 6689c537..8c4c821d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -4,6 +4,7 @@ import com.adc.da.base.entity.BaseEntity; import java.math.BigDecimal; import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.adc.da.slrs.sarRole.entity.TsRole; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -146,6 +147,10 @@ public class TsUser extends BaseEntity { @TableField(exist = false) private List positions; + @ApiModelProperty(value = "角色") + @TableField(exist = false) + private List roles; + @ApiModelProperty("当前页") @TableField(exist = false) private Integer current; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index c3a3b94b..d1cb40d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -12,6 +12,7 @@ import com.adc.da.slrs.sarPosition.entity.TsPosition; //import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.entity.*; import com.adc.da.slrs.sarUser.dao.TsUserDao; @@ -534,6 +535,12 @@ public class TsUserServiceImpl extends ServiceImpl implements // } // } + if(tsUsers!=null &&!tsUsers.isEmpty()){ + for (TsUser user:tsUsers) { + List roleList = tsRoleService.getRoleDataByUserId(user.getUserId()); + user.setRoles(roleList); + } + } Page tsUserPage = new Page<>(); tsUserPage.setCurrent(tsUser.getCurrent()); tsUserPage.setSize(tsUser.getSize()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml index eba64569..a6cd9c07 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml @@ -32,4 +32,8 @@ ) + + From d0f3777d4ace44cb84d6a36fde5ff39ede32ed81 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 27 Nov 2023 18:30:39 +0800 Subject: [PATCH 071/105] =?UTF-8?q?fix:=20=E7=A9=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarMenuStandardNewServiceNewImpl.java | 18 ++++++++++++------ .../entity/SarMenuStandard.java | 18 ++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 9213a8d4..b297ba57 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -208,7 +208,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl resource1.getParentId().equals(resource.getId())) .collect(Collectors.toList()); if (!tsResources.isEmpty()) { - tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); - tsResources.forEach(resource1 -> { - resource1.setTreeType("sarMs"); - resource1.setChildren(recursionGetListChildrenStand((resource1), (children))); - }); + try { + tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); + tsResources.forEach(resource1 -> { + resource1.setTreeType("sarMs"); + resource1.setChildren(recursionGetListChildrenStand((resource1), (children))); + }); + } catch (Exception e) { + log.error("异常"); + } } return tsResources; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index 356328b5..28e31571 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -147,14 +147,16 @@ public class SarMenuStandard extends BaseEntity { this.fbStandCount = countMatches(fbStandMenu, this.id, fbStandIdList); this.esStandCount = countMatches(esStandMenu, this.id, esStandIdList); - for (SarMenuStandard child : children) { - child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1); - this.gbStandCount += child.gbStandCount; - this.gbStandIdList.addAll(child.gbStandIdList); - this.fbStandCount += child.fbStandCount; - this.fbStandIdList.addAll(child.fbStandIdList); - this.esStandCount += child.esStandCount; - this.esStandIdList.addAll(child.esStandIdList); + if (children != null && !children.isEmpty()) { + for (SarMenuStandard child : children) { + child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1); + this.gbStandCount += child.gbStandCount; + this.gbStandIdList.addAll(child.gbStandIdList); + this.fbStandCount += child.fbStandCount; + this.fbStandIdList.addAll(child.fbStandIdList); + this.esStandCount += child.esStandCount; + this.esStandIdList.addAll(child.esStandIdList); + } } } From 727734e9fcd99f9a28405e3629cf14a8c31d9bcd Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 28 Nov 2023 09:35:47 +0800 Subject: [PATCH 072/105] =?UTF-8?q?bug:78295=EF=BC=8C=E5=86=85=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E4=BC=9A=E8=AE=AE=E5=AD=90=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index 8fd0ca2c..11b84e67 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -118,10 +118,12 @@ order by - mt.${sortField} ${sortMode} + mt.${sortField} ${sortMode}, + mt.CREATE_TIME asc iom.${sortField} ${sortMode} + mt.CREATE_TIME asc From c53476bc57db71d879bd99c92e85c625b856805e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 28 Nov 2023 10:52:22 +0800 Subject: [PATCH 073/105] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=B0=86=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarMenuStandard/entity/StandSystemDTO.java | 3 +++ .../impl/SarMenuStandardNewServiceNewImpl.java | 17 ++++++++++------- .../mapper/SarStandMenu/SarStandMenuMapper.xml | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 34ed449e..8e2f01ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -51,6 +51,9 @@ public class StandSystemDTO { @ApiModelProperty(value = "标准状态") private String standState; + @ApiModelProperty(value = "文本状态") + private String textStatus; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "开始发布日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index b297ba57..4c7e5156 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -276,7 +276,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); +// List gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); + // 国标外标标准文本状态 + List gbTextStateDictList = dicItemService.selectAllDicTypeNameByDicCode("WBZTCLASS"); // 企标标准状态字典 List esStateDictList = dicItemService.selectAllDicTypeNameByDicCode("TEXTSTATUSBUSS"); @@ -289,7 +291,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList, List esStateDictList) { + private void translateStandardSystemDTO(StandSystemDTO dto, List gbTextStateDictList, List esStateDictList) { // 翻译数据来源、标准状态 switch (dto.getDataSource()) { case "INLAND": dto.setDataSource("国内标准库"); - dto.setStandState(gbStateDictList.stream() - .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + dto.setStandState(gbTextStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus())) .findFirst().orElse(new TsDicType()).getDicTypeName()); break; case "FOREIGN": dto.setDataSource("海外标准库"); - dto.setStandState(gbStateDictList.stream() - .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + dto.setStandState(gbTextStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus())) .findFirst().orElse(new TsDicType()).getDicTypeName()); break; case "ENTERPRISE": diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 9ad53d50..f6ec0123 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -177,9 +177,11 @@