diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device.xls b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device.xls deleted file mode 100644 index 1c3db516e..000000000 Binary files a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device.xls and /dev/null differ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java index 51b5b5092..9112a0b81 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java index 35b80d90f..ed795fe71 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java @@ -1,9 +1,7 @@ package org.nl.acs.limit_regional.server; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.acs.common.base.CommonService; -import org.nl.acs.device.domain.Device; import org.nl.acs.limit_regional.domain.LimitRegional; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; import org.springframework.data.domain.Pageable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java index f24cec9fa..c8248c93e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -24,8 +24,6 @@ import java.util.concurrent.Executors; public class OpcUtl { private static int timeout = 1 * 60 * 1000; private static String key = "rpc.socketTimeout"; - public static int successNum = 0; - public static int errNum = 0; static { checkTimeout(); @@ -226,15 +224,9 @@ public class OpcUtl { server = new Server(getConnection(host, clsid, user, password, domain), Executors.newSingleThreadScheduledExecutor()); server.connect(); - successNum++; return server; } catch (Exception e) { - errNum++; throw new BadRequestException(e.getMessage()); - } finally { - System.out.println("successNum:" + successNum); - System.out.println("errNum:" + errNum); - System.out.println(11); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java index f62e83ce0..fb4a40e39 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java @@ -1,23 +1,19 @@ package org.nl.acs.opc.rest; import com.alibaba.fastjson.JSONObject; -import org.nl.common.logging.annotation.Log; -import org.nl.acs.opc.domain.Opc; +import lombok.RequiredArgsConstructor; import org.nl.acs.opc.service.OpcService; import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; +import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java index 72873f1fb..11b98aa72 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java @@ -1,26 +1,20 @@ package org.nl.acs.task.rest; -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import org.nl.common.logging.annotation.Log; -import org.nl.acs.task.domain.Task; +import lombok.RequiredArgsConstructor; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskQueryParam; +import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; -import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java index 0e1eb61f8..785d0afda 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java @@ -1,22 +1,17 @@ package org.nl.acs.task.rest; - import lombok.RequiredArgsConstructor; import org.nl.acs.task.service.TaskFeedbackService; -import org.nl.acs.task.service.dto.TaskFeedbackDto; -import org.nl.acs.task.service.dto.TaskFeedbackQueryParam; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java index 6858976af..c48f89279 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java @@ -2,7 +2,6 @@ package org.nl.acs.udw.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.udw.UnifiedData; import org.nl.acs.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.dto.UdwDto;