Merge branch 'developer' into chenhao

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -70,4 +70,11 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<CheckObjectDto> getCompanyAndKeySite(Long companyId);
 
     List<UserUnitDto>  getUserUnit(String id, String type, String code);
+
+    /**
+     * 导出机场单位带过滤      bug2657 by kongfm
+     * @param parentId
+     * @return
+     */
+    List< OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
@@ -45,5 +44,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
      *  根据参数查询
      *
      */
-    Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType, ArrayList<Long> belongBuildingId, Long belongFightingSystemId, Long sequenceNbr);
+    Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType,
+                                                        ArrayList<Long> belongBuildingId, Long belongFightingSystemId,
+                                                        Long sequenceNbr, String equipId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -227,4 +227,11 @@ public interface IOrgUsrService {
 
 	List<OrgUsr> getPersonListByParentId(Long id);
 
+	/**
+	 * 根据parentId 导出机场单位人员    bug2657 by kongfm
+	 * @param parentId
+	 * @return
+	 */
+	List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
+
 }

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

@@ -333,6 +333,7 @@ LEFT JOIN (
         ORDER BY
             u.sequence_nbr DESC
     </select>
+    <!--BUG2655 导出机场人员存在已删除数据 bykongfm-->
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select
     a.biz_org_name bizOrgName,
@@ -356,7 +357,7 @@ LEFT JOIN (
     max(case field_code when 'telephone' then field_value end)                            telephone
     FROM cb_dynamic_form_instance GROUP BY instance_id) b
 
-    on b.instance_id=a.sequence_nbr where a.biz_org_name is not null
+    on b.instance_id=a.sequence_nbr where a.biz_org_name is not null and a.is_delete = 0
     </select>
 
 <select id="getCompanyAndKeySite" resultType="com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto" >
@@ -405,4 +406,39 @@ LEFT JOIN (
 
 </select>
 
+    <!--BUG2657 导出选中单位及子单位人员数据 by kongfm-->
+    <select id="exportPersonToExcelByParentId" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
+         select
+    a.biz_org_name bizOrgName,
+    (select c.biz_org_name from cb_org_usr c  where c.sequence_nbr=a.parent_id) parentId,
+    b.*
+    from cb_org_usr a LEFT JOIN
+    (SELECT
+    instance_id,
+    max(case field_code when 'administrativePositionCode' then field_value_label end)     administrativePositionCode,
+    max(case field_code when 'auditCycle' then field_value_label end)                     auditCycle,
+    max(case field_code when 'certificatesNumber' then field_value end)                   certificatesNumber,
+    max(case field_code when 'certificatesTypeCode' then field_value_label end)           certificatesTypeCode,
+    max(case field_code when 'certificateType' then field_value_label end)                certificateType,
+    max(case field_code when 'fireManagementPostCode' then field_value_label end)         fireManagementPostCode,
+    max(case field_code when 'gender' then field_value_label end)                         gender,
+    max(case field_code when 'internalPositionCode' then field_value_label end)           internalPositionCode,
+    max(case field_code when 'personNumber' then field_value end)                         personNumber,
+    max(case field_code when 'positionType' then field_value_label end)                   positionType,
+    max(case field_code when 'safetyTraining' then field_value_label end)                 safetyTraining,
+    max(case field_code when 'stateCode' then field_value_label end)                      stateCode,
+    max(case field_code when 'telephone' then field_value end)                            telephone
+    FROM cb_dynamic_form_instance GROUP BY instance_id) b
+
+    on b.instance_id=a.sequence_nbr where a.biz_org_name is not null and a.is_delete = 0
+        and a.biz_org_type = "PERSON"
+
+        <if test="parentId != null and parentId != -1 ">
+            and a.biz_org_code like
+            concat((select t.biz_org_code from cb_org_usr t where t.sequence_nbr = #{parentId}), '%')
+        </if>
+
+
+    </select>
+
 </mapper>

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

@@ -120,6 +120,7 @@
         select * from cb_water_resource where is_delete = 1
         <if test="sequenceNbr != null and sequenceNbr != ''">and sequence_nbr = #{sequenceNbr}</if>
         <if test="resourceType != null and resourceType != ''">and resource_type = #{resourceType}</if>
+        <if test="equipId != null and equipId != ''">and equip_id = #{equipId}</if>
         <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
         <if test="belongFightingSystemId != null">
             <if test="belongFightingSystemId > -1">

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

 package com.yeejoin.amos.boot.module.command.biz.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
 import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
-import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgusrDataxDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.common.api.service.*;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
+import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
+import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
+import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
+import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersService;
+import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
+import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
+import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
+import com.yeejoin.amos.boot.module.jcs.api.dto.StateDot;
 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.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.jcs.api.service.*;
-
+import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
+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.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+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.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -47,12 +80,11 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * *指挥资源Api
@@ -963,4 +995,17 @@ public class CommandController extends BaseController {
                                                     @RequestParam(defaultValue = "team") String type) {
         return ResponseHelper.buildResponse(powerTransferService.getPowerTransferStatistics(Long.valueOf(alertId), type));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT", value = "app-更新车辆状态", notes = "app-更新车辆状态")
+    @PutMapping(value = "/app/carStatus")
+    public ResponseModel<Boolean> updateCarStatus(CarStatusInfoDto carStatusInfoDto) {
+        try {
+            equipFeignClient.updateCarStatus(Lists.newArrayList(carStatusInfoDto));
+        } catch (Exception e) {
+            throw new BaseException("更新车辆状态异常", "", e.getMessage());
+        }
+
+        return ResponseHelper.buildResponse(true);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -348,12 +348,13 @@ public class WaterResourceController extends BaseController {
                                                               @RequestParam(value = "size") int size, String name,
                                                               @RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
                                                               Long belongFightingSystemId, Long sequenceNbr,
+                                                              String resourceType,
                                                               String classifyId) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name,
-                classifyId, belongBuildingId, belongFightingSystemId, sequenceNbr));
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,
+                belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId));
     }
 
     /**

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

@@ -1324,11 +1324,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     	 wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
     	 return this.baseMapper.selectList(wrapper);    	 
      }
-    
-    
-    
-    
-   @Override
+
+    @Override
+    public List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId) {
+        return orgUsrMapper.exportPersonToExcelByParentId(parentId);
+    }
+
+
+    @Override
    public List<Map<String, Object>> getLoginUserDetails (AgencyUserModel user) {
 
         // 获取登陆人关联账号

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

@@ -56,12 +56,13 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
      */
     public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
                                                             @Condition(Operator.like) String name,
-                                                            @Condition(Operator.eq) String equipId,
+                                                            @Condition(Operator.eq) String resourceType,
                                                             @Condition(Operator.in) ArrayList<Long> belongBuildingId,
                                                             @Condition(Operator.eq) Long belongFightingSystemId,
-                                                            @Condition(Operator.eq) Long sequenceNbr) {
-        return this.waterResourceMapper.getWaterResourcePageByParams(page, name, equipId, belongBuildingId,
-                belongFightingSystemId, sequenceNbr);
+                                                            @Condition(Operator.eq) Long sequenceNbr,
+                                                            String equipId) {
+        return this.waterResourceMapper.getWaterResourcePageByParams(page, name, resourceType, belongBuildingId,
+                belongFightingSystemId, sequenceNbr, equipId);
     }
 
     /**

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

@@ -146,4 +146,18 @@ public class ExcelController extends BaseController {
             throw new RuntimeException("系统异常！");
         }
     }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出公用类带过滤参数")
+    @PostMapping("/exportByParams/{type}")
+    public void getFireStationFileByParams(HttpServletResponse response,  @PathVariable(value = "type")  String type, @RequestParam(value = "params") String params) {
+        try {
+            ExcelEnums excelEnums=  ExcelEnums.getByKey(type);
+            ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
+            excelService.exportByParams(response, excelDto, params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+    }
 }

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

@@ -40,6 +40,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -1047,4 +1048,79 @@ public class ExcelServiceImpl {
         }
         return data;
     }
+
+
+
+    public void exportByParams(HttpServletResponse response, ExcelDto excelDto, String params) {
+        switch (excelDto.getType()) {
+
+            case "WHP":
+                List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                        FireChemicalDto.class, dataSourcesImpl, false);
+                break;
+            case "XFZJ":
+                List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        fireExpertsDtoList, FireExpertsDto.class, dataSourcesImpl, false);
+                break;
+            case "SYXX":
+                List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        waterResourceDtoList, WaterResourceDto.class, dataSourcesImpl, false);
+                break;
+            case "HKQ":
+                List<AircraftDto> aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        aircraftDtoList, AircraftDto.class, dataSourcesImpl, false);
+                break;
+            case "XFDW":
+                List<FireTeamDto> fireTeamDtoList = fireTeamService.queryFireTeamForList(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireTeamDtoList,
+                        FireTeamDto.class, dataSourcesImpl, false);
+                break;
+            case "WXXFZ":
+                List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        fireStationDtoList, FireStationDto.class, null, false);
+                break;
+            case "XFRY":
+                List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
+                break;
+            case "WBRY":
+                List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList =
+                        maintenanceCompanyService.exportToMaintenancePersonExcel();
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
+                break;
+            case "KEYSITE":
+                List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        keySiteDtoList, KeySiteExcleDto.class, null, false);
+                break;
+            case "JCDWRY":
+                // 机场单位人员参数传递为 parentId = xxxxxxx
+                String parentIdStr = params.split("=")[1];
+                Long parentId = -1l;
+                try {
+                        parentId = Long.parseLong(parentIdStr);
+                } catch (NumberFormatException e) {
+                    throw new BadRequest("导出机场单位时未传递正确parentId");
+                }
+                List<OrgUsrExcelDto> orgUsrList = orgUsrService.exportPersonToExcelByParentId(parentId);
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        orgUsrList, OrgUsrExcelDto.class, null, false);
+                break;
+            case "LDDW":
+                List<LinkageUnitDto> LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel();
+
+                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                        LinkageUnitDtoList, LinkageUnitDto.class, null, false);
+                break;
+            default:
+                break;
+        }
+    }
 }