Commit 5de8ff01 authored by zhangsen's avatar zhangsen

消防系统树和消防建筑树接口参数修改

parent 8d3a985c
package com.yeejoin.equipmanage.common.entity.dto;
import lombok.Data;
@Data
public class RequestBaseDto {
private String bizOrgCode;
}
...@@ -8,6 +8,7 @@ import java.util.Map; ...@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import com.yeejoin.equipmanage.common.entity.*; import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.RequestBaseDto;
import com.yeejoin.equipmanage.common.utils.SpringUtils; import com.yeejoin.equipmanage.common.utils.SpringUtils;
import com.yeejoin.equipmanage.fegin.JcsFeign; import com.yeejoin.equipmanage.fegin.JcsFeign;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -592,12 +593,12 @@ public class FireFightingSystemController extends AbstractBaseController { ...@@ -592,12 +593,12 @@ public class FireFightingSystemController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "消防系统树和消防建筑树", notes = "树菜单") @ApiOperation(value = "消防系统树和消防建筑树", notes = "树菜单")
@GetMapping(value = "/getBuildingTreeAndSystemTree") @GetMapping(value = "/getBuildingTreeAndSystemTree")
public Map<String, List> getBuildingTreeAndSystemTree(@RequestParam String bizOrgCode) { public Map<String, List> getBuildingTreeAndSystemTree(RequestBaseDto dto) {
Map<String, List> map = new HashMap<>(); Map<String, List> map = new HashMap<>();
List<BuildingTreeVo> buildingTrees = buildService.getBuildingTreeByBizOrgCode(bizOrgCode); List<BuildingTreeVo> buildingTrees = buildService.getBuildingTreeByBizOrgCode(dto.getBizOrgCode());
LambdaQueryWrapper<FireFightingSystemEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FireFightingSystemEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByAsc(FireFightingSystemEntity::getRecDate); lambdaQueryWrapper.orderByAsc(FireFightingSystemEntity::getRecDate);
lambdaQueryWrapper.likeRight(StringUtil.isNotEmpty(bizOrgCode), FireFightingSystemEntity::getBizOrgCode, bizOrgCode); lambdaQueryWrapper.likeRight(StringUtil.isNotEmpty(dto.getBizOrgCode()), FireFightingSystemEntity::getBizOrgCode, dto.getBizOrgCode());
List<FireFightingSystemEntity> systemTree = fireFightingSystemService.list(lambdaQueryWrapper); List<FireFightingSystemEntity> systemTree = fireFightingSystemService.list(lambdaQueryWrapper);
systemTree.forEach(action -> { systemTree.forEach(action -> {
action.setDetailListPaneApi(ffsEquipAlarmsUrl); action.setDetailListPaneApi(ffsEquipAlarmsUrl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment