Quellcode durchsuchen

新增派单sop发布

wangliang vor 1 Jahr
Ursprung
Commit
000adf30e4

+ 2 - 2
sop-api/src/main/java/com/qmth/sop/server/api/TBCrmDetailController.java

@@ -197,7 +197,7 @@ public class TBCrmDetailController {
     @ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
     public Result sopImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
             @ApiParam(value = "派单号", required = true) @RequestParam String crmNo) {
-        boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo, crmNo,
+        boolean lock = memoryLock.lock(SystemConstant.LOCK_CRM_DETAIL_SOP_IMPORT_PREFIX + crmNo, crmNo,
                 SystemConstant.LOCK_CRM_DETAIL_SOP_TIME_OUT);
         if (!lock) {
             throw ExceptionResultEnum.ERROR.exception("正在导入数据,请稍候再试!");
@@ -213,7 +213,7 @@ public class TBCrmDetailController {
                 ResultUtil.error(e.getMessage());
             }
         } finally {
-            memoryLock.unlock(SystemConstant.LOCK_CRM_DETAIL_SOP_PREFIX + crmNo);
+            memoryLock.unlock(SystemConstant.LOCK_CRM_DETAIL_SOP_IMPORT_PREFIX + crmNo);
         }
         return ResultUtil.ok(map);
     }

+ 2 - 2
sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -354,11 +354,11 @@ public class SystemConstant {
     public static final String LOCK_FLOW_EXCHANGE_PREFIX = "lock:flow:exchange:";//流程转办锁
     public static final String LOCK_SEQUENCE_PREFIX = "lock:sequence:";//序列锁
     public static final String LOCK_JOB_PREFIX = "lock:job:";//定时任务锁
-    public static final String LOCK_CRM_DETAIL_SOP_PREFIX = "lock:crm:detail:sop:";//派单明细sop锁
+    public static final String LOCK_CRM_DETAIL_SOP_IMPORT_PREFIX = "lock:crm:detail:sop:import";//派单明细sop锁
     public static final String LOCK_CRM_DETAIL_SOP_VAR_PREFIX = "lock:crm:detail:sop:var";//派单明细sop变量锁
     public static final String LOCK_CRM_DETAIL_SOP_CREATE_PREFIX = "lock:crm:detail:sop:create";//派单明细sop创建锁
     public static final String LOCK_CRM_DETAIL_SOP_PUBLISH_PREFIX = "lock:crm:detail:sop:publish";//派单明细sop发布锁
-    public static final String LOCK_CRM_DETAIL_SOP_DELETE_PREFIX = "lock:crm:detail:sop:publish";//派单明细sop删除锁
+    public static final String LOCK_CRM_DETAIL_SOP_DELETE_PREFIX = "lock:crm:detail:sop:delete";//派单明细sop删除锁
 
     public static final Long LOCK_FLOW_TIME_OUT = 60L * 2 * 1000;
     public static final Long LOCK_SEQUENCE_TIME_OUT = 60L * 1 * 1000;