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 27ae692..9cd505b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -108,7 +108,8 @@ }); return R.status(true); } else { - throw new RuntimeException("类型转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(DTO)); + return R.status(true); } } catch (Exception var5) { log.error("解析错误,:{}", var5.getStackTrace()); @@ -199,7 +200,8 @@ } log.info("cover:{}", JSONObject.toJSONString(model)); if (CollUtil.isEmpty(model.getDataMap())) { - throw new RuntimeException("数据转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(model)); + return R.status(true); } else { rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); return R.status(true); 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 27ae692..9cd505b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -108,7 +108,8 @@ }); return R.status(true); } else { - throw new RuntimeException("类型转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(DTO)); + return R.status(true); } } catch (Exception var5) { log.error("解析错误,:{}", var5.getStackTrace()); @@ -199,7 +200,8 @@ } log.info("cover:{}", JSONObject.toJSONString(model)); if (CollUtil.isEmpty(model.getDataMap())) { - throw new RuntimeException("数据转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(model)); + return R.status(true); } else { rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); return R.status(true); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java new file mode 100644 index 0000000..f38be44 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -0,0 +1,35 @@ +package org.springnewfiber.dataadapter.xf.controller; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.xf.entity.monitor.MonitorPointData; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +/** + * @program: newfiber-data-adapter + * @description: 点表监测数据接口 + * @author: djt + * @create: 2022-07-01 17:22 + **/ +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/pointData") +@Api(value = "点表监测数据接口", tags = "点表监测数据接口") +@Slf4j +public class MonitorPointDataController { + private final DataAccessRecordService dataAccessRecordService; + @PostMapping("/realData") + public R xfInterfaceSingle(@RequestBody MonitorPointData monitorPointData) { + dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + return R.status(true); + } +} \ No newline at end of file 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 27ae692..9cd505b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -108,7 +108,8 @@ }); return R.status(true); } else { - throw new RuntimeException("类型转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(DTO)); + return R.status(true); } } catch (Exception var5) { log.error("解析错误,:{}", var5.getStackTrace()); @@ -199,7 +200,8 @@ } log.info("cover:{}", JSONObject.toJSONString(model)); if (CollUtil.isEmpty(model.getDataMap())) { - throw new RuntimeException("数据转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(model)); + return R.status(true); } else { rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); return R.status(true); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java new file mode 100644 index 0000000..f38be44 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -0,0 +1,35 @@ +package org.springnewfiber.dataadapter.xf.controller; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.xf.entity.monitor.MonitorPointData; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +/** + * @program: newfiber-data-adapter + * @description: 点表监测数据接口 + * @author: djt + * @create: 2022-07-01 17:22 + **/ +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/pointData") +@Api(value = "点表监测数据接口", tags = "点表监测数据接口") +@Slf4j +public class MonitorPointDataController { + private final DataAccessRecordService dataAccessRecordService; + @PostMapping("/realData") + public R xfInterfaceSingle(@RequestBody MonitorPointData monitorPointData) { + dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + return R.status(true); + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java new file mode 100644 index 0000000..165adfa --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -0,0 +1,26 @@ +package org.springnewfiber.dataadapter.xf.entity.monitor; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @program: newfiber-data-adapter + * @description: + * @author: djt + * @create: 2022-07-01 17:25 + **/ +@Data +public class MonitorPointData implements Serializable { + @ApiModelProperty(value = "上位机唯一标识") + private String st; + @ApiModelProperty(value = "监测站点code") + private String zdCode; + @ApiModelProperty(value = "采集时间") + private Date tm; + @ApiModelProperty(value = "点表集合") + private List pointDataList; +} 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 27ae692..9cd505b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -108,7 +108,8 @@ }); return R.status(true); } else { - throw new RuntimeException("类型转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(DTO)); + return R.status(true); } } catch (Exception var5) { log.error("解析错误,:{}", var5.getStackTrace()); @@ -199,7 +200,8 @@ } log.info("cover:{}", JSONObject.toJSONString(model)); if (CollUtil.isEmpty(model.getDataMap())) { - throw new RuntimeException("数据转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(model)); + return R.status(true); } else { rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); return R.status(true); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java new file mode 100644 index 0000000..f38be44 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -0,0 +1,35 @@ +package org.springnewfiber.dataadapter.xf.controller; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.xf.entity.monitor.MonitorPointData; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +/** + * @program: newfiber-data-adapter + * @description: 点表监测数据接口 + * @author: djt + * @create: 2022-07-01 17:22 + **/ +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/pointData") +@Api(value = "点表监测数据接口", tags = "点表监测数据接口") +@Slf4j +public class MonitorPointDataController { + private final DataAccessRecordService dataAccessRecordService; + @PostMapping("/realData") + public R xfInterfaceSingle(@RequestBody MonitorPointData monitorPointData) { + dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + return R.status(true); + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java new file mode 100644 index 0000000..165adfa --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -0,0 +1,26 @@ +package org.springnewfiber.dataadapter.xf.entity.monitor; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @program: newfiber-data-adapter + * @description: + * @author: djt + * @create: 2022-07-01 17:25 + **/ +@Data +public class MonitorPointData implements Serializable { + @ApiModelProperty(value = "上位机唯一标识") + private String st; + @ApiModelProperty(value = "监测站点code") + private String zdCode; + @ApiModelProperty(value = "采集时间") + private Date tm; + @ApiModelProperty(value = "点表集合") + private List pointDataList; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java new file mode 100644 index 0000000..2c69a1a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java @@ -0,0 +1,18 @@ +package org.springnewfiber.dataadapter.xf.entity.monitor; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @program: newfiber-data-adapter + * @description: + * @author: djt + * @create: 2022-07-01 17:26 + **/ +@Data +public class PointData { + @ApiModelProperty(value = "点表key") + private String key; + @ApiModelProperty(value = "点表数据") + private String value; +} 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 27ae692..9cd505b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -108,7 +108,8 @@ }); return R.status(true); } else { - throw new RuntimeException("类型转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(DTO)); + return R.status(true); } } catch (Exception var5) { log.error("解析错误,:{}", var5.getStackTrace()); @@ -199,7 +200,8 @@ } log.info("cover:{}", JSONObject.toJSONString(model)); if (CollUtil.isEmpty(model.getDataMap())) { - throw new RuntimeException("数据转换错误"); + log.error("数据转换错误:{}",JSONObject.toJSONString(model)); + return R.status(true); } else { rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); return R.status(true); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java new file mode 100644 index 0000000..f38be44 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorPointDataController.java @@ -0,0 +1,35 @@ +package org.springnewfiber.dataadapter.xf.controller; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.xf.entity.monitor.MonitorPointData; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +/** + * @program: newfiber-data-adapter + * @description: 点表监测数据接口 + * @author: djt + * @create: 2022-07-01 17:22 + **/ +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/pointData") +@Api(value = "点表监测数据接口", tags = "点表监测数据接口") +@Slf4j +public class MonitorPointDataController { + private final DataAccessRecordService dataAccessRecordService; + @PostMapping("/realData") + public R xfInterfaceSingle(@RequestBody MonitorPointData monitorPointData) { + dataAccessRecordService.save(EDataAccessType.IflytekPlcRealtime, EDataAccessType.IflytekPlcRealtime.name(), JSONObject.toJSONString(monitorPointData)); + return R.status(true); + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java new file mode 100644 index 0000000..165adfa --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/MonitorPointData.java @@ -0,0 +1,26 @@ +package org.springnewfiber.dataadapter.xf.entity.monitor; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @program: newfiber-data-adapter + * @description: + * @author: djt + * @create: 2022-07-01 17:25 + **/ +@Data +public class MonitorPointData implements Serializable { + @ApiModelProperty(value = "上位机唯一标识") + private String st; + @ApiModelProperty(value = "监测站点code") + private String zdCode; + @ApiModelProperty(value = "采集时间") + private Date tm; + @ApiModelProperty(value = "点表集合") + private List pointDataList; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java new file mode 100644 index 0000000..2c69a1a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/monitor/PointData.java @@ -0,0 +1,18 @@ +package org.springnewfiber.dataadapter.xf.entity.monitor; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @program: newfiber-data-adapter + * @description: + * @author: djt + * @create: 2022-07-01 17:26 + **/ +@Data +public class PointData { + @ApiModelProperty(value = "点表key") + private String key; + @ApiModelProperty(value = "点表数据") + private String value; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/enums/EDataAccessType.java b/src/main/java/org/springnewfiber/dataadapter/xf/enums/EDataAccessType.java index 36c315f..2cff68b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/enums/EDataAccessType.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/enums/EDataAccessType.java @@ -10,8 +10,9 @@ * 接入方式(讯飞实时数据 iflytek_realtime | 讯飞历史数据 iflytek_history) */ IflytekRealtime("iflytek_realtime", "讯飞实时数据"), - IflytekHistory("iflytek_history", "讯飞历史数据"); - + IflytekHistory("iflytek_history", "讯飞历史数据"), + IflytekPlcRealtime("Iflytek_plc_realtime", "讯飞plc实时数据"), + ; EDataAccessType(String code, String value) { this.code = code; this.value = value;