Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.13:3000/root/govern

Browse Source
This commit is contained in:
huangzj
2023-08-04 15:57:47 +08:00
parent 8e2d20f3e4 8aea82811d
commit 4a954a53fe
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
View File

@@ -151,7 +151,7 @@ public class EquipmentDeliveryController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "装置id", required = true),
@ApiImplicitParam(name = "type", value = "类型", required = true),
@ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
@ApiImplicitParam(name = "lineId", value = "监测点id", required = false)
})
public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type,@RequestParam String lineId){
String methodDescribe = getMethodDescribe("getDeviceData");

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
View File

@@ -110,7 +110,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
if (Objects.isNull(item.getStatMethod())){
DataArrayTreeVO vo4 = new DataArrayTreeVO();
vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2+"M");
vo4.setName("无数据类型");
vo4.setName("M");
vo4.setShowName("无数据类型");
list4.add(vo4);
} else {

4
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
View File

@@ -72,6 +72,10 @@ public class LineTargetServiceImpl implements ILineTargetService {
List<String> setList = new ArrayList<>();
String devId = csLedgerFeignClient.findDevByLineId(lineId).getData();
//1.获取监测点的安装位置
List<CsLinePO> lineList = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData();
if (CollectionUtils.isEmpty(lineList)){
return new ArrayList<DataArrayTreeVO>();
}
CsLinePO line = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData().get(0);
String code = dicDataFeignClient.getDicDataById(line.getPosition()).getData().getCode();
String modelId = null;