From a27451e80446259982b8819915db5a02058c975c Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 23 Nov 2022 17:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/hand/rest/HFHandController.java    | 12 +++-
 .../org/nl/hand/service/HFHandService.java    |  2 +
 .../hand/service/impl/HFHandServiceImpl.java  | 59 ++++++++++++-------
 3 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/rest/HFHandController.java b/acs/nladmin-system/src/main/java/org/nl/hand/rest/HFHandController.java
index c06bbe7..2483dd9 100644
--- a/acs/nladmin-system/src/main/java/org/nl/hand/rest/HFHandController.java
+++ b/acs/nladmin-system/src/main/java/org/nl/hand/rest/HFHandController.java
@@ -134,7 +134,7 @@ public class HFHandController {
         return new ResponseEntity<>(HandService.updateDeviceStatus(whereJson), HttpStatus.OK);
     }
 
-    @PostMapping("/handlogin")
+    @PostMapping("/login")
     @Log("手持登陆验证")
     @ApiOperation("手持登陆验证")
     @SaIgnore
@@ -162,4 +162,14 @@ public class HFHandController {
         return new ResponseEntity<>(HandService.createTask2(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/queryDevice")
+    @Log("查询设备起点和终点")
+    @ApiOperation("查询设备起点和终点")
+    @SaIgnore
+    //@PreAuthorize("@el.check('sect:list')")
+    //@RequestBody JSONObject json
+    public ResponseEntity<Object> queryDevice() {
+        return new ResponseEntity<>(HandService.queryDevice(), HttpStatus.OK);
+    }
+
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/service/HFHandService.java b/acs/nladmin-system/src/main/java/org/nl/hand/service/HFHandService.java
index c4275e6..9dd24c4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/hand/service/HFHandService.java
+++ b/acs/nladmin-system/src/main/java/org/nl/hand/service/HFHandService.java
@@ -112,4 +112,6 @@ public interface HFHandService {
     Map<String, Object> queryMaterial();
 
     Map<String, Object> createTask2(Map<String, String> whereJson);
+
+    Map<String, Object> queryDevice();
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
index 1c1a4f7..af41f8b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
@@ -303,6 +303,12 @@ public class HFHandServiceImpl implements HFHandService {
             resultJson.put("result", "");
             return resultJson;
         }
+        if (StrUtil.isEmpty(task_type)) {
+            resultJson.put("code", "0");
+            resultJson.put("desc", "任务类型不能为空");
+            resultJson.put("result", "");
+            return resultJson;
+        }
         if (StrUtil.isEmpty(next_devicecode)) {
             resultJson.put("code", "0");
             resultJson.put("desc", "终点不能为空");
@@ -317,24 +323,24 @@ public class HFHandServiceImpl implements HFHandService {
 //            return resultJson;
 //        }
         //判断起点有货，终点为空
-        if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
-            resultJson.put("code", "0");
-            resultJson.put("desc", "起点必须有货");
-            resultJson.put("result", "");
-            return resultJson;
-        }
-        if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
-            resultJson.put("code", "0");
-            resultJson.put("desc", "终点必须为空");
-            resultJson.put("result", "");
-            return resultJson;
-        }
-        if (Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())) {
-            resultJson.put("code", "0");
-            resultJson.put("desc", "起点或终点设备已被锁定");
-            resultJson.put("result", "");
-            return resultJson;
-        }
+//        if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "起点必须有货");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
+//        if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "终点必须为空");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
+//        if (Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())) {
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "起点或终点设备已被锁定");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
         if (StrUtil.isEmpty(priority)) {
             priority = "1";
         }
@@ -359,10 +365,10 @@ public class HFHandServiceImpl implements HFHandService {
         dto.setVehicle_code(carrier);
         try {
             taskService.create(dto);
-            startDevice.setIslock("true");
-            nextDevice.setIslock("true");
+//            startDevice.setIslock("true");
+//            nextDevice.setIslock("true");
         } catch (Exception e) {
-            resultJson.put("code", "2");
+            resultJson.put("code", "0");
             resultJson.put("desc", e.getMessage());
             resultJson.put("result", "");
             return resultJson;
@@ -760,5 +766,14 @@ public class HFHandServiceImpl implements HFHandService {
         return jo;
     }
 
-
+    @Override
+    public Map<String, Object> queryDevice() {
+        WQLObject wo = WQLObject.getWQLObject("acs_device");
+        JSONArray resultJSONArray = wo.query("1 = 1", "device_code").getResultJSONArray(0);
+        JSONObject jo = new JSONObject();
+        jo.put("code", "1");
+        jo.put("desc", "查询成功");
+        jo.put("result", resultJSONArray);
+        return jo;
+    }
 }