root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:移除多余包

Browse Source
This commit is contained in:
ludj
2024-02-02 15:41:34 +08:00
parent 9f25ba7b59
commit a85c88139b
34 changed files with 28 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java
View File

@@ -1,7 +1,5 @@
package org.nl.acs.address.rest;
import lombok.RequiredArgsConstructor;
import org.nl.acs.address.service.AddressService;
import org.nl.acs.address.service.dto.AddressDto;
@@ -29,14 +27,12 @@ public class AddressController {
@GetMapping
@Log("查询接口方法地址")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(addressService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增接口方法地址")
public ResponseEntity<Object> create(@Validated @RequestBody AddressDto dto) {
addressService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -44,14 +40,12 @@ public class AddressController {
@PutMapping
@Log("修改接口方法地址")
public ResponseEntity<Object> update(@Validated @RequestBody AddressDto dto) {
addressService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除接口方法地址")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
addressService.deleteAll(ids);
@@ -59,7 +53,6 @@ public class AddressController {
}
@Log("导出接口方法地址")
@GetMapping(value = "/download")
public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
addressService.download(addressService.queryAll(whereJson), response);

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java
View File

@@ -1,17 +1,8 @@
package org.nl.acs.address.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;
/**
* @author jiaolm

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressQueryParam.java
View File

@@ -3,12 +3,6 @@ package org.nl.acs.address.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-10

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java
View File

@@ -5,7 +5,6 @@
package org.nl.acs.common.base;
import lombok.Data;
import org.springframework.stereotype.Component;
@Data
public class CommonFinalParam {

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/CustomerStragetyCacheService.java
View File

@@ -1,7 +1,6 @@
package org.nl.acs.custompolicy;
import org.nl.acs.auto.initial.ApplicationAutoInitial;
import java.util.HashMap;
import java.util.Map;

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/WaitingInstructionDeque.java
View File

@@ -5,12 +5,7 @@ import cn.hutool.core.util.StrUtil;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.instruction.enums.InstructionStatusEnum;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.ObjectUtl;
import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.impl.RouteLineServiceImpl;
import org.nl.config.SpringContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Iterator;
import java.util.LinkedList;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/domain/CustomPolicy.java
View File

@@ -1,14 +1,10 @@
package org.nl.acs.custompolicy.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java
View File

@@ -1,11 +1,8 @@
package org.nl.acs.custompolicy.rest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.address.service.dto.AddressDto;
import org.nl.acs.agv.server.MagicAgvService;
import org.nl.acs.custompolicy.server.CustomPolicyService;
import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO;
import org.nl.acs.custompolicy.server.vo.CustomPolicyPlantVO;
@@ -31,14 +28,12 @@ public class CustomPolicyController {
@GetMapping
@Log("查询自定义策略")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(customPolicyService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增自定义策略基础信息")
public ResponseEntity<Object> create(@Validated @RequestBody CustomPolicyDTO dto) {
customPolicyService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -53,7 +48,6 @@ public class CustomPolicyController {
}
@Log("删除自定义策略")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
customPolicyService.deleteAll(ids);
@@ -63,7 +57,6 @@ public class CustomPolicyController {
@PostMapping("/plantAdd")
@Log("新增自定义策略")
public ResponseEntity<Object> createPlant(@RequestBody CustomPolicyPlantVO customPolicyPlantVO) {
customPolicyService.createPlant(customPolicyPlantVO);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -71,14 +64,12 @@ public class CustomPolicyController {
@GetMapping("/plantList")
@Log("自定义策略列表")
public ResponseEntity<Object> plantList(@RequestParam Long id) {
return new ResponseEntity<>(customPolicyService.plantList(id), HttpStatus.OK);
}
@GetMapping("/updateOn")
@Log("是否启用")
public ResponseEntity<Object> updateOn(@RequestParam Long id, @RequestParam Integer is_on) {
customPolicyService.updateOn(id, is_on);
return new ResponseEntity<>(HttpStatus.OK);
@@ -87,7 +78,6 @@ public class CustomPolicyController {
@GetMapping("/getStrategy")
@Log("自定义策略列表")
public ResponseEntity<Object> updateOn() {
List<Map> list = customPolicyService.findDeviceStrategyOption();
return new ResponseEntity<>(list, HttpStatus.OK);

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java
View File

@@ -2,7 +2,6 @@ package org.nl.acs.custompolicy.server;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.custompolicy.DeviceStrategy;
import org.nl.acs.custompolicy.domain.CustomPolicy;
import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO;
import org.nl.acs.custompolicy.server.vo.CustomPolicyPlantVO;

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java
View File

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jodd.util.StringUtil;
import lombok.AllArgsConstructor;
import org.nl.acs.auto.initial.ApplicationAutoInitial;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.impl.CommonServiceImpl;
@@ -19,7 +18,6 @@ import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO;
import org.nl.acs.custompolicy.server.dto.CustomPolicyPlantDTO;
import org.nl.acs.custompolicy.server.mapper.CustomPolicyMapper;
import org.nl.acs.custompolicy.server.vo.CustomPolicyPlantVO;
import org.nl.acs.task.TaskInstructionLock;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
@@ -173,7 +171,6 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl<CustomPolicyMappe
map.put("name", strategy.getName());
strings.add(map);
}
return strings;
}
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java
View File

@@ -1,10 +1,8 @@
package org.nl.acs.device.rest;
import lombok.RequiredArgsConstructor;
import org.nl.acs.device.service.DeviceAssignedService;
import org.nl.acs.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
import org.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable;

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java
View File

@@ -3,7 +3,6 @@ package org.nl.acs.device.rest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.nl.acs.device.device_driver.DriverTypeEnum;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.dto.DeviceDto;
import org.nl.common.logging.annotation.Log;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java
View File

@@ -28,21 +28,18 @@ public class DeviceDbitemController {
@GetMapping
@Log("查询设备DB项")
public ResponseEntity query(DeviceDbitemQueryParam query, Pageable pageable) {
return new ResponseEntity<>(deviceDbitemService.queryAll(query, pageable), HttpStatus.OK);
}
@PostMapping
@Log("新增设备DB项")
public ResponseEntity create(@Validated @RequestBody DeviceDbitemDto resources) {
return new ResponseEntity<>(deviceDbitemService.insert(resources), HttpStatus.CREATED);
}
@PutMapping
@Log("修改设备DB项")
public ResponseEntity update(@Validated @RequestBody DeviceDbitemDto resources) {
deviceDbitemService.updateById(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -50,7 +47,6 @@ public class DeviceDbitemController {
@DeleteMapping
@Log("删除设备DB项")
public ResponseEntity delete(@RequestBody Set<String> ids) {
deviceDbitemService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java
View File

@@ -21,7 +21,6 @@ import java.util.Map;
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/acsDeviceErpmapping")
public class DeviceErpmappingController {
@@ -30,14 +29,11 @@ public class DeviceErpmappingController {
@GetMapping
@Log("查询设备-ERP映射")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(acsDeviceErpmappingService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增设备-ERP映射")
public ResponseEntity<Object> create(@Validated @RequestBody AcsDeviceErpmappingDto dto) {
acsDeviceErpmappingService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -45,22 +41,18 @@ public class DeviceErpmappingController {
@PutMapping
@Log("修改设备-ERP映射")
public ResponseEntity<Object> update(@Validated @RequestBody AcsDeviceErpmappingDto dto) {
acsDeviceErpmappingService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除设备-ERP映射")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
acsDeviceErpmappingService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("导出设备-ERP映射")
@GetMapping(value = "/download")
public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
acsDeviceErpmappingService.download(acsDeviceErpmappingService.queryAll(whereJson), response);

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java
View File

@@ -36,14 +36,12 @@ public class DeviceExtraController {
@PostMapping
@Log("新增设备扩展")
public ResponseEntity create(@Validated @RequestBody DeviceExtraDto resources) {
return new ResponseEntity<>(deviceExtraService.insert(resources), HttpStatus.CREATED);
}
@PutMapping
@Log("修改设备扩展")
public ResponseEntity update(@Validated @RequestBody DeviceExtraDto resources) {
deviceExtraService.updateById(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -51,7 +49,6 @@ public class DeviceExtraController {
@DeleteMapping
@Log("删除设备扩展")
public ResponseEntity delete(@RequestBody Set<String> ids) {
deviceExtraService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java
View File

@@ -20,7 +20,6 @@ import java.util.Set;
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/deviceRunpoint")
public class DeviceRunpointController {
@@ -28,21 +27,18 @@ public class DeviceRunpointController {
@GetMapping
@Log("查询设备点位")
public ResponseEntity query(DeviceRunpointQueryParam query, Pageable pageable) {
return new ResponseEntity<>(deviceRunpointService.queryAll(query, pageable), HttpStatus.OK);
}
@PostMapping
@Log("新增设备点位")
public ResponseEntity create(@Validated @RequestBody DeviceRunpointDto resources) {
return new ResponseEntity<>(deviceRunpointService.insert(resources), HttpStatus.CREATED);
}
@PutMapping
@Log("修改设备点位")
public ResponseEntity update(@Validated @RequestBody DeviceRunpointDto resources) {
deviceRunpointService.updateById(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -50,7 +46,6 @@ public class DeviceRunpointController {
@DeleteMapping
@Log("删除设备点位")
public ResponseEntity delete(@RequestBody Set<String> ids) {
deviceRunpointService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java
View File

@@ -10,8 +10,6 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Set;
/**
@@ -20,7 +18,6 @@ import java.util.Set;
**/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/deviceisonline")
public class DeviceisonlineController {
@@ -28,21 +25,18 @@ public class DeviceisonlineController {
@GetMapping
@Log("查询设备在线状态")
public ResponseEntity query(DeviceisonlineQueryParam query, Pageable pageable) {
return new ResponseEntity<>(deviceisonlineService.queryAll(query, pageable), HttpStatus.OK);
}
@PostMapping
@Log("新增设备在线状态")
public ResponseEntity create(@Validated @RequestBody DeviceisonlineDto resources) {
return new ResponseEntity<>(deviceisonlineService.insert(resources), HttpStatus.CREATED);
}
@PutMapping
@Log("修改设备在线状态")
public ResponseEntity update(@Validated @RequestBody DeviceisonlineDto resources) {
deviceisonlineService.updateById(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -50,7 +44,6 @@ public class DeviceisonlineController {
@DeleteMapping
@Log("删除设备在线状态")
public ResponseEntity delete(@RequestBody Set<String> ids) {
deviceisonlineService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java
View File

@@ -1,15 +1,8 @@
package org.nl.acs.device.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java
View File

@@ -1,15 +1,8 @@
package org.nl.acs.device.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java
View File

@@ -3,12 +3,6 @@ package org.nl.acs.device.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-09

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java
View File

@@ -1,16 +1,9 @@
package org.nl.acs.device.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;
import java.math.BigDecimal;

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java
View File

@@ -2,13 +2,6 @@ package org.nl.acs.device.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-09

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java
View File

@@ -3,7 +3,6 @@ package org.nl.acs.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java
View File

@@ -3,12 +3,6 @@ package org.nl.acs.device.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-09

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java
View File

@@ -1,15 +1,9 @@
package org.nl.acs.device.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java
View File

@@ -3,12 +3,6 @@ package org.nl.acs.device.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-09

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java
View File

@@ -1,15 +1,8 @@
package org.nl.acs.device.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.sql.Timestamp;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java
View File

@@ -3,12 +3,6 @@ package org.nl.acs.device.service.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.util.Date;
import org.nl.common.annotation.Query;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @author jiaolm
* @date 2023-05-09

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java
View File

@@ -1,6 +1,5 @@
package org.nl.acs.device.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -9,26 +8,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.service.mapper.DeviceMapper;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.acs.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.domain.DeviceErpmapping;
import org.nl.acs.device.service.DeviceErpmappingService;
import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam;
import org.nl.acs.device.service.mapper.DeviceErpmappingMapper;
import org.nl.common.utils.SecurityUtils;
import org.nl.acs.device.service.mapper.DeviceMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.FileUtil;
import org.nl.config.language.LangProcess;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

15
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java
View File

@@ -3,25 +3,22 @@ package org.nl.acs.device.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.device.domain.DeviceAssigned;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.device.service.DeviceExtraService;
import org.nl.acs.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
import org.nl.acs.device.service.mapper.DeviceExtraMapper;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.device.service.DeviceExtraService;
import org.nl.acs.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
import org.nl.acs.device.service.mapper.DeviceExtraMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;
import org.springframework.data.domain.Pageable;

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -32,10 +32,6 @@ import org.nl.acs.device_driver.two_conveyor.slit_two_manipulator.SlitTwoManipul
import org.nl.acs.monitor.DeviceStageMonitor;
import org.nl.acs.route.domain.RouteLine;
import org.nl.acs.route.service.mapper.RouteLineMapper;
//import org.nl.acs.stage.domain.Stage;
//import org.nl.acs.stage.domain.StageActor;
//import org.nl.acs.stage.service.mapper.StageActorMapper;
//import org.nl.acs.stage.service.mapper.StageMapper;
import org.nl.acs.storage_cell.domain.StorageCell;
import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
import org.nl.acs.utils.ConvertUtil;
@@ -84,10 +80,6 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
// 默认不使用缓存
//import org.springframework.cache.annotation.CacheConfig;
//import org.springframework.cache.annotation.CacheEvict;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
View File

@@ -5,8 +5,6 @@ import org.jinterop.dcom.common.JIException;
import org.nl.acs.auto.initial.ApplicationAutoInitial;
import org.nl.acs.device_driver.driver.ItemValue;
import org.nl.acs.opc.service.dto.OpcServerManageDto;
import org.nl.common.exception.BadRequestException;
import org.openscada.opc.lib.common.NotConnectedException;
import org.openscada.opc.lib.da.Group;
import org.openscada.opc.lib.da.Server;

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java
View File

@@ -1,8 +1,7 @@
package org.nl.acs.plc.service;
import com.alibaba.fastjson.JSONArray;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.opc.domain.OpcPlc;
import org.nl.acs.opc.service.dto.OpcPlcDto;
import org.nl.acs.opc.service.dto.OpcPlcQueryParam;

19
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
View File

@@ -1,7 +1,5 @@
package org.nl.acs.plc.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -9,24 +7,21 @@ import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.opc.domain.OpcPlc;
import org.nl.acs.plc.service.OpcPlcService;
import org.nl.acs.opc.service.dto.OpcPlcDto;
import org.nl.acs.opc.service.dto.OpcPlcQueryParam;
import org.nl.acs.opc.service.mapper.OpcPlcMapper;
import org.nl.system.service.logicflow.dao.StageImage;
import org.nl.acs.plc.service.OpcPlcService;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
// 默认不使用缓存
//import org.springframework.cache.annotation.CacheConfig;
//import org.springframework.cache.annotation.CacheEvict;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Pageable;
import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* @author jiaolm