组态功能

This commit is contained in:
2023-06-14 15:09:22 +08:00
parent 0853f36141
commit b8cce3c741
24 changed files with 213 additions and 45 deletions

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);

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);
}
};

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);
}

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);
}
};