单位换算单位字段规范化，统一切面异常捕捉逻辑

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

单位换算单位字段规范化，统一切面异常捕捉逻辑
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent d73f6519
Showing 10 changed files with 140 additions and 112 deletions
ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
ant-design-vue-jeecg/src/views/system/config/modules/MaterialMultipleForm.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialMultiple/entity/MaterialMultiple.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/HuahengBaseController.java
huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiLoggerAspect.java
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/TaskBuildAudienceAspect.java
huaheng-wms-core/src/main/java/org/jeecg/utils/interceptor/HuahengBatisInterceptor.java
@@ -3,8 +3,7 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
+        <a-row :gutter="24"></a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
@@ -12,69 +11,75 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button v-has="'materialMultiple:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button v-has="'materialMultiple:export'" type="primary" icon="download"
-                @click="handleExportXls('物料单位换算')">导出
+      <a-button
+        v-has="'materialMultiple:export'"
+        type="primary"
+        icon="download"
+        @click="handleExportXls('物料单位换算')"
+        >导出
       </a-button>
-      <a-upload v-has="'materialMultiple:import'" name="file" :showUploadList="false" :multiple="false"
-                :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
+      <a-upload
+        v-has="'materialMultiple:import'"
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" v-has="'materialMultiple:deleteBatch'">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
+        <a-button style="margin-left: 8px">批量操作<a-icon type="down"/></a-button>
       </a-dropdown>
-
-      <j-super-query :fieldList="superFieldList" v-has="'materialMultiple:superQuery'"
-                     @handleSuperQuery="handleSuperQuery"/>
+      <j-super-query
+        :fieldList="superFieldList"
+        v-has="'materialMultiple:superQuery'"
+        @handleSuperQuery="handleSuperQuery"
+      />
     </div>
  
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
-        style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
  
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{ x: true }"
         bordered
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         class="j-table-force-nowrap"
-        @change="handleTableChange">
-
+        @change="handleTableChange"
+      >
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
         <template slot="imgSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          <img
+            v-else
+            :src="getImgView(text)"
+            height="25px"
+            alt=""
+            style="max-width:80px;font-size: 12px;font-style: italic;"
+          />
         </template>
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
+          <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
             下载
           </a-button>
         </template>
@@ -82,7 +87,7 @@
         <span slot="action" slot-scope="text, record">
           <a v-has="'materialMultiple:edit'" @click="handleEdit(record)">编辑</a>
  
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -97,7 +102,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
  
@@ -106,10 +110,9 @@
 </template>
  
 <script>
-
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import MaterialMultipleModal from './modules/MaterialMultipleModal'
  
 export default {
@@ -128,107 +131,105 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '物料编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialCode'
         },
         {
           title: '物料名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialName'
         },
         {
           title: '物料规格',
-          align: "center",
+          align: 'center',
           dataIndex: 'materialSpec'
         },
         {
           title: '货主编码',
-          align: "center",
+          align: 'center',
           dataIndex: 'companyCode'
         },
         {
-          title: '单位1',
-          align: "center",
+          title: '基准单位',
+          align: 'center',
           dataIndex: 'unit1'
         },
         {
-          title: '单位2',
-          align: "center",
+          title: '转换单位',
+          align: 'center',
           dataIndex: 'unit2'
         },
         {
-          title: '单位1转单位2换算倍数',
-          align: "center",
+          title: '转换比率',
+          align: 'center',
           dataIndex: 'multiple'
         },
         {
           title: '创建人',
-          align: "center",
+          align: 'center',
           dataIndex: 'createBy'
         },
         {
           title: '创建日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'createTime'
         },
         {
           title: '更新人',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateBy'
         },
         {
           title: '更新日期',
-          align: "center",
+          align: 'center',
           dataIndex: 'updateTime'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/config/materialMultiple/list",
-        delete: "/config/materialMultiple/delete",
-        deleteBatch: "/config/materialMultiple/deleteBatch",
-        exportXlsUrl: "/config/materialMultiple/exportXls",
-        importExcelUrl: "config/materialMultiple/importExcel",
-
+        list: '/config/materialMultiple/list',
+        delete: '/config/materialMultiple/delete',
+        deleteBatch: '/config/materialMultiple/deleteBatch',
+        exportXlsUrl: '/config/materialMultiple/exportXls',
+        importExcelUrl: 'config/materialMultiple/importExcel'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
-    initDictConfig() {
-    },
+    initDictConfig() {},
     getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({type: 'string', value: 'materialCode', text: '物料编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'materialName', text: '物料名称', dictCode: ''})
-      fieldList.push({type: 'string', value: 'materialSpec', text: '物料规格', dictCode: ''})
-      fieldList.push({type: 'string', value: 'companyCode', text: '货主编码', dictCode: ''})
-      fieldList.push({type: 'string', value: 'unit1', text: '单位1', dictCode: ''})
-      fieldList.push({type: 'string', value: 'unit2', text: '单位2', dictCode: ''})
-      fieldList.push({type: 'double', value: 'multiple', text: '单位1转单位2换算倍数', dictCode: ''})
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'materialCode', text: '物料编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialName', text: '物料名称', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'materialSpec', text: '物料规格', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'companyCode', text: '货主编码', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'unit1', text: '基准单位', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'unit2', text: '转换单位', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'multiple', text: '转换比率', dictCode: '' })
       this.superFieldList = fieldList
     }
   }
@@ -24,17 +24,17 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="单位1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit1">
+            <a-form-model-item label="基准单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit1">
               <a-input v-model="model.unit1" placeholder="请输入单位1"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="单位2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit2">
+            <a-form-model-item label="转换单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit2">
               <a-input v-model="model.unit2" placeholder="请输入单位2"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="单位1转单位2换算倍数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="multiple">
+            <a-form-model-item label="转换比率" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="multiple">
               <a-input-number v-model="model.multiple" placeholder="请输入单位1转单位2换算倍数" style="width: 100%"/>
             </a-form-model-item>
           </a-col>
@@ -55,17 +55,17 @@ public class MaterialMultiple implements Serializable {
     @Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
     private String companyCode;
-    /** 单位1 */
-    @Excel(name = "单位1", width = 15)
-    @ApiModelProperty(value = "单位1")
+    /** 基准单位 */
+    @Excel(name = "基准单位", width = 15)
+    @ApiModelProperty(value = "基准单位")
     private String unit1;
-    /** 单位2 */
-    @Excel(name = "单位2", width = 15)
-    @ApiModelProperty(value = "单位2")
+    /** 转换单位 */
+    @Excel(name = "转换单位", width = 15)
+    @ApiModelProperty(value = "转换单位")
     private String unit2;
-    /** 单位1转单位2换算倍数 */
-    @Excel(name = "单位1转单位2换算倍数", width = 15)
-    @ApiModelProperty(value = "单位1转单位2换算倍数")
+    /** 转换比率 */
+    @Excel(name = "转换比率", width = 15)
+    @ApiModelProperty(value = "转换比率")
     private Double multiple;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
@@ -5,8 +5,6 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
  
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.utils.support.RedissonDistributedLocker;
 import org.springframework.beans.factory.annotation.Autowired;
  
@@ -88,9 +86,12 @@ public class HuahengBaseController {
         try {
             log.info("[{}] 开始分布式事务 lockKey = {}，获取锁耗时： {}ms", taskName, fullLockKey, endTime - startTime);
             result = multiProcessListener.doProcess();
-        } catch (Throwable e) {
-            log.error("[{}] 执行分布式事务失败 lockKey = {}，errorMessage = {}", taskName, fullLockKey, ExceptionUtil.getMessage(e), e);
+        } catch (Exception e) {
+            log.error("[{}] 执行分布式事务异常 lockKey = {}，errorMessage = {}", taskName, fullLockKey, ExceptionUtil.getMessage(e), e);
             return Result.error(ExceptionUtil.getSimpleMessage(e));
+        } catch (Throwable e) {
+            log.error("[{}] 执行分布式事务异常 lockKey = {}，errorMessage = {}", taskName, fullLockKey, ExceptionUtil.getMessage(e), e);
+            throw e;
         } finally {
             redissonDistributedLocker.unlock(fullLockKey);
             final long finishTime = SystemClock.now();
@@ -183,7 +183,7 @@ public class OkHttpUtils {
     private static void sendAnnouncement(ApiLog apiLog, String title, String errorString) {
         String userOrRoleString = SpringUtil.getBean(IParameterConfigurationService.class).getValueByCode(QuantityConstant.RULE_API_EXCEPTION_NOTICE_ROLE_OR_NAME);
         List<String> userOrRoleList = StrSpliter.split(userOrRoleString, ",", true, true);
-        SpringUtil.getBean(SystemSync.class).sumCountAnnouncementToUserOrRole(userOrRoleList, title, errorString, DateUtil.offsetDay(new Date(), 1), "H", 5);
+        SpringUtil.getBean(SystemSync.class).sumCountAnnouncementToUserOrRole(userOrRoleList, title, errorString, DateUtil.offsetDay(new Date(), 1), "H", 2);
     }
  
     public static String sendPostByJsonStr(String url, String jsonString) {
@@ -62,7 +62,7 @@ public class ApiAuthenticationAspect {
      * @throws     Throwable
      */
     @Before("executeController()")
-    public void doBefore(JoinPoint joinPoint) throws NoSuchMethodException, Throwable {
+    public void doBefore(JoinPoint joinPoint) throws NoSuchMethodException {
         Method method = this.getTargetMethod(joinPoint);
         // 检查是否有passtoken注释，有则跳过认证
         if (method.isAnnotationPresent(PassApiAuthentication.class)) {
@@ -61,16 +61,22 @@ public class ApiLoggerAspect {
         return aroundXXX2Wms(point, apiLogger);
     }
  
-    /** 记录第三方系统调用WMS接口的日志 **/
-    private Object aroundXXX2Wms(ProceedingJoinPoint point, ApiLogger apiLogger) {
+    /**
+     * 记录第三方系统调用WMS接口的日志
+     * @throws Throwable
+     **/
+    private Object aroundXXX2Wms(ProceedingJoinPoint point, ApiLogger apiLogger) throws Throwable {
         Object ret = null;
         ApiLog apiLog = initApiLog(apiLogger, point);
         try {
             ret = point.proceed();
-        } catch (Throwable e) {
-            setApiLogThrowable(apiLog, e);
+        } catch (Exception e) {
+            setApiLogException(apiLog, e);
             ret = Result.error(e.getMessage());
             return ret;
+        } catch (Throwable e) {
+            setApiLogThrowable(apiLog, e);
+            throw e;
         } finally {
             if (ret != null) {
                 finishApiLog(apiLog, ret);
@@ -35,9 +35,16 @@ public class LogRecordAspect {
         String methodName = point.getSignature().getName();
         log.info(">>>[{}] {} [{}.{}][{}]>>>", request.getMethod(), url, className, methodName, ApiLoggerAspect.getIpAddr(request));
         // result的值就是被拦截方法的返回值
-        Object result = point.proceed();
-        long callTime = System.currentTimeMillis() - startTime;
-        log.info("<<<[{}] {} [cost:{}ms]<<<", request.getMethod(), url, callTime);
-        return result;
+        try {
+            Object result = point.proceed();
+            long callTime = System.currentTimeMillis() - startTime;
+            log.info("<<<[{}] {} [cost:{}ms]<<<", request.getMethod(), url, callTime);
+            return result;
+        } catch (Throwable e) {
+            long callTime = System.currentTimeMillis() - startTime;
+            log.info("<<<[{}] {} 执行异常 [cost:{}ms]<<<", request.getMethod(), url, callTime);
+            throw e;
+        }
+
     }
 }
 \ No newline at end of file
@@ -48,7 +48,7 @@ public class TaskBuildAudienceAspect {
  
     @Resource
     ISysAnnouncementService sysAnnouncementService;
-    
+
     @Resource
     SystemSync systemSync;
  
@@ -56,12 +56,12 @@ public class TaskBuildAudienceAspect {
     public void executeTask() {}
  
     @Before("executeTask()")
-    public void doBefore(JoinPoint joinPoint) throws NoSuchMethodException, Throwable {
+    public void doBefore(JoinPoint joinPoint) throws NoSuchMethodException {
         new ApiAuthentication.ApiAuthenticationBuild().audience(HuahengJwtUtil.TASK_AUDIENCE_NAME).bulid();
     }
  
     @Around("executeTask()")
-    public Object doAround(ProceedingJoinPoint joinPoint) throws NoSuchMethodException {
+    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
         String className = getClassAndMethodName(joinPoint);
         long t1 = System.currentTimeMillis();
         try {
@@ -85,14 +85,23 @@ public class TaskBuildAudienceAspect {
             }
             log.info(noticeName + " " + costTimeString);
             return object;
+        } catch (Exception e) {
+            long t2 = System.currentTimeMillis();
+            String userOrRoleString = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_JOB_EXCEPTION_NOTICE_ROLE_OR_NAME);
+            List<String> userOrRoleList = StrSpliter.split(userOrRoleString, ",", true, true);
+            String noticeName = className + " 定时任务执行异常";
+            String errorString = "异常信息：" + ExceptionUtil.getMessage(e) + " 耗时：" + (t2 - t1) + "ms";
+            systemSync.sumCountAnnouncementToUserOrRole(userOrRoleList, noticeName, errorString, DateUtil.offsetDay(new Date(), 1), "H", 2);
+            log.error(noticeName, e);
         } catch (Throwable e) {
             long t2 = System.currentTimeMillis();
             String userOrRoleString = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_JOB_EXCEPTION_NOTICE_ROLE_OR_NAME);
             List<String> userOrRoleList = StrSpliter.split(userOrRoleString, ",", true, true);
             String noticeName = className + " 定时任务执行异常";
             String errorString = "异常信息：" + ExceptionUtil.getMessage(e) + " 耗时：" + (t2 - t1) + "ms";
-            systemSync.sumCountAnnouncementToUserOrRole(userOrRoleList, noticeName, errorString, DateUtil.offsetDay(new Date(), 1), "H", 10);
+            systemSync.sumCountAnnouncementToUserOrRole(userOrRoleList, noticeName, errorString, DateUtil.offsetDay(new Date(), 1), "H", 2);
             log.error(noticeName, e);
+            throw e;
         }
         return null;
     }
 package org.jeecg.utils.interceptor;
  
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 import java.util.Properties;
  
@@ -8,7 +9,11 @@ import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
@@ -23,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 public class HuahengBatisInterceptor implements Interceptor {
  
     @Override
-    public Object intercept(Invocation invocation) throws Throwable {
+    public Object intercept(Invocation invocation) throws InvocationTargetException, IllegalAccessException {
         MappedStatement mappedStatement = (MappedStatement)invocation.getArgs()[0];
 //        String sqlId = mappedStatement.getId();
 //        log.debug("------sqlId------" + sqlId);
@@ -81,7 +86,7 @@ public class HuahengBatisInterceptor implements Interceptor {
             }
         }
         if (SqlCommandType.UPDATE == sqlCommandType) {
-            LoginUser sysUser = this.getLoginUser();
+//            LoginUser sysUser = this.getLoginUser();
             Field[] fields = null;
             if (parameter instanceof MapperMethod.ParamMap) {
                 MapperMethod.ParamMap<?> p = (MapperMethod.ParamMap<?>)parameter;
@@ -122,7 +127,6 @@ public class HuahengBatisInterceptor implements Interceptor {
                         field.setAccessible(false);
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
                 }
             }
         }