Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-admin/src/main/java/com/zkqy/web/controller/common/CommonFileController.java

@@ -7,9 +7,11 @@ import com.alibaba.fastjson2.TypeReference;
 import com.zkqy.business.entity.DragTable;
 import com.zkqy.business.service.IDragTableService;
 import com.zkqy.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Log;
 import com.zkqy.common.config.ZkqyConfig;
 import com.zkqy.common.constant.Constants;
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
 import com.zkqy.common.utils.StringUtils;
 import com.zkqy.common.utils.file.FileUploadUtils;
 import com.zkqy.common.utils.file.FileUtils;
@@ -66,6 +68,7 @@ public class CommonFileController {
     /**
      * 通用导出excel
      */
+    @Log(title = "动态表格", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CommonEntity commonEntity) throws Exception {
         commonService.export(response, commonEntity);
@@ -78,6 +81,7 @@ public class CommonFileController {
      * @param tableName
      * @throws Exception
      */
+    @Log(title = "动态表格", businessType = BusinessType.EXPORT)
     @PostMapping("/exportTemplate")
     public void exportTemplate(HttpServletResponse response, String tableName, String sqlkey) throws Exception {
         commonService.exportTemplate(response, tableName, sqlkey);
@@ -89,6 +93,7 @@ public class CommonFileController {
      * @param fileName 文件名称
      * @param delete   是否删除
      */
+    @Log(title = "动态表格", businessType = BusinessType.EXPORT)
     @GetMapping("/download")
     public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
         try {
@@ -112,6 +117,7 @@ public class CommonFileController {
     /**
      * 通用上传请求（单个）
      */
+    @Log(title = "动态表格", businessType = BusinessType.IMPORT)
     @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
         try {
@@ -134,6 +140,7 @@ public class CommonFileController {
     /**
      * 通用上传请求（多个）
      */
+    @Log(title = "动态表格", businessType = BusinessType.IMPORT)
     @PostMapping("/uploads")
     public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
         try {
@@ -166,6 +173,7 @@ public class CommonFileController {
     /**
      * 本地资源通用下载
      */
+    @Log(title = "动态表格", businessType = BusinessType.EXPORT)
     @GetMapping("/download/resource")
     public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
@@ -191,6 +199,7 @@ public class CommonFileController {
      * 导入execl数据（单个文件）文件名即表名
      */
 
+    @Log(title = "动态表格", businessType = BusinessType.IMPORT)
     @Anonymous
     @ApiOperation("上传文件")
     @PostMapping(value = "/uploadData", headers = "content-type=multipart/form-data")

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysOperlogController.java

@@ -2,6 +2,8 @@ package com.zkqy.web.controller.monitor;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -35,6 +37,11 @@ public class SysOperlogController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysOperLog operLog)
     {
+        if(SysUser.isAdmin(getUserId())){
+            operLog.setTenantId(0L);
+        }else {
+            operLog.setTenantId(getTenantId());
+        }
         startPage();
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         return getDataTable(list);
@@ -45,6 +52,11 @@ public class SysOperlogController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysOperLog operLog)
     {
+        if(SysUser.isAdmin(getUserId())){
+            operLog.setTenantId(0L);
+        }else {
+            operLog.setTenantId(getTenantId());
+        }
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
         util.exportExcel(response, list, "操作日志");

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -6,8 +6,10 @@ import com.zkqy.business.entity.DragTableBtn;
 import com.zkqy.business.service.IDragFormService;
 import com.zkqy.business.service.IDragTableBtnService;
 import com.zkqy.business.service.IDragTableGroupService;
+import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
 import com.zkqy.common.utils.form.FromUtils;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.runbpm.PreExecutionToolClass;
@@ -54,7 +56,9 @@ public class CommonBtnController extends BaseController {
      * 判断什么类型走什么接口: visible  false代表弹窗未开启时走回显表单模板及数据信息接口；true代表弹窗开启时走保存数据接口
      * 是否提交表单操作 true是 false回显表单数据  commonEntity.getBasicMap().get("visible").toString()
      */
+
     @PostMapping("/commonBtnHandle")
+    @Log(title = "动态按钮操作", businessType = BusinessType.OTHER)
     public AjaxResult commonBtnHandle(@RequestBody CommonEntity commonEntity) throws JsonProcessingException {
         // 获取到按钮类型
         String btnType = commonEntity.getBasicMap().get("btnType").toString();
@@ -84,7 +88,6 @@ public class CommonBtnController extends BaseController {
      * @param commonEntity
      * @return
      */
-
     public AjaxResult insertBtn(CommonEntity commonEntity) throws JsonProcessingException {
         if (commonEntity.getBasicMap().get("visible").toString().equals("true")) {
             return AjaxResult.btnMessage(commonService.batchInsert(commonEntity));

zkqy-business/src/main/java/com/zkqy/business/controller/CommonController.java

@@ -2,10 +2,12 @@ package com.zkqy.business.controller;
 
 import com.zkqy.business.entity.DragForm;
 import com.zkqy.business.service.*;
+import com.zkqy.common.annotation.Log;
 import com.zkqy.common.constant.ButtonTypeConstants;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
 import com.zkqy.common.exception.tenantdatassource.TenantDataSource;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.TableSql;
@@ -48,6 +50,7 @@ public class CommonController extends BaseController {
     /**
      * 共通批量新增
      */
+    @Log(title = "动态表单", businessType = BusinessType.INSERT)
     @PostMapping("/batchInsert")
     public AjaxResult batchInsert(@RequestBody CommonEntity commonEntity) {
         return toAjax(commonService.batchInsert(commonEntity));
@@ -57,6 +60,7 @@ public class CommonController extends BaseController {
      * 共通修改sql
      */
     @PutMapping("/batchEdit")
+    @Log(title = "动态表单", businessType = BusinessType.UPDATE)
     public AjaxResult edit(@RequestBody CommonEntity commonEntity) {
         return toAjax(commonService.edit(commonEntity));
     }
@@ -67,6 +71,7 @@ public class CommonController extends BaseController {
      * 批量删除
      */
     @DeleteMapping("/batchDelete")
+    @Log(title = "动态表单", businessType = BusinessType.DELETE)
     public AjaxResult batchDelete(@RequestBody CommonEntity commonEntity) {
         return toAjax(commonService.batchDelete(commonEntity));
     }

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteNodeController.java

@@ -44,7 +44,7 @@ public class BpmExecuteNodeController extends BaseController {
      * 导出节点执行（记录）列表
      */
     @PreAuthorize("@ss.hasPermi('system:node:export')")
-    @Log(title = "节点执行（记录）", businessType = BusinessType.EXPORT)
+    @Log(title = "节点执行日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpmExecuteNode bpmExecuteNode) {
         List<BpmExecuteNode> list = bpmExecuteNodeService.selectBpmExecuteNodeList(bpmExecuteNode);
@@ -65,7 +65,7 @@ public class BpmExecuteNodeController extends BaseController {
      * 新增节点执行（记录）
      */
     @PreAuthorize("@ss.hasPermi('system:node:add')")
-    @Log(title = "节点执行（记录）", businessType = BusinessType.INSERT)
+    @Log(title = "节点执行日志", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpmExecuteNode bpmExecuteNode) {
         return toAjax(bpmExecuteNodeService.insertBpmExecuteNode(bpmExecuteNode));
@@ -75,7 +75,7 @@ public class BpmExecuteNodeController extends BaseController {
      * 修改节点执行（记录）
      */
     @PreAuthorize("@ss.hasPermi('system:node:edit')")
-    @Log(title = "节点执行（记录）", businessType = BusinessType.UPDATE)
+    @Log(title = "节点执行日志", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpmExecuteNode bpmExecuteNode) {
         return toAjax(bpmExecuteNodeService.updateBpmExecuteNode(bpmExecuteNode));
@@ -85,7 +85,7 @@ public class BpmExecuteNodeController extends BaseController {
      * 删除节点执行（记录）
      */
     @PreAuthorize("@ss.hasPermi('system:node:remove')")
-    @Log(title = "节点执行（记录）", businessType = BusinessType.DELETE)
+    @Log(title = "节点执行日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(bpmExecuteNodeService.deleteBpmExecuteNodeByIds(ids));

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteNodeFormController.java

@@ -44,7 +44,7 @@ public class BpmExecuteNodeFormController extends BaseController {
      * 导出执行节点单列表
      */
     @PreAuthorize("@ss.hasPermi('system:form:export')")
-    @Log(title = "执行节点单", businessType = BusinessType.EXPORT)
+    @Log(title = "执行节点表单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpmExecuteNodeForm bpmExecuteNodeForm) {
         List<BpmExecuteNodeForm> list = bpmExecuteNodeFormService.selectBpmExecuteNodeFormList(bpmExecuteNodeForm);
@@ -65,7 +65,7 @@ public class BpmExecuteNodeFormController extends BaseController {
      * 新增执行节点单
      */
     @PreAuthorize("@ss.hasPermi('system:form:add')")
-    @Log(title = "执行节点单", businessType = BusinessType.INSERT)
+    @Log(title = "执行节点表单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpmExecuteNodeForm bpmExecuteNodeForm) {
         return toAjax(bpmExecuteNodeFormService.insertBpmExecuteNodeForm(bpmExecuteNodeForm));
@@ -75,7 +75,7 @@ public class BpmExecuteNodeFormController extends BaseController {
      * 修改执行节点单
      */
     @PreAuthorize("@ss.hasPermi('system:form:edit')")
-    @Log(title = "执行节点单", businessType = BusinessType.UPDATE)
+    @Log(title = "执行节点表单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpmExecuteNodeForm bpmExecuteNodeForm) {
         return toAjax(bpmExecuteNodeFormService.updateBpmExecuteNodeForm(bpmExecuteNodeForm));
@@ -85,7 +85,7 @@ public class BpmExecuteNodeFormController extends BaseController {
      * 删除执行节点单
      */
     @PreAuthorize("@ss.hasPermi('system:form:remove')")
-    @Log(title = "执行节点单", businessType = BusinessType.DELETE)
+    @Log(title = "执行节点表单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(bpmExecuteNodeFormService.deleteBpmExecuteNodeFormByIds(ids));

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteNodeMiddleController.java

@@ -43,7 +43,7 @@ public class BpmExecuteNodeMiddleController extends BaseController {
      * 导出执行流程用户、节点关联脚本中间列表
      */
     @PreAuthorize("@ss.hasPermi('system:middle:export')")
-    @Log(title = "执行流程用户、节点关联脚本中间", businessType = BusinessType.EXPORT)
+    @Log(title = "执行流程日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpmExecuteNodeMiddle bpmExecuteNodeMiddle) {
         List<BpmExecuteNodeMiddle> list = bpmExecuteNodeMiddleService.selectBpmExecuteNodeMiddleList(bpmExecuteNodeMiddle);
@@ -64,7 +64,7 @@ public class BpmExecuteNodeMiddleController extends BaseController {
      * 新增执行流程用户、节点关联脚本中间
      */
     @PreAuthorize("@ss.hasPermi('system:middle:add')")
-    @Log(title = "执行流程用户、节点关联脚本中间", businessType = BusinessType.INSERT)
+    @Log(title = "执行流程日志", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpmExecuteNodeMiddle bpmExecuteNodeMiddle) {
         return toAjax(bpmExecuteNodeMiddleService.insertBpmExecuteNodeMiddle(bpmExecuteNodeMiddle));
@@ -74,7 +74,7 @@ public class BpmExecuteNodeMiddleController extends BaseController {
      * 修改执行流程用户、节点关联脚本中间
      */
     @PreAuthorize("@ss.hasPermi('system:middle:edit')")
-    @Log(title = "执行流程用户、节点关联脚本中间", businessType = BusinessType.UPDATE)
+    @Log(title = "执行流程日志", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpmExecuteNodeMiddle bpmExecuteNodeMiddle) {
         return toAjax(bpmExecuteNodeMiddleService.updateBpmExecuteNodeMiddle(bpmExecuteNodeMiddle));
@@ -84,7 +84,7 @@ public class BpmExecuteNodeMiddleController extends BaseController {
      * 删除执行流程用户、节点关联脚本中间
      */
     @PreAuthorize("@ss.hasPermi('system:middle:remove')")
-    @Log(title = "执行流程用户、节点关联脚本中间", businessType = BusinessType.DELETE)
+    @Log(title = "执行流程日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(bpmExecuteNodeMiddleService.deleteBpmExecuteNodeMiddleByIds(ids));