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

代码调整

Browse Source
This commit is contained in:
雨木c
2022-12-12 15:18:48 +08:00
parent 9b8af7945a
commit d043ab478b
10 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java
View File

@@ -22,6 +22,9 @@ public class SimpleDTO implements Serializable {
@ApiModelProperty(name = "code", value = "编码")
private String code;
@ApiModelProperty(name = "value", value = "数值")
private String value;
private Integer sort;
}

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
View File

@@ -275,7 +275,11 @@ public class RunManageServiceImpl implements RunManageService {
private GeneralDeviceDTO assembleDataByLine(SimpleDTO simpleDTO, List<Line> lines, List<String> keyIds, Integer level) {
GeneralDeviceDTO generalDeviceDTO = new GeneralDeviceDTO();
if(LineBaseEnum.SUB_V_LEVEL.getCode().equals(level)){
generalDeviceDTO.setName(simpleDTO.getValue());
}else {
generalDeviceDTO.setName(simpleDTO.getName());
}
generalDeviceDTO.setIndex(simpleDTO.getId());
if (CollectionUtil.isNotEmpty(keyIds)) {
List<Line> tempLines = lines.stream().filter(line -> {
@@ -309,7 +313,7 @@ public class RunManageServiceImpl implements RunManageService {
TerminalLedgerVO.ItemData itemData = new TerminalLedgerVO.ItemData();
if (type == 1) {
//电压时候进行排序处理
itemData.setVoltage(Float.parseFloat(general.getName().substring(0, general.getName().indexOf("k"))));
itemData.setVoltage(Float.parseFloat(general.getName()));
}
itemData.setLineCount(general.getLineIndexes().size());
itemData.setDevCount(general.getDeviceIndexes().size());

3
pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/DictData.java
View File

@@ -53,6 +53,9 @@ public class DictData extends BaseEntity {
*/
private Integer algoDescribe;
/**
* 目前只用于表示电压等级数值
*/
private String value;
/**

8
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
View File

@@ -20,13 +20,16 @@
sys_dict_type sys_dict_type
WHERE sys_dict_data.type_id = sys_dict_type.id
AND sys_dict_type.name = #{dictypeName}
order by sort
and sys_dict_data.state = 1
order by sys_dict_data.sort
</select>
<!-- 根据字典名称查询字典数据-->
<select id="getDicDataByName" resultType="DictData">
SELECT sys_dict_data.*
FROM sys_dict_data sys_dict_data
WHERE sys_dict_data.name = #{dicName}
and sys_dict_data.state = 1
order by sys_dict_data.sort
</select>
<!-- 根据字典名称查询字典数据-->
@@ -34,6 +37,8 @@
SELECT sys_dict_data.*
FROM sys_dict_data sys_dict_data
WHERE sys_dict_data.code = #{code}
and sys_dict_data.state = 1
order by sys_dict_data.sort
</select>
<select id="getDicDataByNameAndTypeName" resultType="DictData">
@@ -57,6 +62,7 @@
sys_dict_type sys_dict_type
WHERE sys_dict_data.type_id = sys_dict_type.id
AND sys_dict_type.code = #{dictTypeCode}
and sys_dict_data.state = 1
order by sort
</select>
</mapper>

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

@@ -85,7 +85,7 @@ public interface IDictDataService extends IService<DictData> {
/**
*
* @param cpde 字典code
* @param code 字典code
* @return 根据字典code查询字典数据
*/
DictData getDicDataByCode(String code);

5
pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
View File

@@ -92,4 +92,9 @@ public interface DeptFeignClient {
@GetMapping("/getDirectSonSelf")
HttpResult<List<Dept>> getDirectSonSelf(@RequestParam("deptId") String deptId);
/**
* 获取所有本部
*/
@GetMapping("/getSpecialDeptList")
HttpResult<List<Dept>> getSpecialDeptList();
}

6
pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
View File

@@ -99,6 +99,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory<DeptFeign
log.error("{}异常，降级处理，异常为：{}","查询所有子部门以及自身异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<Dept>> getSpecialDeptList() {
log.error("{}异常，降级处理，异常为：{}","查询所有本部异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

15
pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
View File

@@ -359,6 +359,21 @@ public class DeptController extends BaseController {
}
/**
* 获取所有本部单位
* @author cdf
* @date 2022/12/8
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getSpecialDeptList")
@ApiOperation("获取所有本部单位")
public HttpResult<List<Dept>> getSpecialDeptList(){
String methodDescribe = getMethodDescribe("getSpecialDeptList");
List<Dept> deptList = deptService.getSpecialDeptList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe);
}
}

7
pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
View File

@@ -186,4 +186,11 @@ public interface IDeptService extends IService<Dept> {
* @date 2022/12/1
*/
List<Dept> getDirectSonSelf(String deptId);
/**
* 获取所有本部
* @author cdf
* @date 2022/12/8
*/
List<Dept> getSpecialDeptList();
}

7
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -357,4 +357,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
or().eq(Dept::getId,deptId);
return this.list(lambdaQueryWrapper);
}
@Override
public List<Dept> getSpecialDeptList() {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Dept::getSpecialType,1).eq(Dept::getState, DataStateEnum.ENABLE.getCode());
return this.list(lambdaQueryWrapper);
}
}