fix

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alicp.jetcache.anno.method.SpringCacheContext;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.bag.SynchronizedSortedBag;
 import org.nl.acs.opc.service.dto.OpcServerManageDto;
 import org.nl.acs.udw.UnifiedDataAccessor;
 import org.nl.acs.udw.UnifiedDataAccessorFactory;
@@ -16,7 +17,9 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
-
+/**
+ * @author 20220102CG\noblelift
+ */
 @Slf4j
 @Service
 public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerConnectionStateListener {
@@ -358,6 +361,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
     }
 
 
+    @Override
     public void connectionStateChanged(boolean connected) {
         if (!connected) {
             this.server = null;
@@ -380,6 +384,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
     }
 
 
+    @Override
     public void changed(Item item, ItemState itemState) {
         String itemId = item.getId();
 
@@ -424,7 +429,17 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
             log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb});
 //            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb});
         } else {
+            if(his instanceof int[]){
+                if(!Arrays.equals((long[]) his, (long[]) value)){
                     log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
+                }
+            } else if(his instanceof String){
+                if(!StrUtil.equals((CharSequence) his, (CharSequence) value)){
+                    log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
+                }
+            } else {
+                log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value});
+            }
 //            this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value});
         }
     }

acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/rest/MobileAuthorizationController.java

@@ -34,14 +34,14 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@RequestMapping("/api/pda")
+@RequestMapping("/mobile/auth")
 public class MobileAuthorizationController {
     @Autowired
     private ISysUserService userService;
     @Autowired
     private ISysRoleService roleService;
 
-    @PostMapping(value = "/handlogin")
+    @PostMapping(value = "/login")
     @SaIgnore
     public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
         // 密码解密 - 前端的加密规则: encrypt（根据实际更改）

acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java

@@ -229,13 +229,14 @@ public class HandServiceImpl implements HandService  {
         List<InstructionMybatis> list;
         if (StrUtil.isEmpty(key)&&StrUtil.isEmpty(start_point)&&StrUtil.isEmpty(next_point)){
             list = instructionService.lambdaQuery()
+                    .le(InstructionMybatis::getInstruction_status,"1")
                     .orderByDesc(InstructionMybatis::getCreate_time)
                     .list();
         }else {
             list = instructionService.lambdaQuery()
                     .like(InstructionMybatis::getStart_device_code, start_point)
                     .like(InstructionMybatis::getNext_device_code, next_point)
-                    .ne(InstructionMybatis::getInstruction_status, "2")
+                    .le(InstructionMybatis::getInstruction_status, "1")
                     .eq(InstructionMybatis::getInstruction_code, key)
                     .or()
                     .eq(InstructionMybatis::getCarno, key)
@@ -339,6 +340,7 @@ public class HandServiceImpl implements HandService  {
         if (StrUtil.isEmpty(key)&&StrUtil.isEmpty(start_point)&&StrUtil.isEmpty(next_point)){
             list = taskserver.lambdaQuery()
                     .orderByDesc(Task::getCreate_time)
+                    .lt(Task::getTask_status, "2")
                     .list();
         }else {
             list = taskserver.lambdaQuery()