From 3424b858c5e09e697a2e44e2245b17a4bd5f4374 Mon Sep 17 00:00:00 2001 From: Mahone <22247537@qq.com> Date: Mon, 11 Apr 2022 22:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9F=A5=E8=AF=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KM/controller/KmDocController.java | 293 ------------------ .../KM/service/impl/KmDocServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 293 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/controller/KmDocController.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/controller/KmDocController.java index eff74e0..48e304f 100644 --- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/controller/KmDocController.java +++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/controller/KmDocController.java @@ -94,66 +94,6 @@ public class KmDocController extends JeecgController { return Result.OK(); } -// /** -// * 提审 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "km_doc-提审") -// @ApiOperation(value="km_doc-提审", notes="km_doc-提审") -// @PutMapping(value = "/submitAudit") -// public Result submitAudit(@RequestParam(name="id") String id) { -// KmDoc kmDoc = kmDocService.getById(id); -// if(kmDoc!= null && (kmDoc.getStatus().equals(DocStatusEnum.Draft.getCode()) -// || kmDoc.getStatus().equals(DocStatusEnum.Reject.getCode()) )){ -// kmDoc.setStatus(DocStatusEnum.WaitAudit.getCode()); -// if(kmDocService.updateById(kmDoc)){ -// return Result.OK("提审成功"); -// } -// else -// return Result.error("全部失败"); -// } -// else{ -// return Result.error("不允许提审"); -// } -// } -// -// /** -// * 批量提审 -// * -// * @param ids -// * @return -// */ -// @AutoLog(value = "km_doc-批量提审") -// @ApiOperation(value="km_doc-批量提审", notes="km_doc-批量提审") -// @PutMapping(value = "/submitAuditBatch") -// public Result submitAuditBatch(@RequestParam(name="ids",required=true) String ids) { -// Integer success = 0; -// List failIds = new ArrayList<>(); -// if(ids.length()>0) { -// List idList = Arrays.asList(ids.split(",")); -// for (String id : idList) { -// KmDoc kmDoc = kmDocService.getById(id); -// if(kmDoc!= null && (kmDoc.getStatus().equals(DocStatusEnum.Draft.getCode()) -// || kmDoc.getStatus().equals(DocStatusEnum.Reject.getCode()) )){ -// kmDoc.setStatus(DocStatusEnum.WaitAudit.getCode()); -// if(kmDocService.updateById(kmDoc)){ -// success +=1; -// } -// else -// failIds.add(id); -// } -// else{ -// failIds.add(id); -// } -// } -// } -// if(success >0) -// return Result.OK(failIds); -// else -// return Result.error("全部失败"); -// } //取消文件收录 @ApiOperation(value="km_doc-取消文件收录", notes="km_doc-取消文件收录") @@ -176,25 +116,6 @@ public class KmDocController extends JeecgController { return Result.error("文档参数不能为空"); } -// /** -// * 分页查询专题文档 -// * -// * @param topicId -// * @param pageNo -// * @param pageSize -// * @param topicId -// * @return -// */ -// @ApiOperation(value="km_doc-分页查询专题文档", notes="km_doc-分页查询专题文档") -// @GetMapping(value = "/listTopicPageList") -// public Result queryTopicPageList(@RequestParam(name="topicId",required = true) String topicId, -// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, -// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { -// Page page = new Page(pageNo, pageSize); -// IPage pageList = kmDocService.queryTopicPageList(page,topicId); -// return Result.OK(pageList); -// } - /** * 分页文件列表 * @@ -226,55 +147,6 @@ public class KmDocController extends JeecgController { return Result.OK(pageList); } - /** - * 分页待审核列表 - * - * @param kmDocParamVO - * @param pageNo - * @param pageSize - * @param req - * @return - */ -// @ApiOperation(value="km_doc-分页待审核列表", notes="km_doc-分页待审核列表") -// @GetMapping(value = "/listWaitAudit") -// @PermissionData(pageComponent = "km/filemanagement/PendingReviewList") -// public Result queryWaitAuditPageList(KmDocParamVO kmDocParamVO, -// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, -// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, -// HttpServletRequest req) { -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kmDocParamVO, req.getParameterMap()); -// String orderBy = queryWrapper.getExpression().getOrderBy().getSqlSegment(); -// kmDocParamVO.setStatusList(Arrays.asList(1)); -// Page page = new Page(pageNo, pageSize); -// IPage pageList = kmDocService.queryPageList(page,kmDocParamVO,orderBy); -// return Result.OK(pageList); -// } -// -// -// /** -// * 分页已审核列表 -// * -// * @param kmDocParamVO -// * @param pageNo -// * @param pageSize -// * @param req -// * @return -// */ -// @ApiOperation(value="km_doc-分页已审核列表", notes="km_doc-分页已审核列表") -// @GetMapping(value = "/listPassed") -// @PermissionData(pageComponent = "km/filemanagement/AuditedList") -// public Result queryPassedPageList(KmDocParamVO kmDocParamVO, -// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, -// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, -// HttpServletRequest req) { -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kmDocParamVO, req.getParameterMap()); -// String orderBy = queryWrapper.getExpression().getOrderBy().getSqlSegment(); -// kmDocParamVO.setStatusList(Arrays.asList(2)); -// Page page = new Page(pageNo, pageSize); -// IPage pageList = kmDocService.queryPageList(page,kmDocParamVO,orderBy); -// return Result.OK(pageList); -// } - @ApiOperation(value="km_doc-最新发布档案", notes="km_doc-最新发布档案") @GetMapping(value = "/listRecently") public Result queryRecentPageList(KmDocParamVO kmDocParamVO, @@ -300,171 +172,6 @@ public class KmDocController extends JeecgController { } return result; } -// -// @AutoLog(value = "km_doc-编辑并发布") -// @ApiOperation(value="km_doc-编辑并发布", notes="km_doc-编辑并发布") -// @PutMapping(value = "/editAndRelease") -// @Transactional -// public Result editAndRelease(@RequestBody KmDocParamVO kmdDocTarget,HttpServletRequest req) { -// Result result = kmDocService.editAndRelease(kmdDocTarget,req); -// if(result.isSuccess()){ -// kmDocVisitRecordService.logVisit(kmdDocTarget.getId(),IpUtils.getIpAddr(req),DocVisitTypeEnum.Edit.getCode()); -// } -// return result; -// } -// -// @AutoLog(value = "km_doc-编辑发布状态") -// @ApiOperation(value="km_doc-编辑发布状态", notes="km_doc-编辑发布状态") -// @PutMapping(value = "/editReleaseFlag") -// public Result editReleaseFlag(@RequestBody KmDoc kmDoc,HttpServletRequest req) { -// Result result = kmDocService.editReleaseFlag(kmDoc); -// if(result.isSuccess()){ -// kmDocVisitRecordService.logVisit(kmDoc.getId(),IpUtils.getIpAddr(req),DocVisitTypeEnum.Edit.getCode()); -// } -// return result; -// } -// -// @AutoLog(value = "km_doc-编辑已审核") -// @ApiOperation(value="km_doc-编辑已审核", notes="km_doc-编辑已审核") -// @PutMapping(value = "/editRelease") -// @Transactional -// public Result editAuditPassed(@RequestBody KmDocParamVO kmDocTarget,HttpServletRequest req) { -// Result result = kmDocService.editAuditPassed(kmDocTarget); -// if(result.isSuccess()){ -// kmDocVisitRecordService.logVisit(kmDocTarget.getId(),IpUtils.getIpAddr(req),DocVisitTypeEnum.Edit.getCode()); -// } -// return result; -// } -// -// /** -// * 审核驳回 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "km_doc-审核驳回") -// @ApiOperation(value="km_doc-审核驳回", notes="km_doc-审核驳回") -// @PutMapping(value = "/auditReject") -// public Result auditReject(@RequestParam(name="id",required=true) String id,HttpServletRequest req) { -// KmDoc kmDoc = kmDocService.getById(id); -// if(kmDoc !=null && kmDoc.getStatus().equals(DocStatusEnum.WaitAudit.getCode())){ -// kmDoc.setStatus(DocStatusEnum.Reject.getCode()); -// if(kmDocService.updateById(kmDoc)) { -// kmDocVisitRecordService.logVisit(kmDoc.getId(),IpUtils.getIpAddr(req),DocVisitTypeEnum.AuditReject.getCode()); -// log.info("驳回文档成功:{}",kmDoc.getName()); -// return Result.OK("审核成功!"); -// } -// } -// return Result.error("审核失败!"); -// } -// -// /** -// * 批量审核驳回 -// * -// * @param ids -// * @return -// */ -// @AutoLog(value = "km_doc-批量审核驳回") -// @ApiOperation(value="km_doc-批量审核驳回", notes="km_doc-批量审核驳回") -// @PutMapping(value = "/auditRejectBatch") -// public Result auditRejectBatch(@RequestParam(name="ids",required=true) String ids,HttpServletRequest req) { -// Integer success = 0; -// List successIds = new ArrayList<>(); -// List failIds = new ArrayList<>(); -// if(ids.length()>0) { -// List idList = Arrays.asList(ids.split(",")); -// for (String id : idList) { -// KmDoc kmDoc = kmDocService.getById(id); -// if(kmDoc!= null && kmDoc.getStatus().equals(DocStatusEnum.WaitAudit.getCode()) ){ -// kmDoc.setStatus(DocStatusEnum.Reject.getCode()); -// if(kmDocService.updateById(kmDoc)){ -// kmDocVisitRecordService.logVisit(kmDoc.getId(),IpUtils.getIpAddr(req),DocVisitTypeEnum.AuditReject.getCode()); -// log.info("驳回文档成功:{}",kmDoc.getName()); -// successIds.add(id); -// success +=1; -// } -// else -// failIds.add(id); -// } -// else{ -// failIds.add(id); -// } -// } -// } -// if(success >0) { -// return Result.OK(failIds); -// } -// else -// return Result.error("全部失败"); -// } -// -// /** -// * 审核通过 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "km_doc-审核通过") -// @ApiOperation(value="km_doc-审核通过", notes="km_doc-审核通过") -// @PutMapping(value = "/auditPass") -// public Result auditPass(@RequestParam(name="id",required=true) String id,HttpServletRequest req) { -// return kmDocService.auditDoc(id,req); -// } -// -// /** -// * 批量审核通过 -// * -// * @param ids -// * @return -// */ -// @AutoLog(value = "km_doc-批量审核通过") -// @ApiOperation(value="km_doc-批量审核通过", notes="km_doc-批量审核通过") -// @PutMapping(value = "/auditPassBatch") -// public Result auditPassBatch(@RequestParam(name="ids",required=true) String ids,HttpServletRequest req) { -// Integer success = 0; -// List successIds = new ArrayList<>(); -// List failIds = new ArrayList<>(); -// if(ids.length()>0) { -// String ip = IpUtils.getIpAddr(req); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// //String userId = "1"; -// if(sysUser == null) -// return Result.error("用户信息异常"); -// -// String userId = sysUser.getUsername(); -// -// List idList = Arrays.asList(ids.split(",")); -// for (String id : idList) { -// KmDoc kmDoc = kmDocService.getById(id); -// if(kmDoc!= null && kmDoc.getStatus().equals(DocStatusEnum.WaitAudit.getCode()) ){ -// kmDoc.setStatus(DocStatusEnum.Passed.getCode()); -// kmDoc.setLastUpdateTime(DateUtils.getDate()); -// kmDoc.setLastUpdateBy(userId); -// if(kmDocService.updateById(kmDoc)){ -// kmDocService.indexDocSync(kmDoc); -// successIds.add(id); -// success +=1; -// -// log.info("审核文档成功:{}",kmDoc.getName()); -// kmDocVisitRecordService.logVisit(id, -// IpUtils.getIpAddr(req), -// DocVisitTypeEnum.AuditPass.getCode()); -// } -// else -// failIds.add(id); -// } -// else{ -// failIds.add(id); -// } -// } -// } -// if(success >0) { -// //审核后才入库ES kmDocService.indexDocSyncBatch(successIds); -// return Result.OK(failIds); -// } -// else -// return Result.error("全部失败"); -// } /** * 通过id删除 diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java index cda81ad..ff889d4 100644 --- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/service/impl/KmDocServiceImpl.java @@ -1213,6 +1213,7 @@ public class KmDocServiceImpl extends ServiceImpl implements if(kmDocOrig == null) return Result.error("找不到文档"); if(kmDocOrig.getStatus() != DocStatusEnum.Draft.getCode() + && kmDocOrig.getStatus() != DocStatusEnum.Passed.getCode() && kmDocOrig.getStatus() != DocStatusEnum.WaitAudit.getCode() && kmDocOrig.getStatus() != DocStatusEnum.Reject.getCode() ) return Result.error("文档状态不允许修改");