rev:移除多余代码

This commit is contained in:
ludj
2024-02-02 15:55:00 +08:00
parent a85c88139b
commit 709d15f977
8 changed files with 4 additions and 31 deletions

View File

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Map; import java.util.Map;

View File

@@ -1,9 +1,7 @@
package org.nl.acs.limit_regional.server; package org.nl.acs.limit_regional.server;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.acs.common.base.CommonService; 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.domain.LimitRegional;
import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;

View File

@@ -24,8 +24,6 @@ import java.util.concurrent.Executors;
public class OpcUtl { public class OpcUtl {
private static int timeout = 1 * 60 * 1000; private static int timeout = 1 * 60 * 1000;
private static String key = "rpc.socketTimeout"; private static String key = "rpc.socketTimeout";
public static int successNum = 0;
public static int errNum = 0;
static { static {
checkTimeout(); checkTimeout();
@@ -226,15 +224,9 @@ public class OpcUtl {
server = new Server(getConnection(host, clsid, user, password, domain), server = new Server(getConnection(host, clsid, user, password, domain),
Executors.newSingleThreadScheduledExecutor()); Executors.newSingleThreadScheduledExecutor());
server.connect(); server.connect();
successNum++;
return server; return server;
} catch (Exception e) { } catch (Exception e) {
errNum++;
throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
} finally {
System.out.println("successNum:" + successNum);
System.out.println("errNum:" + errNum);
System.out.println(11);
} }
} }

View File

@@ -1,23 +1,19 @@
package org.nl.acs.opc.rest; package org.nl.acs.opc.rest;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.nl.common.logging.annotation.Log; import lombok.RequiredArgsConstructor;
import org.nl.acs.opc.domain.Opc;
import org.nl.acs.opc.service.OpcService; import org.nl.acs.opc.service.OpcService;
import org.nl.acs.opc.service.dto.OpcDto; 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 org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @author jiaolm * @author jiaolm

View File

@@ -1,26 +1,20 @@
package org.nl.acs.task.rest; package org.nl.acs.task.rest;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.nl.common.logging.annotation.Log; import lombok.RequiredArgsConstructor;
import org.nl.acs.task.domain.Task;
import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto; 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 org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @author jiaolm * @author jiaolm

View File

@@ -1,22 +1,17 @@
package org.nl.acs.task.rest; package org.nl.acs.task.rest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.nl.acs.task.service.TaskFeedbackService; 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.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @author jiaolm * @author jiaolm

View File

@@ -2,7 +2,6 @@ package org.nl.acs.udw.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.acs.udw.UnifiedData; import org.nl.acs.udw.UnifiedData;
import org.nl.acs.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.nl.acs.udw.dto.UdwDto; import org.nl.acs.udw.dto.UdwDto;