diff --git a/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java b/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java deleted file mode 100644 index 2459f7c..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/RcvLogController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.gunshi.project.xyt.model.RcvLogUpR; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 报文日志数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/log") -@Tag(name = "统一接收-报文日志数据") -public class RcvLogController { - - //page - page,time,stcd,stnm,protocol -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java b/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java index 82e33bb..0200759 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java @@ -3,11 +3,13 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StPptnR; -import com.gunshi.project.xyt.model.StPptnRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; +import com.gunshi.project.xyt.mapper.RcvLogUpRMapper; +import com.gunshi.project.xyt.model.*; +import com.gunshi.project.xyt.model.RcvLogUpRAutoDao; import com.gunshi.project.xyt.model.StStbprpBAutoMapper; +import com.gunshi.project.xyt.so.RcvLogUpRSo; import com.gunshi.project.xyt.so.RtuDataSo; +import com.gunshi.project.xyt.vo.RcvLogUpRVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; @@ -21,26 +23,26 @@ import java.util.ArrayList; import java.util.List; /** - * 雨量数据接口 + * 报文日志数据接口 * * @author lyf * @version 1.0.0 * @since 2024-01-26 */ @RestController -@RequestMapping("/rcv/logupr") -@Tag(name = "统一接收-雨量数据") +@RequestMapping("/rcv/log") +@Tag(name = "统一接收-报文日志") public class RcvLogUpRController { @Autowired - private StPptnRAutoDao dao; + private RcvLogUpRMapper mapper; @Autowired private StStbprpBAutoMapper stbprpDao; @Operation(summary = "分页查询") - @PostMapping("/page") - public R> page(@RequestBody RtuDataSo so) { + @PostMapping("/up/page") + public R> page(@RequestBody RcvLogUpRSo so) { List stcds = new ArrayList<>(); if (StringUtils.isNotEmpty(so.getStcd())) { stcds.add(so.getStcd()); @@ -50,13 +52,7 @@ public class RcvLogUpRController { ).stream().map(StStbprpB::getStcd).toList()); } - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StPptnR::getStcd, stcds); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } + Page page = mapper.page(so.getPageSo().toPage(), so); return R.ok(page); } diff --git a/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java new file mode 100644 index 0000000..0de5b3d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java @@ -0,0 +1,42 @@ +package com.gunshi.project.xyt.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.xyt.so.RcvLogUpRSo; +import com.gunshi.project.xyt.vo.RcvLogUpRVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-30 + */ +@Mapper +public interface RcvLogUpRMapper { + + @Select(""" + + """) + Page page(@Param("page") Page page, @Param("so") RcvLogUpRSo so); +} diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java index 5ec8c64..4ecca60 100644 --- a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java +++ b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java @@ -25,7 +25,7 @@ public class RcvLogUpR { @TableField("PROTOCOL_ID") @Schema(description = "协议ID") - private Long protocolId; + private String protocolId; @TableField("ORIGINAL_MSG") @Schema(description = "原始报文") diff --git a/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java b/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java new file mode 100644 index 0000000..488eea5 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java @@ -0,0 +1,40 @@ +package com.gunshi.project.xyt.scheduled; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.project.xyt.model.RcvLogUpR; +import com.gunshi.project.xyt.model.RcvLogUpRAutoDao; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-30 + */ +@Component +@Slf4j +public class RcvLogUpMockJob { + + @Autowired + private RcvLogUpRAutoDao dao; + + @Scheduled(cron = "0 */1 * * * ?") + public void mock() { + RcvLogUpR one = dao.page(new Page(1,1,1).addOrder(OrderItem.desc("RECEIVE_TM"))).getRecords().getFirst(); + one.setId(IdWorker.getId()); + one.setReceiveTm(new Date()); + one.setDecodedTm(new Date()); + one.setObserveTm(new Date()); + dao.save(one); + log.info("{}", one); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java b/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java new file mode 100644 index 0000000..246f88e --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java @@ -0,0 +1,23 @@ +package com.gunshi.project.xyt.so; + +import com.gunshi.db.dto.DateTimeRangeSo; +import com.gunshi.db.dto.PageSo; +import lombok.Data; + +import java.util.Date; + +/** + * 报文日志查询参数 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-30 + */ +@Data +public class RcvLogUpRSo { + private PageSo pageSo; + private DateTimeRangeSo dateTimeRangeSo; + private String protocolId; + private String stcd; + private String stnm; +} diff --git a/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java b/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java new file mode 100644 index 0000000..92c13de --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java @@ -0,0 +1,26 @@ +package com.gunshi.project.xyt.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.gunshi.project.xyt.model.RcvLogUpR; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-30 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class RcvLogUpRVo extends RcvLogUpR { + @TableField("protocolName") + @Schema(description = "协议名称") + private String protocolName; + + @TableField("stnm") + @Schema(description = "测站名称") + private String stnm; +}