diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java index 40399c82..0798a1c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java @@ -14,7 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("gardsStations") +@RequestMapping("/gardsStations") @Api(value = "台站管理", tags = "台站管理") public class GardsStationsController { @@ -27,7 +27,7 @@ public class GardsStationsController { * @param gardsStations * @return */ - @GetMapping("findPage") + @GetMapping("/findPage") @ApiOperation(value = "分页查询台站管理信息", notes = "分页查询台站管理信息") public Result> findPage(QueryRequest queryRequest, GardsStations gardsStations){ Result> result = gardsStationsService.findPage(queryRequest, gardsStations); @@ -39,7 +39,7 @@ public class GardsStationsController { * @param stationId * @return */ - @GetMapping("findInfo") + @GetMapping("/findInfo") @ApiOperation(value = "查询台站管理详情信息", notes = "查询台站管理详情信息") public GardsStations findInfo(Integer stationId){ GardsStations result = gardsStationsService.findInfo(stationId); @@ -49,7 +49,7 @@ public class GardsStationsController { /** * 新增台站信息接口 */ - @PostMapping("create") + @PostMapping("/create") @ApiOperation(value = "新增台站管理信息", notes = "新增台站管理信息") public Result create(@RequestBody @Validated(value = InsertGroup.class) GardsStations gardsStations){ Result result = gardsStationsService.create(gardsStations); @@ -59,7 +59,7 @@ public class GardsStationsController { /** * 修改台站信息接口 */ - @PutMapping("update") + @PutMapping("/update") @ApiOperation(value = "修改台站管理信息", notes = "修改台站管理信息") public Result update(@RequestBody @Validated(value = UpdateGroup.class) GardsStations gardsStations){ Result result = gardsStationsService.update(gardsStations); @@ -70,7 +70,7 @@ public class GardsStationsController { * 删除台站信息接口 * @param stationId */ - @DeleteMapping("deleteById") + @DeleteMapping("/deleteById") @ApiOperation(value = "删除台站管理信息", notes = "删除台站管理信息") public Result deleteById(Integer stationId){ Result result = gardsStationsService.deleteById(stationId); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java index 7fc286a9..dc4aa2e0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java @@ -1,7 +1,11 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.system.entity.GardsDetectors; public interface GardsDetectorsMapper extends BaseMapper { + + Page findPage(Page page, GardsDetectors gardsDetectors); + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml new file mode 100644 index 00000000..edeaeb53 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml @@ -0,0 +1,37 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 42625529..8b781eac 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.system.entity.GardsDetectors; import org.jeecg.modules.system.entity.GardsStations; import org.jeecg.modules.system.mapper.GardsDetectorsMapper; @@ -24,6 +25,7 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -33,22 +35,22 @@ public class GardsDetectorsServiceImpl extends ServiceImpl> findPage(QueryRequest queryRequest, GardsDetectors gardsDetectors) { Result> result = new Result<>(); //查询台站信息接口 - List gardsStations = gardsStationsService.getGardsStations(); + HashMap stationMap = (HashMap)redisUtil.get("stationMap"); //分页查询 Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Page detectorsPage = this.baseMapper.selectPage(page, queryWrapper); + Page detectorsPage = this.baseMapper.findPage(page, gardsDetectors); detectorsPage.getRecords().forEach(item->{ - if (CollectionUtils.isNotEmpty(gardsStations)) { - for (GardsStations gardsStation:gardsStations) { - if (gardsStation.getStationId().equals(item.getStationId())){ - item.setStationName(gardsStation.getStationCode()); - } + if (CollectionUtils.isNotEmpty(stationMap)) { + String stationValue = stationMap.get(item.getStationId()); + if (StringUtils.isNotBlank(stationValue)){ + item.setStationName(stationValue); } } }); @@ -60,18 +62,17 @@ public class GardsDetectorsServiceImpl extends ServiceImpl gardsStations = gardsStationsService.getGardsStations(); + HashMap stationMap = (HashMap) redisUtil.get("stationMap"); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(GardsDetectors::getDetectorId, id); GardsDetectors gardsDetectors = this.baseMapper.selectOne(queryWrapper); if (Objects.isNull(gardsDetectors)) { throw new RuntimeException("当前数据不存在"); } - if (CollectionUtils.isNotEmpty(gardsStations)){ - for (GardsStations gardsStation:gardsStations) { - if (gardsStation.getStationId().equals(gardsDetectors.getStationId())) { - gardsDetectors.setStationName(gardsStation.getStationCode()); - } + if (CollectionUtils.isNotEmpty(stationMap)){ + String stationValue = stationMap.get(gardsDetectors.getStationId()); + if (StringUtils.isNotBlank(stationValue)){ + gardsDetectors.setStationName(stationValue); } } return gardsDetectors; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java index d729278c..13c67634 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java @@ -26,6 +26,10 @@ public class GardsNuclearfacilityServiceImpl extends ServiceImpl> result = new Result<>(); Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotBlank(gardsNuclearfacility.getFacilityName()), GardsNuclearfacility::getFacilityName, gardsNuclearfacility.getFacilityName()); + queryWrapper.eq(StringUtils.isNotBlank(gardsNuclearfacility.getType()), GardsNuclearfacility::getType, gardsNuclearfacility.getType()); + queryWrapper.eq(StringUtils.isNotBlank(gardsNuclearfacility.getLocation()), GardsNuclearfacility::getLocation, gardsNuclearfacility.getLocation()); + queryWrapper.eq(StringUtils.isNotBlank(gardsNuclearfacility.getStatus()), GardsNuclearfacility::getStatus, gardsNuclearfacility.getStatus()); Page gardsNuclearfacilityPage = this.baseMapper.selectPage(page, queryWrapper); result.setSuccess(true); result.setResult(gardsNuclearfacilityPage); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java index 9f75c916..40d67015 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java @@ -4,10 +4,12 @@ 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.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.system.entity.GardsDetectors; import org.jeecg.modules.system.entity.GardsSampleData; import org.jeecg.modules.system.entity.GardsStations; @@ -19,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; +import java.util.Objects; @Service("gardsSampleDataService") @DS("ori") @@ -27,26 +31,31 @@ public class GardsSampleDataServiceImpl extends ServiceImpl> findPage(QueryRequest queryRequest, GardsSampleData gardsSampleData) { //查询全部台站信息 - List gardsStations = gardsStationsService.getGardsStations(); + HashMap stationMap = (HashMap) redisUtil.get("stationMap"); //查询全部监测器信息 List detectors = gardsDetectorsService.findDetectors(); Result> result = new Result<>(); Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(Objects.nonNull(gardsSampleData.getSampleId()) ,GardsSampleData::getSampleId, gardsSampleData.getSampleId()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getStationId()) ,GardsSampleData::getStationId, gardsSampleData.getStationId()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getDetectorId()) ,GardsSampleData::getDetectorId, gardsSampleData.getDetectorId()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getCollectStart()) ,GardsSampleData::getCollectStart, gardsSampleData.getCollectStart()); + queryWrapper.eq(Objects.nonNull(gardsSampleData.getCollectStop()) ,GardsSampleData::getCollectStop, gardsSampleData.getCollectStop()); Page sampleDataPage = this.baseMapper.selectPage(page, queryWrapper); sampleDataPage.getRecords().forEach(item->{ - if (CollectionUtils.isNotEmpty(gardsStations)){ - for (GardsStations stations:gardsStations) { - if (stations.getStationId().equals(item.getStationId())){ - item.setStationName(stations.getStationCode()); - } + if (CollectionUtils.isNotEmpty(stationMap)){ + String stationValue = stationMap.get(item.getStationId()); + if (StringUtils.isNotBlank(stationValue)){ + item.setStationName(stationValue); } } if (CollectionUtils.isNotEmpty(detectors)){ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index 5950fd67..7c0bcdb0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -9,13 +9,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.system.entity.GardsStations; import org.jeecg.modules.system.mapper.GardsStationsMapper; import org.jeecg.modules.system.service.IGardsStationsService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -23,6 +26,9 @@ import java.util.Objects; @DS("ora") public class GardsStationsServiceImpl extends ServiceImpl implements IGardsStationsService { + @Autowired + private RedisUtil redisUtil; + /** * 分页查询台站信息接口 * @param queryRequest @@ -34,6 +40,9 @@ public class GardsStationsServiceImpl extends ServiceImpl> result = new Result<>(); Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(gardsStations.getCountryCode()), GardsStations::getCountryCode, gardsStations.getCountryCode()); + queryWrapper.eq(StringUtils.isNotBlank(gardsStations.getType()), GardsStations::getType, gardsStations.getType()); + queryWrapper.eq(StringUtils.isNotBlank(gardsStations.getStatus()), GardsStations::getStatus, gardsStations.getStatus()); Page pageList = this.baseMapper.selectPage(page, queryWrapper); result.setSuccess(true); result.setResult(pageList); @@ -136,6 +145,11 @@ public class GardsStationsServiceImpl extends ServiceImpl getGardsStations() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); List gardsStations = this.baseMapper.selectList(queryWrapper); + HashMap map = new HashMap<>(); + for (GardsStations station:gardsStations) { + map.put(station.getStationId(),station.getStationCode()); + } + redisUtil.set("stationMap",map); return gardsStations; } }