WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhn
2022-06-07 16:25:56 +08:00
parent 1641809cec 3e1df70a62
commit d218a66cac
6 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+17 -1
View File
@@ -327,7 +327,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
*/
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigEO paramsConfigEO, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
List<OSSFile> 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<ParamsCollec
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setIsLock(paramsConfigEO.getIsLock());
configDataVO.setTemplateId(templateId);
configDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -435,6 +443,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -456,6 +466,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -477,6 +489,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
@@ -508,6 +522,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
fileConfigDataVO.setIsLock(paramsConfigEO.getIsLock());
fileConfigDataVO.setTemplateId(templateId);
fileConfigDataVO.setTemplateName(templateName);
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+18
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
@@ -87,6 +88,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
*/
@Override
public boolean add(ParamsManifestEO paramsManifestEO) {
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> 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<ParamsManifestEOMap
*/
@Override
public boolean editById(ParamsManifestEO paramsManifestEO) {
ParamsManifestEO oldParamsManifestEO = getById(paramsManifestEO.getTitle());
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestEO::getTitle, oldParamsManifestEO.getTitle());
queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
throw new JeroBootException("标题已存在！");
}
ParamsManifestEO updateEO = new ParamsManifestEO();
updateEO.setId(paramsManifestEO.getId());
updateEO.setTitle(paramsManifestEO.getTitle());
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsConfigDataVO.java
+2
View File
@@ -18,4 +18,6 @@ public class ParamsConfigDataVO {
private String controlVerify; // 控件校验
private List<Map<String, String>> controlValue; // 控件备选值
private String dataValue; // 配置具体数据
private String templateName; // 模板附件名称
private String templateId; // 模板附件id
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+7
View File
@@ -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<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-分页列表查询")
@ApiOperation(value="项目库基础表-分页列表查询", notes="项目库基础表-分页列表查询")
@RequiresPermissions("projectLibraryBase:page")
@PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<ProjectLibraryBase> pageList= projectLibraryBaseService.queryPageList(params);
@@ -70,6 +72,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-添加")
@ApiOperation(value="项目库基础表-添加", notes="项目库基础表-添加")
@RequiresPermissions("projectLibraryBase:add")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException {
projectLibraryBaseService.add(projectLibraryBase);
@@ -84,6 +87,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-编辑")
@ApiOperation(value="项目库基础表-编辑", notes="项目库基础表-编辑")
@RequiresPermissions("projectLibraryBase:edit")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) {
projectLibraryBaseService.editById(projectLibraryBase);
@@ -98,6 +102,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-通过id删除")
@ApiOperation(value="项目库基础表-通过id删除", notes="项目库基础表-通过id删除")
@RequiresPermissions("projectLibraryBase:delete")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id,
@RequestParam(name="cut",required=true) String cut) {
@@ -113,6 +118,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-批量删除")
@ApiOperation(value="项目库基础表-批量删除", notes="项目库基础表-批量删除")
@RequiresPermissions("projectLibraryBase:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
@RequestParam(name="cut",required=true) String cut) {
@@ -128,6 +134,7 @@ public class ProjectLibraryBaseController extends JeroController<ProjectLibraryB
*/
@AutoLog(value = "项目库基础表-通过id查询")
@ApiOperation(value="项目库基础表-通过id查询", notes="项目库基础表-通过id查询")
@RequiresPermissions("projectLibraryBase:queryById")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id,
@RequestParam(name="cut",required=true) String cut) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+6
View File
@@ -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<ProjectRel
*/
@AutoLog(value = "项目库-相关人员维护表-分页列表查询")
@ApiOperation(value="项目库-相关人员维护表-分页列表查询", notes="项目库-相关人员维护表-分页列表查询")
@RequiresPermissions("projectRelatedPersonnel:page")
@PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> map) {
List<ProjectRelatedPersonnel> pageList= projectRelatedPersonnelService.queryPageList((String) map.get("projectId"));
@@ -82,6 +84,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
*/
@AutoLog(value = "项目库-相关人员维护表-编辑")
@ApiOperation(value="项目库-相关人员维护表-编辑", notes="项目库-相关人员维护表-编辑")
@RequiresPermissions("projectRelatedPersonnel:edit")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ProjectRelatedPersonnel projectRelatedPersonnel) {
projectRelatedPersonnelService.editById(projectRelatedPersonnel);
@@ -138,6 +141,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
*/
@AutoLog(value = "项目库-相关人员维护表-导出excel")
@ApiOperation(value="项目库-相关人员维护表-导出excel", notes="项目库-相关人员维护表-导出excel")
@RequiresPermissions("projectRelatedPersonnel:exportXls")
@GetMapping(value = "/exportXls", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public void exportXls(@RequestParam(name="id") String id,
@RequestParam(name="projectId") String projectId,
@@ -153,6 +157,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
*/
@AutoLog(value = "项目库-相关人员维护表-导出excel模板")
@ApiOperation(value="项目库-相关人员维护表-导出excel模板", notes="项目库-相关人员维护表-导出excel模板")
@RequiresPermissions("projectRelatedPersonnel:exportTemplate")
@GetMapping(value = "/exportTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public void exportTemplate(ProjectRelatedPersonnel projectRelatedPersonnel, HttpServletResponse response, HttpServletRequest request) throws Exception {
projectRelatedPersonnelService.exportTemplate(projectRelatedPersonnel,response,request);
@@ -164,6 +169,7 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
*/
@AutoLog(value = "项目库-相关人员维护表-通过excel导入数据")
@ApiOperation(value="项目库-相关人员维护表-通过excel导入数据", notes="项目库-相关人员维护表-通过excel导入数据")
@RequiresPermissions("projectRelatedPersonnel:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public void importExcel(MultipartFile file,
@RequestParam(name="projectId",required=true) String projectId,
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java
+2
View File
@@ -13,6 +13,7 @@ import com.jero.modules.project.vo.TimeNodeVO;
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.*;
@@ -137,6 +138,7 @@ public class ProjectTaskPlanningController extends JeroController<ProjectTaskPla
*/
@AutoLog(value = "法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
@ApiOperation(value="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询", notes="法规,认证任务计划 (各阶段确认进度) 表-通过projectId查询")
@RequiresPermissions("projectTaskPlanning:queryByProjectId")
@GetMapping(value = "/queryByProjectId")
public Result<?> queryByProjectId(@RequestParam(name="projectId",required=true) String projectId,
@RequestParam(name="cut",required=true) String cut) {