操作记录页面优化

Signed-off-by: TanYibin <5491541@qq.com>

操作记录页面优化
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 2f616f9e
Showing 5 changed files with 52 additions and 43 deletions
.gitignore
ant-design-vue-jeecg/src/views/jeecg/modules/JeecgDemoTabsModal.vue
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/entity/OperationLog.java
@@ -51,3 +51,4 @@ build/
  
 ### VS Code ###
 .vscode/
+.myumldata
@@ -66,10 +66,8 @@
  
         <a-tabs defaultActiveKey="1">
           <a-tab-pane tab="Tab 1" key="1">
-
             <a-table :columns="columns" :dataSource="data" :pagination="false" size="middle">
-              <template v-for="(col, i) in ['name', 'workId', 'department']" :slot="col"
-                        slot-scope="text, record, index">
+              <template v-for="(col, i) in ['name', 'workId', 'department']" :slot="col" slot-scope="text, record">
                 <a-tooltip title="必填项" :defaultVisible="false" :overlayStyle="{ color: 'red' }">
                   <a-input :key="col" v-if="record.editable" style="margin: -5px 0" :value="text"
                            :placeholder="columns[i].title"
@@ -77,7 +75,7 @@
                   <template v-else>{{ text }}</template>
                 </a-tooltip>
               </template>
-              <template slot="operation" slot-scope="text, record, index">
+              <template slot="operation" slot-scope="text, record">
                 <template v-if="record.editable">
                   <span v-if="record.isNew">
                     <a @click="saveRow(record.key)">添加</a>
@@ -35,7 +35,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="操作结果状态">
-              <a-input placeholder="请输入操作结果状态容" v-model="queryParam.operationStatus"></a-input>
+              <j-dict-select-tag placeholder="请输入操作结果状态容" v-model="queryParam.operationStatus" dictCode="operation_status"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -154,7 +154,7 @@
           {
             title:'操作结果状态',
             align:"center",
-            dataIndex: 'operationStatus'
+            dataIndex: 'operationStatus_dictText'
           },
           {
             title: '操作',
@@ -178,7 +178,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
@@ -207,11 +207,11 @@
         fieldList.push({type:'string',value:'bizType',text:'业务类型',dictCode:''})
         fieldList.push({type:'string',value:'operationMsg',text:'操作内容',dictCode:''})
         fieldList.push({type:'datetime',value:'operationTime',text:'操作时间'})
-        fieldList.push({type:'int',value:'operationStatus',text:'操作结果状态',dictCode:''})
         fieldList.push({type:'int',value:'operationCostTime',text:'操作耗时',dictCode:''})
         fieldList.push({type:'string',value:'contentReturn',text:'方法返回内容',dictCode:''})
         fieldList.push({type:'string',value:'contentException',text:'方法异常内容',dictCode:''})
         fieldList.push({type:'string',value:'operatorName',text:'操作人姓名',dictCode:''})
+        fieldList.push({type:'int',value:'operationStatus',text:'操作结果状态',dictCode:'operation_status'})
         this.superFieldList = fieldList
       }
     }
@@ -13,7 +13,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
  
 import com.alibaba.druid.util.StringUtils;
  
-import lombok.extern.slf4j.Slf4j;;
+import lombok.extern.slf4j.Slf4j;
  
 // 暂时注释掉，提高系统性能
 @Slf4j
@@ -27,7 +27,7 @@ public class LogRecordAspect {
     public void excudeService() {}
  
     @Around("excudeService()")
-    public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
+    public Object doAround(ProceedingJoinPoint point) throws Throwable {
         long startTime = System.currentTimeMillis();
         // 接收到请求，记录请求内容
         ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
@@ -38,7 +38,7 @@ public class LogRecordAspect {
         log.info("[Controller start] {}{}[{}][{}]", url, StringUtils.isEmpty(queryString) ? "" : "?" + queryString, request.getMethod(),
             ApiLoggerAspect.getIpAddr(request));
         // result的值就是被拦截方法的返回值
-        Object result = pjp.proceed();
+        Object result = point.proceed();
         long callTime = System.currentTimeMillis() - startTime;
         log.info("[Controller return] {}[{}ms]", url, callTime);
         return result;
 package org.jeecg.modules.wms.monitor.operation.entity;
  
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+
+import cn.monitor4all.logRecord.annotation.LogRecordDiffObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
  
 /**
  * @Description: 操作记录表
- * @Author: jeecg-boot
- * @Date:   2023-02-20
- * @Version: V1.0
+ * @Author:      jeecg-boot
+ * @Date:        2023-02-20
+ * @Version:     V1.0
  */
 @Data
 @TableName("operation_log")
@@ -31,48 +30,59 @@ import lombok.experimental.Accessors;
 public class OperationLog implements Serializable {
     private static final long serialVersionUID = 1L;
  
-	/**主键*/
-	@TableId(type = IdType.AUTO)
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private java.lang.Integer id;
-	/**业务ID*/
-	@Excel(name = "业务ID", width = 15)
+
+    /** 业务ID */
+    @Excel(name = "业务ID", width = 15)
     @ApiModelProperty(value = "业务ID")
     private java.lang.String bizId;
-	/**业务类型*/
-	@Excel(name = "业务类型", width = 15)
+
+    /** 业务类型 */
+    @Excel(name = "业务类型", width = 15)
     @ApiModelProperty(value = "业务类型")
     private java.lang.String bizType;
-	/**业务标签*/
+
+    /** 业务标签 */
     @Excel(name = "业务标签", width = 15)
     @ApiModelProperty(value = "业务标签")
     private java.lang.String bizTag;
-	/**操作内容*/
-	@Excel(name = "操作内容", width = 15)
+
+    /** 操作内容 */
+    @Excel(name = "操作内容", width = 15)
     @ApiModelProperty(value = "操作内容")
     private java.lang.String operationMsg;
-	/**操作时间*/
-	@Excel(name = "操作时间", width = 15)
+
+    /** 操作时间 */
+    @Excel(name = "操作时间", width = 15)
     @ApiModelProperty(value = "操作时间")
     private java.util.Date operationTime;
-	/**操作结果状态*/
-	@Excel(name = "操作结果状态", width = 15)
+
+    /** 操作结果状态 */
+    @Excel(name = "操作结果状态", width = 15, dicCode = "operation_status")
+    @Dict(dicCode = "operation_status")
     @ApiModelProperty(value = "操作结果状态")
     private java.lang.Integer operationStatus;
-	/**操作耗时*/
-	@Excel(name = "操作耗时", width = 15)
+
+    /** 操作耗时 */
+    @Excel(name = "操作耗时", width = 15)
     @ApiModelProperty(value = "操作耗时")
     private java.lang.Long operationCostTime;
-	/**方法返回内容*/
-	@Excel(name = "方法返回内容", width = 15)
+
+    /** 方法返回内容 */
+    @Excel(name = "方法返回内容", width = 15)
     @ApiModelProperty(value = "方法返回内容")
     private java.lang.String contentReturn;
-	/**方法异常内容*/
-	@Excel(name = "方法异常内容", width = 15)
+
+    /** 方法异常内容 */
+    @Excel(name = "方法异常内容", width = 15)
     @ApiModelProperty(value = "方法异常内容")
     private java.lang.String contentException;
-	/**操作人姓名*/
-	@Excel(name = "操作人姓名", width = 15)
+
+    /** 操作人姓名 */
+    @Excel(name = "操作人姓名", width = 15)
     @ApiModelProperty(value = "操作人姓名")
     private java.lang.String operatorName;
 }