diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index bead11a58..88cada6f2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/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 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 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 add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.add(paramsManifestEO); if (isSuccess) { @@ -169,7 +171,7 @@ public class ParamsManifestEOController extends JeroController edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO); if (isSuccess) { @@ -188,7 +190,7 @@ public class ParamsManifestEOController extends JeroController 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 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 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 history(@RequestParam(name="title",required=true) String title) { List historyVersionList = paramsManifestEOService.getHistoryVersionList(title); return Result.OK(historyVersionList); @@ -263,7 +265,7 @@ public class ParamsManifestEOController extends JeroController 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 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 copy(@RequestBody ParamsManifestVO paramsManifestVO) { ParamsManifestEO paramsManifestEO = new ParamsManifestEO(); BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO); @@ -315,7 +317,7 @@ public class ParamsManifestEOController extends JeroController queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) { List list = paramsConfigEOService.queryList(paramsManifestId); if (CollectionUtil.isNotEmpty(list)) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 68430dd6e..4862bf93f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/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; 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 55655c56c..917df22c9 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 @@ -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