diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a816a1d6f..1876ca93d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -327,7 +327,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) { List paramsConfigDataVOList = new ArrayList<>(); - + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplate()); + String templateId = null; + String templateName= null; + if (CollectionUtil.isNotEmpty(ossFiles)) { + templateId = ossFiles.get(0).getId(); + templateName = ossFiles.get(0).getFileName(); + } if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); @@ -370,6 +376,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle()); + queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + throw new JeroBootException("标题已存在!"); + } + String paramsManifestId = UUID.randomUUID().toString().replace("-",""); // 根据参数模板id发布版本查询对应参数项集合 @@ -135,6 +144,15 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, oldParamsManifestEO.getTitle()); + queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + throw new JeroBootException("标题已存在!"); + } + ParamsManifestEO updateEO = new ParamsManifestEO(); updateEO.setId(paramsManifestEO.getId()); updateEO.setTitle(paramsManifestEO.getTitle()); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java index f639793f5..eb35f4d5c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java @@ -18,4 +18,6 @@ public class ParamsConfigDataVO { private String controlVerify; // 控件校验 private List> controlValue; // 控件备选值 private String dataValue; // 配置具体数据 + private String templateName; // 模板附件名称 + private String templateId; // 模板附件id } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index ce6f792d0..659adc94d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -9,6 +9,7 @@ import com.jero.modules.project.service.IProjectLibraryBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,6 +44,7 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList= projectLibraryBaseService.queryPageList(params); @@ -70,6 +72,7 @@ public class ProjectLibraryBaseController extends JeroController add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { projectLibraryBaseService.add(projectLibraryBase); @@ -84,6 +87,7 @@ public class ProjectLibraryBaseController extends JeroController edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { projectLibraryBaseService.editById(projectLibraryBase); @@ -98,6 +102,7 @@ public class ProjectLibraryBaseController extends JeroController delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { @@ -113,6 +118,7 @@ public class ProjectLibraryBaseController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids, @RequestParam(name="cut",required=true) String cut) { @@ -128,6 +134,7 @@ public class ProjectLibraryBaseController extends JeroController queryById(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 291cceac3..28464be32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; @@ -42,6 +43,7 @@ public class ProjectRelatedPersonnelController extends JeroController queryPageList(@RequestBody Map map) { List pageList= projectRelatedPersonnelService.queryPageList((String) map.get("projectId")); @@ -82,6 +84,7 @@ public class ProjectRelatedPersonnelController extends JeroController edit(@Validated @RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) { projectRelatedPersonnelService.editById(projectRelatedPersonnel); @@ -138,6 +141,7 @@ public class ProjectRelatedPersonnelController extends JeroController queryByProjectId(@RequestParam(name="projectId",required=true) String projectId, @RequestParam(name="cut",required=true) String cut) {