tudc 3 lat temu
rodzic
commit
9a377932b2

+ 6 - 0
flowable/src/main/java/com/huyi/flowable/controller/ApiController.java

@@ -1,6 +1,7 @@
 package com.huyi.flowable.controller;
 
 import com.huyi.flowable.BaseResult;
+import com.huyi.flowable.annotation.Log;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.IdentityService;
 import org.flowable.idm.api.Group;
@@ -33,6 +34,7 @@ public class ApiController {
      * @param groupId   分组id或公司id
      * @return BaseResult
      */
+    @Log
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "addUser")
     @ResponseBody
@@ -90,6 +92,7 @@ public class ApiController {
      * @param groupName     分组名称
      * @return BaseResult
      */
+    @Log
     @RequestMapping(value = "addGroup")
     @ResponseBody
     public BaseResult addGroup (@RequestParam("groupId") String groupId, @RequestParam("groupName") String groupName){
@@ -119,6 +122,7 @@ public class ApiController {
      * @param groupId
      * @return
      */
+    @Log
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "deleteUserGroup")
     @ResponseBody
@@ -141,6 +145,7 @@ public class ApiController {
      * @param id
      * @return
      */
+    @Log
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "deleteUser")
     @ResponseBody
@@ -164,6 +169,7 @@ public class ApiController {
      * @param groupId
      * @return
      */
+    @Log
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "deleteGroup")
     @ResponseBody

+ 2 - 0
flowable/src/main/java/com/huyi/flowable/controller/CloudSupplyChainController.java

@@ -1,6 +1,7 @@
 package com.huyi.flowable.controller;
 
 import com.huyi.flowable.BaseResult;
+import com.huyi.flowable.annotation.Log;
 import com.huyi.flowable.mapper.CloudSupplyChainMapper;
 import org.flowable.engine.IdentityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@ public class CloudSupplyChainController {
      * 查询是否配置审批流程
      * @return
      */
+    @Log
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "selectApproval")
     @ResponseBody

+ 21 - 0
flowable/src/main/java/com/huyi/flowable/controller/FlowController.java

@@ -209,6 +209,7 @@ public class FlowController {
      */
     @RequestMapping(value = "strartFlow")
     @ResponseBody
+    @Log
     public BaseResult strartFlow(@RequestParam String menuId,
                                  @RequestParam String companyId,
                                  @RequestParam String businessKey,
@@ -256,6 +257,7 @@ public class FlowController {
      */
     @RequestMapping(value = "myStrartedFlow")
     @ResponseBody
+    @Log
     public BaseResult myStrartedFlow(HttpServletRequest request,
                                      @RequestParam(value = "excutionName", required = false) String excutionName,
                                      @RequestParam(value = "processDefName", required = false) String processDefName,
@@ -280,6 +282,7 @@ public class FlowController {
     @RequestMapping(value = "deleteProcessInstanceById")
     @ResponseBody
     @Transactional(rollbackFor=Exception.class)
+    @Log
     public BaseResult deleteProcessInstanceById(@RequestParam("processInstanceId") String processInstanceId,
                                                 @RequestParam("reason")String reason,
                                                 @RequestParam(value = "formData", required = false)String formData,
@@ -308,6 +311,7 @@ public class FlowController {
      */
     @RequestMapping(value = "genProcessDiagram",produces = MediaType.IMAGE_JPEG_VALUE)
     @ResponseBody
+    @Log
     public void genProcessDiagram(@RequestParam("processId") String processId, HttpServletResponse response) throws IOException {
         flowProcess.genProcessDiagram(response, processId);
     }
@@ -319,6 +323,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getTaskByUserId")
     @ResponseBody
+    @Log
     public List<Task> getTaskByUserId(@RequestParam("userId") String userId){
         return flowTask.getTaskByUserId(userId);
     }
@@ -330,6 +335,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getTaskByGroupId")
     @ResponseBody
+    @Log
     public List<Task> getTaskByGroupId(@RequestParam(value = "groupId") String groupId){
         return flowTask.getTaskByGroupId(groupId);
     }
@@ -343,6 +349,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getMyTask")
     @ResponseBody
+    @Log
     public BaseResult getMyTask(HttpServletRequest request,
                                 @RequestParam(value = "excutionName", required = false) String excutionName,
                                 @RequestParam(value = "processDefName", required = false) String processDefName,
@@ -367,6 +374,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getMyJoinProcint")
     @ResponseBody
+    @Log
     public BaseResult getMyJoinProcint(HttpServletRequest request,
                                        @RequestParam(value = "excutionName", required = false) String excutionName,
                                        @RequestParam(value = "processDefName", required = false) String processDefName,
@@ -386,6 +394,7 @@ public class FlowController {
      */
     @RequestMapping(value = "claimTask")
     @ResponseBody
+    @Log
     public String claimTask(HttpServletRequest request, @RequestParam("taskId") String taskId){
         LoginUser user = tokenService.getUser(request);
         flowTask.claimTask(user.getSysUser().getStaffCode(), taskId);
@@ -406,6 +415,7 @@ public class FlowController {
     @RequestMapping(value = "completeTask")
     @ResponseBody
     @Transactional(rollbackFor=Exception.class)
+    @Log
     public BaseResult completeTask( @RequestParam("files") MultipartFile[] files,
                                     @RequestParam("taskId") String taskId,
                                     @RequestParam(value = "formData", required = false) String formData,
@@ -442,6 +452,7 @@ public class FlowController {
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "transferTask")
     @ResponseBody
+    @Log
     public BaseResult transferTask(
             @RequestParam("taskId") String taskId,
             @RequestParam("acceptUserId") String acceptUserId) {
@@ -454,6 +465,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getUserInf")
     @ResponseBody
+    @Log
     public Map<String, Object> getUserInf(HttpServletRequest request){
         Map res = new HashMap();
         LoginUser loginUser = tokenService.getUser(request);
@@ -473,6 +485,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getProcessDefs")
     @ResponseBody
+    @Log
     public List<Map<String, String>> getProcessDefs(){
         List<ProcessDefinition> processDefList = flowModel.allProcessDef();
 
@@ -493,6 +506,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getProcessHisTaskList")
     @ResponseBody
+    @Log
     public BaseResult getProcessHisTaskList(@RequestParam("processId") String processId) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
         List<HistoricActivityInstance> hisTaskList = flowTask.getHisTaskList(processId);
 
@@ -535,6 +549,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getTaskAttachments")
     @ResponseBody
+    @Log
     public BaseResult getTaskAttachments(@RequestParam("taskId") String taskId){
         return new BaseResult(flowTask.getTaskAttachments(taskId));
     }
@@ -546,6 +561,7 @@ public class FlowController {
      */
     @RequestMapping(value = "deleteAttachment")
     @ResponseBody
+    @Log
     public String deleteAttachment(@RequestParam("attachmentId") String attachmentId){
         flowTask.deleteAttachment(attachmentId);
         return "1";
@@ -559,6 +575,7 @@ public class FlowController {
      */
     @RequestMapping(value = "getAttachmentContent")
     @ResponseBody
+    @Log
     public String getAttachmentContent(@RequestParam("attachmentId") String attachmentId, HttpServletResponse response) {
         Attachment attachment = flowTask.getAttachment(attachmentId);
         InputStream inputStream = flowTask.getAttachmentContent(attachmentId);
@@ -613,6 +630,7 @@ public class FlowController {
     @RequestMapping(value = "handUpProcessInstance")
     @ResponseBody
     @Transactional(rollbackFor=Exception.class)
+    @Log
     public String handUpProcessInstance(
             @RequestParam("files") MultipartFile[] files,
             @RequestParam("taskId") String taskId,
@@ -633,6 +651,7 @@ public class FlowController {
      */
     @RequestMapping(value = "activateProcessInstance")
     @ResponseBody
+    @Log
     public String activateProcessInstance(
             @RequestParam(value = "taskId") String taskId
     ) {
@@ -648,6 +667,7 @@ public class FlowController {
      */
     @RequestMapping(value = "findReturnUserTask")
     @ResponseBody
+    @Log
     public List findReturnUserTask(
             @RequestParam(value = "taskId") String taskId
     ) {
@@ -663,6 +683,7 @@ public class FlowController {
     @Transactional(rollbackFor=Exception.class)
     @RequestMapping(value = "flowReturn")
     @ResponseBody
+    @Log
     public BaseResult flowReturn(
             @RequestParam("taskId") String taskId,
             @RequestParam("targetKey") String targetKey

+ 8 - 0
flowable/src/main/java/com/huyi/flowable/controller/ServerController.java

@@ -1,6 +1,7 @@
 package com.huyi.flowable.controller;
 
 import com.huyi.flowable.BaseResult;
+import com.huyi.flowable.annotation.Log;
 import com.huyi.flowable.api.FlowableConfig;
 import com.huyi.flowable.entity.CusMeHistory;
 import com.huyi.flowable.entity.CusMeconfig;
@@ -71,6 +72,7 @@ public class ServerController {
      */
     @RequestMapping(value = "getTableInfo")
     @ResponseBody
+    @Log
     public List getTableInfo(@RequestParam("tableName") String tableName)  {
         // 查询表字段信息
         List<Map<String, Object>> tableColumnList = tableColumnsMapper.selectColumns(tableName);
@@ -92,6 +94,7 @@ public class ServerController {
 
     @RequestMapping(value = "getTableEntity")
     @ResponseBody
+    @Log
     public List getTableEntity(@RequestParam("tableName") String tableName)  {
         // 查询表字段信息
         List<Map<String, Object>> tableColumnList = tableColumnsMapper.selectColumns(tableName);
@@ -124,6 +127,7 @@ public class ServerController {
      */
     @RequestMapping(value = "getMenuList")
     @ResponseBody
+    @Log
     public List getMenuList(HttpServletRequest request,@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
         // 请求获取参数
@@ -208,6 +212,7 @@ public class ServerController {
      */
     @RequestMapping(value = "updateMenuModel")
     @ResponseBody
+    @Log
     public int updateMenuModel(@RequestBody CusMeconfig meconfig,HttpServletRequest request) {
         Map<String, Object> param = new HashMap<>();
         param.put("menuId", meconfig.getMenuId());
@@ -249,6 +254,7 @@ public class ServerController {
      */
     @RequestMapping(value = "getMenuConfig")
     @ResponseBody
+    @Log
     public String getMenuConfig(@RequestParam("menuId") String menuId, @RequestParam("companyId") String companyId) throws IOException {
         Map<String, Object> param = new HashMap<>();
         param.put("menuId", menuId);
@@ -276,6 +282,7 @@ public class ServerController {
      */
     @RequestMapping(value = "getNodeFormJsonData")
     @ResponseBody
+    @Log
     public BaseResult getNodeFormJsonData(@RequestParam("menuId") String menuId, @RequestParam("companyId") String companyId) {
         BaseResult result = new BaseResult();
         Map<String, Object> resData = new HashMap<>();
@@ -313,6 +320,7 @@ public class ServerController {
      */
     @RequestMapping(value = "getNodeForm")
     @ResponseBody
+    @Log
     public Map getNodeForm(@RequestParam("processId") String processId,
                                   @RequestParam("nodeId") String nodeId,
                                   @RequestParam("instId") String instId) {

+ 0 - 11
flowable/src/main/java/com/huyi/flowable/controllerAdvice/FLowableRequest.java

@@ -17,15 +17,4 @@ public class FLowableRequest extends HttpServletRequestWrapper {
 
 
     }
-
-    @Override
-    public String[] getParameterValues(String param){
-        String[] value = this.request.getParameterValues(param);
-        if (value != null && value.length > 0) {
-            logger.info("参数:" + param + ":" + value[0]);
-        } else {
-            logger.info("参数:" + param + ":" + null);
-        }
-        return value;
-    }
 }