Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

数据中心台账修改

Browse Source
This commit is contained in:
雨木c
2023-04-07 13:36:14 +08:00
parent 54767414b5
commit 0eb101dc70
18 changed files with 90 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.device.pq.controller;
import com.njcn.device.pq.service.IDeviceService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* pqs
* 设备相关
* @author cdf
* @date 2023/4/4
*/
@Slf4j
@Api(tags = "台账-设备相关")
@RestController
@RequestMapping("/dev")
@RequiredArgsConstructor
public class DeviceController extends BaseController {
private final IDeviceService iDeviceService;
}

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -486,7 +486,6 @@
substation.`Name` subName,
subscale.name subScale,
pqdevice.IP ip,
pqdevice.Com_Flag comFlag,
factory.`Name` manufacturer,
voltage.`Name` voltageName,
scale.`Name` voltageScale,

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
View File

@@ -147,7 +147,7 @@ public class RunManageServiceImpl implements RunManageService {
*/
private TerminalLedgerVO.TemData filterScale(GeneralDeviceDTO generalDeviceDTO, List<SimpleDTO> scales) {
TerminalLedgerVO.TemData temData = new TerminalLedgerVO.TemData();
temData.setName(DicDataTypeEnum.DEV_VOLTAGE.getName());
temData.setName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName());
//如果电压等级集合为空，则查询所有的电压等级
if (CollectionUtil.isEmpty(scales)) {
List<DictData> scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData();

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -1416,7 +1416,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
List<DictData> manufacturerList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName()).getData();
List<DictData> devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData();
List<DictData> frontList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.FRONT_TYPE.getName()).getData();
List<DictData> scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData();
List<DictData> scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
List<Node> nodeList = nodeService.nodeAllList();