云前置改造

This commit is contained in:
xy
2025-09-23 16:34:24 +08:00
parent ee07f7a5e2
commit 9d2b4b97f9
15 changed files with 303 additions and 37 deletions

View File

@@ -1,10 +1,16 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
import com.njcn.csdevice.pojo.param.CsLineParam;
import com.njcn.csdevice.pojo.po.CsLinePO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -44,5 +50,5 @@ public interface CsLineFeignClient {
HttpResult<CsLinePO> getById(@RequestParam("lineId") String lineId);
@PostMapping("/getLinesByDevList")
HttpResult<List<CsLinePO>> getLinesByDevList(@RequestParam("ids") List<String> ids);
HttpResult<List<CsLinePO>> getLinesByDevList(@RequestBody List<String> ids);
}

View File

@@ -54,4 +54,7 @@ public interface WlRecordFeignClient {
@PostMapping("/findDevBaseDataByLineId")
HttpResult<List<RecordVo>> findDevBaseDataByLineId(@RequestBody @Validated WlRecordParam.lineRecord param);
@GetMapping("/getTestRecordById")
HttpResult<RecordVo.RecordItemVo> getTestRecordById(@RequestParam("testRecordId") @Validated String testRecordId);
}

View File

@@ -70,6 +70,12 @@ public class WlRecordClientFallbackFactory implements FallbackFactory<WlRecordFe
log.error("{}异常,降级处理,异常为:{}","根据监测点id查询装置基础数据",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<RecordVo.RecordItemVo> getTestRecordById(String testRecordId) {
log.error("{}异常,降级处理,异常为:{}","根据测试项ID查询测试项信息",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

View File

@@ -58,6 +58,8 @@ public interface DataParam {
String GOVERNANCE_SYSTEM = "治理系统";
String cldDev = "云前置设备";
String EvtParamPhase = "Evt_Param_Phase";
String EvtParamDepth = "Evt_Param_VVaDepth";

View File

@@ -7,7 +7,6 @@ import com.njcn.csdevice.pojo.param.CsLineParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -31,19 +30,15 @@ public class IcdLedgerParam implements Serializable {
@ApiModelProperty("设备和mac关系")
private Map<String,String> devMacMap;
@Valid
@ApiModelProperty("工程信息")
private CsEngineeringAddParm engineering;
@Valid
@ApiModelProperty("项目信息")
private AppProjectAddParm project;
@Valid
@ApiModelProperty("装置信息")
private List<CsEquipmentDeliveryAddParm> device;
@Valid
@ApiModelProperty("监测点信息")
private List<CsLineParam> line;
}

View File

@@ -23,6 +23,9 @@ public class CsLedgerVO implements Serializable {
@ApiModelProperty(name = "pid",value = "父id")
private String pid;
@ApiModelProperty(name = "pids",value = "父id集合")
private String pids;
@ApiModelProperty(name = "name",value = "名称")
private String name;