From 143b765fd3a7ebad766501e42c4277c50385b179 Mon Sep 17 00:00:00 2001 From: ForwithyNew <2008nmj@sina.com> Date: Tue, 11 Jun 2024 17:34:24 +0800 Subject: [PATCH] =?UTF-8?q?/getGroupWarning=EF=BC=9A=E6=8A=8A=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E5=AD=98=E8=B5=B7=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/whdc/controller/QXWarnController.java | 50 +++++++++++-- .../java/com/whdc/mapper/QXWarningMapper.java | 11 +++ .../java/com/whdc/model/entity/QXWarning.java | 74 +++++++++++++++++++ .../java/com/whdc/model/vo/QXWarningVO.java | 9 +++ .../com/whdc/service/IQXWarningService.java | 10 +++ .../service/impl/QXWarningServiceImpl.java | 19 +++++ src/main/resources/mapper/QXWarningMapper.xml | 7 ++ 7 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/whdc/mapper/QXWarningMapper.java create mode 100644 src/main/java/com/whdc/model/entity/QXWarning.java create mode 100644 src/main/java/com/whdc/service/IQXWarningService.java create mode 100644 src/main/java/com/whdc/service/impl/QXWarningServiceImpl.java create mode 100644 src/main/resources/mapper/QXWarningMapper.xml diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index c6b57c8..276ef63 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -8,12 +8,10 @@ import com.whdc.model.dto.GroupWarningDto; import com.whdc.model.dto.WarnDppleDto; import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.AddressBookOld; +import com.whdc.model.entity.QXWarning; import com.whdc.model.entity.WarnMsgFB; import com.whdc.model.vo.*; -import com.whdc.service.IAddressBookOldService; -import com.whdc.service.IAddressBookService; -import com.whdc.service.IAdinfoService; -import com.whdc.service.IWarnMsgFBService; +import com.whdc.service.*; import com.whdc.utils.HttpUtil; import com.whdc.utils.ResultJson; import io.swagger.annotations.Api; @@ -25,12 +23,15 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; +import org.springframework.validation.annotation.Validated; 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 java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -49,9 +50,27 @@ public class QXWarnController { private IAddressBookOldService addressBookOldService; @Autowired private IAdinfoService adinfoService; - @Autowired private IWarnMsgFBService warnMsgFBService; + @Autowired + private IQXWarningService service; + + @ApiOperation(value = "新增") + @PostMapping(value = "/add") + public ResultJson insert(@RequestBody @Validated QXWarning dto) { + + //根据warnid是否重复 + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(QXWarning::getWarnid,dto.getWarnid()).list() + ) + ){ + return ResultJson.error("该名称或编码重复"); + } + + boolean save = service.save(dto); + return ResultJson.ok(save); + } /** * 气象预警-正在生效的预警信息 @@ -81,7 +100,26 @@ public class QXWarnController { JSONObject json = JSON.parseObject(str); if (json != null && json.getInteger("code") == HttpStatus.SC_OK) { List data = json.getJSONArray("data").toJavaList(WarningData.class); - return ResultJson.ok(getList(data, publishUnit, warnSignalLevel, warnSignalType)); + List warningList = getList(data, publishUnit, warnSignalLevel, warnSignalType); + //将warningList存起来 + for(int i=0;i { + List find(@Param("dto")QXWarning dto); +} diff --git a/src/main/java/com/whdc/model/entity/QXWarning.java b/src/main/java/com/whdc/model/entity/QXWarning.java new file mode 100644 index 0000000..bb571bb --- /dev/null +++ b/src/main/java/com/whdc/model/entity/QXWarning.java @@ -0,0 +1,74 @@ +package com.whdc.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +@Data +@Accessors(chain = true) // chain = true 实现链式调用 +@ApiModel(value = "QXWARNING 对象", description = "气象预警表") +@JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性 +@TableName("FXKH_TXL.QXWARNING") +public class QXWarning { + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + private Integer id; + + @TableField("CREATE_TIME") + @ApiModelProperty(value = "预警信息生成时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + @TableField("PUBLISH_TIME") + @ApiModelProperty(value = "预警信息发布时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date publishTime; + + @TableField("START_TIME") + @ApiModelProperty(value = "预警信息开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startTime; + + @TableField("END_TIME") + @ApiModelProperty(value = "预警信息结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date endTime; + + @ApiParam(value = "预警类型") + @ApiModelProperty(value = "预警类型", dataType = "java.lang.String") + private String warnSignalType; + + @ApiParam(value = "预警级别") + @ApiModelProperty(value = "预警级别", dataType = "java.lang.String") + private String warnSignalLevel; + + @ApiParam(value = "发布单位") + @ApiModelProperty(value = "发布单位", dataType = "java.lang.String") + private String publishUnit; + + @ApiParam(value = "预警内容") + @ApiModelProperty(value = "预警内容", dataType = "java.lang.String") + private String content; + + @TableField("WARNID") + @ApiModelProperty(value = "预警信息ID") + private Integer warnid; + + @TableField("CTNM") + @ApiModelProperty(value = "预警市名称", dataType = "java.lang.String") + private String ctnm; + + @TableField("CNNM") + @ApiModelProperty(value = "预警县名称", dataType = "java.lang.String") + private String cnnm; +} diff --git a/src/main/java/com/whdc/model/vo/QXWarningVO.java b/src/main/java/com/whdc/model/vo/QXWarningVO.java index 005814f..b9fd7e2 100644 --- a/src/main/java/com/whdc/model/vo/QXWarningVO.java +++ b/src/main/java/com/whdc/model/vo/QXWarningVO.java @@ -10,9 +10,18 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class QXWarningVO { + @ApiModelProperty(value = "生成时间") + private String createTime; + @ApiModelProperty(value = "发布时间") private String publishTime; + @ApiModelProperty(value = "起始时间") + private String startTime; + + @ApiModelProperty(value = "终止时间") + private String endTime; + @ApiModelProperty(value = "发布单位") private String publishUnit; diff --git a/src/main/java/com/whdc/service/IQXWarningService.java b/src/main/java/com/whdc/service/IQXWarningService.java new file mode 100644 index 0000000..bed2891 --- /dev/null +++ b/src/main/java/com/whdc/service/IQXWarningService.java @@ -0,0 +1,10 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.QXWarning; + +import java.util.List; + +public interface IQXWarningService extends IService { + List find(QXWarning dto); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/QXWarningServiceImpl.java b/src/main/java/com/whdc/service/impl/QXWarningServiceImpl.java new file mode 100644 index 0000000..fd98bed --- /dev/null +++ b/src/main/java/com/whdc/service/impl/QXWarningServiceImpl.java @@ -0,0 +1,19 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.whdc.mapper.QXWarningMapper; +import com.whdc.model.entity.QXWarning; +import com.whdc.service.IQXWarningService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class QXWarningServiceImpl extends ServiceImpl implements IQXWarningService { + @Override + public List find(QXWarning dto) { + return null; + } +} diff --git a/src/main/resources/mapper/QXWarningMapper.xml b/src/main/resources/mapper/QXWarningMapper.xml new file mode 100644 index 0000000..911b881 --- /dev/null +++ b/src/main/resources/mapper/QXWarningMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file