[update] 快速特勤，锁定/解锁入参增加特勤ID

signal-control-service/src/main/java/net/wanji/web/bo/BatchLockBO.java

+package net.wanji.web.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.wanji.databus.vo.LockControlVO;
+
+import java.util.List;
+
+/**
+ * @author Kent HAN
+ * @date 2023/5/17 13:36
+ */
+@Data
+public class BatchLockBO {
+    @ApiModelProperty(value = "特勤ID")
+    Integer specialServiceId;
+    @ApiModelProperty(value = "锁定/解锁列表")
+    List<LockControlVO> lockControlVOList;
+}

signal-control-service/src/main/java/net/wanji/web/controller/SpecialServiceController.java

@@ -110,8 +110,8 @@ public class SpecialServiceController {
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/batchLock",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
-    public JsonViewObject batchLock(@RequestBody List<LockControlVO> lockControlVOList) {
-        specialServiceService.batchLock(lockControlVOList);
+    public JsonViewObject batchLock(@RequestBody BatchLockBO batchLockBO) {
+        specialServiceService.batchLock(batchLockBO);
         return JsonViewObject.newInstance().success();
     }
 

signal-control-service/src/main/java/net/wanji/web/service/SpecialServiceService.java

 package net.wanji.web.service;
 
-import net.wanji.databus.vo.LockControlVO;
 import net.wanji.web.bo.*;
 import net.wanji.web.vo.specialService.*;
 
@@ -31,7 +30,7 @@ public interface SpecialServiceService {
 
     List<SpecialDirListVO> getOutDirList(List<CrossIdBO> crossIdBOList);
 
-    void batchLock(List<LockControlVO> lockControlVOList);
+    void batchLock(BatchLockBO batchLockBO);
 
     GroupListVO groupList(SpecialServiceIdBO specialServiceIdBO);
 

signal-control-service/src/main/java/net/wanji/web/service/impl/SpecialServiceServiceImpl.java

@@ -623,11 +623,9 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
 
     @Override
     @Transactional
-    public void batchLock(List<LockControlVO> lockControlVOList) {
-        // 获取关联特勤Id
-        LockControlVO vo = lockControlVOList.get(0);
-        String crossCode = vo.getCrossCode();
-        Integer specialServiceId = specialServiceCrossMapper.selectSpecialServiceIdByCrossId(crossCode);
+    public void batchLock(BatchLockBO batchLockBO) {
+        Integer specialServiceId = batchLockBO.getSpecialServiceId();
+        List<LockControlVO> lockControlVOList = batchLockBO.getLockControlVOList();
 
         for (LockControlVO lockControlVO : lockControlVOList) {
             utcFeignClients.lockControl(lockControlVO);

wj-common/src/main/java/net/wanji/common/framework/exceptionhandler/GlobalExceptionHandler.java

@@ -143,6 +143,6 @@ public class GlobalExceptionHandler {
             errorMessage = e.getMessage();
         }
         log.error("RuntimeException异常:", e);
-        return JsonViewObject.newInstance().fail("出现异常！原因是：" + errorMessage);
+        return JsonViewObject.newInstance().fail(errorMessage);
     }
 }