diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java new file mode 100644 index 0000000..6ff2216 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java @@ -0,0 +1,74 @@ +package org.springnewfiber.dataadapter.newfiber.controller; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.BeanUtils; +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.BladeRedis; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityDto; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityEntity; +import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; +import org.springnewfiber.dataadapter.xf.XfDataEnum; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/waterQuality") +@Api(value = "水质船监测数据接口", tags = "水质船监测数据接口") +@Slf4j +public class WaterQualityController { + private final RabbitTemplate rabbitTemplate; + private final DataAccessRecordService dataAccessRecordService; + private final BladeRedis redis; + + @PostMapping("/newfiber-dhgx") + public R xfInterface(@RequestBody WaterQualityDto dto) { + log.error("data:{},flag:{}", JSONObject.toJSONString(dto), XfDataEnum.dhgx_szq.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, XfDataEnum.dhgx_szq.getCode(), JSONObject.toJSONString(dto)); + if(redis.exists(dto.getSt())){ + WaterQualityDto old= redis.get(dto.getSt()); + if(old!=null&& DateUtil.betweenMs(old.getTt(),dto.getTt())>=(1000*4*60*60)){ + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + }else { + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + return R.status(true); + } + + + public static void main(String[] args) { + String bigDateStr="2022-10-10 08:00:00"; + String endDateStr="2022-10-10 09:00:00"; + long time= DateUtil.betweenMs(DateUtil.parse(bigDateStr, DatePattern.NORM_DATETIME_PATTERN),DateUtil.parse(endDateStr, DatePattern.NORM_DATETIME_PATTERN)); + System.out.println(time/60/1000/60); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java new file mode 100644 index 0000000..6ff2216 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java @@ -0,0 +1,74 @@ +package org.springnewfiber.dataadapter.newfiber.controller; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.BeanUtils; +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.BladeRedis; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityDto; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityEntity; +import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; +import org.springnewfiber.dataadapter.xf.XfDataEnum; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/waterQuality") +@Api(value = "水质船监测数据接口", tags = "水质船监测数据接口") +@Slf4j +public class WaterQualityController { + private final RabbitTemplate rabbitTemplate; + private final DataAccessRecordService dataAccessRecordService; + private final BladeRedis redis; + + @PostMapping("/newfiber-dhgx") + public R xfInterface(@RequestBody WaterQualityDto dto) { + log.error("data:{},flag:{}", JSONObject.toJSONString(dto), XfDataEnum.dhgx_szq.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, XfDataEnum.dhgx_szq.getCode(), JSONObject.toJSONString(dto)); + if(redis.exists(dto.getSt())){ + WaterQualityDto old= redis.get(dto.getSt()); + if(old!=null&& DateUtil.betweenMs(old.getTt(),dto.getTt())>=(1000*4*60*60)){ + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + }else { + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + return R.status(true); + } + + + public static void main(String[] args) { + String bigDateStr="2022-10-10 08:00:00"; + String endDateStr="2022-10-10 09:00:00"; + long time= DateUtil.betweenMs(DateUtil.parse(bigDateStr, DatePattern.NORM_DATETIME_PATTERN),DateUtil.parse(endDateStr, DatePattern.NORM_DATETIME_PATTERN)); + System.out.println(time/60/1000/60); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java new file mode 100644 index 0000000..31467ed --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java @@ -0,0 +1,55 @@ +package org.springnewfiber.dataadapter.newfiber.entity; + +import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +@Data +public class WaterQualityDto { + @JsonProperty(value = "c") + @ApiModelProperty(value = "水温") + private BigDecimal c; + @JsonProperty(value = "nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh4n; + @JsonProperty(value = "turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value = "algae") + @ApiModelProperty(value = "蓝绿藻") + private BigDecimal algae; + @ApiModelProperty(value = "溶解氧") + @JsonProperty(value = "dO") + private BigDecimal dO; + @JsonProperty(value = "cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value = "chla") + @ApiModelProperty(value = "叶绿素a") + private BigDecimal chla; + @JsonProperty(value = "ph") + @ApiModelProperty(value = "pH值") + private BigDecimal ph; + @JsonProperty(value = "tn") + @ApiModelProperty(value = " 总氮") + private BigDecimal tn; + @JsonProperty(value = "tp") + @ApiModelProperty(value = " 总磷") + private BigDecimal tp; + @JsonProperty(value = "codmn") + @ApiModelProperty(value = " COD") + private BigDecimal codmn; + @ApiModelProperty(value = " st") + private String st; + @ApiModelProperty(value = " tt") + private Date tt; + + public static void main(String[] args) { + String str="{\"tt\":1667867700000,\"st\":\"0220100021\",\"c\":17.66419,\"nh4n\":0.50770,\"turb\":46.14257,\"algae\":17773.76367,\"dO\":8.23237,\"cond\":194.16431,\"chla\":0.00323,\"ph\":7.91721,\"tn\":1.01749,\"tp\":0.10019,\"codmn\":3.86996,\"ut\":1667867700000}"; + WaterQualityDto dto=JSONObject.parseObject(str,WaterQualityDto.class); + System.out.println(JSONObject.toJSONString(dto)); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java new file mode 100644 index 0000000..6ff2216 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java @@ -0,0 +1,74 @@ +package org.springnewfiber.dataadapter.newfiber.controller; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.BeanUtils; +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.BladeRedis; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityDto; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityEntity; +import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; +import org.springnewfiber.dataadapter.xf.XfDataEnum; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/waterQuality") +@Api(value = "水质船监测数据接口", tags = "水质船监测数据接口") +@Slf4j +public class WaterQualityController { + private final RabbitTemplate rabbitTemplate; + private final DataAccessRecordService dataAccessRecordService; + private final BladeRedis redis; + + @PostMapping("/newfiber-dhgx") + public R xfInterface(@RequestBody WaterQualityDto dto) { + log.error("data:{},flag:{}", JSONObject.toJSONString(dto), XfDataEnum.dhgx_szq.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, XfDataEnum.dhgx_szq.getCode(), JSONObject.toJSONString(dto)); + if(redis.exists(dto.getSt())){ + WaterQualityDto old= redis.get(dto.getSt()); + if(old!=null&& DateUtil.betweenMs(old.getTt(),dto.getTt())>=(1000*4*60*60)){ + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + }else { + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + return R.status(true); + } + + + public static void main(String[] args) { + String bigDateStr="2022-10-10 08:00:00"; + String endDateStr="2022-10-10 09:00:00"; + long time= DateUtil.betweenMs(DateUtil.parse(bigDateStr, DatePattern.NORM_DATETIME_PATTERN),DateUtil.parse(endDateStr, DatePattern.NORM_DATETIME_PATTERN)); + System.out.println(time/60/1000/60); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java new file mode 100644 index 0000000..31467ed --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java @@ -0,0 +1,55 @@ +package org.springnewfiber.dataadapter.newfiber.entity; + +import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +@Data +public class WaterQualityDto { + @JsonProperty(value = "c") + @ApiModelProperty(value = "水温") + private BigDecimal c; + @JsonProperty(value = "nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh4n; + @JsonProperty(value = "turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value = "algae") + @ApiModelProperty(value = "蓝绿藻") + private BigDecimal algae; + @ApiModelProperty(value = "溶解氧") + @JsonProperty(value = "dO") + private BigDecimal dO; + @JsonProperty(value = "cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value = "chla") + @ApiModelProperty(value = "叶绿素a") + private BigDecimal chla; + @JsonProperty(value = "ph") + @ApiModelProperty(value = "pH值") + private BigDecimal ph; + @JsonProperty(value = "tn") + @ApiModelProperty(value = " 总氮") + private BigDecimal tn; + @JsonProperty(value = "tp") + @ApiModelProperty(value = " 总磷") + private BigDecimal tp; + @JsonProperty(value = "codmn") + @ApiModelProperty(value = " COD") + private BigDecimal codmn; + @ApiModelProperty(value = " st") + private String st; + @ApiModelProperty(value = " tt") + private Date tt; + + public static void main(String[] args) { + String str="{\"tt\":1667867700000,\"st\":\"0220100021\",\"c\":17.66419,\"nh4n\":0.50770,\"turb\":46.14257,\"algae\":17773.76367,\"dO\":8.23237,\"cond\":194.16431,\"chla\":0.00323,\"ph\":7.91721,\"tn\":1.01749,\"tp\":0.10019,\"codmn\":3.86996,\"ut\":1667867700000}"; + WaterQualityDto dto=JSONObject.parseObject(str,WaterQualityDto.class); + System.out.println(JSONObject.toJSONString(dto)); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java new file mode 100644 index 0000000..f9dd187 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java @@ -0,0 +1,45 @@ +package org.springnewfiber.dataadapter.newfiber.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; + +import java.math.BigDecimal; + +@Data +public class WaterQualityEntity extends BaseXfInterfaceEntity { + @JsonProperty(value = "c") + @ApiModelProperty(value = "水温") + private BigDecimal c; + @JsonProperty(value = "nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh4n; + @JsonProperty(value = "turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value = "algae") + @ApiModelProperty(value = "蓝绿藻") + private BigDecimal algae; + @JsonProperty(value = "do") + @ApiModelProperty(value = "溶解氧") + private BigDecimal dO; + @JsonProperty(value = "cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value = "chla") + @ApiModelProperty(value = "叶绿素a") + private BigDecimal chla; + @JsonProperty(value = "ph") + @ApiModelProperty(value = "pH值") + private BigDecimal ph; + @JsonProperty(value = "tn") + @ApiModelProperty(value = " 总氮") + private BigDecimal tn; + @JsonProperty(value = "tp") + @ApiModelProperty(value = " 总磷") + private BigDecimal tp; + @JsonProperty(value = "codmn") + @ApiModelProperty(value = " COD") + private BigDecimal codmn; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java new file mode 100644 index 0000000..6ff2216 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/controller/WaterQualityController.java @@ -0,0 +1,74 @@ +package org.springnewfiber.dataadapter.newfiber.controller; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.BeanUtils; +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.BladeRedis; +import org.springnewfiber.dataadapter.config.R; +import org.springnewfiber.dataadapter.entity.PtReceiveBaseModel; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityDto; +import org.springnewfiber.dataadapter.newfiber.entity.WaterQualityEntity; +import org.springnewfiber.dataadapter.sswj.util.RealTimeSerializer; +import org.springnewfiber.dataadapter.xf.XfDataEnum; +import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; +import org.springnewfiber.dataadapter.xf.service.DataAccessRecordService; + +@RestController +@RequiredArgsConstructor +//@PreAuth(AuthConstant.PERMISSION_ALL) +@RequestMapping("/waterQuality") +@Api(value = "水质船监测数据接口", tags = "水质船监测数据接口") +@Slf4j +public class WaterQualityController { + private final RabbitTemplate rabbitTemplate; + private final DataAccessRecordService dataAccessRecordService; + private final BladeRedis redis; + + @PostMapping("/newfiber-dhgx") + public R xfInterface(@RequestBody WaterQualityDto dto) { + log.error("data:{},flag:{}", JSONObject.toJSONString(dto), XfDataEnum.dhgx_szq.getRemark()); + dataAccessRecordService.save(EDataAccessType.IflytekRealtime, XfDataEnum.dhgx_szq.getCode(), JSONObject.toJSONString(dto)); + if(redis.exists(dto.getSt())){ + WaterQualityDto old= redis.get(dto.getSt()); + if(old!=null&& DateUtil.betweenMs(old.getTt(),dto.getTt())>=(1000*4*60*60)){ + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + }else { + WaterQualityEntity entity = new WaterQualityEntity(); + BeanUtils.copyProperties(dto, entity); + entity.setStcd(dto.getSt()); + entity.setStnm(dto.getSt()); + entity.setTm(dto.getTt()); + PtReceiveBaseModel model = RealTimeSerializer.xfObjectToRealMap(entity); + log.info("cover:{}", JSONObject.toJSONString(model)); + rabbitTemplate.convertAndSend(JSONObject.toJSONString(model)); + redis.set(dto.getSt(),dto); + } + return R.status(true); + } + + + public static void main(String[] args) { + String bigDateStr="2022-10-10 08:00:00"; + String endDateStr="2022-10-10 09:00:00"; + long time= DateUtil.betweenMs(DateUtil.parse(bigDateStr, DatePattern.NORM_DATETIME_PATTERN),DateUtil.parse(endDateStr, DatePattern.NORM_DATETIME_PATTERN)); + System.out.println(time/60/1000/60); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java new file mode 100644 index 0000000..31467ed --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityDto.java @@ -0,0 +1,55 @@ +package org.springnewfiber.dataadapter.newfiber.entity; + +import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +@Data +public class WaterQualityDto { + @JsonProperty(value = "c") + @ApiModelProperty(value = "水温") + private BigDecimal c; + @JsonProperty(value = "nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh4n; + @JsonProperty(value = "turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value = "algae") + @ApiModelProperty(value = "蓝绿藻") + private BigDecimal algae; + @ApiModelProperty(value = "溶解氧") + @JsonProperty(value = "dO") + private BigDecimal dO; + @JsonProperty(value = "cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value = "chla") + @ApiModelProperty(value = "叶绿素a") + private BigDecimal chla; + @JsonProperty(value = "ph") + @ApiModelProperty(value = "pH值") + private BigDecimal ph; + @JsonProperty(value = "tn") + @ApiModelProperty(value = " 总氮") + private BigDecimal tn; + @JsonProperty(value = "tp") + @ApiModelProperty(value = " 总磷") + private BigDecimal tp; + @JsonProperty(value = "codmn") + @ApiModelProperty(value = " COD") + private BigDecimal codmn; + @ApiModelProperty(value = " st") + private String st; + @ApiModelProperty(value = " tt") + private Date tt; + + public static void main(String[] args) { + String str="{\"tt\":1667867700000,\"st\":\"0220100021\",\"c\":17.66419,\"nh4n\":0.50770,\"turb\":46.14257,\"algae\":17773.76367,\"dO\":8.23237,\"cond\":194.16431,\"chla\":0.00323,\"ph\":7.91721,\"tn\":1.01749,\"tp\":0.10019,\"codmn\":3.86996,\"ut\":1667867700000}"; + WaterQualityDto dto=JSONObject.parseObject(str,WaterQualityDto.class); + System.out.println(JSONObject.toJSONString(dto)); + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java new file mode 100644 index 0000000..f9dd187 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/newfiber/entity/WaterQualityEntity.java @@ -0,0 +1,45 @@ +package org.springnewfiber.dataadapter.newfiber.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springnewfiber.dataadapter.xf.entity.BaseXfInterfaceEntity; + +import java.math.BigDecimal; + +@Data +public class WaterQualityEntity extends BaseXfInterfaceEntity { + @JsonProperty(value = "c") + @ApiModelProperty(value = "水温") + private BigDecimal c; + @JsonProperty(value = "nh4n") + @ApiModelProperty(value = "氨氮") + private BigDecimal nh4n; + @JsonProperty(value = "turb") + @ApiModelProperty(value = "浊度") + private BigDecimal turb; + @JsonProperty(value = "algae") + @ApiModelProperty(value = "蓝绿藻") + private BigDecimal algae; + @JsonProperty(value = "do") + @ApiModelProperty(value = "溶解氧") + private BigDecimal dO; + @JsonProperty(value = "cond") + @ApiModelProperty(value = "电导率") + private BigDecimal cond; + @JsonProperty(value = "chla") + @ApiModelProperty(value = "叶绿素a") + private BigDecimal chla; + @JsonProperty(value = "ph") + @ApiModelProperty(value = "pH值") + private BigDecimal ph; + @JsonProperty(value = "tn") + @ApiModelProperty(value = " 总氮") + private BigDecimal tn; + @JsonProperty(value = "tp") + @ApiModelProperty(value = " 总磷") + private BigDecimal tp; + @JsonProperty(value = "codmn") + @ApiModelProperty(value = " COD") + private BigDecimal codmn; +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 2b4c298..13b9e17 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -29,6 +29,7 @@ SurgeTankData("SurgeTankData", "调蓄池监测数据"), DiverterWellData("DiverterWellData", "分流井监测数据"), StSlwtRData("StSlwtRData","其他水体监测数据"), + dhgx_szq("dhgx_szq","东湖高新-水质船"), ; private String code; private String remark;