Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireTeamDto.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
+
 /**
 * 消防队伍
 *
@@ -59,4 +61,15 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "消防队类型（专职消防队，监控大队）")
+    private String type;
+
+    @ApiModelProperty(value = "执勤车辆数")
+    private String onDutyCount;
+
+    @ApiModelProperty(value = "出动车辆数")
+    private String outCount;
+
+    @ApiModelProperty(value = "队伍下车辆")
+    private List<FireCarDto> children;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireBrigadeTypeEnum.java

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 消防队伍类型枚举
+ *
+ * @author DELL
+ */
+@Getter
+@AllArgsConstructor
+public enum FireBrigadeTypeEnum {
+    专职消防队("fullTime", "116", "专职消防队"),
+    监控大队("monitorTeam", "118", "监控大队");
+
+    private String key;
+    private String code;
+    private String name;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/feign/EquipFeignClient.java

@@ -58,4 +58,12 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/equipSpecific/getAirEquipSpecificDetail", method = RequestMethod.GET)
     ResponseModel<Object> getAirEquipSpecificDetail(@RequestParam Long stockDetailId) throws InnerInvokException;
+
+    /**
+     * 获取车辆列表
+     *
+     * @return
+     */
+    @RequestMapping(value = "/car/list-all", method = RequestMethod.GET)
+    ResponseModel<Object> getFireCarListAll();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/EquipFeignService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-
-/**
- * 装备服务feign
- *
- * @author Dell
- */
-@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip")
-//@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
-public interface EquipFeignService {
-
-	/**
-	 * 获取车辆列表
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/car/list-all", method = RequestMethod.GET)
-	ResponseModel<Object> getFireCarListAll();
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -180,7 +181,7 @@ public class PowerTransferController extends BaseController {
     @GetMapping(value = "/power/tree")
     @ApiOperation(value = "力量调派资源树", notes = "力量调派资源树")
     public ResponseModel<Object> getPowerTree() {
-        iPowerTransferService.getPowerTree();
+        powerTransferService.getPowerTree();
         return ResponseHelper.buildResponse("");
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -79,7 +79,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
          /**
           * 同步保存ES
           */
-         eSAlertCalledService.saveAlertCalledToES(alertCalled);
+//         eSAlertCalledService.saveAlertCalledToES(alertCalled);
          
 		 return alertCalledVo;	
 	 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireCarDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
@@ -13,15 +15,11 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
+import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.EquipFeignService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
-import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
@@ -31,6 +29,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -66,11 +65,12 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     AlertFormValueServiceImpl alertFormValueService;
 
     @Autowired
-    EquipFeignService equipFeignService;
+    EquipFeignClient equipFeignService;
 
     @Autowired
     FireTeamServiceImpl fireTeamService;
 
+    @Override
     public PowerTransferVo getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesVo> powerTransferList =
                 this.baseMapper.getPowerTransferList(alertCalledId);
@@ -132,7 +132,29 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             });
         }
         // 2.查询消防队伍列表
-        List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code", ""));
+        List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code",
+                FireBrigadeTypeEnum.专职消防队.getCode()));
+        List<FireTeam> monitorFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code",
+                FireBrigadeTypeEnum.监控大队.getCode()));
+
+        // 3.组装专职消防队伍车辆
+//        List<FireTeamDto> fireTeamDtoList = Lists.newArrayList();
+//        if (!CollectionUtils.isEmpty(fullTimeFireBrigadeList)) {
+//            fullTimeFireBrigadeList.forEach(brigade -> {
+//                FireTeamDto teamDto = new FireTeamDto();
+//                BeanUtils.copyProperties(brigade, teamDto);
+//                teamDto.setType(FireBrigadeTypeEnum.专职消防队.getKey());
+//
+////                teamDto.setChildren();
+//            });
+//        }
+        fireCarDtoList.stream().collect(Collectors.groupingBy(FireCarDto::getTeamId));
+        try {
+            TreeParser.getTree(null, monitorFireBrigadeList, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
+                    "getParent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
@@ -207,6 +229,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
     }
 
+    @Override
     public List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId) {
         return this.baseMapper.getLastPowerTransferCompany(alertCalledId);
     }