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

因修改influxDB数据库的部分表结构，谐波模块修改了部分代码

Browse Source
This commit is contained in:
njcn_dhj
2022-06-28 21:08:17 +08:00
parent 76747b5553
commit 90af2c3693
19 changed files with 707 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AreaMapper.java
View File

@@ -60,7 +60,7 @@ public interface AreaMapper extends BaseMapper<Area> {
*
* @return 行政区域树（首次）
*/
List<AreaTreeDTO> getAreaDeptTree(@Param("type") Integer type, @Param("state")Integer state);
List<AreaTreeDTO> getAreaDeptTree(@Param("id")String id,@Param("type") Integer type, @Param("state")Integer state);
/**
* 查询所有区域

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

@@ -63,7 +63,9 @@
sys_area.lng lng,
sys_area.lat lat
FROM sys_area sys_area
WHERE sys_area.type = #{type}
WHERE sys_area.id = #{id}
or sys_area.pid = #{id}
and sys_area.type = #{type}
AND sys_area.state = #{state}
</select>

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

@@ -187,7 +187,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
id = deptFeignClient.getAreaIdByDeptId(RequestUtil.getDeptIndex()).getData();
}
areaTreeVOList = this.baseMapper.getAreaDeptTree(type, DataStateEnum.ENABLE.getCode());
areaTreeVOList = this.baseMapper.getAreaDeptTree(id,type, DataStateEnum.ENABLE.getCode());
List<AreaTreeDTO> finalAreaTreeVOList = areaTreeVOList;
String finalId = id;
areaTreeVOS = areaTreeVOList.stream().filter(deptTreeVO ->