[清退] 代码提交

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -29,9 +29,11 @@ import com.tykj.dev.device.user.subject.service.UserService;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.DeviceLifeStatus;
 import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -172,7 +174,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         }
 
         repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
-        isCommission(taskBto,deviceRepel1.getId());
+//        isEnd(taskBto,deviceRepel1.getId());
     }
 
     @Override
@@ -226,7 +228,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
       repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
       TaskBto currentTask= taskService.get(taskId);
       taskService.moveToSpecial(currentTask,StatusEnum.SEND_BACK_1206);
-      isCommission(taskBto,deviceRepel1.getId());
+//      isEnd(taskBto,deviceRepel1.getId());
 
     }
 
@@ -300,7 +302,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
             taskBto.setOwnUnit(deviceRepel.getUnitId());
             taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1204,-1);
-            isCommission(taskBto,deviceRepel.getId());
+//            isEnd(taskBto,deviceRepel.getId());
 
         }else {
             taskService.moveToEnd(taskBto);
@@ -312,8 +314,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     @Override
     public void resolveConfirm(Integer taskId,Integer userId) {
 
-        StringBuffer ids=new StringBuffer();
         TaskBto taskBto= taskService.get(taskId);
+
+        StringBuffer ids=new StringBuffer();
         DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
         TaskBto parentTask= taskService.get(taskBto.getParentTaskId());
         taskService.moveToSpecial(parentTask, GlobalMap.getStatusEnumMap().get(parentTask.getBillStatus()),0);
@@ -342,10 +345,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     @Override
     public void submitChooseDevice(Integer taskId, ResolveConfirm resolveConfirm) {
         long stime=System.currentTimeMillis();
+        TaskBto taskBto= taskService.get(taskId);
+        isNotSubmit(taskBto,StatusEnum.SEND_BACK_1205);
         log.info("提交装备接口开始{}",taskId);
         Map<String,Integer> map=new HashMap<>();
         StringBuffer ids=new StringBuffer();
-        TaskBto taskBto= taskService.get(taskId);
         DeviceRepelDetail deviceRepelDetail= deviceRepelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
         RepelTaskStatistical repelTaskStatistical= repelTaskStatisticalService.findRepelTaskStatistical(taskBto.getId(),deviceRepelDetail.getRepelId());
         List<ModelCount> modelCountList= JacksonUtil.readValue(repelTaskStatistical.getModelCount(), new TypeReference<List<ModelCount>>() {});
@@ -760,4 +764,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
 
     }
 
+    private void isNotSubmit(TaskBto taskBto,StatusEnum statusEnum){
+        if (taskBto.getBillStatus()!=statusEnum.id){
+             throw new ApiException(ResponseEntity.status(303).body("任务已被其他专管员处理"));
+        }
+
+    }
+
 }