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-14 15:09:22 +08:00
parent 0853f36141
commit b8cce3c741
24 changed files with 213 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataArrayFeignClient.java
View File

@@ -9,6 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.api.fallback.DataArrayFeignClientFallbackFactory;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -31,7 +32,7 @@ public interface DataArrayFeignClient {
HttpResult<List<CsDataArray>> getArrayBySet(@RequestBody List<CsDataSet> setList);
@PostMapping("/getDataArray")
HttpResult<List<LineTargetVO>> getDataArray(@RequestBody List<String> dataSetList);
HttpResult<List<DataArrayTreeVO>> getDataArray(@RequestBody List<String> dataSetList);
@PostMapping("/getDataArrayById")
HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name);

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java
View File

@@ -28,7 +28,7 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory<CsLed
@Override
public HttpResult<String> findDevByLineId(String lineId) {
log.error("{}异常，降级处理，异常为：{}","根据监测点获取装置失败",cause.toString());
log.error("{}异常，降级处理，异常为：{}","根据监测点获取装置",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataArrayFeignClientFallbackFactory.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.DataArrayFeignClient;
import com.njcn.csdevice.pojo.po.CsDataArray;
import com.njcn.csdevice.pojo.po.CsDataSet;
import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
import com.njcn.csdevice.pojo.vo.LineTargetVO;
import com.njcn.csdevice.utils.CsDeviceEnumUtil;
import feign.hystrix.FallbackFactory;
@@ -41,7 +42,7 @@ public class DataArrayFeignClientFallbackFactory implements FallbackFactory<Data
}
@Override
public HttpResult<List<LineTargetVO>> getDataArray(List<String> dataSetList) {
public HttpResult<List<DataArrayTreeVO>> getDataArray(List<String> dataSetList) {
log.error("{}异常，降级处理，异常为：{}","获取详细数据",cause.toString());
throw new BusinessException(finalExceptionEnum);
}

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java
View File

@@ -54,7 +54,7 @@ public class DevModelFeignClientFallbackFactory implements FallbackFactory<DevMo
@Override
public HttpResult<CsDevModelPO> getModelById(String id) {
log.error("{}异常，降级处理，异常为：{}","根据id查询模板失败",cause.toString());
log.error("{}异常，降级处理，异常为：{}","根据id查询模板",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DataArrayDTO.java
View File

@@ -21,4 +21,8 @@ public class DataArrayDTO implements Serializable {
private String dataArrayName;
private String dataArrayShowName;
private String statMethod;
private String phase;
}

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
View File

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -22,6 +24,7 @@ import java.util.Date;
/**
* 装置数据模板表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@TableName(value = "cs_dev_model")
public class CsDevModelPO extends BaseEntity {
@@ -56,7 +59,7 @@ public class CsDevModelPO extends BaseEntity {
* 版本日期
*/
@TableField(value = "version_date")
private Date versionDate;
private LocalDateTime versionDate;
/**
* 装置模板文件路径

27
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataArrayTreeVO.java Normal file
View File

@@ -0,0 +1,27 @@
package com.njcn.csdevice.pojo.vo;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/6/14 13:36
*/
@Data
public class DataArrayTreeVO {
private String id;
private String name;
private String showName;
private List<DataArrayTreeVO> children = new ArrayList<>();
}

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

@@ -14,7 +14,7 @@ import java.util.List;
* @createTime 2023/6/1 10:13
*/
@Data
public class LineTargetVO {
public class LineTargetVO {
@ApiModelProperty("指标id")
private String id;