From 0158e290095dd625179308c0949801334d2f6105 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 12 Nov 2021 09:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/WgStandorpolicyInfoDao.java | 2 ++ .../entity/WgStandorpolicyInfo.java | 20 +++++++++++++ .../impl/WgStandorpolicyInfoServiceImpl.java | 9 +++++- .../controller/WgWorkGroupController.java | 6 ++++ .../service/IWgWorkGroupService.java | 2 ++ .../service/impl/WgWorkGroupServiceImpl.java | 29 ++++++++++++++++++- .../WgStandorpolicyInfoMapper.xml | 28 +++++++++++++++++- .../wg_work_group/WgWorkGroupMapper.xml | 10 +++---- 8 files changed, 98 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java index b1a409be..65976945 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java @@ -21,4 +21,6 @@ public interface WgStandorpolicyInfoDao extends BaseMapper List researchAllDatas(@Param(value = "type")String type); + List researchAllDatasPartTwo(@Param(value = "type")String type); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java index cc9ffde9..1190b830 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.wgStandorpolicyInfo.entity; import com.adc.da.base.entity.BaseEntity; 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; @@ -32,31 +33,50 @@ public class WgStandorpolicyInfo extends BaseEntity { private String id; @ApiModelProperty(value = "工作组id") + @TableField("wg_id") private String wgId; + @ApiModelProperty(value = "关联标准政策id") + @TableField("stand_id") + private String standId; + @ApiModelProperty(value = "政策/标准 类别") + @TableField(exist = false) private String categary; @ApiModelProperty(value = "政策/标准 编号") + @TableField(exist = false) private String number; @ApiModelProperty(value = "政策/标准 年份") + @TableField(exist = false) private String year; @ApiModelProperty(value = "政策标准 名称") + @TableField(exist = false) private String name; @ApiModelProperty(value = "政策/标准 英文名称") + @TableField(exist = false) private String usname; @ApiModelProperty(value = "文本状态") + @TableField(exist = false) private String status; @ApiModelProperty(value = "参与制定情况") + @TableField(exist = false) private String joinDevelop; @ApiModelProperty(value = "相关材料") + @TableField(exist = false) private String netDatum; + @ApiModelProperty(value = "相关材料") + @TableField(exist = false) + private String dataType; + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java index b40afa03..26c12980 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java @@ -25,6 +25,13 @@ public class WgStandorpolicyInfoServiceImpl extends ServiceImpl getAllDatas(String type) { - return wgStandorpolicyInfoDao.researchAllDatas(type); + List wgStandorpolicyInfos=wgStandorpolicyInfoDao.researchAllDatas(type); + if ("0".equals(type)) { + List wgStandorpolicyInfos1 = wgStandorpolicyInfoDao.researchAllDatasPartTwo(type); + wgStandorpolicyInfos1.forEach(wgStandorpolicyInfo -> wgStandorpolicyInfo.setDataType("3")); + wgStandorpolicyInfos.addAll(wgStandorpolicyInfos1); + } + wgStandorpolicyInfos.removeIf(wgStandorpolicyInfo -> null==wgStandorpolicyInfo.getName()); + return wgStandorpolicyInfos; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java index 69196b75..e838fcd2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -38,6 +38,12 @@ public class WgWorkGroupController extends BaseController { return Result.success(wgWorkGroupService.saveDatas(wgWorkGroup)); } + @ApiOperation("添加标准/政策节点数据") + @PostMapping("/addStand") + public ResponseMessage addResourceData(@RequestBody WgWorkGroupDTO wgWorkGroup){ + return Result.success(wgWorkGroupService.saveStandDatas(wgWorkGroup)); + } + @ApiOperation("搜索工作组节点数据") @GetMapping("/researchData") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java index 7bd998c1..29b3096b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -20,6 +20,8 @@ public interface IWgWorkGroupService extends IService { String saveDatas(WgWorkGroupDTO wgWorkGroupDTO); + String saveStandDatas(WgWorkGroupDTO wgWorkGroupDTO); + WgWorkGroupShowDTO researchData(String type); //优化查询接口 速度 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 8f364930..2042e81a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -87,7 +87,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl0){ + List wgWorkGroups=new ArrayList<>(); + wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + WgWorkGroup wgWorkGroup=new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); + wgStandorpolicyInfo.setWgId(wgWorkGroup.getId()); + wgWorkGroups.add(wgWorkGroup); + }); + + boolean flag=wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); + boolean flag1=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + if (flag && flag1){ + return "添加成功"; + }else { + return "添加失败"; + } + }else { + return "数据有误，请检查数据"; + } + } + @Override public WgWorkGroupShowDTO researchData(String type) { //构建最初的节点 用来向下搜索 @@ -209,13 +233,16 @@ public class WgWorkGroupServiceImpl extends ServiceImpl0) { wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { if (null!=wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { + wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos().add(wgStandorpolicyInfo); }else { List wgStandorpolicyInfos1=new ArrayList<>(); wgStandorpolicyInfos1.add(wgStandorpolicyInfo); + wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setWgStandorpolicyInfos(wgStandorpolicyInfos1); } }); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml index 0f8c0d6f..4dc7ea84 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml @@ -8,8 +8,34 @@ + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml index d7a0e490..fde7c4e7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -22,10 +22,10 @@ - - + + + + @@ -45,7 +45,7 @@ select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} - select * from wg_work_group where wg_work_group.type =#{type}