Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

系统功能调整

Browse Source
This commit is contained in:
xy
2024-12-02 14:46:58 +08:00
parent 8f57310625
commit e7b4117167
12 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java
View File

@@ -16,6 +16,7 @@ import com.njcn.system.service.SysDicTreePOService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -178,10 +179,13 @@ public class DictTreeController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/queryDictType")
@ApiOperation("获取指标类型")
@ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
public HttpResult<List<SysDicTreePO>> queryDictType(@RequestParam @Validated String lineId) {
@ApiImplicitParams ({
@ApiImplicitParam(name = "lineId", value = "监测点id", required = true),
@ApiImplicitParam(name = "conType", value = "接线方式", required = true)
})
public HttpResult<List<SysDicTreePO>> queryDictType(@RequestParam @Validated String lineId, @RequestParam @Validated Integer conType) {
String methodDescribe = getMethodDescribe("queryDictType");
List<SysDicTreePO> result = sysDicTreePOService.queryDictType(lineId);
List<SysDicTreePO> result = sysDicTreePOService.queryDictType(lineId,conType);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

2
pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java
View File

@@ -64,5 +64,5 @@ public interface SysDicTreePOService extends IService<SysDicTreePO> {
*/
List<SysDicTreePO> queryByCodeList(String code);
List<SysDicTreePO> queryDictType(String lineId);
List<SysDicTreePO> queryDictType(String lineId, Integer conType);
}

12
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
View File

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -177,7 +178,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
}
@Override
public List<SysDicTreePO> queryDictType(String lineId) {
public List<SysDicTreePO> queryDictType(String lineId, Integer conType) {
DictTreeVO vo = queryByCode("Statistical_Type");
LambdaQueryWrapper<SysDicTreePO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDicTreePO::getPid,vo.getId())
@@ -190,7 +191,14 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
}
//通用指标
else {
queryWrapper.eq(SysDicTreePO::getType,2);
//角型接线
if (Objects.equals(conType,1)) {
queryWrapper.in(SysDicTreePO::getType, Arrays.asList(2,4));
}
//其他接线方式
else {
queryWrapper.in(SysDicTreePO::getType,Arrays.asList(2,5));
}
}
return this.list(queryWrapper);
}