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

微调

Browse Source
This commit is contained in:
xuyang
2023-06-28 11:45:57 +08:00
parent 5a8e283789
commit ac46544730
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java
View File

@@ -42,12 +42,10 @@ public class DeviceManagerVO {
@Data @Data
public static class DataSetVO { public static class DataSetVO {
@ApiModelProperty(value = "数据集Id") @ApiModelProperty(value = "数据集Id")
private String id; private String id;
@ApiModelProperty(value = "数据集名称") @ApiModelProperty(value = "数据集名称")
private String name; private String name;
} }
} }

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

@@ -136,7 +136,7 @@ public class EquipmentDeliveryController extends BaseController {
@ApiImplicitParam(name = "type", value = "类型", required = true), @ApiImplicitParam(name = "type", value = "类型", required = true),
}) })
public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type){ public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type){
String methodDescribe = getMethodDescribe("getDeviceData"); String methodDescribe = getMethodDescribe("deviceData");
DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId,type); DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId,type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
} }

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

@@ -101,7 +101,23 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
DataArrayTreeVO vo4 = new DataArrayTreeVO(); DataArrayTreeVO vo4 = new DataArrayTreeVO();
vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2 + item3); vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2 + item3);
vo4.setName(item3); vo4.setName(item3);
vo4.setShowName(item3); switch (item3) {
case "avg":
vo4.setShowName("平均值");
break;
case "max":
vo4.setShowName("最大值");
break;
case "min":
vo4.setShowName("最小值");
break;
case "cp95":
vo4.setShowName("CP95");
break;
default:
vo4.setShowName(item3);
break;
}
list4.add(vo4); list4.add(vo4);
}); });
vo3.setChildren(list4); vo3.setChildren(list4);