Browse Source

# 接站FDP站点推送bug修改

zhongwei
haungxing 1 year ago
parent
commit
31e38b644b
  1. 6
      hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java
  2. 6
      hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/feign/QuestionClient.java
  3. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

6
hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IQuestionClient.java

@ -28,9 +28,9 @@ public interface IQuestionClient {
* @return * @return
*/ */
@GetMapping(SUBMIT_STATION_INFO) @GetMapping(SUBMIT_STATION_INFO)
R<Boolean> submitStationInfo(@RequestParam("fdp站点类型") Integer fdpStationType, R<Boolean> submitStationInfo(@RequestParam Integer fdpStationType,
@RequestParam("站点编码") String stationCode, @RequestParam String stationCode,
@RequestParam(value = "站点描述",required = false) String stationDesc); @RequestParam(required = false) String stationDesc);
@DeleteMapping(DELETE_STATION_INFO) @DeleteMapping(DELETE_STATION_INFO)
R<Boolean> deleteStationInfo(@RequestParam String stationId); R<Boolean> deleteStationInfo(@RequestParam String stationId);

6
hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/feign/QuestionClient.java

@ -21,9 +21,9 @@ public class QuestionClient implements IQuestionClient {
@GetMapping(SUBMIT_STATION_INFO) @GetMapping(SUBMIT_STATION_INFO)
@Override @Override
public R<Boolean> submitStationInfo(@RequestParam("fdp站点类型") Integer fdpStationType, public R<Boolean> submitStationInfo(@RequestParam Integer fdpStationType,
@RequestParam("站点编码") String stationCode, @RequestParam String stationCode,
@RequestParam(value = "站点描述",required = false) String stationDesc) { @RequestParam(required = false) String stationDesc) {
return R.status(fdpQuestionService.submitStationInfo(fdpStationType,stationCode,stationDesc)); return R.status(fdpQuestionService.submitStationInfo(fdpStationType,stationCode,stationDesc));
} }

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

@ -114,7 +114,7 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
StationPushConfigVO configVO = stationPushConfigService.getOne(BeanUtil.copy(config, StationPushConfigDTO.class)); StationPushConfigVO configVO = stationPushConfigService.getOne(BeanUtil.copy(config, StationPushConfigDTO.class));
if(ObjectUtil.isNotEmpty(configVO) && configVO.getIsPush()) { if(ObjectUtil.isNotEmpty(configVO) && configVO.getIsPush()) {
log.info("{}站点开始智能诊断站点推送",req.getCode()); log.info("{}站点开始智能诊断站点推送",req.getCode());
new Thread(() -> questionClient.submitStationInfo(configVO.getFdpStationType(), req.getCode(), ""), "智能诊断站点推送").start(); new Thread(() -> questionClient.submitStationInfo(configVO.getFdpStationType(), req.getCode(), "运维平台推送"), "智能诊断站点推送").start();
} }
// 如果设备数据来源未选定其他 则进行站点初始化操作 // 如果设备数据来源未选定其他 则进行站点初始化操作
if (StationConstants.GATHER.equals(req.getDataOrigin()) && !StationConstants.HZ3000_OTHER.equals(req.getDataSource())) { if (StationConstants.GATHER.equals(req.getDataOrigin()) && !StationConstants.HZ3000_OTHER.equals(req.getDataSource())) {

Loading…
Cancel
Save