Browse Source

feat: 添加对象信息查询接口

master_tdsql
hxh 1 year ago
parent
commit
e4762957b9
  1. 18
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
  2. 17
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
  3. 58
      shuili-system/src/main/java/com/kms/yxgh/common/controller/ObjectInfoController.java
  4. 30
      shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectInfoDto.java
  5. 58
      shuili-system/src/main/java/com/kms/yxgh/common/service/SyDictService.java
  6. 32
      shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java

18
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java

@ -1,11 +1,12 @@
package com.kms.yg.df.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.df.domain.BsSgcDfJbxx;
import com.kms.yg.df.mapper.BsSgcDfJbxxMapper;
import com.kms.yg.sz.domain.BsSgcSzGcda;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.service.BaseService;
import com.shuili.common.utils.StringUtils;
@ -22,7 +23,7 @@ import java.util.Map;
* @date 2023-12-25
*/
@Service
public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJbxx>{
public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJbxx> {
@Autowired
private BsSgcDfJbxxMapper bsSgcDfJbxxMapper;
@ -38,7 +39,7 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
String projectType = projectInfo.getDikeType();
queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcdStart()), "ADCD_START", projectInfo.getAdcdStart());
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
queryWrapper.like(projectName != null, "dike_name", projectName);
queryWrapper.like(projectType != null, "dike_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
@ -47,7 +48,7 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
Map<String, Object> params = sp.getParams();
if (params!=null) {
if (params != null) {
//create_time
if (params.get("orderBy") != null) {
String orderBy = (String) params.get("orderBy");
@ -56,8 +57,15 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
}
Page<BsSgcDfJbxx> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<BsSgcDfJbxx> page = new Page<>(sp.getPageNum(), sp.getPageSize());
Page<BsSgcDfJbxx> infoPage = bsSgcDfJbxxMapper.selectPage(page, queryWrapper);
return infoPage;
}
//通过编码查询堤防信息
public BsSgcDfJbxx selectByDikeCode(String dikeCode) {
Wrapper<BsSgcDfJbxx> queryWrapper = Wrappers.lambdaQuery(BsSgcDfJbxx.class)
.eq(BsSgcDfJbxx::getDikeCode, dikeCode);
return bsSgcDfJbxxMapper.selectOne(queryWrapper);
}
}

17
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java

@ -1,7 +1,9 @@
package com.kms.yg.sz.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yg.sz.domain.BsSgcSzGcda;
import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper;
@ -21,7 +23,7 @@ import java.util.Map;
* @date 2023-12-25
*/
@Service
public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGcda>{
public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGcda> {
@Autowired
private BsSgcSzGcdaMapper bsSgcSzGcdaMapper;
@ -37,7 +39,7 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
queryWrapper.isNull("EXPR_DATE");
queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcd()), "adcd", projectInfo.getAdcd());
queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
queryWrapper.eq(projectInfo.getId() != null, "id", projectInfo.getId());
queryWrapper.like(projectName != null, "waga_name", projectName);
queryWrapper.like(projectType != null, "waga_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
@ -46,7 +48,7 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
Map<String, Object> params = sp.getParams();
if (params!=null) {
if (params != null) {
//create_time
if (params.get("orderBy") != null) {
String orderBy = (String) params.get("orderBy");
@ -55,8 +57,15 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
}
Page<BsSgcSzGcda> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<BsSgcSzGcda> page = new Page<>(sp.getPageNum(), sp.getPageSize());
Page<BsSgcSzGcda> infoPage = bsSgcSzGcdaMapper.selectPage(page, queryWrapper);
return infoPage;
}
//通过编码查询水闸工程基础信息
public BsSgcSzGcda selectByWagaCode(String waGaCode) {
Wrapper<BsSgcSzGcda> queryWrapper = Wrappers.<BsSgcSzGcda>lambdaQuery()
.eq(BsSgcSzGcda::getWagaCode, waGaCode);
return bsSgcSzGcdaMapper.selectOne(queryWrapper);
}
}

58
shuili-system/src/main/java/com/kms/yxgh/common/controller/ObjectInfoController.java

@ -0,0 +1,58 @@
package com.kms.yxgh.common.controller;
import com.kms.yg.df.domain.BsSgcDfJbxx;
import com.kms.yg.df.service.BsSgcDfJbxxService;
import com.kms.yg.sz.domain.BsSgcSzGcda;
import com.kms.yg.sz.service.BsSgcSzGcdaService;
import com.kms.yxgh.base.Response;
import com.kms.yxgh.common.dto.ObjectInfoDto;
import com.kms.yxgh.common.service.SyDictService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @ClassName: ObjectInfoController
* @Description: TODO
* @Date: 2024/3/19 下午5:01
* *
* @author: hxh
* @version: 1.0
*/
@RestController
@AllArgsConstructor
@RequestMapping("/run/api/object")
@Api(tags = "大屏对象详细相关")
public class ObjectInfoController {
private final BsSgcDfJbxxService bsSgcDfJbxxService;
private final BsSgcSzGcdaService bsSgcSzGcdaService;
private final SyDictService syDictService;
//通过类型和编码查询对象详细信息
@GetMapping("/info/{type}/{code}")
@ApiOperation("通过类型和编码查询对象详细信息")
public Response<ObjectInfoDto> info(@PathVariable String type, @PathVariable String code) {
if ("1".equals(type)) {
BsSgcDfJbxx bsSgcDfJbxx = bsSgcDfJbxxService.selectByDikeCode(code);
ObjectInfoDto objectInfoDto = new ObjectInfoDto();
objectInfoDto.setCode(bsSgcDfJbxx.getDikeCode());
objectInfoDto.setName(bsSgcDfJbxx.getDikeName());
objectInfoDto.setAdcd(bsSgcDfJbxx.getAdcd());
objectInfoDto.setRiverLocation(bsSgcDfJbxx.getRiverLocation());
objectInfoDto.setGrad(syDictService.get("embankment_level", bsSgcDfJbxx.getDikeGrad()).getDictLabel());
} else if ("2".equals(type)) {
BsSgcSzGcda bsSgcSzGcda = bsSgcSzGcdaService.selectByWagaCode(code);
ObjectInfoDto objectInfoDto = new ObjectInfoDto();
objectInfoDto.setCode(bsSgcSzGcda.getWagaCode());
objectInfoDto.setName(bsSgcSzGcda.getWagaName());
objectInfoDto.setAdcd(bsSgcSzGcda.getAdcd());
objectInfoDto.setGrad(syDictService.get("building_level", bsSgcSzGcda.getEngScal()).getDictLabel());
}
return Response.fail();
}
}

30
shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectInfoDto.java

@ -0,0 +1,30 @@
package com.kms.yxgh.common.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @ClassName: ObjectInfoDto
* @Description: TODO
* @Date: 2024/3/19 下午5:19
* *
* @author: hxh
* @version: 1.0
*/
@Data
@ApiModel(value = "对象信息")
public class ObjectInfoDto {
@ApiModelProperty("编码")
private String code;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("行政区划")
private String adcd;
@ApiModelProperty("所属河流")
private String riverLocation;
@ApiModelProperty("级别")
private String grad;
}

58
shuili-system/src/main/java/com/kms/yxgh/common/service/SyDictService.java

@ -0,0 +1,58 @@
package com.kms.yxgh.common.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.kms.system.mapper.SysDictDataMapper;
import com.shuili.common.core.domain.entity.SysDictData;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
/**
* @ClassName: SyDictService
* @Description: TODO
* @Date: 2024/3/19 下午5:23
* *
* @author: hxh
* @version: 1.0
*/
@Service
@RequiredArgsConstructor
public class SyDictService {
private final SysDictDataMapper dictDataMapper;
private LoadingCache<DictKey, SysDictData> dictDataCache;
@PostConstruct
private void init() {
this.dictDataCache = Caffeine.newBuilder()
.maximumSize(1000)
.expireAfterWrite(10, TimeUnit.MINUTES)
.build(key -> dictDataMapper.selectOne(Wrappers.<SysDictData>lambdaQuery()
.eq(SysDictData::getDictType, key.getDictType())
.eq(SysDictData::getDictValue, key.getDictValue())));
}
public SysDictData get(String dictType, String dictValue) {
return dictDataCache.get(new DictKey(dictType, dictValue));
}
@Data
@AllArgsConstructor
@NoArgsConstructor
private static class DictKey implements Serializable {
private String dictType;
private String dictValue;
}
}

32
shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java

@ -4,9 +4,6 @@ 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.plugins.pagination.Page;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.kms.system.mapper.SysDictDataMapper;
import com.kms.yxgh.common.domain.DeviceCheckingRecordView;
import com.kms.yxgh.common.dto.WarningDto;
import com.kms.yxgh.common.dto.WarningQueDto;
@ -17,19 +14,13 @@ import com.kms.yxgh.util.BeanCopyUtils;
import com.shuili.common.core.domain.SearchParam;
import com.shuili.common.core.domain.entity.SysDictData;
import com.shuili.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@ -46,19 +37,7 @@ import java.util.stream.Collectors;
public class WarningService {
private final WarningMapper warningMapper;
private final SysDictDataMapper dictDataMapper;
private LoadingCache<DictKey, SysDictData> dictDataCache;
@PostConstruct
private void init() {
this.dictDataCache = Caffeine.newBuilder()
.maximumSize(1000)
.expireAfterWrite(10, TimeUnit.MINUTES)
.build(key -> dictDataMapper.selectOne(Wrappers.<SysDictData>lambdaQuery()
.eq(SysDictData::getDictType, key.getDictType())
.eq(SysDictData::getDictValue, key.getDictValue())));
}
private final SyDictService dictDataCache;
public IPage<WarningDto> selectPage(SearchParam<WarningQueDto> sp) {
Page<DeviceCheckingRecordView> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@ -103,7 +82,7 @@ public class WarningService {
} else if (WarningStatisticQueDto.StatisticType.WARNING_TYPE.equals(sp.getType())) {
iPage = warningMapper.statisticByWarningType(page, sp);
warningStatisticDto.setStatistics(iPage.getRecords().stream().peek(item -> {
SysDictData dictData = dictDataCache.get(new DictKey("xc_warnning_type", item.getCode()));
SysDictData dictData = dictDataCache.get("xc_warnning_type", item.getCode());
if (dictData != null) {
item.setName(dictData.getDictLabel());
}
@ -118,12 +97,5 @@ public class WarningService {
return warningStatisticDto;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
private static class DictKey implements Serializable {
private String dictType;
private String dictValue;
}
}

Loading…
Cancel
Save