任务 8145 8146 8147 8148

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityServi
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
@@ -1207,6 +1208,14 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(buildId == null ? null : keySiteService.getBuildAndKeyTree(buildId));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据bizOrgCode建筑部位树", notes = "根据bizOrgCode建筑部位树")
+    @GetMapping(value = "/getBuildTreeCcs/{buildId}")
+    public ResponseModel<List<OrgMenuDto>> getBuildTreeCcs(@PathVariable Long buildId) throws Exception {
+
+        return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildId));
+    }
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据重点部位id查询详情", notes = "根据重点部位id查询详情")

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -392,6 +392,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		return list1;
 	}
 
+
 	@Override
 	public List<KeySiteDateDto> getKeySiteDate(Long id) {
 		return keySiteMapper.getKeySiteDate(id);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WarehouseStructureController.java

@@ -210,4 +210,20 @@ public class WarehouseStructureController extends AbstractBaseController {
 		String orgcode = getOrgCode();
 		return iFormInstanceService.getValueByColumn(sourceId, orgcode);
 	}
+	/**
+	 */
+	@RequestMapping(value = "/getWarehouseStructureByCode", method = RequestMethod.GET)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "根据code查询建筑id", notes = "根据code查询建筑id")
+	public Long getWarehouseStructureByCode(@RequestParam String code) {
+		QueryWrapper<WarehouseStructure> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("code",code);
+		WarehouseStructure one = iWarehouseStructureService.getOne(queryWrapper);
+		if(null == one) {
+			return null;
+		}
+		return one.getSourceId();
+	}
 }
+
+