提交添加车辆页面的单位部门树 和车辆类型统计的代码修改

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

@@ -39,6 +39,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.equipmanage.common.dto.CarInfoDto;
 import com.yeejoin.equipmanage.common.dto.CarStatusInfoDto;
@@ -74,6 +75,7 @@ import com.yeejoin.equipmanage.common.vo.ExtinguishantRequeset;
 import com.yeejoin.equipmanage.common.vo.LonAndLatEntityVo;
 import com.yeejoin.equipmanage.common.vo.OnBoardEquipment;
 import com.yeejoin.equipmanage.config.EquipmentIotMqttReceiveConfig;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.CarInfoMapper;
 import com.yeejoin.equipmanage.mapper.CarMapper;
 import com.yeejoin.equipmanage.mapper.CarPropertyMapper;
@@ -185,7 +187,12 @@ public class CarController extends AbstractBaseController {
 
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
+    
+    @Value("${auth-key-fire-car}")
+    private String carAuthKey;
 
+    @Autowired
+    JcsFeign jcsFeign;
     /**
      * 新增消防车信息
      *
@@ -1276,4 +1283,12 @@ public class CarController extends AbstractBaseController {
     public ResponseModel<List> getCarFusionList() {
         return CommonResponseUtil.success(iCarService.getCarFusionList());
     }
+    
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
+    public ResponseModel<Object> companyTreeByUserAndType() throws Exception {
+        FeignClientResult<List<OrgMenuDto>>   menusList = jcsFeign.getCompanyDeptTreeWithAuth(carAuthKey, null);
+        return ResponseHelper.buildResponse(menusList.getResult());
+    }
 }

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

 package com.yeejoin.equipmanage.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,31 +33,45 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
-import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.EquProperty;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
+import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
+import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
+import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
+import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemTreeVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemTypeTreeVo;
+import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
+import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.*;
+import com.yeejoin.equipmanage.service.IBuilldService;
+import com.yeejoin.equipmanage.service.ICarService;
+import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
+import com.yeejoin.equipmanage.service.IEquipmentIndexService;
+import com.yeejoin.equipmanage.service.IEquipmentService;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
+import com.yeejoin.equipmanage.service.IFireFightingSystemService;
+import com.yeejoin.equipmanage.service.IManufacturerInfoService;
+import com.yeejoin.equipmanage.service.IUploadFileService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author zjw

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1031,7 +1031,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     		equipmentCategory.setCount(Double.parseDouble(num+""));
     		List<EquipmentCategory> childrenList =equipmentCategory.getChildren();
     		if(childrenList!=null && childrenList.size()>0) {
-    			 getCountToChildren(childrenList,bizOrgCode);
+    			getCarCountToChildren(childrenList,bizOrgCode);
     		}
 		}
 		return	children;

amos-boot-system-equip/src/main/resources/application.properties

@@ -94,4 +94,6 @@ auth-key-fire-equip=fire_equip_info
 # 权限标识-消防视频
 auth-key-fire-video=fire_video_info
 # 权限标识-消防视频
-auth-key-fire-build-video=fire_build_video_info
\ No newline at end of file
+auth-key-fire-build-video=fire_build_video_info
+
+auth-key-fire-car=fire_car_info
\ No newline at end of file