From de97f459fdce8f273db98f8136e2915b59635fae Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 15 Jul 2021 17:14:54 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E5=B8=A6=E5=85=A5=20=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfo.java | 2 ++ .../impl/SarStandardsInfoServiceImpl.java | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) 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 df2df62e..f61bd816 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 @@ -154,6 +154,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + @TableField(exist = false) private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID 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 33c619a5..277fdd53 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 @@ -286,10 +286,36 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl transformUpperCase(Map orgMap) { + Map resultMap = new HashMap<>(); + + for (Map.Entry entry : orgMap.entrySet()) { + String newKey = entry.getKey().toLowerCase(); + resultMap.put(newKey, orgMap.get(entry.getKey())); + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && !InitStandAttrUtil.fileFieldList.isEmpty() && InitStandAttrUtil.fileFieldList.contains(entry.getKey())) { + String value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + if(!fileObj.isEmpty()){ + resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName()); + } + } + } + } + + return resultMap; + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); From 7751c75ccf738ed94c2c4e9c5e88b52ae33ef834 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Thu, 15 Jul 2021 17:16:21 +0800 Subject: [PATCH 02/12] feat --- ...ndardComplianceAssessResultController.java | 105 +++++++++++++++++- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index b637499d..d3a8822d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import cn.hutool.core.map.MapUtil; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -16,12 +17,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import oracle.ucp.proxy.annotation.Post; +import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** *

@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController { } } } + + private static class InsertEntity{ + List entityList; + T eo; + } + + @ApiOperation(value="（插入/更新）标准清单") + @PostMapping("/standard") + public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { + + SarStandardsInfoEO eo = insertEntity.eo; + + if (eo.getStandApplicationType() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); + + }else { + if(eo.getPosition()==1){ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + + }else{ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + } + + + return Result.success(); + } + @ApiOperation(value = "条件查询标准涉及项目符合性清单") @GetMapping("/product") public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { @@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + @ApiOperation(value = "插入标准涉及项目符合性清单") + @PostMapping("/product") + public ResponseMessage insertProduct(List eo) throws Exception { + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + + + return Result.success(); + } + + @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { @@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } } + + + @ApiOperation(value = "插入技术审核符合性清单") + @PostMapping("/interpretation") + public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { + + InterpretationEO eo = insertEntity.eo; + + if (eo.getPosition()==1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + } else { + + + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + + return Result.success(); + } } From 5efce6f2d119487ab694581fc4c39efb739949fe Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 15 Jul 2021 18:37:49 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20vpps=20model=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarModelTreeController.java | 40 ++++++++++ .../sarModelTree/dao/SarModelTreeDao.java | 16 ++++ .../sarModelTree/entity/SarModelTree.java | 68 +++++++++++++++++ .../service/ISarModelTreeService.java | 20 +++++ .../service/impl/SarModelTreeServiceImpl.java | 53 +++++++++++++ .../adc/da/slrs/sarTree/dao/SarModelDao.java | 8 +- .../adc/da/slrs/sarTree/entity/SarVPPS.java | 2 + .../service/impl/SarModelServiceImpl.java | 16 ++-- .../service/impl/SarVPPSServiceImpl.java | 8 +- .../controller/SarVppsTreeController.java | 41 ++++++++++ .../slrs/sarVppsTree/dao/SarVppsTreeDao.java | 16 ++++ .../slrs/sarVppsTree/entity/SarVppsTree.java | 76 +++++++++++++++++++ .../service/ISarVppsTreeService.java | 19 +++++ .../service/impl/SarVppsTreeServiceImpl.java | 53 +++++++++++++ .../sarModelTree/SarModelTreeMapper.xml | 5 ++ .../mapper/sarVppsTree/SarVppsTreeMapper.xml | 5 ++ 16 files changed, 434 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java new file mode 100644 index 00000000..7b10eccb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarModelTree.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; +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.sarModelTree.entity.SarModelTree; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-模块树结构") +@RequestMapping("/${restPath}/sarModelTree") +public class SarModelTreeController extends BaseController { + + @Autowired + private ISarModelTreeService iSarModelTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarModelTree sarVppsTree){ + List tsResources = iSarModelTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java new file mode 100644 index 00000000..f26aeef4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarModelTree.dao; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarModelTreeDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java new file mode 100644 index 00000000..cbdd10d2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.sarModelTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarModelTree对象", description="") +public class SarModelTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @TableField("NAME") + private String name; + + @TableField("PID") + private String pid; + + @TableField("MODEL") + private String model; + + @ApiModelProperty(value = "模块结构特性") + @TableField("FEATURES") + private String features; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java new file mode 100644 index 00000000..b1d2c3f3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarModelTree.service; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarModelTreeService extends IService { + + List getAll(SarModelTree sarModelTree); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java new file mode 100644 index 00000000..e3e3c907 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarModelTree.service.impl; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao; +import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarModelTreeServiceImpl extends ServiceImpl implements ISarModelTreeService { + + /** + * 查询所有菜单 + * @param sarModelTree + */ + @Override + public List getAll(SarModelTree sarModelTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarModelTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarModelTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarModelTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java index 735b69dc..5eb54a3a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java @@ -8,8 +8,8 @@ import java.util.List; public interface SarModelDao extends BaseMapper { - @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)") - List findTreeAll(); - @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}") - List selectList(@Param("pid") String pid); +// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)") +// List findTreeAll(); +// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}") +// List selectList(@Param("pid") String pid); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java index af7f22c2..d50927e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarTree.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="SarVPPS对象", description="") +@TableName(value = "sar_vpps_tree") public class SarVPPS extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java index 729a9f06..586be308 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarTree.service.impl; import com.adc.da.slrs.sarTree.dao.SarModelDao; import com.adc.da.slrs.sarTree.entity.SarModel; import com.adc.da.slrs.sarTree.service.SarModelService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,8 +24,10 @@ public class SarModelServiceImpl implements SarModelService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarModelDao.findTreeAll(); - for (SarModel sarVppsOne : sarVppsList) { + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarModelDao.selectList(qw); + for (SarModel sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } return sarVppsList; @@ -32,14 +35,15 @@ public class SarModelServiceImpl implements SarModelService { /** * 递归调用获取子节点 - * * @param parent：父节点 * @return List */ - private List getChildren(SarModel parent) { + private List getChildren(SarModel parent){ String pid = parent.getId(); - List children = sarModelDao.selectList(pid); - for (SarModel sarVppsOne : children) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarModelDao.selectList(qw); + for(SarModel sarVppsOne:children){ sarVppsOne.setChildren(getChildren((sarVppsOne))); } return children; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java index 30db1809..d4ce1aba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java @@ -24,7 +24,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarVPPSDao.findTreeAll(); + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarVPPSDao.selectList(qw); for (SarVPPS sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } @@ -38,7 +40,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { */ private List getChildren(SarVPPS parent){ String pid = parent.getId(); - List children = sarVPPSDao.selectList(pid); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarVPPSDao.selectList(qw); for(SarVPPS sarVppsOne:children){ sarVppsOne.setChildren(getChildren((sarVppsOne))); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java new file mode 100644 index 00000000..9f78cba2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarVppsTree.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +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.sarVppsTree.entity.SarVppsTree; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-Vpps树结构") +@RequestMapping("/${restPath}/sarVppsTree") +public class SarVppsTreeController extends BaseController { + + @Autowired + private ISarVppsTreeService iSarVppsTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarVppsTree sarVppsTree){ + List tsResources = iSarVppsTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java new file mode 100644 index 00000000..b91948c6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarVppsTree.dao; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarVppsTreeDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java new file mode 100644 index 00000000..e9fb22cf --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -0,0 +1,76 @@ +package com.adc.da.slrs.sarVppsTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarVppsTree对象", description="") +public class SarVppsTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @ApiModelProperty(value = "VPPS编码") + @TableField("VPPS_CODE") + private String vppsCode; + + @ApiModelProperty(value = "父级id") + @TableField("PID") + private String pid; + + @ApiModelProperty(value = "编码") + @TableField("CODE") + private String code; + + @ApiModelProperty(value = "中文名称") + @TableField("CHINESE_NAME") + private String chineseName; + + @ApiModelProperty(value = "中文名称") + @TableField("ENGLISH_NAME") + private String englishName; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java new file mode 100644 index 00000000..910b46ec --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.sarVppsTree.service; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarVppsTreeService extends IService { + + List getAll(SarVppsTree sarVppsTree); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java new file mode 100644 index 00000000..1a7b51d4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarVppsTree.service.impl; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarVppsTreeServiceImpl extends ServiceImpl implements ISarVppsTreeService { + + /** + * 查询所有菜单 + * @param sarVppsTree + */ + @Override + public List getAll(SarVppsTree sarVppsTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarVppsTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarVppsTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarVppsTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml new file mode 100644 index 00000000..9541c60b --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml new file mode 100644 index 00000000..8e2bb000 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarVppsTree/SarVppsTreeMapper.xml @@ -0,0 +1,5 @@ + + + + + From 59b8ee7e19d96587726f5bf3001bdc5394926821 Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 16 Jul 2021 03:10:09 +0000 Subject: [PATCH 04/12] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..23fac18c 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ #============================================== # 邮箱配置1 From ee7358191220b6873943a779b3e0a6489989fe8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:27:45 +0000 Subject: [PATCH 05/12] Update application.properties --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6b97ffad..5b30f553 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From eca5c9ae331a2c72dcc9dee2d26f98ec02bf6b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Fri, 16 Jul 2021 08:50:12 +0000 Subject: [PATCH 06/12] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 23fac18c..d10482d6 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 From 63181803aa3024423a2efcedd13c2233827226e7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 18 Jul 2021 17:10:35 +0800 Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) 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 277fdd53..0b2d01bf 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 @@ -316,6 +316,31 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { + for (SarStandardsInfo row : sarlist) { + attrInfoDetails(row); + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); @@ -1826,7 +1851,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { List sarStandardsInfoEOList = new ArrayList<>(); sarStandardsInfoEOList.add(resultlist.get(0)); - attrInfoShow(sarStandardsInfoEOList); + attrInfoShowDetails(sarStandardsInfoEOList); sarStandardsInfoEO = sarStandardsInfoEOList.get(0); } // 查询纳入清单的国家地区 From a2be968da5c056e097b616c12ba7371c61ef2c46 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Mon, 19 Jul 2021 09:32:23 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6-=E6=A0=B9=E6=8D=AE=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86=E7=AD=9B=E9=80=89=20=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AAbug=EF=BC=8C=E6=8B=86?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99=E5=90=8E=E4=B8=8D=E8=AE=A9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 34 ++++++++++++++++++- .../controller/SarStandFileEOController.java | 4 +++ .../standardSplit/entity/SarStandFileEO.java | 10 ++++++ .../impl/SarFileSplitInfoEOServiceImpl.java | 7 ++-- .../SarFileSplitInfoEOMapper.xml | 3 ++ .../standardSplit/SarStandFileEOMapper.xml | 3 +- 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a724e332..8d9ef5de 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -88,8 +88,40 @@ public class ActSarItemsEOService { @Value("${elas.flag}") private boolean elasflag; + /** + * 标准解读流程入库" + * @param standJson + * @throws Exception + */ + public void createStandardRead(String standJson) throws Exception{ + JSONObject object = JSONObject.parseObject(standJson); + String fileName = object.getString("fileName"); + String fileType = object.getString("fileType"); + String creationTime = object.getString("creationTime"); + String creationUser = object.getString("creationUser"); + String standId = object.getString("standId"); + //数组去重 + JSONArray responUserList1 = object.getJSONArray("itemList"); + for (Object obj:responUserList1) { + JSONObject object1 = (JSONObject) obj; + JSONArray preResponUserList = object1.getJSONArray("zxUserId"); + String oldNumber = object1.getString("oldNumber"); + String itemsNum = object1.getString("itemsNum"); + String itemsName = object1.getString("itemsName"); + String itemsTitle = object1.getString("itemsTitle"); + String applyArcticId = object1.getString("applyArcticId"); + String applyArctic = object1.getString("applyArctic"); + String changePoint = object1.getString("changePoint"); + String technicalRequir = object1.getString("technicalRequir"); + String onlineData = object1.getString("onlineData"); + String newData = object1.getString("newData"); + String complianceRequir = object1.getString("complianceRequir"); + String complianceState = object1.getString("complianceState"); + } + } + /*** - * @Description: 标准入库流程数据保存 + * @Description: 标准解读流程入库" * @Author: yangxuenan * @Date: 2020/12/7 13:48 * @Param: [standJson] diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index c671b63c..825a91d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; @@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + for (SarStandFileEO one:rows) { + one.setAttId(one.getAttId1()); + } if (rows != null && !rows.isEmpty()) { for (SarStandFileEO sarStandFileEO : rows) { List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java index b45d23b3..6e8ef33a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity { private String validFlag; private String useModel; private String attId; + + public String getAttId1() { + return attId1; + } + + public void setAttId1(String attId1) { + this.attId1 = attId1; + } + + private String attId1; private String resId; private String standId; private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d49d5d84..ad78a58f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -37,9 +37,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.dao.PersonCollectEODao; +import org.springframework.transaction.interceptor.TransactionAspectSupport; @Service -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); @@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } @Override + @Transactional public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ // 拆分文件主表中插入数据 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); @@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); - String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); @@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } catch (Exception e) { e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return -1; } if(treeList.size()>0 && messageList.size() > 0){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml index 5f560a34..491246ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -263,6 +263,9 @@ and SAR_FILE_SPLIT_INFO.stand_id = #{standId} + + and SAR_TYPE = #{sarType} + and SAR_FILE_SPLIT_INFO.id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 471e17c1..8a7744c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -20,6 +20,7 @@ + @@ -278,7 +279,7 @@ CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year) ) ) AS standNumber, SAR_STANDARDS_INFO.stand_name as standName, - SAR_STAND_FILE.att_id AS attId, + SAR_STAND_FILE.att_id AS attId1, SAR_STANDARDS_INFO.STAND_TYPE as sarType FROM SAR_STAND_FILE From 21931a9455e478edca4ab170124ff96a5299e898 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 12:02:56 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 7ef6ef5f..8985ecd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity { private String sycpx; @ApiModelProperty(value = "适用认证") - @TableField("SYZD") - private String syzd; + @TableField("SYRZ") + private String syrz; @ApiModelProperty(value = "责任工程师") @TableField("ZRGCS") From 7db2b79b637518e13c24eaa791a5b68217a557b8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 16:29:52 +0800 Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 9 +++++++++ .../slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java | 2 ++ .../service/ISarStandardsInfoService.java | 2 ++ .../service/impl/SarStandardsInfoServiceImpl.java | 5 +++++ .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 10 ++++++++++ 5 files changed, 28 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 8c3a3177..c35efe84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -419,6 +419,15 @@ public class SarStandardsInfoController extends BaseController } } + + @ApiOperation(value = "标准发布查询") + @GetMapping("/getStandInfoByList") + //@RequiresPermissions("lawss:sarStandardsInfo:get") + public ResponseMessage> getStandInfoByList(String limit) throws Exception { + List result = sarStandardsInfoEOService.getStandInfoByList(limit); + return Result.success(result); + } + @ApiOperation(value = "|SarStandardsInfoEO|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 98bc1851..5fa8089c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); + List queryStandInfoByList(@Param("limit") Integer limit); + Integer selectStandColumn(@Param("columnName") String columnName); Integer selectCounterStandardsCount(SarStandardsInfo 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 3d021796..b3fc3d01 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 @@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService { List selectStandardsByStandnumber(String replaceStandNum, String standType); + List getStandInfoByList(String limit); + SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception; public void attrInfoDetails (SarStandardsInfo row) throws Exception; 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 0b2d01bf..c3e1a681 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 @@ -1829,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ + return dao.queryStandInfoByList(Integer.valueOf(limit)); + } + /** * 新增过程中验证标准号 * 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 253602d1..2bc31a08 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 @@ -626,6 +626,16 @@ + +