fix 手持

acs/hd/nladmin-system/src/main/java/org/nl/hand/service/impl/PadServiceImpl.java

@@ -238,7 +238,7 @@ public class PadServiceImpl implements PadService {
 
         JSONArray result = WQL
                 .getWO("QHAND_QUERY")
-                .addParam("flag", "6")
+                .addParam("flag", "7")
                 .addParam("region", param.getString("region"))
                 .process()
                 .getResultJSONArray(0);
@@ -258,7 +258,7 @@ public class PadServiceImpl implements PadService {
 
         WQLObject
                 .getWQLObject("acs_device_extra")
-                .update(update_extra, "extra_name = 'agv_check_status' AND device_code = " + param.getString("device_code") + "'");
+                .update(update_extra, "extra_name = 'agv_check_status' AND device_code = '" + param.getString("device_code") + "'");
 
         resultJSON.put("code", "1");
         resultJSON.put("desc", "操作成功");

acs/hd/nladmin-system/src/main/java/org/nl/hand/wql/QHAND_QUERY.wql

@@ -176,7 +176,7 @@
      	ENDQUERY
       ENDIF
 
-    IF 输入.flag = "5"
+    IF 输入.flag = "6"
         QUERY
             SELECT
             	`value` AS 'region_id',
@@ -190,7 +190,7 @@
         ENDQUERY
     ENDIF
 
-    IF 输入.flag = "6"
+    IF 输入.flag = "7"
         QUERY
             SELECT
             	device.device_id,

lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "手持叫料")

lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/login/rest/HandLoginController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.annotation.Log;
+import org.nl.annotation.rest.AnonymousPostMapping;
 import org.nl.config.RsaProperties;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.security.config.bean.SecurityProperties;
@@ -55,7 +56,7 @@ public class HandLoginController {
     private final TokenProvider tokenProvider;
     private final OnlineUserService onlineUserService;
 
-    @PostMapping("/handlogin")
+    @AnonymousPostMapping("/handlogin")
     @Log("手持登陆验证")
     @ApiOperation("手持登陆验证")
     public ResponseEntity<Object> handlogin(@RequestBody Map<String, String> whereJson, HttpServletRequest request) {

lms/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -17,11 +17,12 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      #url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:yongyu_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:jianan_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:yongyu_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       #password: ${DB_PWD:P@ssw0rd}
-      password: ${DB_PWD:Root.123456}
+#      password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -68,7 +69,7 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:1}
-    host: ${REDIS_HOST:47.111.78.178}
+    host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
@@ -165,5 +166,5 @@ jetcache:
         maxIdle: 200
         maxTotal: 1000
       uri:
-        - redis://47.111.78.178:6379
+        - redis://127.0.0.1:6379