From d5ad4a81c8074add4292057d74448d3b7e6c45e7 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Sat, 14 Sep 2024 16:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BA=8B=E4=BB=B6=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zlevent/pojo/param/ErrorEventParam.java | 18 +++++++++++++ .../controller/CsDevErrEvtController.java | 16 +++++++++++ .../zlevent/mapper/CsDevErrEvtMapper.java | 6 +++++ .../mapper/mapping/CsDevErrEvtMapper.xml | 10 +++++++ .../zlevent/service/ICsDevErrEvtService.java | 4 +++ .../service/impl/CsDevErrEvtServiceImpl.java | 27 +++++++++++++++++++ 6 files changed, 81 insertions(+) create mode 100644 iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/param/ErrorEventParam.java create mode 100644 iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/mapping/CsDevErrEvtMapper.xml diff --git a/iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/param/ErrorEventParam.java b/iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/param/ErrorEventParam.java new file mode 100644 index 0000000..b24369d --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/param/ErrorEventParam.java @@ -0,0 +1,18 @@ +package com.njcn.zlevent.pojo.param; + +import com.njcn.web.pojo.param.BaseParam; +import lombok.Data; + +/** + * @author xy + */ +@Data +public class ErrorEventParam extends BaseParam { + + private String nDid; + + private String startTime; + + private String endTime; + +} diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/CsDevErrEvtController.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/CsDevErrEvtController.java index 46e6d87..dfc3f19 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/CsDevErrEvtController.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/CsDevErrEvtController.java @@ -1,19 +1,24 @@ package com.njcn.zlevent.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; import com.njcn.mq.message.AppEventMessage; import com.njcn.web.controller.BaseController; +import com.njcn.zlevent.pojo.param.ErrorEventParam; +import com.njcn.zlevent.pojo.po.CsDevErrEvt; import com.njcn.zlevent.service.ICsDevErrEvtService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +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; @@ -46,5 +51,16 @@ public class CsDevErrEvtController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/list") + @ApiOperation("查询异常事件列表分页") + @ApiImplicitParam(name = "param", value = "查询参数", required = true) + public HttpResult> getList(@RequestBody @Validated ErrorEventParam param) { + String methodDescribe = getMethodDescribe("getList"); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param); + Page list = csDevErrEvtService.getList(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/CsDevErrEvtMapper.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/CsDevErrEvtMapper.java index ac729dd..615ca50 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/CsDevErrEvtMapper.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/CsDevErrEvtMapper.java @@ -1,7 +1,11 @@ package com.njcn.zlevent.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.user.pojo.vo.RoleVO; import com.njcn.zlevent.pojo.po.CsDevErrEvt; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,6 @@ import com.njcn.zlevent.pojo.po.CsDevErrEvt; */ public interface CsDevErrEvtMapper extends BaseMapper { + Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); + } diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/mapping/CsDevErrEvtMapper.xml b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/mapping/CsDevErrEvtMapper.xml new file mode 100644 index 0000000..b329b74 --- /dev/null +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/mapping/CsDevErrEvtMapper.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsDevErrEvtService.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsDevErrEvtService.java index 72b9023..33afd38 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsDevErrEvtService.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsDevErrEvtService.java @@ -1,7 +1,9 @@ package com.njcn.zlevent.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.mq.message.AppEventMessage; +import com.njcn.zlevent.pojo.param.ErrorEventParam; import com.njcn.zlevent.pojo.po.CsDevErrEvt; /** @@ -20,4 +22,6 @@ public interface ICsDevErrEvtService extends IService { */ void insertErrorEvent(AppEventMessage appEventMessage); + Page getList(ErrorEventParam param); + } diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsDevErrEvtServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsDevErrEvtServiceImpl.java index 10f4dd5..45c97e5 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsDevErrEvtServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsDevErrEvtServiceImpl.java @@ -1,13 +1,23 @@ package com.njcn.zlevent.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.db.constant.DbConstant; import com.njcn.mq.message.AppEventMessage; +import com.njcn.user.pojo.vo.RoleVO; +import com.njcn.web.factory.PageFactory; import com.njcn.zlevent.mapper.CsDevErrEvtMapper; +import com.njcn.zlevent.pojo.param.ErrorEventParam; import com.njcn.zlevent.pojo.po.CsDevErrEvt; import com.njcn.zlevent.service.ICsDevErrEvtService; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -38,6 +48,23 @@ public class CsDevErrEvtServiceImpl extends ServiceImpl getList(ErrorEventParam param) { + // 构造时间字符串 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("evt.evt_time",param.getStartTime() + " 00:00:00",param.getEndTime() + " 23:59:59"); + queryWrapper.orderBy(true, false, "evt.evt_time"); + if (ObjectUtil.isNotNull(param)) { + //查询参数不为空，进行条件填充 + if (StrUtil.isNotBlank(param.getSearchValue())) { + //用户表提供用户名、登录名 模糊查询 + queryWrapper + .and(par -> par.like("evt.ndid", param.getSearchValue())); + } + } + return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper); + } + /** * 时间转换 */