From e9988097679a12764838c29323fea2e76411b75c Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 8 Jul 2021 20:04:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?add:=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 2 + .../controller/SarStandItemsController.java | 33 +++++++++++ .../sarStandItems/dao/SarStandItemsDao.java | 4 ++ .../entity/SarStandItemsDto.java | 56 +++++++++++++++++++ .../impl/SarStandItemsServiceImpl.java | 5 ++ .../SarStandItems/SarStandItemsMapper.xml | 17 ++++++ 6 files changed, 117 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3919b41a..f6223f44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -84,6 +84,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl * 前端控制器 @@ -20,4 +32,25 @@ import com.adc.da.base.web.BaseController; @RequestMapping("/SarStandItems/sar-stand-items") public class SarStandItemsController extends BaseController { + @Autowired + private SarStandItemsServiceImpl ServiceImpl; + + @ApiOperation(value = "分解单查询") + @GetMapping("/findAllItems") + public ResponseMessage findAllItems(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size,String type,String ids){ + if (!StringUtils.isEmpty(ids) && ids.contains(",")){ + String[] Sids=ids.split(","); + List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + return Result.success("200",ItemDto); + }else if (!StringUtils.isEmpty(ids)){ + String[] Sids=new String[1]; + Sids[0]=ids; + List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + return Result.success("200",ItemDto); + }else { + List ItemDto = ServiceImpl.findAllItems(Page,Size,type,null); + return Result.success("200",ItemDto); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 20e88748..d2af513f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -1,9 +1,11 @@ package com.adc.da.slrs.sarStandItems.dao; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -18,6 +20,7 @@ import java.util.Set; * @author super_liu * @since 2021-06-01 */ +@Mapper public interface SarStandItemsDao extends BaseMapper { List querySarStandItemsList(SarStandItemsEOPage page); @@ -50,4 +53,5 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsSvpps(SarStandItems sarStandItemsEO); + List selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java new file mode 100644 index 00000000..291c3471 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import java.util.Date; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-08 + */ +@Slf4j +@Data +public class SarStandItemsDto { + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准ID") + private String standId; + + @ApiModelProperty(value = "条目编号") + private String itemsNum; + + @ApiModelProperty(value = "内容") + private String itemsName; + + @ApiModelProperty(value = "责任部门") + private String responsibleUnit; + + + + + + + @ApiModelProperty(value = "SVPPS") + private String svpps; + + + @ApiModelProperty(value = "适用车型") + private String applyArctic; + + + @ApiModelProperty(value = "要求类型") + private String claimType; + + @ApiModelProperty(value = "覆盖关系") + private String busStandCover; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 1973f711..3de73d3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandItems.service.impl; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; +import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; @@ -56,4 +57,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(int Page,int Size,String type,String[] ids){ + return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 185b011c..bb6eb6b8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -641,4 +641,21 @@ + + + + From 04792ee931e4545622b74f7ca3d8e1386fda11d8 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 8 Jul 2021 20:05:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?add:=E5=88=86=E8=A7=A3=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index 291c3471..f173797e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -1,8 +1,5 @@ package com.adc.da.slrs.sarStandItems.entity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; From 4b8aac9bc4c164bdf388b5c0119feb4162f3fd04 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 8 Jul 2021 21:04:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=90=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/common/ActDefineStartMap.java | 1 + .../sarStandItems/controller/SarStandItemsController.java | 8 ++++---- .../adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java | 2 +- .../service/impl/SarStandItemsServiceImpl.java | 4 ++-- .../controller/SarStandProjectLibraryController.java | 4 +++- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 2 -- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 388aba37..7e8446b5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -19,6 +19,7 @@ public class ActDefineStartMap { map.put("3","standardCommentProcessWorkFlow"); map.put("4","standardregulatoryinventory"); + map.put("5","projectEvaluationProcess"); return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 54094522..30fd670d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -37,18 +37,18 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/findAllItems") - public ResponseMessage findAllItems(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size,String type,String ids){ + public ResponseMessage findAllItems( String type,String ids){ if (!StringUtils.isEmpty(ids) && ids.contains(",")){ String[] Sids=ids.split(","); - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + List ItemDto = ServiceImpl.findAllItems(type,Sids); return Result.success("200",ItemDto); }else if (!StringUtils.isEmpty(ids)){ String[] Sids=new String[1]; Sids[0]=ids; - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + List ItemDto = ServiceImpl.findAllItems(type,Sids); return Result.success("200",ItemDto); }else { - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,null); + List ItemDto = ServiceImpl.findAllItems(type,null); return Result.success("200",ItemDto); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index d2af513f..99539e9c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -53,5 +53,5 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsSvpps(SarStandItems sarStandItemsEO); - List selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids); + List selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3de73d3d..9f4c2df3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -58,7 +58,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(int Page,int Size,String type,String[] ids){ - return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids); + public List findAllItems(String type,String[] ids){ + return dao.selectAllItemsByIds(type,ids); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 39cb0fb4..3f4e51a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -7,6 +7,8 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -84,7 +86,7 @@ public class SarStandProjectLibraryController extends BaseController - - LIMIT #{page} , #{size}; 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 4/5] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=20=E7=9B=B8=E5=85=B3=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=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}) From 0842280775e884440d5f1a3525230ad65d741d6b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 8 Jul 2021 22:56:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarUpdLogController.java | 20 ++- .../da/slrs/sarUpdLog/dao/SarUpdLogDao.java | 4 + .../da/slrs/sarUpdLog/entity/SarUpdLog.java | 6 +- .../sarUpdLog/entity/SarUpdLogEOPage.java | 122 ++++++++++++++ .../sarUpdLog/service/ISarUpdLogService.java | 4 + .../service/impl/SarUpdLogServiceImpl.java | 6 + .../mapper/SarUpdLog/SarUpdLogMapper.xml | 150 ++++++++++++++++++ 7 files changed, 310 insertions(+), 2 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java index 712e6768..c0d55b20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java @@ -1,12 +1,21 @@ package com.adc.da.slrs.sarUpdLog.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -17,7 +26,16 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarUpdLog|") -@RequestMapping("/SarUpdLog/sar-upd-log") +@RequestMapping("/${restPath}/lawss/sarUpdLog") public class SarUpdLogController extends BaseController { + @Autowired + private ISarUpdLogService iSarUpdLogService; + + @ApiOperation(value = "|SarUpdLogEO|查询") + @GetMapping("/getLogList") + public ResponseMessage> list(SarUpdLogEOPage page) throws Exception { + page.setOrderBy("SAR_UPD_LOG.creation_time desc,id"); + return Result.success(iSarUpdLogService.queryByList(page)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java index 4b6afaac..2243731c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java @@ -1,8 +1,11 @@ package com.adc.da.slrs.sarUpdLog.dao; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarUpdLogDao extends BaseMapper { + List queryByList(SarUpdLogEOPage page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java index 0973cdbf..02a6cc82 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -45,10 +46,13 @@ public class SarUpdLog extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @TableField("CREATION_USER") private String creationUser; - + @ApiModelProperty(value = "创建用户名称") + @TableField(exist = false) + private String creationUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java new file mode 100644 index 00000000..0e42089c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java @@ -0,0 +1,122 @@ +package com.adc.da.slrs.sarUpdLog.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_UPD_LOG SarUpdLogEOPage
+ * 作者：code generator
+ * 日期： 2020-12-08
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarUpdLogEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String sarType; + private String sarTypeOperator = "="; + private String sarId; + private String sarIdOperator = "="; + private String content; + private String contentOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getSarType() { + return this.sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getSarTypeOperator() { + return this.sarTypeOperator; + } + + public void setSarTypeOperator(String sarTypeOperator) { + this.sarTypeOperator = sarTypeOperator; + } + + public String getSarId() { + return this.sarId; + } + + public void setSarId(String sarId) { + this.sarId = sarId; + } + + public String getSarIdOperator() { + return this.sarIdOperator; + } + + public void setSarIdOperator(String sarIdOperator) { + this.sarIdOperator = sarIdOperator; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentOperator() { + return this.contentOperator; + } + + public void setContentOperator(String contentOperator) { + this.contentOperator = contentOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java index 9e18ccde..ddb181f1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java @@ -1,8 +1,10 @@ package com.adc.da.slrs.sarUpdLog.service; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; import java.util.Map; /** @@ -15,6 +17,8 @@ import java.util.Map; */ public interface ISarUpdLogService extends IService { + List queryByList(SarUpdLogEOPage page); + void createBaseLog(String sarId, String sarType, String content) throws Exception; void createUpdateLog(String sarType, String sarId, Map oldMap, Map newMap, String standContent) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 4525855c..4e979cfd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -4,6 +4,7 @@ import com.adc.da.common.SarTypeEnum; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.dao.SarUpdLogDao; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.LoginUserUtil; @@ -48,6 +49,11 @@ public class SarUpdLogServiceImpl extends ServiceImpl i private List notCheckFieldList = Arrays.asList(notCheckField.split(",")); + @Override + public List queryByList(SarUpdLogEOPage page){ + return dao.queryByList(page); + } + public void createUpdateLog (String sarType, String sarId, Map oldMap, Map newMap,String standContent) throws Exception { SarUpdLog sarUpdLogEO = new SarUpdLog(); sarUpdLogEO.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml index a4bab2be..93b7040c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml @@ -1,5 +1,155 @@ + + + + + + + + + + + + + SAR_UPD_LOG.id, sar_type, sar_id, content, SAR_UPD_LOG.creation_time,SAR_UPD_LOG.creation_user + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and sar_type ${sarTypeOperator} #{sarType} + + + and sar_id ${sarIdOperator} #{sarId} + + + and content ${contentOperator} #{content} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + + + + + + insert into SAR_UPD_LOG() + values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP}) + + + + + + insert into SAR_UPD_LOG + + id, + sar_type, + sar_id, + content, + creation_time, + creation_user, + + + #{id, jdbcType=VARCHAR}, + #{sarType, jdbcType=VARCHAR}, + #{sarId, jdbcType=VARCHAR}, + #{content, jdbcType=CLOB}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + + + + + + update SAR_UPD_LOG + set sar_type = #{sarType}, + sar_id = #{sarId}, + content = #{content}, + creation_time = #{creationTime} + where id = #{id} + + + + + update SAR_UPD_LOG + + + sar_type = #{sarType}, + + + sar_id = #{sarId}, + + + content = #{content}, + + + creation_time = #{creationTime}, + + + creation_user = #{creationUser}, + + + where id = #{id} + + + + + + + + delete from SAR_UPD_LOG + where id = #{value} + + + + + + + + + +