diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java index 43be4e3..f47ade5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.expert.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.expert.manage.ExpertAdminManage; import com.ningdatech.pmapi.expert.manage.ExpertManage; import com.ningdatech.pmapi.expert.model.ExpertAdminExpertManageQuery; @@ -40,18 +41,21 @@ public class ExpertController { @PostMapping("/registration") @ApiOperation("社会专家报名") + @WebLog("社会专家报名") public void expertRegistration(@Valid @RequestBody ExpertRegistrationRequest request) { expertManage.expertRegistration(request); } @PostMapping("/basic-info-submit") @ApiOperation("专家管理员新增专家)") + @WebLog("专家管理员新增专家") public void expertBasicInfoSubmit(@Valid @RequestBody ExpertUserBasicInfoSubmitRequest request) { expertManage.expertBasicInfoSubmit(request); } @GetMapping("/detail") @ApiOperation("专家获取专家详细信息") + @WebLog("专家获取专家详细信息") public ExpertFullInfoVO getExpertFullInfoDetail() { return expertManage.getExpertFullInfoDetail(null); } @@ -59,12 +63,14 @@ public class ExpertController { @GetMapping("/admin/detail") @ApiOperation("专家管理员获取专家详细信息") + @WebLog("专家管理员获取专家详细信息") public ExpertFullInfoVO getExpertFullInfoDetail(@RequestParam(value = "expertUserId") @NotNull Long expertUserId) { return expertManage.getExpertFullInfoDetail(expertUserId); } @PostMapping("/expert-library/list") @ApiOperation("专家库列表查询接口") + @WebLog("专家库列表查询接口") public PageVo getExpertLibraryList( @RequestBody @Valid ExpertAdminExpertManageQuery expertAdminExpertManageQuery) { return expertAdminManage.getExpertLibraryList(expertAdminExpertManageQuery); @@ -72,6 +78,7 @@ public class ExpertController { @PostMapping("/basic-info-modify") @ApiOperation("专家信息编辑") + @WebLog("专家信息编辑") public ExpertBasicInfoModifyResultVO expertBasicInfoModify(@Valid @RequestBody AdminExpertBasicInfoModifyRequest request) { // ExpertUserInfoValidator.expertBasicInfoModifyRequestValidate(request); return expertAdminManage.adminModifyExpertBasicInfo(request); @@ -79,6 +86,7 @@ public class ExpertController { @PostMapping("/get-zzd-info") @ApiOperation("获取浙政钉用户信息") + @WebLog("获取浙政钉用户信息") public ZzdInfoByMobileVO getZzdInfo(@Valid @RequestBody GetZzdInfoRequest request) { return expertAdminManage.getZzdInfo(request); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java index 80fc97a..931f4b5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.expert.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.expert.manage.ExpertMetaApplyManage; import com.ningdatech.pmapi.expert.model.cmd.MetaApplyListQuery; import com.ningdatech.pmapi.expert.model.req.MetaApplyResultRequest; @@ -34,23 +35,27 @@ public class ExpertMetaApplyController { @PostMapping("/list") @ApiOperation(value = "审核列表筛选") + @WebLog("审核列表筛选") public PageVo metaApplyListQuery(@RequestBody @Valid MetaApplyListQuery metaApplyListQuery) { return expertMetaApplyManage.metaApplyListQuery(metaApplyListQuery); } @PostMapping("/result") @ApiOperation(value = "审核结果处理") + @WebLog("审核结果处理") public void metaApplyResult(@RequestBody @Valid MetaApplyResultRequest applyResultRequest) { expertMetaApplyManage.metaApplyResult(applyResultRequest); } @PostMapping("/revoke/{applyId}") @ApiOperation(value = "申请撤销") + @WebLog("申请撤销") public void metaApplyRevoke(@PathVariable Long applyId) { expertMetaApplyManage.metaApplyRevoke(applyId); } @ApiOperation("申请审核详情") + @WebLog("申请审核详情") @GetMapping("/detail/{applyId}") public MetaApplyResultVo applyAuditDetail(@PathVariable Long applyId) { return expertMetaApplyManage.metaApplyResult(applyId); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java index dbda6c1..a841a8a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java @@ -41,6 +41,7 @@ public class ExpertReviewController { @GetMapping("/detail/{meetingId}/{projectId}/{userId}") @ApiOperation("获取专家评审详情") + @WebLog("获取专家评审详情") @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "专家ID"), @ApiImplicitParam(name = "projectId", value = "项目ID") @@ -57,6 +58,7 @@ public class ExpertReviewController { @ApiImplicitParam(name = "meetingId", value = "会议ID") }) @ApiOperation("查看组员评审意见") + @WebLog("查看组员评审意见") public List listForGroupLeader(@PathVariable Long meetingId, @PathVariable Long projectId) { return expertReviewManage.listReviews(projectId, meetingId, true); @@ -68,6 +70,7 @@ public class ExpertReviewController { @ApiImplicitParam(name = "meetingId", value = "会议ID") }) @ApiOperation("查看项目某次会议的所有评审意见") + @WebLog("查看项目某次会议的所有评审意见") public List list(@PathVariable Long meetingId, @PathVariable Long projectId) { return expertReviewManage.listReviews(projectId, meetingId, false); @@ -78,6 +81,7 @@ public class ExpertReviewController { @ApiImplicitParam(name = "projectCode", value = "项目编号"), }) @ApiOperation("查看项目的所有评审意见") + @WebLog("查看项目的所有评审意见") public ProjectReviewDetailVO projectExpertReviewDetail(@PathVariable String projectCode) { return expertReviewManage.projectExpertReviewDetail(projectCode); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java index 244ea81..27438da 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java @@ -33,6 +33,7 @@ public class ReviewTemplateSettingsController { @GetMapping("/template/{templateType}/{regionCode}") @ApiOperation("根据模版类型获取模版") + @WebLog("根据模版类型获取模版") public ReviewTemplateVO getReviewTemplateByType(@PathVariable Integer templateType, @PathVariable String regionCode) { return reviewTemplateSettingsManage.getReviewTemplateSettings(templateType, regionCode); } @@ -46,6 +47,7 @@ public class ReviewTemplateSettingsController { @GetMapping("/template") @ApiOperation("根据模版ID获取评审模版") + @WebLog("根据模版ID获取评审模版") @ApiImplicitParam(name = "templateId", defaultValue = "模版ID") public ReviewTemplateVO getTemplateById(@RequestParam Long templateId) { return reviewTemplateSettingsManage.getReviewTemplateSettings(templateId); @@ -53,6 +55,7 @@ public class ReviewTemplateSettingsController { @GetMapping("/templates") @ApiOperation("(批量)根据模版ID获取评审模版") + @WebLog("(批量)根据模版ID获取评审模版") @ApiImplicitParam(name = "templateIds", defaultValue = "模版ID集合") public List getTemplateById(@RequestParam List templateIds) { return reviewTemplateSettingsManage.listReviewTemplateSettings(templateIds); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java index 3bf7fa9..8717373 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.filemanage.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.filemanage.manage.DocumentationManage; import com.ningdatech.pmapi.filemanage.model.dto.DocumentationGroupSaveDTO; import com.ningdatech.pmapi.filemanage.model.dto.DocumentationSaveDTO; @@ -31,42 +32,49 @@ public class DocumentationController { @GetMapping("/group/list") @ApiOperation(value = "分组列表", notes = "分组列表") + @WebLog("档案管理-资料文档-分组列表") public List groupList(){ return documentationManage.groupList(); } @PostMapping("/group/add") @ApiOperation(value = "分组添加", notes = "分组添加") + @WebLog("档案管理-资料文档-分组添加") public String addGroup(@Validated @RequestBody DocumentationGroupSaveDTO dto){ return documentationManage.addGroup(dto); } @PostMapping("/group/delete/{id}") @ApiOperation(value = "分组删除", notes = "分组删除") + @WebLog("档案管理-资料文档-分组删除") public String deleteGroup(@PathVariable Long id){ return documentationManage.deleteGroup(id); } @GetMapping("/list") @ApiOperation(value = "文档列表", notes = "文档列表") + @WebLog("档案管理-资料文档-文档列表") public PageVo list(@ModelAttribute DocumentationListParam param){ return documentationManage.list(param); } @GetMapping("/detail/{id}") @ApiOperation(value = "文档详情", notes = "文档详情") + @WebLog("档案管理-资料文档-文档详情") public DocumentationVO detail(@PathVariable Long id){ return documentationManage.detail(id); } @PostMapping("/add") @ApiOperation(value = "文档添加", notes = "文档添加") + @WebLog("档案管理-资料文档-文档添加") public String addDoc(@Validated @RequestBody DocumentationSaveDTO dto){ return documentationManage.addDoc(dto); } @PostMapping("/delete/{id}") @ApiOperation(value = "文档删除", notes = "文档删除") + @WebLog("档案管理-资料文档-文档删除") public String deleteDoc(@PathVariable Long id){ return documentationManage.deleteDoc(id); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java index 0605b44..269fbe6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.filemanage.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.filemanage.manage.ProjectFileManage; import com.ningdatech.pmapi.filemanage.model.param.ProjectFileListParam; import com.ningdatech.pmapi.filemanage.model.vo.ProjectFileListVO; @@ -28,18 +29,21 @@ public class ProjectFileController { @GetMapping("/list") @ApiOperation(value = "档案列表", notes = "档案列表") + @WebLog("档案管理-项目档案-档案列表") public PageVo list(@ModelAttribute ProjectFileListParam param){ return projectFileManage.list(param); } @GetMapping("/{projectId}") @ApiOperation(value = "档案详情", notes = "档案详情") + @WebLog("档案管理-项目档案-档案详情") public ProjectFileVO file(@PathVariable Long projectId){ return projectFileManage.file(projectId); } @PostMapping("/want-read/{projectId}") @ApiOperation(value = "申请借阅", notes = "申请借阅") + @WebLog("档案管理-项目档案-申请借阅") public String wantRead(@PathVariable Long projectId){ return projectFileManage.wantRead(projectId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java index fb49fdf..74a4ded 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.fiscal.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.fiscal.manage.CompanyFiscalCodeManage; import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO; import com.ningdatech.pmapi.fiscal.model.po.ReqGetCompanyFiscalCodeAndSealSnPO; @@ -33,12 +34,14 @@ public class CompanyFiscalCodeController { @ApiOperation(value = "财政编码-配置", notes = "财政编码配置") @PostMapping("/fiscal-and-seal/configure") + @WebLog("财政编码-配置") public void fiscalAndSealCodeConfigure(@Valid @RequestBody ReqCompanyFiscalCodeAndSealSnPO reqCompanyFiscalCodeAndSealSnPO) { companyFiscalCodeManage.fiscalCodeConfigure(reqCompanyFiscalCodeAndSealSnPO); } @ApiOperation(value = "获取财政编码-配置", notes = "获取财政编码配置") @PostMapping("/fiscal-and-seal/get-configure") + @WebLog("获取财政编码配置") public ResCompanyFiscalCodeAndSealSnVO getFiscalAndSealCodeConfigure(@Valid @RequestBody ReqGetCompanyFiscalCodeAndSealSnPO request) { return companyFiscalCodeManage.getFiscalCodeConfigure(request); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java b/pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java index df7443b..b5f091c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java @@ -4,6 +4,7 @@ package com.ningdatech.pmapi.leave.controller; import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.model.IdVo; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.leave.entity.po.LeaveCreateReq; import com.ningdatech.pmapi.leave.entity.po.LeaveListByCreatorReq; import com.ningdatech.pmapi.leave.entity.vo.LeaveDetailVO; @@ -35,11 +36,13 @@ public class ExpertLeaveController { @ApiOperation("请假") @PostMapping("/save") + @WebLog("请假") public IdVo askForLeave(@Valid @RequestBody LeaveCreateReq po) { return leaveManage.askForLeave(po); } @ApiOperation("请假详情") + @WebLog("请假详情") @GetMapping(value = {"/detail/{leaveId}", "/detail/{auditId}/byApply"}) public LeaveDetailVO detail(@PathVariable(required = false) Long leaveId, @PathVariable(required = false) Long auditId) { @@ -50,18 +53,21 @@ public class ExpertLeaveController { } @ApiOperation("我的请假列表(发起人)") + @WebLog("我的请假列表(发起人)") @GetMapping("/leaveListByCreator") public PageVo leaveListByCreator(LeaveListByCreatorReq po) { return leaveManage.leaveListByCreator(po); } @ApiOperation("销假") + @WebLog("销假") @GetMapping("/endLeave") public void endLeave(Long leaveId) { leaveManage.endLeave(leaveId); } @ApiOperation("撤销") + @WebLog("撤销") @GetMapping("/cancel") public void cancelLeave(Long leaveId) { leaveManage.cancel(leaveId); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java b/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java index 80b2081..dd67179 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.meta.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.meta.manage.MetaManage; import com.ningdatech.pmapi.meta.model.po.ReqAddDictionaryPO; import com.ningdatech.pmapi.meta.model.po.ReqDictionaryListPO; @@ -35,6 +36,7 @@ public class MetaDictionaryManageController { @PostMapping("/list") @ApiOperation("字典筛选数据返回") + @WebLog("字典筛选数据返回") public List expertDictList(@RequestBody ReqDictionaryListPO request) { DictionaryRequestValidator.dictionaryRequestValidator(request); return metaManage.getDictionaryList(request); @@ -42,6 +44,7 @@ public class MetaDictionaryManageController { @PostMapping("/common/list") @ApiOperation("通用字典筛选数据返回") + @WebLog("通用字典筛选数据返回") public List commonDictList(@RequestBody ReqDictionaryListPO request) { DictionaryRequestValidator.dictionaryRequestValidator(request); return metaManage.commonDictList(request); @@ -49,12 +52,14 @@ public class MetaDictionaryManageController { @PostMapping("/add/dictionary") @ApiOperation("添加字典值") + @WebLog("添加字典值") public void addDictionary(@Valid @RequestBody ReqAddDictionaryPO reqAddDictionaryPO) { metaManage.addDictionary(reqAddDictionaryPO); } @PostMapping("/remove/dictionary/{dictionaryCode}") @ApiOperation("删除字典值") + @WebLog("删除字典值") public void removeDictionary(@PathVariable String dictionaryCode) { metaManage.removeDictionary(dictionaryCode); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java b/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java index 6b27ddc..e66f767 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.meta.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.meta.manage.MetaManage; import com.ningdatech.pmapi.meta.model.po.ReqAddTagTypePO; import com.ningdatech.pmapi.meta.model.po.ReqTagListPO; @@ -46,6 +47,7 @@ public class MetaTagManageController { @PostMapping("/tag") @ApiOperation("获取专家标签的树状结构") + @WebLog("获取专家标签的树状结构") public List getRegionTree(HttpServletResponse response, @RequestBody ReqTagListPO request) { response.setHeader("Cache-Control", MAX_AGE_STR); TagListRequestValidator.tagListRequestValidator(request); @@ -54,24 +56,28 @@ public class MetaTagManageController { @PostMapping("/tag/query") @ApiOperation("标签查询接口") + @WebLog("标签查询接口") public List tagQuery(@Valid @RequestBody ReqTagQueryPO reqTagQueryPO) { return metaManage.tagQuery(reqTagQueryPO); } @PostMapping("/tag-tyoe/list") @ApiOperation("获取标签分类列表") + @WebLog("获取标签分类列表") public List tagTypeList() { return metaManage.tagTypeList(); } @PostMapping("/add/tag-type") @ApiOperation("新增标签分类") + @WebLog("新增标签分类") public void addTagType(@Valid @RequestBody ReqAddTagTypePO request) { metaManage.addTagType(request); } @PostMapping("/remove/tag/{tagCode}") @ApiOperation("删除标签") + @WebLog("删除标签") public void removeTagName(@PathVariable String tagCode) { metaManage.removeTagName(tagCode); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java index 038877d..438aab2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.organization.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.organization.manage.OrganizationManage; import com.ningdatech.pmapi.organization.model.po.ReqOrganizationListPO; import com.ningdatech.pmapi.organization.model.po.ReqSynthesizePO; @@ -39,17 +40,20 @@ public class DingOrganizationController { @ApiOperation("单位列表筛选") @PostMapping("/list") + @WebLog("单位列表筛选") public PageVo organizationList(@Valid @RequestBody ReqOrganizationListPO reqOrganizationListPO) { return organizationManage.organizationList(reqOrganizationListPO); } @PostMapping("/get-child-list") @ApiOperation("获取组织架构的树状结构(单位筛选列表)") + @WebLog("获取组织架构的树状结构(单位筛选列表)") public List getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode, @RequestParam(value = "orgName", required = false) String orgName) { return organizationManage.getChildOrganizationList(parentCode, orgName, false); } @ApiOperation("组织树状列表筛选(前端定制化接口不可复用)") + @WebLog("组织树状列表筛选(前端定制化接口不可复用)") @PostMapping("/tree-list") public List treeVOList(@Valid @RequestBody ReqSynthesizePO request) { return organizationManage.treeRubbishVOList(request); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java index 65c6e3c..6dc0940 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.organization.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.organization.manage.GovBusinessStripManage; import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO; import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO; @@ -38,6 +39,7 @@ public class GovBusinessStripController { @GetMapping("/get-child-list") @ApiOperation("获取条线标签的的树状结构") + @WebLog("获取条线标签的的树状结构") public List getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode) { return govBusinessStripManage.getChildOrganizationList(parentCode); } @@ -45,6 +47,7 @@ public class GovBusinessStripController { @GetMapping("/list") @ApiOperation("获取省局条线列表") + @WebLog("获取省局条线列表") public List getProvincialGovBusinessStripList(@RequestParam(value = "businessStripName", required = false) String businessStripName) { return govBusinessStripManage.getProvincialGovBusinessStripList(businessStripName); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java index af0c6cc..133b403 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.organization.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.wflow.bean.dto.WflowOrgProcdefDto; import com.wflow.bean.vo.OrgProcdefVo; import com.wflow.service.OrgProcdefService; @@ -32,6 +33,7 @@ public class ProcDefController { @ApiOperation(value = "单位流程配置列表", notes = "单位流程配置列表") @GetMapping("/list") + @WebLog("单位流程配置列表") public PageVo list(@RequestParam String orgCode, @RequestParam(defaultValue = "1") Integer pageNumber, @RequestParam(defaultValue = "10") Integer pageSize) { return orgProcdefService.getOrgProcessByOrgCode(orgCode, pageNumber, pageSize); @@ -39,18 +41,21 @@ public class ProcDefController { @ApiOperation(value = "单位流程配置详情", notes = "单位流程配置详情") @GetMapping("/detail/{processDefId}") + @WebLog("单位流程配置详情") public OrgProcdefVo detail(@PathVariable String processDefId) { return orgProcessModelService.getProcess(processDefId); } @ApiOperation(value = "单位流程配置保存", notes = "单位流程配置保存") @PostMapping("/save") + @WebLog("单位流程配置保存") public String save(@Validated @RequestBody WflowOrgProcdefDto wflowOrgProcdefDto) { return orgProcessModelService.saveProcess(wflowOrgProcdefDto); } @ApiOperation(value = "单位流程配置启用", notes = "单位流程配置启用") @PutMapping("/enable/{processDefId}") + @WebLog("单位流程配置启用") public String enableProcess(@PathVariable String processDefId) { orgProcessModelService.enableProcess(processDefId, Boolean.FALSE); return "启用成功"; @@ -58,6 +63,7 @@ public class ProcDefController { @ApiOperation(value = "单位流程配置禁用", notes = "单位流程配置禁用") @PutMapping("/disable/{processDefId}") + @WebLog("单位流程配置禁用") public String disableProcess(@PathVariable String processDefId) { orgProcessModelService.enableProcess(processDefId, Boolean.TRUE); return "禁用成功"; @@ -65,12 +71,14 @@ public class ProcDefController { @ApiOperation(value = "单位流程配置部署", notes = "单位流程配置部署") @PostMapping("/deploy/{processDefId}") + @WebLog("单位流程配置部署") public String deploy(@Validated @PathVariable String processDefId) { return orgProcessModelService.deployProcess(processDefId, null); } @ApiOperation(value = "单位流程配置删除", notes = "单位流程配置删除") @PostMapping("/delete/{processDefId}") + @WebLog("单位流程配置删除") public Boolean delete(@PathVariable String processDefId) { return orgProcessModelService.delProcess(processDefId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java index f44fb07..8f7464e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.ConstructionManage; import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; @@ -38,6 +39,7 @@ public class ConstructionController { private final ConstructionManage constructionManage; @ApiOperation(value = "待合同备案的项目列表", notes = "合同备案的项目列表") + @WebLog("合同备案的项目列表") @GetMapping("/contract/project-list") public PageVo projectlist(@ModelAttribute ProjectListReq req) { return constructionManage.projectLibList(req); @@ -45,23 +47,27 @@ public class ConstructionController { @GetMapping("/contract/export") @ApiOperation("待合同备案的项目列表导出") + @WebLog("待合同备案的项目列表导出") public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,constructionManage::exportList); } @ApiOperation(value = "合同备案的详情-通过项目ID", notes = "合同备案的详情-通过项目ID") + @WebLog("合同备案的详情-通过项目ID") @GetMapping("/contract/detail/{projectId}") public ContractVO detailContractByProjectId(@PathVariable Long projectId) { return constructionManage.detailContractByProjectId(projectId); } @ApiOperation(value = "填写合同信息", notes = "填写合同信息") + @WebLog("填写合同信息") @PostMapping("/submit-contract") public String submitContract(@Validated @RequestBody ContractSaveDTO dto) { return constructionManage.submitContract(dto); } @ApiOperation(value = "待初验备案的项目列表", notes = "待初验备案的项目列表") + @WebLog("待初验备案的项目列表") @GetMapping("/pre-ins/project-list") public PageVo preProjectlist(@ModelAttribute ProjectListReq req) { return constructionManage.preProjectlist(req); @@ -69,17 +75,20 @@ public class ConstructionController { @GetMapping("/pre-ins/export") @ApiOperation("待初验备案的项目列表导出") + @WebLog("待初验备案的项目列表导出") public void exportPreList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,constructionManage::exportPreList); } @ApiOperation(value = "初验备案的详情-通过项目ID", notes = "初验备案的详情-通过项目ID") + @WebLog("初验备案的详情-通过项目ID") @GetMapping("/pre-ins/detail/{projectId}") public PreInsVO detailPreInsByProjectId(@PathVariable Long projectId) { return constructionManage.detailPreInsByProjectId(projectId); } @ApiOperation(value = "填写初验信息", notes = "填写初验信息") + @WebLog("填写初验信息") @PostMapping("/submit-pre-ins") public String submitPreIns(@Validated @RequestBody PreInsSaveDTO dto) { return constructionManage.submitPreIns(dto); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java index 805c88f..6dcd7e5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; @@ -32,12 +33,14 @@ public class ConstructionPlanController { private final ConstructionPlanManage constructionPlanManage; @ApiOperation(value = "可申报建设方案项目列表", notes = "可申报建设方案项目列表") + @WebLog("可申报建设方案项目列表") @GetMapping("/list") public PageVo list(@Validated @ModelAttribute ConstrctionPlanListReq planReq) { return constructionPlanManage.projectLibList(planReq); } @ApiOperation(value = "建设方案申报", notes = "建设方案申报") + @WebLog("建设方案申报") @PostMapping("/start") public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { String instanceId = constructionPlanManage.startTheProcess(dto); @@ -46,6 +49,7 @@ public class ConstructionPlanController { @GetMapping("/export") @ApiOperation("可申报建设方案项目列表导出") + @WebLog("可申报建设方案项目列表导出") public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response) { ExcelDownUtil.downXls(response, planReq, constructionPlanManage::exportList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java index 71df54a..15e8215 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java @@ -4,6 +4,7 @@ import java.util.Iterator; import javax.servlet.http.HttpServletResponse; +import com.ningdatech.log.annotation.WebLog; import org.apache.commons.lang3.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,12 +46,14 @@ public class DeclaredProjectController { private final ProjectAdjustmentManage projectAdjustmentManage; @ApiOperation(value = "申报项目已申报列表", notes = "申报项目已申报列表") + @WebLog("申报项目已申报列表") @GetMapping("/list") public PageVo list(@ModelAttribute ProjectListReq req) { return declaredProjectManage.projectLibList(req); } @ApiOperation(value = "核心业务列表", notes = "核心业务列表") + @WebLog("核心业务列表") @GetMapping("/core-biz") public JSONObject bizList(@RequestParam(required = false) String businessName) { JSONObject jsonObject = JSONObject.parseObject(DeclaredProjectContant.Biz.CORE_BIZ); @@ -71,24 +74,28 @@ public class DeclaredProjectController { } @ApiOperation(value = "申报项目草稿箱列表", notes = "申报项目草稿箱列表") + @WebLog("申报项目草稿箱列表") @GetMapping("/draft") public PageVo draft(@ModelAttribute DeclaredProjectListParamDTO params) { return declaredProjectManage.pageDraft(params); } @ApiOperation(value = "申报项目草稿箱详情", notes = "申报项目草稿箱详情") + @WebLog("申报项目草稿箱详情") @GetMapping("/draft/{id}") public ProjectDraftVO draft(@PathVariable(value = "id") Long id) { return declaredProjectManage.draftDatail(id); } @ApiOperation(value = "申报项目保存至草稿箱", notes = "申报项目保存至草稿箱") + @WebLog("申报项目保存至草稿箱") @PostMapping("/save-to-draft") public Object saveToDraft(@Validated @RequestBody ProjectDraftSaveDTO dto) { return declaredProjectManage.saveToDraft(dto); } @ApiOperation(value = "申报项目", notes = "申报项目") + @WebLog("申报项目") @PostMapping("/start") public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { String instanceId = declaredProjectManage.startTheProcess(dto); @@ -96,6 +103,7 @@ public class DeclaredProjectController { } @ApiOperation(value = "重新申报项目", notes = "重新申报项目") + @WebLog("重新申报项目") @PostMapping("/restart") public String reStartTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { return projectAdjustmentManage.adjustment(dto); @@ -103,6 +111,7 @@ public class DeclaredProjectController { @GetMapping("/export") @ApiOperation("申报项目列表导出") + @WebLog("申报项目列表导出") public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,declaredProjectManage::exportList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java index d36a1d4..a6b53f0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.DelayedApplyManage; import com.ningdatech.pmapi.projectdeclared.model.dto.DelayedApplyDTO; @@ -31,6 +32,7 @@ public class DelayedApplyController { private final DelayedApplyManage delayedApplyManage; @ApiOperation(value = "过期的项目列表", notes = "过期的项目列表") + @WebLog("过期的项目列表") @GetMapping("/project-list") public PageVo projectlist(@ModelAttribute ProjectListReq req) { return delayedApplyManage.projectLibList(req); @@ -38,11 +40,13 @@ public class DelayedApplyController { @GetMapping("/export") @ApiOperation("过期的项目列表导出") + @WebLog("过期的项目列表导出") public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,delayedApplyManage::exportList); } @ApiOperation(value = "延期申报", notes = "延期申报") + @WebLog("延期申报") @PostMapping("/apply") public String delayedApply(@Validated @RequestBody DelayedApplyDTO dto) { return delayedApplyManage.delayedApply(dto); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java index 4942650..3db077d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.FinalAcceptanceManage; import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; @@ -33,6 +34,7 @@ public class FinalAcceptanceController { private final FinalAcceptanceManage finalAcceptanceManage; @ApiOperation(value = "待终验申报的项目列表", notes = "待终验申报的项目列表") + @WebLog("待终验申报的项目列表") @GetMapping("/project-list") public PageVo projectlist(@ModelAttribute ProjectListReq req) { return finalAcceptanceManage.projectLibList(req); @@ -40,17 +42,20 @@ public class FinalAcceptanceController { @GetMapping("/export") @ApiOperation("待终验申报的项目导出") + @WebLog("待终验申报的项目导出") public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,finalAcceptanceManage::exportList); } @ApiOperation(value = "待终验申报的项目列表", notes = "待终验申报的项目列表") + @WebLog("待终验申报的项目列表") @GetMapping("/detail/{projectId}") public FinalAcceptanceVO detailByProjectId(@PathVariable Long projectId) { return finalAcceptanceManage.detailByProjectId(projectId); } @ApiOperation(value = "终验申报", notes = "终验申报") + @WebLog("终验申报") @PostMapping("/start-process") public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { String instanceId = finalAcceptanceManage.startProcess(dto); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java index b29ccc7..764267a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.projectdeclared.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.projectdeclared.manage.IrsManage; import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO; @@ -28,12 +29,14 @@ public class IrsController { private final IrsManage irsManage; @ApiOperation(value = "irs应用列表", notes = "irs应用列表") + @WebLog("irs应用列表") @GetMapping("/application-list") public List applicationList() { return irsManage.applicationList(); } @ApiOperation(value = "试点任务列表", notes = "试点任务列表") + @WebLog("试点任务列表") @GetMapping("/piot-tasks") public List piotTasks() { return irsManage.listPiotTasks(); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java index 4828dca..9b6eca6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import javax.servlet.http.HttpServletResponse; +import com.ningdatech.log.annotation.WebLog; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,12 +35,14 @@ public class PrequalificationDeclaredController { private final PrequalificationDeclaredProjectManage prequalificationDeclaredProjectManage; @ApiOperation(value = "可预审申报项目列表", notes = "可预审申报项目列表") + @WebLog("可预审申报项目列表") @GetMapping("/list") public PageVo list(@Validated @ModelAttribute PrequalificationDeclaredListReq preReq) { return prequalificationDeclaredProjectManage.pageInfo(preReq); } @ApiOperation(value = "申报预审", notes = "申报预审") + @WebLog("申报预审") @PostMapping("/start") public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { return prequalificationDeclaredProjectManage.startTheProcess(dto); @@ -47,6 +50,7 @@ public class PrequalificationDeclaredController { @GetMapping("/export") @ApiOperation("可预审申报项目列表导出") + @WebLog("可预审申报项目列表导出") public void exportList(PrequalificationDeclaredListReq preReq, HttpServletResponse response){ ExcelDownUtil.downXls(response,preReq,prequalificationDeclaredProjectManage::exportList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java index ee1cba3..22605a4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; @@ -35,12 +36,14 @@ public class ProjectAdjustmentController { private final ProjectAdjustmentManage projectAdjustmentManage; @ApiOperation(value = "可做项目内容调整的列表", notes = "可做项目内容调整的列表") + @WebLog("可做项目内容调整的列表") @GetMapping("/list") public PageVo list(@Validated @ModelAttribute AdjustmentListReq preReq) { return projectAdjustmentManage.projectLibList(preReq); } @ApiOperation(value = "项目内容调整", notes = "项目内容调整") + @WebLog("项目内容调整") @PostMapping public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { String instanceId = projectAdjustmentManage.adjustment(dto); @@ -49,6 +52,7 @@ public class ProjectAdjustmentController { @GetMapping("/export") @ApiOperation("项目内容调整列表导出") + @WebLog("项目内容调整列表导出") public void exportList(AdjustmentListReq preReq, HttpServletResponse response){ ExcelDownUtil.downXls(response,preReq,projectAdjustmentManage::exportList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java index 1b7ea33..b6fe07d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; import com.ningdatech.pmapi.projectdeclared.manage.PurchaseManage; @@ -34,12 +35,14 @@ public class PurchaseController { private final ProjectAdjustmentManage projectAdjustmentManage; @ApiOperation(value = "待采购结果备案列表", notes = "待采购结果备案列表") + @WebLog("待采购结果备案列表") @GetMapping("/project-list") public PageVo projectlist(@ModelAttribute ProjectListReq req) { return purchaseManage.projectLibList(req); } @ApiOperation(value = "采购结果备案详情", notes = "采购结果备案详情") + @WebLog("采购结果备案详情") @GetMapping("/detail/{projectId}") public PurchaseVO detailByProjectId(@PathVariable Long projectId) { return purchaseManage.detailByProjectId(projectId); @@ -47,11 +50,13 @@ public class PurchaseController { @GetMapping("/export") @ApiOperation("待采购结果备案列表导出") + @WebLog("待采购结果备案列表导出") public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,purchaseManage::exportList); } @ApiOperation(value = "填写采购结果", notes = "填写采购结果") + @WebLog("填写采购结果") @PostMapping("/submit-result") public String submitResult(@Validated @RequestBody PurchaseSaveDTO dto) { return purchaseManage.submitResult(dto); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java index 311b76e..8850698 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java @@ -37,6 +37,7 @@ public class AnnualPlanController { @GetMapping("/list") @ApiOperation("年度计划库列表") + @WebLog("年度计划库列表") public PageVo annualPlanLibList(ProjectListReq req) { return annualPlanLibManage.annulPlanLibList(req); } @@ -78,12 +79,14 @@ public class AnnualPlanController { @PostMapping("/exportList") @ApiOperation("项目(增补)库列表导出") + @WebLog("项目(增补)库列表导出") public void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) { annualPlanLibManage.exportList(param, response); } @PostMapping("/exportModifyList") @ApiOperation("项目(增补)库编辑表导出") + @WebLog("项目(增补)库编辑表导出") public void exportModifyList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) { annualPlanLibManage.exportModifyList(param, response); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java index fa5b865..3c977c0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.projectlib.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; @@ -38,6 +39,7 @@ public class ProjectLibController { @GetMapping("/list") @ApiOperation("项目库列表") + @WebLog("项目库列表") public PageVo projectLibList(ProjectListReq req) { UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); return projectLibManage.projectLibListWithPermission(req,user); @@ -45,18 +47,21 @@ public class ProjectLibController { @GetMapping("/{id}") @ApiOperation("获取项目详情") + @WebLog("获取项目详情") private ProjectDetailVO detail (@PathVariable Long id){ return projectLibManage.getProjectDetail(id); } @GetMapping("/processSchedule/{projectId}") @ApiOperation("项目库申报项目当前进度详情") + @WebLog("项目库申报项目当前进度详情") private List processScheduleDetail(@PathVariable("projectId") Long projectId){ return projectLibManage.processScheduleDetail(projectId); } @PostMapping("/exportList") @ApiOperation("项目库列表导出") + @WebLog("项目库列表导出") private void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response){ projectLibManage.exportList(param,response); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java index 06fceed..3ba4ab1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectlib.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectlib.manage.ProjectRenewalFundManage; import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; @@ -33,42 +34,49 @@ public class ProjectRenewalFundDeclarationController { @GetMapping("/list") @ApiOperation("项目续建资金库") + @WebLog("项目续建资金库") public PageVo list(ProjectRenewalListReq req) { return projectRenewalFundManage.list(req); } @GetMapping("/{id}") @ApiOperation("项目续建资金详情") + @WebLog("项目续建资金详情") private ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){ return projectRenewalFundManage.detail(id); } @PostMapping("/declared") @ApiOperation("项目续建资金申请") + @WebLog("项目续建资金申请") private Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){ return projectRenewalFundManage.declared(dto); } @PostMapping("/audit") @ApiOperation("续建项目审核") + @WebLog("续建项目审核") private Long audit(@Validated @RequestBody ProjectRenewalAuditReq param){ return projectRenewalFundManage.audit(param); } @DeleteMapping("/delete/{projectRenewalId}") @ApiOperation("续建项目删除") + @WebLog("续建项目删除") private Long delete(@PathVariable("projectRenewalId") Long projectRenewalId){ return projectRenewalFundManage.delete(projectRenewalId); } @GetMapping("/export") @ApiOperation("项目库续建项目列表导出") + @WebLog("项目库续建项目列表导出") private void exportList(ProjectRenewalListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportList); } @GetMapping("/exportRenewalDeclare") @ApiOperation("申报管理续建项目资金申报列表导出") + @WebLog("申报管理续建项目资金申报列表导出") private void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportRenewalDeclareList); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java index 1b6733e..2eed155 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.sms.controller; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.sms.constant.VerificationCodeType; import com.ningdatech.pmapi.sms.manage.SmsManage; import com.ningdatech.pmapi.sms.model.po.ReqVerificationCodePO; @@ -34,6 +35,7 @@ public class VerificationCodeController { */ @ApiOperation(value = "发送验证码", notes = "发送验证码") @PostMapping(value = "/send") + @WebLog("发送验证码") public void send(@Validated @RequestBody ReqVerificationCodePO request) { smsManage.sendVerificationCode(request); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java index 45cd0a9..15acc01 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.sys.controller; +import com.ningdatech.log.annotation.WebLog; import com.wflow.bean.dto.WflowFormsDto; import com.wflow.bean.vo.WflowFormVo; import com.wflow.workflow.service.WflowFormsService; @@ -27,12 +28,14 @@ public class FormController { private final WflowFormsService formService; @ApiOperation(value = "获取系统表单", notes = "获取系统表单") + @WebLog("获取系统表单") @GetMapping("/{regionCode}") public WflowFormVo detail(@PathVariable(value = "regionCode") String regionCode) { return formService.getFormByRegionCode(regionCode); } @ApiOperation(value = "编辑系统表单", notes = "编辑系统表单") + @WebLog("编辑系统表单") @PostMapping("/modify") public String modify(@Validated @RequestBody WflowFormsDto dto) { return formService.modifySysForm(dto); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java index e6d5251..10f7f39 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java @@ -48,6 +48,7 @@ public class MenuController { private final MenuManage menuManage; @ApiOperation("查询系统所有的菜单") + @WebLog("查询系统所有的菜单") @GetMapping("/list") public List allTree() { List list = menuService.list(Wrappers.lambdaQuery(Menu.class).orderByAsc(Menu::getSort)); @@ -55,6 +56,7 @@ public class MenuController { } @ApiOperation("查询系统所有数据权限的菜单") + @WebLog("查询系统所有数据权限的菜单") @GetMapping("/listByDataScope") public List allTreeByDataScope() { LambdaQueryWrapper dsQuery = Wrappers.lambdaQuery(Menu.class) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java index d9d7aca..a090537 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.sys.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.sys.manage.NotifyManage; import com.ningdatech.pmapi.sys.model.req.NotifyListReq; import com.ningdatech.pmapi.sys.model.vo.NotifyVO; @@ -39,6 +40,7 @@ public class NotifyController { @PostMapping("/read/{id}") @ApiOperation("已读") + @WebLog("消息-已读") public Boolean read(@PathVariable Long id) { return notifyManage.read(id); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java index 771a0f0..72b31d6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.sys.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage; import com.wflow.bean.dto.WflowModelHistorysDto; import com.wflow.bean.vo.WflowModelVo; @@ -50,6 +51,7 @@ public class SysProcDefController { @ApiOperation(value = "系统流程配置保存", notes = "系统流程配置保存") @PostMapping("/save") + @WebLog("系统流程配置保存") public String save(@Validated @RequestBody WflowModelHistorysDto dto) { return processModelService.saveProcess(dto); } @@ -64,6 +66,7 @@ public class SysProcDefController { @ApiOperation(value = "系统流程配置发布", notes = "系统流程配置发布") @PostMapping("/deploy/{formId}") + @WebLog("系统流程配置发布") public String deploy(@Validated @PathVariable String formId) { return processModelService.deployProcess(formId,null); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java index 7fad9c9..ea21adb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java @@ -66,6 +66,7 @@ public class TodoCenterController { * @return void */ @PostMapping("/todo-list/export") + @WebLog("待办中心-待我处理项目列表导出") public void exportPendingProjectList(@Valid @RequestBody ToBeProcessedExportReq param, HttpServletResponse response){ todoCenterManage.exportTodoList(response,param); @@ -87,6 +88,7 @@ public class TodoCenterController { * @return 操作结果 */ @PostMapping("/handler") + @WebLog("审核通过,盖章并通过、退回、撤回、驳回等操作") public Object handler(@Valid @RequestBody ReqProcessHandlerDTO param) { String nextTaskId = todoCenterManage.handler(param); return nextTaskId; @@ -161,18 +163,21 @@ public class TodoCenterController { @ApiOperation(value = "被退回项目内容调整并通过", notes = "被退回项目内容调整并通过") @PostMapping("/adjustAndHandle") + @WebLog("被退回项目内容调整并通过") public String startTheProcess(@Validated @RequestBody AdjustHandleDTO dto) { String instanceId = todoCenterManage.adjustmentAndHandle(dto); return "退回项目内容调整并且重新通过 【" + instanceId + "】 成功"; } @ApiOperation("获取未签章的pdf文件") + @WebLog("获取未签章的pdf文件") @PostMapping("/getNotSealedPdf/{projectId}") public Long getNotSealedPdf (@Valid @PathVariable("projectId") Long projectId){ return todoCenterManage.getNotSealedPdf(projectId); } @ApiOperation("获取签章后的pdf文件") + @WebLog("获取签章后的pdf文件") @PostMapping("/getSealedPdf") public Long getSealedPdf(@Valid @RequestBody SealInfoDTO req){ return todoCenterManage.getSealedPdf(req); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java index 3faf708..04eda16 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.user.controller; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.user.manage.UserInfoManage; import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO; import com.ningdatech.pmapi.user.model.po.ReqUserDetailPO; @@ -53,6 +54,7 @@ public class UserInfoController { @ApiOperation(value = "用户详情编辑", notes = "用户详情编辑") @PostMapping("/detail/edit") + @WebLog("用户详情编辑") public void userInfoDetailEdit(@Valid @RequestBody ReqUserDetailEditPO req) { userInfoManage.userInfoDetailEdit(req); }