skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/StBdDataController.java
@@ -3,13 +3,13 @@ import cn.gistack.sm.sjztmd.entity.StBdData; import cn.gistack.sm.sjztmd.service.IStBdDataService; import cn.gistack.sm.sjztmd.vo.StBdDataVO; import cn.gistack.sm.sjztmd.vo.StBdVO; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -31,8 +31,8 @@ */ @ApiOperation(value="分页查询北斗平台监测数据", notes="分页查询北斗平台监测数据") @GetMapping("/list") public R<IPage<StBdData>> list(StBdData stBdData, Query query) throws Exception { IPage<StBdData> pageList = stBdDataService.page(Condition.getPage(query), Condition.getQueryWrapper(stBdData)); public R<IPage<StBdData>> list(StBdVO stBdData, Query query) throws Exception { IPage<StBdData> pageList = stBdDataService.selectAlarmRecordPage( query, stBdData); return R.data(pageList); }
@@ -2,9 +2,14 @@ import cn.gistack.sm.sjztmd.entity.StBdData; import cn.gistack.sm.sjztmd.vo.StBdDataVO; import cn.gistack.sm.sjztmd.vo.StBdVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.mp.support.Query; public interface IStBdDataService extends IService<StBdData>{ Boolean insertData(StBdDataVO stBdDataVO) throws Exception; IPage<StBdData> selectAlarmRecordPage(Query query, StBdVO stBdVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/StBdDataServiceImpl.java
@@ -5,11 +5,18 @@ import cn.gistack.sm.sjztmd.mapper.StBdDataMapper; import cn.gistack.sm.sjztmd.service.IStBdDataService; import cn.gistack.sm.sjztmd.vo.StBdDataVO; import cn.gistack.sm.sjztmd.vo.StBdVO; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -53,6 +60,17 @@ return true; } @Override public IPage<StBdData> selectAlarmRecordPage(Query query, StBdVO stBdVO) { LambdaQueryWrapper<StBdData> queryWrapper = Wrappers.<StBdData>query().lambda() .eq(StrUtil.isNotEmpty(stBdVO.getCodeType()), StBdData::getCodeType, stBdVO.getCodeType()) .eq(StrUtil.isNotEmpty(stBdVO.getFromAddr()), StBdData::getFromAddr, stBdVO.getFromAddr()) .eq(StrUtil.isNotEmpty(stBdVO.getToAddr()), StBdData::getToAddr, stBdVO.getToAddr()) .ge(stBdVO.getStartTime() != null, StBdData::getTm, stBdVO.getStartTime()) .le(stBdVO.getEndTime() != null, StBdData::getTm, stBdVO.getEndTime()); return page(Condition.getPage(query), queryWrapper); } private boolean contentIsContainChinese(String content) { if (content == null || content.isEmpty()) { return false; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/StBdVO.java
New file @@ -0,0 +1,17 @@ package cn.gistack.sm.sjztmd.vo; import cn.gistack.sm.sjztmd.entity.StBdData; import lombok.Data; @Data public class StBdVO extends StBdData { /** * 开始时间 */ private String startTime; /** * 结束时间 */ private String endTime; }
