From e067c8ae612ef3d8184dcd932629730439eb953a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 8 Jul 2021 22:34:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E6=A0=91=20=E7=9B=B8=E5=85=B3=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E7=9B=B8=E5=85=B3=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/AdcDaApplication.java | 17 +++++++ .../controller/TsResourceController.java | 18 ++++++++ .../slrs/sarResource/entity/TsResource.java | 4 ++ .../service/ITsResourceService.java | 10 ++++ .../service/impl/TsResourceServiceImpl.java | 36 ++++++++++++++- .../SarStandardsInfoController.java | 46 +++++++++++++------ .../service/ISarStandardsInfoService.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 5 +- .../SarStandardsInfoMapper.xml | 28 +++++------ 9 files changed, 134 insertions(+), 32 deletions(-) diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java index f2d62d02..1310d5ab 100644 --- a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java +++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java @@ -1,12 +1,17 @@ package com.adc.da; +import org.apache.catalina.connector.Connector; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; @EnableEurekaClient @EnableFeignClients @@ -19,4 +24,16 @@ public class AdcDaApplication { SpringApplication.run(AdcDaApplication.class, args); } + @Bean + public ConfigurableServletWebServerFactory webServerFactory() { + TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); + factory.addConnectorCustomizers(new TomcatConnectorCustomizer() { + @Override + public void customize(Connector connector) { + connector.setProperty("relaxedQueryChars", "|{}[]"); + } + }); + return factory; + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index f287dc62..5bd87742 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -4,15 +4,19 @@ package com.adc.da.slrs.sarResource.controller; 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.SarMenuStandard; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -28,6 +32,20 @@ import java.util.List; public class TsResourceController extends BaseController { @Autowired private ITsResourceService tsResourceService; + + @ApiOperation("根据ID查询菜单") + @GetMapping("/getMenuById") + public ResponseMessage getMenuById(@RequestParam String menuId){ + TsResource sarMenus = tsResourceService.getById(menuId); + if(sarMenus != null && sarMenus.getParentIds() != null && StringUtils.isNotBlank(sarMenus.getParentIds())){ + List menuStandards = tsResourceService.getMenuByIds(Arrays.asList(sarMenus.getParentIds().split(","))); + if(!menuStandards.isEmpty()){ + String parentIdsName = menuStandards.stream().map(TsResource::getMenuName).collect(Collectors.joining(",")); + sarMenus.setParentIdsName(parentIdsName); + } + } + return Result.success(sarMenus); + } @ApiOperation("查询所有资源") @GetMapping diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index ea2c9408..c94365c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -87,4 +87,8 @@ public class TsResource extends BaseEntity { @TableField(exist = false) private List children; + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 883ed9e9..31d663fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarResource.service; import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,6 +17,15 @@ import java.util.List; */ public interface ITsResourceService extends IService { + List getParentMenuId(String menuId); + + /** + * 通过Ids查询menu + * @param menuIds :菜单Ids + * @return List

+ */ + List getMenuByIds(List menuIds); + List getAll(TsResource tsResource); ResponseMessage addResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index d7a9351f..909a0dcf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarResource.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -29,6 +31,36 @@ import java.util.List; public class TsResourceServiceImpl extends ServiceImpl implements ITsResourceService { @Autowired private TsResourceDao dao; + + public List getParentMenuId (String menuId) { + List parentIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(menuId)) { + List sarMenuEOList = dao.selectList(new QueryWrapper<>()); + Tree tree = new Tree(sarMenuEOList); + TreeNode treeNode = tree.getTreeNode(menuId); + while (treeNode.getParent() != null) { + parentIds.add(treeNode.getParent().getNodeId()); + treeNode = treeNode.getParent(); + } + } + return parentIds; + } + + /** + * 通过Ids查询menu + * @param menuIds :菜单Ids + * @return List + */ + @Override + public List getMenuByIds(List menuIds) { + if(menuIds!=null&&menuIds.size()>0){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.in("id",menuIds); + return dao.selectList(sarMenuQueryWrapper); + } + return new ArrayList<>(); + } + /** * 查询所有菜单 * @param tsResource @@ -54,7 +86,7 @@ public class TsResourceServiceImpl extends ServiceImpl addResource(TsResource TsResource) { - if(TsResource.getParentId()!=null){ + if(TsResource.getParentId() != null && StringUtils.isNotBlank(TsResource.getParentId())){ TsResource parent=dao.selectById(TsResource.getParentId()); if(parent==null){ return Result.error("该父菜单不存在"); @@ -75,7 +107,7 @@ public class TsResourceServiceImpl extends ServiceImpl @Value("${file.downloadUrl}") private String fileDownloadPath; + private static String stringTy = "UTF8"; + private static String responseParam1 = "Content-Disposition"; + private static String responseParam2 = "attachment;filename="; + @Autowired ISarLawsInfoService sarLawsInfoEOService; @@ -197,7 +204,7 @@ public class SarStandardsInfoController extends BaseController response.setHeader("Content-Disposition", "attachment; filename=" + ReadExcel.encodeFileName(standardsInfoExcelVO.getExportName()+".xlsx", request)); - response.setContentType("application/force-download"); +// response.setContentType("application/force-download"); // 导出所有数据 List datas = sarStandardsInfoEOService.getExportDatas(standardsInfoExcelVO); workbook = StandExportUtil.exportDatas(datas,standardsInfoExcelVO.getStandType()); @@ -419,20 +426,31 @@ public class SarStandardsInfoController extends BaseController @PostMapping("/saveStandardsMenu") //@RequiresPermissions("lawss:sarStandardsInfo:saveStandardsMenu") public ResponseMessage saveStandardsMenu(@RequestBody SarStandardsInfoEOPage standardsInfoEO) throws Exception { - if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) { - return Result.error("所选节点不支持配置标准"); - } else { - boolean flag = false; - try { - flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO); - }catch (NullPointerException e){ - flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); - } - if (flag){ - return Result.success("200","配置成功",true); - } - return Result.error("-1","配置失败"); +// if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) { +// return Result.error("所选节点不支持配置标准"); +// } else { +// boolean flag = false; +// try { +// flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO); +// }catch (NullPointerException e){ +// flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); +// } +// if (flag){ +// return Result.success("200","配置成功",true); +// } +// return Result.error("-1","配置失败"); +// } + boolean flag = false; + try { + flag = sarStandardsInfoEOService.updateStandardsMenu(standardsInfoEO); + }catch (NullPointerException e){ + flag = sarStandardsInfoEOService.updateStandInfo(standardsInfoEO); } + if (flag){ + return Result.success("200","配置成功",true); + } + return Result.error("-1","配置失败"); + } @ApiOperation(value = "|SarStandardsInfoEO|详情页面查询相近标准") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 5c239a4b..3d021796 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -32,7 +32,9 @@ public interface ISarStandardsInfoService extends IService { List selectStandardsByStandnumber(String replaceStandNum, String standType); SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception; + public void attrInfoDetails (SarStandardsInfo row) throws Exception; + boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO); boolean updateStandInfo(SarStandardsInfoEOPage standardsInfoEO); 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 d3a1eacc..fe4d0e45 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 @@ -94,7 +94,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + List getMenuIdList=tsUserService.getResourceId(new TsResource()); +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 67aec86e..573c327a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -392,11 +392,11 @@ - + and country = #{country} - + and ( (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') @@ -406,27 +406,27 @@ ) - + and stand_name like concat(concat('%',#{standName}),'%') - + and stand_en_name like concat(concat('%',#{standEnName}),'%') - + and stand_state = #{standState} - + and stand_nature = #{standNature} - + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') - + and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') @@ -488,14 +488,14 @@ #{item} - + and SAR_STANDARDS_INFO.stand_sort = #{standSort} - + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 - + and SAR_STANDARDS_INFO.id in ( select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') @@ -508,13 +508,13 @@ and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%') - + and SAR_STAND_ATTR_INFO.SYCLLX = #{applyArctic} - + and is_relate_access = #{isRelateAccess} - + and (${advanceSearchStr})