认证-参数清单-权限

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -68,7 +69,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-分页列表查询")
 	@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
 	@GetMapping(value = "/page")
-//	@RequiresPermissions("params:manifest:page")
+	@RequiresPermissions("params:manifest:page")
 	public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -130,12 +131,13 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	/**
 	 * 获取配置标识
 	 * 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
+	 * true-可添加配置；false-不可添加配置
 	 * @return
 	 */
 	@AutoLog(value = "参数清单-获取配置标识")
 	@ApiOperation(value="参数清单-获取配置标识", notes="参数清单-获取配置标识")
 	@GetMapping(value = "/getConfigFlag")
-//	@RequiresPermissions("params:manifest:page")
+	@RequiresPermissions("params:manifest:page")
 	public Result<?> getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) {
 		boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
 		return Result.OK(configFlag);
@@ -150,7 +152,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-添加")
 	@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
 	@PostMapping(value = "/add")
-//	@RequiresPermissions("params:manifest:add")
+	@RequiresPermissions("params:manifest:add")
 	public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
 		boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
 		if (isSuccess) {
@@ -169,7 +171,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-编辑")
 	@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
 	@PostMapping(value = "/edit")
-//	@RequiresPermissions("params:manifest:edit")
+	@RequiresPermissions("params:manifest:edit")
 	public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
 		boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
 		if (isSuccess) {
@@ -188,7 +190,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-通过id删除")
 	@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
 	@GetMapping(value = "/delete")
-//	@RequiresPermissions("params:manifest:delete")
+	@RequiresPermissions("params:manifest:delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
 		boolean isSuccess = paramsManifestEOService.deleteById(id, cut);
 		if (isSuccess) {
@@ -207,7 +209,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-批量删除")
 	@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
 	@PostMapping(value = "/deleteBatch")
-//	@RequiresPermissions("params:manifest:deleteBatch")
+	@RequiresPermissions("params:manifest:deleteBatch")
 	public Result<?> deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) {
 		if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) {
 			return Result.error("参数不能为空！");
@@ -229,7 +231,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-变更扩展")
 	 @ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
 	 @GetMapping(value = "/changeExtension")
-//	 @RequiresPermissions("params:manifest:change")
+	 @RequiresPermissions("params:manifest:change")
 	 public Result<?> changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
 		 boolean isSuccess = paramsManifestEOService.changeExtension(id, cut);
 		 if(isSuccess) {
@@ -248,7 +250,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-历史版本")
 	 @ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
 	 @GetMapping(value = "/history")
-//	 @RequiresPermissions("params:manifest:history")
+	 @RequiresPermissions("params:manifest:history")
 	 public Result<?> history(@RequestParam(name="title",required=true) String title) {
 		 List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
 		 return Result.OK(historyVersionList);
@@ -263,7 +265,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-查询所有项目的所有参数清单")
 	 @ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
 	 @PostMapping(value = "/getAllManifest")
-//	 @RequiresPermissions("params:manifest:copy")
+	 @RequiresPermissions("params:manifest:copy")
 	 public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									 @RequestParam(name="projectName",required=false) String projectName) {
@@ -280,7 +282,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-复制-参数模板列表查询")
 	 @ApiOperation(value="参数清单-复制-参数模板列表查询", notes="参数清单-复制-参数模板列表查询")
 	 @GetMapping(value = "/getParamsTemplatePageOfCopy")
-//	@RequiresPermissions("params:manifest:copy")
+	@RequiresPermissions("params:manifest:copy")
 	 public Result<?> getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO,
 												  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -299,7 +301,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @AutoLog(value = "参数清单-复制清单")
 	 @ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
 	 @PostMapping(value = "/copy")
-//	 @RequiresPermissions("params:manifest:copy")
+	 @RequiresPermissions("params:manifest:copy")
 	 public Result<?> copy(@RequestBody ParamsManifestVO paramsManifestVO) {
 		 ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
 		 BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO);
@@ -315,7 +317,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	@AutoLog(value = "参数清单-判断配置列表是否为空")
 	@ApiOperation(value="参数清单-判断配置列表是否为空", notes="参数清单-判断配置列表是否为空")
 	@GetMapping(value = "/verifyConfig")
-//	@RequiresPermissions("params:config:list")
+	@RequiresPermissions("params:manifest:page")
 	public Result<?> queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) {
 		List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
 		if (CollectionUtil.isNotEmpty(list)) {

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java

@@ -97,9 +97,6 @@ public class ParamsManifestEO implements Serializable {
     @TableField(exist = false)
     private String paramsTemplateName;
 
-    @TableField(exist = false)
-    private Boolean configFlag; // true-可添加配置；false-不可添加配置
-
     @TableField(exist = false)
     private String cut;
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -36,6 +36,7 @@ import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOSe
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
+import com.jero.modules.ocr.service.WebSocketServer;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -115,7 +116,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private ISysUserRoleService sysUserRoleService;
 	@Autowired
 	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
-
+	@Autowired
+	private WebSocketServer webSocketServer;
 
 
 
@@ -1552,8 +1554,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				updateParamsManifestEO.setId(paramsManifestId);
 				updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
 				updateParamsManifestEO.setFinishTime(time);
-				paramsManifestEOService.updateById(updateParamsManifestEO);
-
+				boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO);
+				if (isSuccess2) {
+					webSocketServer.sendMessage();
+				}
 			}
 
 		return isSuccess;