力量调派信息

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -28,7 +28,7 @@
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
-        a.is_delete=0 ORDER BY a.rec_date 
+        a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
@@ -37,6 +37,8 @@
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+
+        ORDER BY a.rec_date
     </select>
 
 

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCarCountDto", description = "按车辆统计力量调派")
+public class PowerCarCountDto {
+
+    @ApiModelProperty(value = "车名称")
+    protected String carName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "车牌号")
+    protected String plateNumber;
+}
+
+
+

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCompanyCountDto", description = "按单位统计力量调派")
+public class PowerCompanyCountDto {
+    @ApiModelProperty(value = "单位id")
+    protected Long companyId;
+    @ApiModelProperty(value = "单位名称")
+    protected String companyName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "人数量")
+    protected int userNum;
+    @ApiModelProperty(value = " 车辆信息")
+    List<PowerCarCountDto>  PowerCarCountDto;
+}
+
+
+

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
-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;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,4 +63,17 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
     Map<String, Integer> getCompanyNum(@Param("id") Long id);
 
     List<PowerData> getPowerDataList(@Param("id") Long id);
+
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/23
+     * </PRE>
+     * 力量调派按单位统计
+     */
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount(@Param("id") Long id);
+
+    List<PowerCarCountDto> getPowerCarCountDtocount(@Param("alertCalledId") Long alertCalledId,@Param("companyId") Long companyId);
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
@@ -28,5 +29,5 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      * 获取力量调派资源树
      */
     List<FireBrigadeResourceDto> getPowerTree();
-
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -44,7 +44,8 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count, 0
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count,
+        0
         no_return_car_count
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
@@ -121,39 +122,91 @@
     </select>
 
 
-
     <select id="getCompanyNum" resultType="Map">
-  select COUNT(*) companyNum from
-(SELECT DISTINCT
-	b.company_id
-FROM
-	jc_power_transfer a
-	LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
-	LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
-WHERE
-	a.alert_called_id  = ${id} UNION ALL
-SELECT DISTINCT
-	b.company_id
-FROM
-	jc_alert_submitted a
-	LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
-WHERE
-	a.alert_called_id = ${id}) m
+      select COUNT(*) companyNum from
+    (SELECT DISTINCT
+        b.company_id
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id  = ${id} UNION ALL
+    SELECT DISTINCT
+        b.company_id
+    FROM
+        jc_alert_submitted a
+        LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
+    WHERE
+        a.alert_called_id = ${id}) m
+        </select>
+
+        <select id="getPowerDataList" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
+      SELECT DISTINCT
+        b.company_name companyName,
+        c.resources_name carName,
+        c.resources_num carNum
+
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${id}
     </select>
 
-    <select id="getPowerDataList" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
-  SELECT DISTINCT
-	b.company_name companyName,
-	c.resources_name carName,
-	c.resources_num carNum
 
-FROM
-	jc_power_transfer a
-	LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
-	LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
-WHERE
-	a.alert_called_id = ${id}
+
+
+
+
+
+    <select id="getPowerCompanyCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto">
+           SELECT
+        b.company_id companyId,
+        b.company_name companyName,
+        COUNT( c.resources_num ) carNum
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${id}
+    GROUP BY
+        b.company_id,
+        b.company_name
+    </select>
+
+    <select id="getPowerCarCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto">
+         SELECT * from  (	  SELECT
+        COUNT( c.resources_num ) carNum,
+        c.resources_name carName,
+        GROUP_CONCAT( c.resources_num ) plateNumber
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${alertCalledId}
+        AND b.company_id = ${companyId}
+    GROUP BY
+        c.resources_name ) m where m.carNum>0
     </select>
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </mapper>

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +70,10 @@ public class CommandController extends BaseController {
     
     @Autowired
     IFirefightersService firefightersService;
+
+
+    @Autowired
+    IPowerTransferService powerTransferService;
     /**
      * 警情列表
      *
@@ -509,7 +514,7 @@ public class CommandController extends BaseController {
 
     /**
      *
-     * 当前灾情阶段
+     * 力量统计当前灾情阶段
      *
      * */
     @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
@@ -532,6 +537,20 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(list);
     }
 
-
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/22
+     * </PRE>
+     * 到场力量 列表统计
+     */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getPowerCompanyCountDtocount/{id}")
+    @ApiOperation(httpMethod = "GET", value = "到场力量 列表统计", notes = "到场力量 列表统计")
+    public ResponseModel<Object> getPowerCompanyCountDtocount(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerCompanyCountDtocount(id));
+    }
 
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,11 +24,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-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;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
@@ -70,6 +66,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     @Autowired
     FireTeamServiceImpl fireTeamService;
 
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
     @Override
     public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesDto> powerTransferList =
@@ -183,6 +181,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         return fireBrigadeResourceList;
     }
 
+
+
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
         PowerTransferCompanyResources powerTransferCompanyResources;
@@ -319,4 +319,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         return transferInfo;
     }
+
+    @Override
+    public List<PowerCompanyCountDto> getPowerCompanyCountDtocount(Long id) {
+        List<PowerCompanyCountDto> list= powerTransferMapper.getPowerCompanyCountDtocount(id);
+        if(list!=null&&list.size()>0){
+            list.stream().forEach(powerCompanyCountDto->{
+                List<PowerCarCountDto> li= powerTransferMapper.getPowerCarCountDtocount(id,powerCompanyCountDto.getCompanyId());
+                powerCompanyCountDto.setPowerCarCountDto(li);
+            });
+        }
+        return list;
+    }
 }