diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index e28f9d9..27ae692 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -6,6 +6,9 @@ import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import java.util.Date; +import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -20,11 +23,19 @@ import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; import org.springnewfiber.dataadapter.xf.XfDataEnum; -import org.springnewfiber.dataadapter.xf.entity.*; - -import java.util.Date; -import java.util.List; -import java.util.Map; +import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; +import org.springnewfiber.dataadapter.xf.entity.MonitorChnlDataDto; +import org.springnewfiber.dataadapter.xf.entity.MonitorForcastData; +import org.springnewfiber.dataadapter.xf.entity.MonitorLakeData; +import org.springnewfiber.dataadapter.xf.entity.MonitorMeteorologicalData; +import org.springnewfiber.dataadapter.xf.entity.MonitorPptnData; +import org.springnewfiber.dataadapter.xf.entity.MonitorPumpData; +import org.springnewfiber.dataadapter.xf.entity.MonitorRiverData; +import org.springnewfiber.dataadapter.xf.entity.MonitorSoilData; +import org.springnewfiber.dataadapter.xf.entity.MonitorWasData; +import org.springnewfiber.dataadapter.xf.entity.MonitorWetlogData; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; /** * @program: newfiber-data-adapter @@ -44,9 +55,12 @@ @Value("${business.hankouSaveUrl}") private String hankouSaveUrl; + private final DataAccessRecordService dataAccessRecordService; + @PostMapping("/xfInterface") public R xfInterface(@ApiParam(value = "数据json") @RequestParam("data") String data, @ApiParam(value = "数据类型") @RequestParam("xfBaseData") XfDataEnum xfDataEnum) { log.error("data:{},flag:{}", JSONObject.toJSONString(data), xfDataEnum.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, xfDataEnum.getCode(), data); List DTO = null; try { if (xfDataEnum == XfDataEnum.ChnlData) { @@ -143,6 +157,7 @@ @PostMapping("/xfInterface/single") public R xfInterfaceSingle(@ApiParam(value = "数据json") @RequestParam("data") String data, @ApiParam(value = "数据类型") @RequestParam("xfBaseData") XfDataEnum xfDataEnum) { log.error("data:{},flag:{}", JSONObject.toJSONString(data), xfDataEnum.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, xfDataEnum.getCode(), data); PtReceiveBaseModel model = new PtReceiveBaseModel(); try { if (xfDataEnum == XfDataEnum.ChnlData) {