Merge remote-tracking branch 'origin/master'

renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java

@@ -2,6 +2,7 @@ package io.renren.common.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
 import io.renren.common.validator.ValidatorUtils;
@@ -41,14 +42,17 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/ability/center")
 public class AbilityCenterController {
-    private static Logger logger = LoggerFactory.getLogger(AbilityCenterController.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(AbilityCenterController.class);
+
     @Autowired
     private ActProcessService actProcessService;
     @Autowired
     private TAbilityApplicationService tAbilityApplicationService;
     @Autowired
     private ActRunningService actRunningService;
-    private static String key = "abilityprocess";
+
+    private static final String key = "abilityprocess";
 
     private static Map<String, Object> params = new HashMap<String, Object>() {
         {
@@ -66,6 +70,7 @@ public class AbilityCenterController {
      */
     @PostMapping(value = "/apply")
     @ApiOperation("批量进行能力申请")
+    @LogOperation("批量进行能力申请")
     public Result<List<ProcessInstanceDTO>> apply(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
         // 仿照请求接口 /act/process/lastestPage
         PageData<Map<String, Object>> page = actProcessService.page(params);

renren-admin/src/main/java/io/renren/common/controller/CensusController.java

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/census/center")
 public class CensusController {
 
-    private static Logger logger = LoggerFactory.getLogger(CensusController.class);
+    private static final Logger logger = LoggerFactory.getLogger(CensusController.class);
 
     @Autowired
     private ResourceService resourceService;
@@ -57,6 +57,7 @@ public class CensusController {
      */
     @GetMapping(value = "/resource_amount")
     @ApiOperation("各类资源数目")
+    @LogOperation("各类资源数目")
     public Result<List<Map<String, Object>>> resourceAmount() {
         List<Map<String, Object>> dbAmount = resourceService.getAmountGroupByType();
         dbAmount = dbAmount.stream().filter(index -> Arrays.asList(censusTypes).contains(index.get("type").toString())).collect(Collectors.toList());
@@ -85,6 +86,7 @@ public class CensusController {
 
     @GetMapping(value = "/whole_amount")
     @ApiOperation("平台整体情况")
+    @LogOperation("平台整体情况")
     public Result<List<Map<String, Object>>> wholeAmount() {
         List<Map<String, Object>> result = Collections.synchronizedList(new ArrayList<>());
 
@@ -151,6 +153,7 @@ public class CensusController {
 
     @GetMapping(value = "/apply_amount")
     @ApiOperation("各类资源申请成功数目")
+    @LogOperation("各类资源申请成功数目")
     public Result<List<Map<String, Object>>> applyAmount() {
         List<Map<String, Object>> dbAmount = tAbilityApplicationService.getAmountGroupByType();
         List<String> temp = dbAmount.stream().map(index -> index.get("type").toString()).collect(Collectors.toList());

renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java

@@ -43,9 +43,11 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/census/center/v2")
 public class CensusControllerV2 {
+
     @Value("${project.place}")
     private Integer projectPlace;
     @Value("${project.higher}")
+
     private Boolean higher;
     private static final Logger logger = LoggerFactory.getLogger(CensusControllerV2.class);
 
@@ -102,8 +104,8 @@ public class CensusControllerV2 {
     }
 
     @PostMapping("/trafficStatistics")
-    @ApiOperation("浏览量统计")
-    @LogOperation("浏览量统计")
+    @ApiOperation("能力云图-浏览量统计")
+    @LogOperation("能力云图-浏览量统计")
     public Result trafficStatistics(@RequestBody JSONObject jsonObject) {
         HashMap<String, Object> resultMap = new HashMap<>();
         String startDate = jsonObject.getString("startDate");
@@ -116,8 +118,8 @@ public class CensusControllerV2 {
 
 
     @GetMapping("/applicationNum")
-    @ApiOperation("应用资源数量统计")
-    @LogOperation("应用资源数量统计")
+    @ApiOperation("能力云图-应用资源数量统计")
+    @LogOperation("能力云图-应用资源数量统计")
     public Result<List<Map<String, Object>>> applicationNum() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
 
@@ -157,16 +159,16 @@ public class CensusControllerV2 {
     }
 
     @GetMapping("/districtResourceRank")
-    @ApiOperation("应用资源区县市排名")
-    @LogOperation("应用资源区县市排名")
+    @ApiOperation("能力云图-应用资源区县市排名")
+    @LogOperation("能力云图-应用资源区县市排名")
     public Result<List<Map<String, Object>>> districtResourceRank() {
         List<Map<String, Object>> result = resourceRank(3);
         return new Result().ok(result);
     }
 
     @GetMapping("/cityResourceRank")
-    @ApiOperation("应用资源委办局排名")
-    @LogOperation("应用资源委办局排名")
+    @ApiOperation("能力云图-应用资源委办局排名")
+    @LogOperation("能力云图-应用资源委办局排名")
     public Result<List<Map<String, Object>>> cityResourceRank() {
         List<Map<String, Object>> result = resourceRank(2);
         return new Result().ok(result);
@@ -217,8 +219,8 @@ public class CensusControllerV2 {
 
 
     @GetMapping("/assemblerInfo")
-    @ApiOperation("组件服务简况")
-    @LogOperation("组件服务简况")
+    @ApiOperation("能力云图-组件服务简况")
+    @LogOperation("能力云图-组件服务简况")
     public Result<List<Map<String, Object>>> assemblerInfo() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
         CompletableFuture<Void> allAssemblyAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总组件服务数目
@@ -277,8 +279,8 @@ public class CensusControllerV2 {
     }
 
     @GetMapping("/knowledgeInfo")
-    @ApiOperation("知识库简况")
-    @LogOperation("知识库简况")
+    @ApiOperation("能力云图-知识库简况")
+    @LogOperation("能力云图-知识库简况")
     public Result<List<Map<String, Object>>> knowledgeInfo() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
         CompletableFuture<Void> allKnowledgeAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总知识库数目
@@ -307,15 +309,15 @@ public class CensusControllerV2 {
     }
 
     @GetMapping("/componentServiceRank")
-    @ApiOperation("组件服务排名")
-    @LogOperation("组件服务排名")
+    @ApiOperation("能力云图-组件服务排名")
+    @LogOperation("能力云图-组件服务排名")
     public Result componentServiceRank(String type) {
         return new Result().ok(resourceService.componentServiceRank(type));
     }
 
     @GetMapping("/infrastructureInfo")
-    @ApiOperation("基础设施简况")
-    @LogOperation("基础设施简况")
+    @ApiOperation("能力云图-基础设施简况")
+    @LogOperation("能力云图-基础设施简况")
     public Result<List<Map<String, Object>>> infrastructureInfo() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
         CompletableFuture<Void> allAmount = null;
@@ -372,8 +374,8 @@ public class CensusControllerV2 {
 
 
     @GetMapping("/dataResourceInfo")
-    @ApiOperation("数据资源简况")
-    @LogOperation("数据资源简况")
+    @ApiOperation("能力云图-数据资源简况")
+    @LogOperation("能力云图-数据资源简况")
     public Result<List<Map<String, Object>>> dataResourceInfo() {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
         CompletableFuture<Void> allAmount = null;

renren-admin/src/main/java/io/renren/common/controller/CommentController.java

@@ -1,6 +1,7 @@
 package io.renren.common.controller;
 
 
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
 import io.renren.modules.activiti.dto.ProcessInstanceDTO;
@@ -41,9 +42,10 @@ public class CommentController {
     private TDemandCommentService tDemandCommentService;
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    private static Logger logger = LoggerFactory.getLogger(CommentController.class);
 
-    private static String key = "comment_review";
+    private static final Logger logger = LoggerFactory.getLogger(CommentController.class);
+
+    private static final String key = "comment_review";
 
     private static Map<String, Object> params = new HashMap<String, Object>() {
         {
@@ -60,6 +62,7 @@ public class CommentController {
      */
     @PostMapping(value = "/apply")
     @ApiOperation("批量进行评论审核申请")
+    @LogOperation("批量进行评论审核申请")
     public Result<ProcessInstanceDTO> apply(@RequestBody TDemandCommentDTO tDemandCommentDTO) {
         // 仿照请求接口 /act/process/lastestPage
         PageData<Map<String, Object>> page = actProcessService.page(params);

renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java

@@ -2,6 +2,7 @@ package io.renren.common.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
 import io.renren.common.validator.ValidatorUtils;
@@ -32,7 +33,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/demand_v2/center")
 public class DemandDataController {
-    private static Logger logger = LoggerFactory.getLogger(DemandDataController.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(DemandDataController.class);
 
     @Autowired
     private ActProcessService actProcessService;
@@ -41,7 +43,7 @@ public class DemandDataController {
     @Autowired
     private TDemandDataService tDemandDataService;
 
-    private static String key = "abilitydemandapply";
+    private static final String key = "abilitydemandapply";
 
     private static Map<String, Object> params = new HashMap<String, Object>() {
         {
@@ -52,6 +54,7 @@ public class DemandDataController {
 
     @PostMapping(value = "/apply")
     @ApiOperation("进行能力需求申请")
+    @LogOperation("进行能力需求申请")
     public Result<ProcessInstanceDTO> apply(@RequestBody TDemandDataDTO tDemandDataDTO) {
         // 仿照请求接口 /act/process/lastestPage
         PageData<Map<String, Object>> page = actProcessService.page(params);

renren-admin/src/main/java/io/renren/common/controller/FileUploadController.java

@@ -1,5 +1,6 @@
 package io.renren.common.controller;
 
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -35,7 +36,8 @@ public class FileUploadController {
     private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd/");
 
     @PostMapping("/upload")
-    @ApiOperation("上传")
+    @ApiOperation("文件上传")
+    @LogOperation("文件上传")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "文件", paramType = "file", dataType = "file", required = true)
     })

renren-admin/src/main/java/io/renren/common/controller/RejectController.java

@@ -2,6 +2,7 @@ package io.renren.common.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.utils.Result;
 import io.renren.modules.activiti.service.ActTaskService;
 import io.renren.modules.sys.dto.SysUserDTO;
@@ -36,6 +37,7 @@ public class RejectController {
 
     @PostMapping("relaunch/{taskId}")
     @ApiOperation("携带更新后的表单重新发起流程")
+    @LogOperation("携带更新后的表单重新发起流程")
     public Result relaunch(@PathVariable("taskId") String taskId, @RequestBody Map<String, Object> params) {
         if (StringUtils.isEmpty(taskId)) {
             return new Result().error("流程taskId未传参");

renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java

@@ -4,6 +4,7 @@ package io.renren.common.controller;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONObject;
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
 import io.renren.common.validator.ValidatorUtils;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/resource/center")
 public class ResourceMountController {
-    private static Logger logger = LoggerFactory.getLogger(ResourceMountController.class);
+    private static final Logger logger = LoggerFactory.getLogger(ResourceMountController.class);
 
     @Autowired
     private ActProcessService actProcessService;
@@ -60,18 +61,18 @@ public class ResourceMountController {
     @Autowired
     protected TaskService taskService;
 
-    private static String apply_key = "resourcemountapply"; // 资源上架
+    private static final String apply_key = "resourcemountapply"; // 资源上架
 
-    private static String undercarriage_key = "resourcundercarriageapply"; // 资源下架
+    private static final String undercarriage_key = "resourcundercarriageapply"; // 资源下架
 
-    private static Map<String, Object> apply_params = new HashMap<String, Object>() {
+    private static final Map<String, Object> apply_params = new HashMap<String, Object>() {
         {
             put("isLatestVersion", true); // 取最新版本
             put("key", apply_key); // 限定 能力资源上架
         }
     };
 
-    private static Map<String, Object> undercarriage_params = new HashMap<String, Object>() {
+    private static final Map<String, Object> undercarriage_params = new HashMap<String, Object>() {
         {
             put("isLatestVersion", true); // 取最新版本
             put("key", undercarriage_key); // 限定 资源下架
@@ -81,6 +82,7 @@ public class ResourceMountController {
 
     @PostMapping(value = "/apply")
     @ApiOperation("批量进行能力上架申请")
+    @LogOperation("批量进行能力上架申请")
     public Result<List<ProcessInstanceDTO>> apply(@RequestBody TResourceBatchMountApplyDTO tResourceBatchMountApplyDTO) {
         // 仿照请求接口 /act/process/lastestPage
         PageData<Map<String, Object>> page = actProcessService.page(apply_params);
@@ -143,6 +145,7 @@ public class ResourceMountController {
 
     @PostMapping(value = "/undercarriage")
     @ApiOperation("批量进行能力下架申请")
+    @LogOperation("批量进行能力下架申请")
     public Result<List<ProcessInstanceDTO>> undercarriage(@RequestBody TResourceUndercarriageApplyDTO tResourceUndercarriageApplyDTO) {
         // 仿照请求接口 /act/process/lastestPage
         PageData<Map<String, Object>> page = actProcessService.page(undercarriage_params);

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActModelController.java

@@ -32,7 +32,8 @@ public class ActModelController {
     private ActModelService actModelService;
 
     @GetMapping("page")
-    @ApiOperation("分页")
+    @ApiOperation("模型管理-分页查询")
+    @LogOperation("模型管理-分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -47,8 +48,8 @@ public class ActModelController {
     }
 
     @PostMapping
-    @ApiOperation("新增模型")
-    @LogOperation("新增模型")
+    @ApiOperation("模型管理-新增模型")
+    @LogOperation("模型管理-新增模型")
 //    @RequiresPermissions("sys:model:all")
     public Result save(@RequestBody ModelDTO dto) throws Exception{
         //效验数据
@@ -60,8 +61,8 @@ public class ActModelController {
     }
 
     @PostMapping("deploy/{id}")
-    @ApiOperation("部署")
-    @LogOperation("部署")
+    @ApiOperation("模型管理-部署")
+    @LogOperation("模型管理-部署")
 //    @RequiresPermissions("sys:model:all")
     public Result deploy(@PathVariable("id") String id) {
         actModelService.deploy(id);
@@ -69,16 +70,16 @@ public class ActModelController {
     }
 
     @GetMapping("export/{id}")
-    @ApiOperation("导出")
-    @LogOperation("导出")
+    @ApiOperation("模型管理-导出")
+    @LogOperation("模型管理-导出")
 //    @RequiresPermissions("sys:model:all")
     public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) {
         actModelService.export(id, response);
     }
 
     @DeleteMapping
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("模型管理-删除")
+    @LogOperation("模型管理-删除")
 //    @RequiresPermissions("sys:model:all")
     public Result delete(@RequestBody String[] ids) {
         for(String id : ids) {
@@ -89,7 +90,7 @@ public class ActModelController {
 
 //    @GetMapping("image/{deploymentId}")
     @ApiOperation(value = "查看流程图", produces="application/octet-stream")
-    @LogOperation("查看流程图")
+    @LogOperation("模型管理-查看流程图")
     @RequiresPermissions("sys:model:all")
     public void viewDeployImage(@PathVariable("deploymentId") String deploymentId, @ApiIgnore HttpServletResponse response){
         actModelService.deployImage(deploymentId, response);

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActProcessController.java

@@ -48,6 +48,7 @@ public class ActProcessController {
 
     @GetMapping("page")
     @ApiOperation("流程管理-分页")
+    @LogOperation("流程管理-分页")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -62,6 +63,7 @@ public class ActProcessController {
 
     @GetMapping("lastestPage")
     @ApiOperation("发起流程-分页")
+    @LogOperation("发起流程-分页")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -92,6 +94,7 @@ public class ActProcessController {
 
     @PutMapping("active/{id}")
     @LogOperation("激活流程")
+    @ApiOperation("激活流程")
 //    @RequiresPermissions("sys:process:all")
     public Result active(@PathVariable("id") String id) {
         actProcessService.active(id);
@@ -132,6 +135,7 @@ public class ActProcessController {
 
     @GetMapping(value = "resource")
     @ApiOperation(value="获取资源文件", produces="application/octet-stream")
+    @LogOperation("获取资源文件")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "deploymentId", value = "部署ID", paramType = "query", dataType="String"),
         @ApiImplicitParam(name = "resourceName", value = "资源名称", paramType = "query", dataType="String")
@@ -155,6 +159,7 @@ public class ActProcessController {
 
     @GetMapping(value = "getProcDefBizRoute/{id}")
     @ApiOperation("根据流程ID获取业务路由配置")
+    @LogOperation("根据流程ID获取业务路由配置")
     public Result getProcDefBizRoute(@PathVariable("id") String id){
         ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getProcDefBizRoute(id);
         return new Result().ok(processBizRouteDTO);
@@ -162,6 +167,7 @@ public class ActProcessController {
 
     @GetMapping(value = "getLatestProcDefBizRoute")
     @ApiOperation("根据流程定义KEY获取最新的流程配置信息")
+    @LogOperation("根据流程定义KEY获取最新的流程配置信息")
     @ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", paramType = "query", dataType="String")
     public Result getLatestProcDefBizRoute(String procDefKey){
         ProcessBizRouteDTO processBizRouteDTO = processBizRouteService.getLatestProcDefBizRoute(procDefKey);
@@ -170,6 +176,7 @@ public class ActProcessController {
 
     @GetMapping(value = "getProcDefBizRouteAndProcessInstance")
     @ApiOperation("根据业务ID获取流程业务路由配置和实例信息")
+    @LogOperation("根据业务ID获取流程业务路由配置和实例信息")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "procDefKey", value = "流程定义KEY", required = true, paramType = "query", dataType="String"),
         @ApiImplicitParam(name = "businessKey", value = "业务KEY", required = true, paramType = "query", dataType="String")
@@ -198,6 +205,7 @@ public class ActProcessController {
 
     @PostMapping("saveProcBizRoute")
     @ApiOperation("保存业务路由配置")
+    @LogOperation("保存业务路由配置")
     public Result saveProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
         processBizRouteService.save(processBizRouteDTO);
         return new Result();
@@ -205,6 +213,7 @@ public class ActProcessController {
 
     @PutMapping("saveProcBizRoute")
     @ApiOperation("更新业务路由配置")
+    @LogOperation("更新业务路由配置")
     public Result updateProcBizRoute(@RequestBody ProcessBizRouteDTO processBizRouteDTO){
         processBizRouteService.updateProcBizRoute(processBizRouteDTO);
         return new Result();

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActRunningController.java

@@ -30,7 +30,8 @@ public class ActRunningController {
     private ActRunningService actRunningService;
 
     @GetMapping("page")
-    @ApiOperation("分页")
+    @ApiOperation("运行中的流程-分页查询")
+    @LogOperation("运行中的流程-分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -45,8 +46,8 @@ public class ActRunningController {
     }
 
     @DeleteMapping("{id}")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除运行中的流程")
+    @LogOperation("删除运行中的流程")
 //    @RequiresPermissions("sys:running:all")
     @ApiImplicitParam(name = "id", value = "ID", paramType = "query", dataType="String")
     public Result deleteInstance(@PathVariable("id") String id) {

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java

@@ -42,6 +42,7 @@ public class ActTaskController {
      */
     @GetMapping("page")
     @ApiOperation("待办任务，默认查询所有待办任务。根据用户ID或角色ID查询个人或组的任务")
+    @LogOperation("查询所有待办任务，根据用户ID或角色ID查询个人或组的任务")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -62,6 +63,7 @@ public class ActTaskController {
      */
     @GetMapping("myToDoTaskPage")
     @ApiOperation("我的待办列表")
+    @LogOperation("我的待办列表查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -97,6 +99,7 @@ public class ActTaskController {
      */
     @PostMapping("claim")
     @ApiOperation("认领任务")
+    @LogOperation("认领任务")
     @ApiImplicitParam(name = "taskId", value = "taskId", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
     public Result claimTask(String taskId) {
@@ -112,6 +115,7 @@ public class ActTaskController {
      */
     @PostMapping("unclaim")
     @ApiOperation("释放任务")
+    @LogOperation("释放任务")
     @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
     public Result unclaimTask(String taskId) {
@@ -127,6 +131,7 @@ public class ActTaskController {
      */
     @PostMapping("complete")
     @ApiOperation("任务处理（完成任务）")
+    @LogOperation("任务处理（完成任务）")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "comment", value = "审批意见", paramType = "query", dataType = "String")
@@ -145,6 +150,7 @@ public class ActTaskController {
      */
     @PostMapping("completeByVariables")
     @ApiOperation("带参数的任务处理（完成任务）")
+    @LogOperation("带参数的任务处理（完成任务）")
 //    @RequiresPermissions("sys:task:all")
     public Result completeTaskByVariables(@RequestBody TaskDTO taskDTO) {
         if (StringUtils.isEmpty(taskDTO.getTaskId())) {
@@ -159,6 +165,7 @@ public class ActTaskController {
      */
     @PostMapping("entrust")
     @ApiOperation("任务委托(更改审批人)")
+    @LogOperation("任务委托(更改审批人)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "assignee", value = "受理人", paramType = "query", dataType = "String")
@@ -178,6 +185,7 @@ public class ActTaskController {
      */
     @GetMapping("getTaskVariables")
     @ApiOperation("获取流程变量")
+    @LogOperation("获取流程变量")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "variableName", value = "参数的键", paramType = "query", dataType = "String")
@@ -195,6 +203,7 @@ public class ActTaskController {
      */
     @PostMapping("updateTaskVariable")
     @ApiOperation("更新任务变量")
+    @LogOperation("更新任务变量")
 //    @RequiresPermissions("sys:task:all")
     public Result updateTaskVariable(@RequestBody TaskDTO taskDTO) {
         if (StringUtils.isEmpty(taskDTO.getTaskId())) {
@@ -209,6 +218,7 @@ public class ActTaskController {
      */
     @DeleteMapping("deleteTaskVariables")
     @ApiOperation("删除任务的所有变量")
+    @LogOperation("删除任务的所有变量")
     @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
     public Result deleteTaskVariables(String taskId) {
@@ -224,6 +234,7 @@ public class ActTaskController {
      */
     @DeleteMapping("deleteVariable")
     @ApiOperation("删除指定变量，默认删除本地变量")
+    @LogOperation("删除指定变量，默认删除本地变量")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "variableName", value = "变量名", paramType = "query", dataType = "String"),
@@ -243,6 +254,7 @@ public class ActTaskController {
      */
     @PostMapping("backPreviousTask")
     @ApiOperation("回退任务到上一节点")
+    @LogOperation("回退任务到上一节点")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "comment", value = "回退审核意见", paramType = "query", dataType = "String")
@@ -261,6 +273,7 @@ public class ActTaskController {
      */
     @PostMapping("endProcess")
     @ApiOperation("终止流程(直接全拒绝)")
+    @LogOperation("终止流程(直接全拒绝)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "comment", value = "终止审核意见", paramType = "query", dataType = "String")
@@ -276,6 +289,7 @@ public class ActTaskController {
      */
     @PostMapping("backToFirst")
     @ApiOperation("驳回，回退至第一个用户任务(重新录入表单)")
+    @LogOperation("驳回，回退至第一个用户任务(重新录入表单)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "comment", value = "驳回审核意见", paramType = "query", dataType = "String")

renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java

@@ -1,5 +1,6 @@
 package io.renren.modules.activiti.controller;
 
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.constant.Constant;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
@@ -57,6 +58,7 @@ public class HistoryController {
 
     @GetMapping("getInstImage")
     @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream")
+    @LogOperation("获取流程活动图")
     @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:his:all")
     public void getProcessInstanceDiagram(String processInstanceId, @ApiIgnore HttpServletResponse response) throws Exception {
@@ -65,6 +67,7 @@ public class HistoryController {
 
     @GetMapping("getHistoryProcessInstancePage")
     @ApiOperation("历史流程实例列表")
+    @LogOperation("查询历史流程实例列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -85,6 +88,7 @@ public class HistoryController {
 
     @GetMapping("getMyProcessInstancePage")
     @ApiOperation("我发起的流程")
+    @LogOperation("查询我发起的流程")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -104,6 +108,7 @@ public class HistoryController {
 
     @GetMapping("getMyHandledInstancePage")
     @ApiOperation("已办任务：根据登录账号查询用户已办任务")
+    @LogOperation("已办任务：根据登录账号查询用户已办任务")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -144,6 +149,7 @@ public class HistoryController {
 
     @GetMapping("getTaskHandleDetailInfo")
     @ApiOperation("获取流程处理详情")
+    @LogOperation("获取流程处理详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "processInstanceId", value = "实例ID", paramType = "query", dataType = "String")
     })

renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java

@@ -2,6 +2,7 @@ package io.renren.modules.category.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.exception.ErrorCode;
 import io.renren.common.utils.MessageUtils;
 import io.renren.common.utils.Result;
@@ -35,30 +36,35 @@ public class CategoryController {
 
     @GetMapping("/getTopCategory")
     @ApiOperation("获取一级分类")
+    @LogOperation("获取编目一级分类")
     public Result getTopCategory() {
         return new Result().ok(categoryService.getTopCategory());
     }
 
     @GetMapping("/getCategoryTree")
     @ApiOperation("获取完整分类数据")
+    @LogOperation("获取编目完整树形数据")
     public Object getCategoryTree() {
         return new Result<List<CategoryDTO>>().ok(categoryService.getCategoryTree());
     }
 
     @GetMapping("/getAllFiledByTopCategory")
     @ApiOperation("根据一级分类获取属性字段")
+    @LogOperation("根据一级分类查询属性字段")
     public Object getAllFiledByTopCategory(String topCategoryName) {
         return new Result<List<Category>>().ok(categoryService.getAllFiledByTopCategory(topCategoryName));
     }
 
     @GetMapping("/getAllFilterCriteriaByTopCategory")
     @ApiOperation("根据一级分类获取筛选条件字段")
+    @LogOperation("根据一级分类获取筛选条件字段")
     public Object getAllFilterCriteriaByTopCategory(String topCategoryName) {
         return new Result<>().ok(categoryService.getAllFilterCriteriaByTopCategory(topCategoryName));
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
+    @ApiOperation("新增编目分类")
+    @LogOperation("新增编目分类")
     public Object insert(@RequestBody CategoryDTO categoryDTO) {
         //效验数据
         ValidatorUtils.validateEntity(categoryDTO, AddGroup.class, DefaultGroup.class);
@@ -81,7 +87,8 @@ public class CategoryController {
     }
 
     @PostMapping("/update")
-    @ApiOperation("修改")
+    @ApiOperation("修改编目")
+    @LogOperation("修改编目")
     public Object update(@RequestBody CategoryDTO categoryDTO) {
         //效验数据
         ValidatorUtils.validateEntity(categoryDTO, UpdateGroup.class, DefaultGroup.class);
@@ -93,7 +100,8 @@ public class CategoryController {
     }
 
     @PostMapping("/deleteById")
-    @ApiOperation("删除")
+    @ApiOperation("删除编目")
+    @LogOperation("删除编目")
     public Object deleteById(@RequestBody JSONObject jsonObject) {
         try {
             categoryService.deleteByIds(jsonObject);

renren-admin/src/main/java/io/renren/modules/demanData/controller/TDemandDataController.java

@@ -45,6 +45,7 @@ public class TDemandDataController {
 
     @GetMapping("/page")
     @ApiOperation("分页")
+    @LogOperation("分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -67,6 +68,7 @@ public class TDemandDataController {
 
     @GetMapping("/{id}")
     @ApiOperation("信息")
+    @LogOperation("信息")
 //    @RequiresPermissions("demanData:tdemanddata:info")
     public Result<TDemandDataDTO> get(@PathVariable("id") Long id) {
         TDemandDataDTO data = tDemandDataService.get(id);

renren-admin/src/main/java/io/renren/modules/demandComment/controller/TDemandCommentController.java

@@ -47,6 +47,7 @@ public class TDemandCommentController {
 
     @GetMapping("/page")
     @ApiOperation("分页")
+    @LogOperation("分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -68,6 +69,7 @@ public class TDemandCommentController {
 
     @GetMapping("/myComment/page")
     @ApiOperation("我的评论分页")
+    @LogOperation("我的评论分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -91,6 +93,7 @@ public class TDemandCommentController {
 
     @GetMapping("/{id}")
     @ApiOperation("信息")
+    @LogOperation("信息")
 //    @RequiresPermissions("demandComment:tdemandcomment:info")
     public Result<TDemandCommentDTO> get(@PathVariable("id") Long id) {
         TDemandCommentDTO data = tDemandCommentService.get(id);

renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java

@@ -40,6 +40,7 @@ public class DevelopmentGuideController {
 
     @PostMapping("/uploadDevelopmentFile")
     @ApiOperation("开发指南文件上传")
+    @LogOperation("开发指南文件上传")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "开发指南文件", paramType = "file", dataType = "file", required = true),
             @ApiImplicitParam(name = "fileName", value = "文件名称", paramType = "query", dataType = "String", required = true),

renren-admin/src/main/java/io/renren/modules/job/controller/ScheduleJobController.java

@@ -34,6 +34,7 @@ public class ScheduleJobController {
 
 	@GetMapping("page")
 	@ApiOperation("分页")
+	@LogOperation("分页")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
 		@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -50,6 +51,7 @@ public class ScheduleJobController {
 
 	@GetMapping("{id}")
 	@ApiOperation("信息")
+	@LogOperation("信息")
 //	@RequiresPermissions("sys:schedule:info")
 	public Result<ScheduleJobDTO> info(@PathVariable("id") Long id){
 		ScheduleJobDTO schedule = scheduleJobService.get(id);

renren-admin/src/main/java/io/renren/modules/job/controller/ScheduleJobLogController.java

@@ -1,5 +1,6 @@
 package io.renren.modules.job.controller;
 
+import io.renren.common.annotation.LogOperation;
 import io.renren.common.constant.Constant;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.Result;
@@ -29,6 +30,7 @@ public class ScheduleJobLogController {
 
 	@GetMapping("page")
 	@ApiOperation("分页")
+	@LogOperation("分页")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
 		@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -45,6 +47,7 @@ public class ScheduleJobLogController {
 
 	@GetMapping("{id}")
 	@ApiOperation("信息")
+	@LogOperation("信息")
 //	@RequiresPermissions("sys:schedule:log")
 	public Result<ScheduleJobLogDTO> info(@PathVariable("id") Long id){
 		ScheduleJobLogDTO log = scheduleJobLogService.get(id);

renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

@@ -43,6 +43,7 @@ public class TAbilityApplicationController {
 
     @GetMapping("page")
     @ApiOperation("分页")
+    @LogOperation("分页")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -57,6 +58,7 @@ public class TAbilityApplicationController {
 
     @GetMapping("{id}")
     @ApiOperation("信息")
+    @LogOperation("信息")
     public Result<TAbilityApplicationDTO> get(@PathVariable("id") Long id){
         TAbilityApplicationDTO data = tAbilityApplicationService.get(id);
 

renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java

@@ -29,9 +29,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 部门动态审批人 v2
@@ -61,6 +63,8 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
     @Autowired
     private ResourceService resourceService;
     @Autowired
+    private JdbcTemplate jdbcTemplate;
+    @Autowired
     private TAbilityApplicationService tAbilityApplicationService;
 
     @Override
@@ -127,31 +131,16 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
             if (kv.containsKey("tAbilityApplicationDTOList")) {
                 dtoList = (List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList");
             }
+            String[] sqls;
             if (auditingBaseDTO.getReject() != null && auditingBaseDTO.getReject() == Boolean.TRUE) { // 存在被拒绝的节点
-
+                sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET del_flag = 0,approve_status = '不通过' WHERE id = %s", i.getId()))
+                        .collect(Collectors.toList()).toArray(new String[dtoList.size()]);
             } else {
-
+                sqls = dtoList.stream().map(i -> String.format("UPDATE t_ability_application SET del_flag = 0,approve_status = '通过' WHERE id = %s", i.getId()))
+                        .collect(Collectors.toList()).toArray(new String[dtoList.size()]);
             }
+            jdbcTemplate.batchUpdate(sqls);
         }
-
-//        builder.registerTypeAdapter(Date.class, (JsonDeserializer<Date>) (json, typeOfT, context) -> new Date(json.getAsJsonPrimitive().getAsLong()));
-//
-//        Gson gson = builder.create();
-//        JsonElement jsonElement = gson.toJsonTree(kv);
-//        TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class);
-//        if (abilityApplicationDTO != null) {
-//            if (abilityApplicationDTO.getReject() != null && abilityApplicationDTO.getReject() == Boolean.TRUE) { // 存在被拒绝的节点
-//                abilityApplicationDTO.setDelFlag(0);
-//                abilityApplicationDTO.setApproveStatus("不通过");
-//                tAbilityApplicationService.update(abilityApplicationDTO);
-//                logger.error("审批不通过！申请id:" + abilityApplicationDTO.getId());
-//            } else {
-//                abilityApplicationDTO.setDelFlag(0);
-//                abilityApplicationDTO.setApproveStatus("通过");
-//                tAbilityApplicationService.update(abilityApplicationDTO);
-//                logger.error("审批通过！申请id:" + abilityApplicationDTO.getId());
-//            }
-//        }
     }
 
     /**
@@ -199,7 +188,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
             try {
                 logger.error("流程参数异常" + JSON.toJSONString(kv));
             } catch (Exception exception) {
-                logger.error("", exception);
+                logger.error("流程参数异常", exception);
             }
         }
     }
@@ -222,13 +211,13 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
         if (kv.get("gatewayCode") != null ||
                 !ActTaskService.Task_HANDLE_STATE_AGREE.equals(kv.get(ActTaskService.Task_HANDLE_STATE))) return;
         try {
-            GsonBuilder builder = new GsonBuilder();
-            builder.registerTypeAdapter(Date.class, (JsonDeserializer<Date>) (json, typeOfT, context) -> new Date(json.getAsJsonPrimitive().getAsLong()));
-
-            Gson gson = builder.create();
-            JsonElement jsonElement = gson.toJsonTree(kv);
-            TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class);
-            applyCode(delegateTask, abilityApplicationDTO);
+            List<TAbilityApplicationDTO> dtoList = new ArrayList<>();
+            if (kv.containsKey("tAbilityApplicationDTOList")) {
+                dtoList = (List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList");
+            }
+            dtoList.stream().forEach(index -> {
+                applyCode(delegateTask, index); // 列表内都执行
+            });
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e);
         }

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -436,6 +436,7 @@ public class ResourceController {
 
     @PostMapping("/getDataResource")
     @ApiOperation("获取数据资源")
+    @LogOperation("获取数据资源")
     public Result<Object> getDataResource(@RequestBody GetDataResourceListDto dto) {
         Optional<AbstractDataResourceService> factory = DataResourceFactory.build();
         if (factory.isPresent()) {

renren-admin/src/main/java/io/renren/modules/resourceBrowse/controller/ResourceBrowseController.java

@@ -43,7 +43,8 @@ public class ResourceBrowseController {
     private ResourceService resourceService;
 
     @GetMapping("/page")
-    @ApiOperation("分页")
+    @ApiOperation("浏览记录-分页查询")
+    @LogOperation("浏览记录-分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -58,7 +59,8 @@ public class ResourceBrowseController {
     }
 
     @GetMapping("/select/{id}")
-    @ApiOperation("信息")
+    @ApiOperation("浏览记录-详细信息")
+    @LogOperation("浏览记录-详细信息")
     //@RequiresPermissions("resourceBrowse:resourcebrowse:info")
     public Result<ResourceBrowseDTO> get(@PathVariable("id") Long id){
         ResourceBrowseDTO data = resourceBrowseService.get(id);
@@ -67,8 +69,8 @@ public class ResourceBrowseController {
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("保存浏览记录")
+    @LogOperation("保存浏览记录")
     //@RequiresPermissions("resourceBrowse:resourcebrowse:save")
     public Result save(@RequestBody ResourceBrowseDTO dto){
         //效验数据
@@ -93,8 +95,8 @@ public class ResourceBrowseController {
     //}
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("批量删除浏览记录")
+    @LogOperation("批量删除浏览记录")
     //@RequiresPermissions("resourceBrowse:resourcebrowse:delete")
     public Result delete(@RequestBody Long[] ids){
         //效验数据

renren-admin/src/main/java/io/renren/modules/resourceCar/controller/ResourceCarController.java

@@ -34,7 +34,8 @@ public class ResourceCarController {
     private ResourceCarService resourceCarService;
 
     @GetMapping("/page")
-    @ApiOperation("分页")
+    @ApiOperation("申购车-分页查询")
+    @LogOperation("申购车-分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "当前页码，从1开始", paramType = "body", required = true, dataType="int") ,
         @ApiImplicitParam(name = "pageSize", value = "每页显示记录数", paramType = "body",required = true, dataType="int") ,
@@ -47,14 +48,16 @@ public class ResourceCarController {
     }
 
     @GetMapping("/total")
-    @ApiOperation("申购车总数")
+    @ApiOperation("申购车总数查询")
+    @LogOperation("申购车总数查询")
     public Result total(){
         return new Result<>().ok(resourceCarService.total());
     }
 
 
     @GetMapping("/select/{id}")
-    @ApiOperation("信息")
+    @ApiOperation("申购记录详细信息查询")
+    @LogOperation("申购记录详细信息查询")
     //@RequiresPermissions("resourceCar:resourcecar:info")
     public Result<ResourceCarDTO> get(@PathVariable("id") Long id){
         ResourceCarDTO data = resourceCarService.get(id);
@@ -62,8 +65,8 @@ public class ResourceCarController {
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("添加申购车")
+    @LogOperation("添加申购车")
     //@RequiresPermissions("resourceCar:resourcecar:save")
     public Result save(@RequestBody ResourceCarDTO dto){
         //效验数据
@@ -77,8 +80,8 @@ public class ResourceCarController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除申购")
+    @LogOperation("删除申购")
     //@RequiresPermissions("resourceCar:resourcecar:delete")
     public Result delete(@RequestBody JSONObject jsonObject){
         resourceCarService.deleteByIds(jsonObject);

renren-admin/src/main/java/io/renren/modules/resourceCollection/controller/ResourceCollectionController.java

@@ -37,7 +37,8 @@ public class ResourceCollectionController {
     private ResourceCollectionService resourceCollectionService;
 
     @GetMapping("/page")
-    @ApiOperation("分页")
+    @ApiOperation("我的收藏分页查询")
+    @LogOperation("我的收藏分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "当前页码，从1开始", paramType = "body", required = true, dataType="int") ,
             @ApiImplicitParam(name = "pageSize", value = "每页显示记录数", paramType = "body",required = true, dataType="int") ,
@@ -50,7 +51,7 @@ public class ResourceCollectionController {
     }
 
     @GetMapping("/select/{id}")
-    @ApiOperation("信息")
+    @ApiOperation("收藏详细信息查询")
     //@RequiresPermissions("resourceCollection:resourcecollection:info")
     public Result<ResourceCollectionDTO> get(@PathVariable("id") Long id){
         ResourceCollectionDTO data = resourceCollectionService.get(id);
@@ -59,8 +60,8 @@ public class ResourceCollectionController {
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("新增收藏")
+    @LogOperation("新增收藏")
     //@RequiresPermissions("resourceCollection:resourcecollection:save")
     public Result save(@RequestBody List<ResourceCollectionEntity> list){
         //效验数据
@@ -85,8 +86,8 @@ public class ResourceCollectionController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("取消收藏")
+    @LogOperation("取消收藏")
     //@RequiresPermissions("resourceCollection:resourcecollection:delete")
     public Result delete(@RequestBody Long[] resourceIds){
         //效验数据

renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java

@@ -42,6 +42,7 @@ public class TResourceMountApplyController {
 
     @GetMapping("/page")
     @ApiOperation("分页")
+    @LogOperation("分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@@ -58,6 +59,7 @@ public class TResourceMountApplyController {
 
     @GetMapping("/{id}")
     @ApiOperation("信息")
+    @LogOperation("信息")
 //    @RequiresPermissions("resourceMountApply:tresourcemountapply:info")
     public Result<TResourceMountApplyDTO> get(@PathVariable("id") Long id) {
         TResourceMountApplyDTO data = tResourceMountApplyService.get(id);

renren-admin/src/main/java/io/renren/modules/resourceScore/controller/ResourceScoreController.java

@@ -41,6 +41,7 @@ public class ResourceScoreController {
 
     @GetMapping("/page")
     @ApiOperation("分页")
+    @LogOperation("分页")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -56,6 +57,7 @@ public class ResourceScoreController {
 
     @GetMapping("/select/{resourceId}")
     @ApiOperation("查询个人评价信息")
+    @LogOperation("查询个人评价信息")
     //@RequiresPermissions("resourceScore:resourcescore:info")
     public Result<ResourceScoreDTO> get(@PathVariable("resourceId") Long resourceId){
         ResourceScoreDTO data = resourceScoreService.selectByRidAndUid(resourceId);
@@ -64,8 +66,8 @@ public class ResourceScoreController {
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("新增能力评分")
+    @LogOperation("新增能力评分")
     //@RequiresPermissions("resourceScore:resourcescore:save")
     public Result save(@RequestBody ResourceScoreDTO dto){
         //效验数据
@@ -79,8 +81,8 @@ public class ResourceScoreController {
     }
 
     @PutMapping("/update")
-    @ApiOperation("修改")
-    @LogOperation("修改")
+    @ApiOperation("修改能力评分")
+    @LogOperation("修改能力评分")
     //@RequiresPermissions("resourceScore:resourcescore:update")
     public Result update(@RequestBody ResourceScoreDTO dto){
         //效验数据
@@ -90,8 +92,8 @@ public class ResourceScoreController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除能力评分")
+    @LogOperation("删除能力评分")
     //@RequiresPermissions("resourceScore:resourcescore:delete")
     public Result delete(@RequestBody Long[] ids){
         //效验数据

renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java

@@ -153,7 +153,7 @@ public class LoginController {
 
     @PostMapping("logout")
     @ApiOperation(value = "退出")
-    @LogOperation("/退出")
+    @LogOperation("退出")
     public Result logout(HttpServletRequest request, HttpServletResponse response) {
         UserDetail user = SecurityUser.getUser();
 

renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java

@@ -1,7 +1,6 @@
 package io.renren.modules.sys.controller;
 
 import io.renren.common.annotation.LogOperation;
-import io.renren.common.dao.BaseDao;
 import io.renren.common.utils.Result;
 import io.renren.common.validator.AssertUtils;
 import io.renren.common.validator.ValidatorUtils;
@@ -39,7 +38,8 @@ public class SysDeptController {
 	/**  ytl 2022-06-23 新增 start **/
 	@GetMapping("treeList")
 	@ApiOperation("根据当前用户所在部门查询下属部门tree，可以根据部门名称模糊查询")
-	public Result<List<SysDeptDTO>> treeList(@RequestParam(required = false,value = "keywords") String keywords){
+	@LogOperation("根据当前用户所在部门查询下属部门")
+	public Result<List<SysDeptDTO>> treeList(@RequestParam(required = false,value = "模糊查询,部门名称") String keywords){
 		Long deptId = SecurityUser.getDeptId();
 		List<SysDeptDTO> result = new ArrayList<>();
 		SysDeptDTO sysDeptDTO = sysDeptService.get(deptId);
@@ -67,7 +67,8 @@ public class SysDeptController {
 	}
 	/**  ytl 2022-06-23 新增 end **/
 	@GetMapping("list")
-	@ApiOperation("列表")
+	@ApiOperation("查询部门列表")
+	@LogOperation("查询部门列表")
 //	@RequiresPermissions("sys:dept:list")
 	public Result<List<SysDeptDTO>> list(){
 		List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
@@ -76,7 +77,8 @@ public class SysDeptController {
 	}
 
 	@GetMapping("{id}")
-	@ApiOperation("信息")
+	@ApiOperation("查询部门详细信息")
+	@LogOperation("查询部门详细信息")
 //	@RequiresPermissions("sys:dept:info")
 	public Result<SysDeptDTO> get(@PathVariable("id") Long id){
 		SysDeptDTO data = sysDeptService.get(id);
@@ -85,8 +87,8 @@ public class SysDeptController {
 	}
 
 	@PostMapping
-	@ApiOperation("保存")
-	@LogOperation("保存")
+	@ApiOperation("新增部门")
+	@LogOperation("新增部门")
 //	@RequiresPermissions("sys:dept:save")
 	public Result save(@RequestBody SysDeptDTO dto){
 		//效验数据
@@ -98,8 +100,8 @@ public class SysDeptController {
 	}
 
 	@PutMapping
-	@ApiOperation("修改")
-	@LogOperation("修改")
+	@ApiOperation("修改部门信息")
+	@LogOperation("修改部门信息")
 //	@RequiresPermissions("sys:dept:update")
 	public Result update(@RequestBody SysDeptDTO dto){
 		//效验数据
@@ -111,8 +113,8 @@ public class SysDeptController {
 	}
 
 	@DeleteMapping("{id}")
-	@ApiOperation("删除")
-	@LogOperation("删除")
+	@ApiOperation("删除部门")
+	@LogOperation("删除部门")
 //	@RequiresPermissions("sys:dept:delete")
 	public Result delete(@PathVariable("id") Long id){
 		//效验数据

renren-admin/src/main/java/io/renren/modules/sys/controller/SysDictDataController.java

@@ -33,7 +33,8 @@ public class SysDictDataController {
     private SysDictDataService sysDictDataService;
 
     @GetMapping("page")
-    @ApiOperation("字典数据")
+    @ApiOperation("字典数据分页查询")
+    @LogOperation("字典数据分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -51,7 +52,8 @@ public class SysDictDataController {
     }
 
     @GetMapping("{id}")
-    @ApiOperation("信息")
+    @ApiOperation("查询字典数据详细信息")
+    @LogOperation("查询字典数据详细信息")
 //    @RequiresPermissions("sys:dict:info")
     public Result<SysDictDataDTO> get(@PathVariable("id") Long id){
         SysDictDataDTO data = sysDictDataService.get(id);
@@ -60,8 +62,8 @@ public class SysDictDataController {
     }
 
     @PostMapping
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("新增字典数据")
+    @LogOperation("新增字典数据")
 //    @RequiresPermissions("sys:dict:save")
     public Result save(@RequestBody SysDictDataDTO dto){
         //效验数据
@@ -73,8 +75,8 @@ public class SysDictDataController {
     }
 
     @PutMapping
-    @ApiOperation("修改")
-    @LogOperation("修改")
+    @ApiOperation("修改字典数据信息")
+    @LogOperation("修改字典数据信息")
 //    @RequiresPermissions("sys:dict:update")
     public Result update(@RequestBody SysDictDataDTO dto){
         //效验数据
@@ -86,8 +88,8 @@ public class SysDictDataController {
     }
 
     @DeleteMapping
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除字典数据")
+    @LogOperation("删除字典数据")
 //    @RequiresPermissions("sys:dict:delete")
     public Result delete(@RequestBody Long[] ids){
         //效验数据

renren-admin/src/main/java/io/renren/modules/sys/controller/SysDictTypeController.java

@@ -35,7 +35,8 @@ public class SysDictTypeController {
     private SysDictTypeService sysDictTypeService;
 
     @GetMapping("page")
-    @ApiOperation("字典类型")
+    @ApiOperation("字典类型分页查询")
+    @LogOperation("字典类型分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -53,7 +54,8 @@ public class SysDictTypeController {
     }
 
     @GetMapping("{id}")
-    @ApiOperation("信息")
+    @ApiOperation("查询字典类型详细信息")
+    @LogOperation("查询字典类型详细信息")
 //    @RequiresPermissions("sys:dict:info")
     public Result<SysDictTypeDTO> get(@PathVariable("id") Long id){
         SysDictTypeDTO data = sysDictTypeService.get(id);
@@ -62,8 +64,8 @@ public class SysDictTypeController {
     }
 
     @PostMapping
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("新增字典类型")
+    @LogOperation("新增字典类型")
 //    @RequiresPermissions("sys:dict:save")
     public Result save(@RequestBody SysDictTypeDTO dto){
         //效验数据
@@ -75,8 +77,8 @@ public class SysDictTypeController {
     }
 
     @PutMapping
-    @ApiOperation("修改")
-    @LogOperation("修改")
+    @ApiOperation("修改字典类型信息")
+    @LogOperation("修改字典类型信息")
 //    @RequiresPermissions("sys:dict:update")
     public Result update(@RequestBody SysDictTypeDTO dto){
         //效验数据
@@ -88,8 +90,8 @@ public class SysDictTypeController {
     }
 
     @DeleteMapping
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除字典类型")
+    @LogOperation("删除字典类型")
 //    @RequiresPermissions("sys:dict:delete")
     public Result delete(@RequestBody Long[] ids){
         //效验数据
@@ -101,7 +103,8 @@ public class SysDictTypeController {
     }
 
     @GetMapping("all")
-    @ApiOperation("所有字典数据")
+    @ApiOperation("查询所有字典类型")
+    @LogOperation("查询所有字典类型")
     public Result<List<DictType>> all(){
         List<DictType> list = sysDictTypeService.getAllList();
 

renren-admin/src/main/java/io/renren/modules/workDynamics/controller/WorkDynamicsController.java

@@ -39,7 +39,8 @@ public class WorkDynamicsController {
     private WorkDynamicsService workDynamicsService;
 
     @GetMapping("/page")
-    @ApiOperation("分页")
+    @ApiOperation("工作动态分页查询")
+    @LogOperation("工作动态分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
@@ -55,7 +56,8 @@ public class WorkDynamicsController {
     }
 
     @GetMapping("/select/{id}")
-    @ApiOperation("信息")
+    @ApiOperation("查询工作动态详细信息")
+    @LogOperation("查询工作动态详细信息")
     //@RequiresPermissions("workDynamics:workdynamics:info")
     public Result<WorkDynamicsDTO> get(@PathVariable("id") Long id){
         WorkDynamicsDTO data = workDynamicsService.get(id);
@@ -64,8 +66,8 @@ public class WorkDynamicsController {
     }
 
     @PostMapping("/insert")
-    @ApiOperation("保存")
-    @LogOperation("保存")
+    @ApiOperation("新增工作动态")
+    @LogOperation("新增工作动态")
     //@RequiresPermissions("workDynamics:workdynamics:save")
     public Result save(@RequestBody WorkDynamicsDTO dto){
         //效验数据
@@ -77,8 +79,8 @@ public class WorkDynamicsController {
     }
 
     @PutMapping("/update")
-    @ApiOperation("修改")
-    @LogOperation("修改")
+    @ApiOperation("修改工作动态信息")
+    @LogOperation("修改工作动态信息")
     //@RequiresPermissions("workDynamics:workdynamics:update")
     public Result update(@RequestBody WorkDynamicsDTO dto){
         //效验数据
@@ -90,8 +92,8 @@ public class WorkDynamicsController {
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    @LogOperation("删除")
+    @ApiOperation("删除工作动态")
+    @LogOperation("删除工作动态")
     //@RequiresPermissions("workDynamics:workdynamics:delete")
     public Result delete(@RequestBody Long[] ids){
         //效验数据