1.取消任务,增加密码权限

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -747,9 +747,9 @@ public class LiteOrderCache {
                                 pos = null;
                                 log.error("工单号:" + orderNo + " " + e.getMessage());
                             }
-                            if (disable){
+                            /*if (disable){
                                 break;
-                            }
+                            }*/
                         } while (pos == null);
                     }
                     if (pos == null) {

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -6,9 +6,7 @@ import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.common.utils.FileUtil;
-import com.neotel.smfcore.common.utils.QueryHelp;
-import com.neotel.smfcore.common.utils.SecurityUtils;
+import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.storage.service.po.Storage;
@@ -43,6 +41,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -224,13 +223,21 @@ public class TaskController {
 
     @ApiOperation("取消任务")
     @AnonymousDeleteMapping
-    public ResponseEntity<Object> cancel(@RequestBody Set<String> ids){
+    public ResponseEntity<Object> cancel(@RequestBody Map<String, Object> paramMap) {
+        List<String> ids = (List<String>) paramMap.get("ids");
+        String password = paramMap.get("password") == null ? "" : paramMap.get("password").toString();
+        String permissionPassword = dataCache.getCache(Constants.CACHE_permissionPassword);
+        if (StringUtils.isNotEmpty(permissionPassword)){
+            if (!permissionPassword.equals(password)){
+                throw new ValidateException("smfcore.error.permissionPassword", "权限密码错误");
+            }
+        }
         for (String taskId : ids) {
             DataLog task = dataLogManager.get(taskId);
-            if(task.isCancel()||task.isFinished()||task.isEnd()){
-                throw new ValidateException("smfcore.taskHasEnd","任务{0}已取消或已结束",new String[]{task.getPosName()} );
+            if (task.isCancel() || task.isFinished() || task.isEnd()) {
+                throw new ValidateException("smfcore.taskHasEnd", "任务{0}已取消或已结束", new String[]{task.getPosName()});
             }
-            taskService.cancelTask(taskId,"人工");
+            taskService.cancelTask(taskId, "人工");
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }