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-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dao/SeismometeorologyDtoDao.java

@@ -43,10 +43,9 @@ public class SeismometeorologyDtoDao {
      *
      * **/
     public   List<SeismometeorologyDto> findCarStateByWatchSn(){
-        Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
-        calendar.add(Calendar.DAY_OF_MONTH,-1);
     	 System.out.println(new Date().getTime());
-        Query query = new Query(Criteria.where("releaseTime").gte(calendar.getTimeInMillis()));
+         Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
+         		.lte(getEndTime()));
          Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
          query.with(sort);
          List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
@@ -61,8 +60,8 @@ public class SeismometeorologyDtoDao {
     public   List<SeismometeorologyDto> findDutyCarStateBy(){
        
         System.out.println(new Date().getTime());
-        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime().getTime())
-        		.lte(getEndTime().getTime()));
+        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
+        		.lte(getEndTime()));
         Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
         query.with(sort);
         List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/SeismometeorologyDto.java

@@ -41,7 +41,7 @@ public class SeismometeorologyDto {
 
     @ApiModelProperty(value = "发布时间")
     @Field("releaseTime")
-    private Long releaseTime;
+    private Date releaseTime;
 
     @ApiModelProperty(value = "发布单位")
     @Field("releaseCompany")
@@ -52,7 +52,10 @@ public class SeismometeorologyDto {
     private String content;
     
    
-    public SeismometeorologyDto(Long sequenceNbr, String type, String typeName, String grade, Long releaseTime, String releaseCompany, String content) {
+
+
+
+    public SeismometeorologyDto(Long sequenceNbr, String type, String typeName, String grade, Date releaseTime, String releaseCompany, String content) {
         this.sequenceNbr = sequenceNbr;
         this.type = type;
         this.typeName = typeName;

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/videoDataDto.java

+package com.yeejoin.amos.boot.module.command.api.dto;
+
+public class videoDataDto {
+	
+	private String code;
+	private String msg;
+	private String data;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CompanyDto.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value="CompanyDto", description="重点单位资源")
 public class CompanyDto {
     @ApiModelProperty(value = "主键ID")
-    protected Long id;
+    protected Long sequenceNbr;
 
     @ApiModelProperty(value = "经度")
     private Double longitude;

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

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface RescueEquipmentMapper extends BaseMapper<RescueEquipment> {
 
-    List<Long> getVehicleCodeCodeList(boolean isDelete);
+    List<Long> getVehicleCodeCodeList(boolean isDelete,Long companyId);
 }

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

@@ -16,5 +16,5 @@ public interface SpecialPositionStaffMapper extends BaseMapper<SpecialPositionSt
 
     List<SpecialPositionStaff> getPositionStaffList(boolean isDelete);
 
-    List<Long> getPositionStaffCodeList(boolean isDelete);
+    List<Long> getPositionStaffCodeList(boolean isDelete,Long companyId);
 }

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

@@ -5,7 +5,6 @@ import java.util.List;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto;
 
 /**
  * 重点部位接口类
@@ -19,7 +18,7 @@ public interface IKeySiteService {
  * @param id
  * @return
  */
-	public boolean  deletebyId(Long id);
+	public boolean deleteById(Long id);
 /**
  * 保存
  * @param model
@@ -51,10 +50,10 @@ public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
 public List<KeySiteExcleDto> exportToExcel();
 
-public boolean  saveExcle(List<KeySiteExcleDto> excelDtoList);
 /**获取所在建筑的树结构信息
  * 
  * @return
  */
 public List<Object> getBuildTree() ;
+public boolean saveExcel(List<KeySiteExcleDto> excelDtoList);
 }

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

@@ -163,6 +163,12 @@ public interface IMaintenanceCompanyService {
 	 */
 	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel();
 
+	/**
+	 * 获取附件列表
+	 *
+	 * @param sequenceNbr
+	 * @return
+	 */
 	public Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr);
 
 }

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

@@ -127,6 +127,7 @@
 
         SELECT
         a.name ,
+        a.sequence_nbr sequenceNbr,
         ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum
         FROM cb_fire_team a
         where  a.is_delete=0

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

@@ -213,7 +213,7 @@
     <select id="listContractDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.CompanyDto">
 
         SELECT
-        a.id,
+        a.id sequenceNbr,
         a.name,
         a.longitude,
         a.latitude,

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

@@ -5,6 +5,6 @@
     <select id="getVehicleCodeCodeList" resultType="java.lang.Long">
         select distinct vehicle_type_code
         from cb_rescue_equipment
-        where is_delete = #{isDelete}
+        where is_delete = #{isDelete} and company_id = #{companyId}
     </select>
 </mapper>

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

@@ -11,6 +11,6 @@
     <select id="getPositionStaffCodeList" resultType="java.lang.Long">
         select distinct position_name_code
         from cb_special_position_staff
-        where is_delete = #{isDelete}
+        where is_delete = #{isDelete} and company_id = #{companyId}
     </select>
 </mapper>

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

@@ -77,13 +77,13 @@
         a.maintenance_unit maintenanceUnit,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_water_resource a
-        where a.is_delete=0 and a.longitude is not null and a.latitude is not null
+        where a.is_delete=1 and a.longitude is not null and a.latitude is not null
         <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
-            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
-            #{par.distance}
+           <!--  and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance} -->
         </if>
         ORDER BY distance limit #{pageNum},#{pageSize}
     </select>
@@ -92,13 +92,13 @@
         SELECT
         COUNT(a.sequence_nbr) num
         FROM cb_water_resource a
-        where a.is_delete=0 and a.longitude is not null and a.latitude is not null
+        where a.is_delete=1 and a.longitude is not null and a.latitude is not null
         <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
-            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
-            #{par.distance}
+          <!--   and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance} -->
         </if>
     </select>
     <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto">

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 
 /**
 * 航空器信息接口类
@@ -11,4 +12,5 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
 */
 public interface IAircraftService {
     AircraftDto queryByAircraftSeq(String agencyCode, Long seq);
+    Aircraft queryByaircraftModel(String seq);
 }

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -117,8 +118,8 @@ public class ContractController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
     public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
-                                                         Date signedDate) {
-        Page<ContractDto> page = new Page<ContractDto>();
+                                                         String signedDate) {
+        Page<ContractDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         AgencyUserModel amosUser = getUserInfo();

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

@@ -26,7 +26,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
@@ -94,7 +93,7 @@ public class KeySiteController extends BaseController {
     @DeleteMapping(value = "delete/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除重点部位", notes = "根据sequenceNbr删除重点部位")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(keySiteService.deletebyId(sequenceNbr));
+        return ResponseHelper.buildResponse(keySiteService.deleteById(sequenceNbr));
     }
 
     /**
@@ -153,7 +152,4 @@ public class KeySiteController extends BaseController {
 		return ResponseHelper.buildResponse(keySiteService.getOrguserTree());
 	}
 	
-	
-	
-	
 }

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

@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

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

@@ -153,6 +153,19 @@ public class  OrgUsrController extends BaseController {
        return ResponseHelper.buildResponse(menus);
    }
 
+    /**
+     *
+     * 获取单位部门树
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/org/company/tree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取单位树(bizOrgCode为物理主键)", notes = "获取单位树(bizOrgCode为物理主键)")
+    public ResponseModel< List<OrgMenuDto>> getCompanyTree() {
+        List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyList());
+        return ResponseHelper.buildResponse(menus);
+    }
 
     /**
      * 列表分页查询

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

@@ -103,11 +103,13 @@ public class RescueEquipmentController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "救援装备分页查询", notes = "救援装备分页查询")
     public ResponseModel<Page<RescueEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                 @RequestParam(value = "size") int size,
+                                                                Long companyId,
                                                                 String vehicleTypeCode) {
         Page<RescueEquipmentDto> page = new Page<RescueEquipmentDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, vehicleTypeCode));
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.queryForRescueEquipmentPage(page, false,
+                companyId, vehicleTypeCode));
     }
 
     /**
@@ -143,7 +145,7 @@ public class RescueEquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询没有数据的岗位类型", notes = "查询没有数据的岗位类型")
     @GetMapping(value = "/vehicle_list")
-    public ResponseModel<HashMap<Object, Object>> getRescueEquipmentList() throws Exception {
-        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.getRescueEquipmentList());
+    public ResponseModel<HashMap<Object, Object>> getRescueEquipmentList(Long companyId) throws Exception {
+        return ResponseHelper.buildResponse(rescueEquipmentServiceImpl.getRescueEquipmentList(companyId));
     }
 }

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

@@ -102,11 +102,14 @@ public class SpecialPositionStaffController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "特岗人员分页查询", notes = "特岗人员分页查询")
     public ResponseModel<Page<SpecialPositionStaffDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                      @RequestParam(value = "size") int size,
+                                                                     Long companyId,
                                                                      String positionNameCode) {
         Page<SpecialPositionStaffDto> page = new Page<SpecialPositionStaffDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.queryForSpecialPositionStaffPage(page,
+                companyId,
+                false,
                 positionNameCode));
     }
 
@@ -143,7 +146,7 @@ public class SpecialPositionStaffController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询没有数据的岗位类型", notes = "查询没有数据的岗位类型")
     @GetMapping(value = "/gwmc_list")
-    public ResponseModel<HashMap<Object, Object>> getSpecialPositionStaffList() throws Exception {
-        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.getSpecialPositionStaffList());
+    public ResponseModel<HashMap<Object, Object>> getSpecialPositionStaffList(Long companyId) throws Exception {
+        return ResponseHelper.buildResponse(specialPositionStaffServiceImpl.getSpecialPositionStaffList(companyId));
     }
 }

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

@@ -47,7 +47,7 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
      * 分页查询
      */
     public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete, Long companyId,
-                                                  Long signedCompanyId, String name, Long typeCode, Date signedDate,
+                                                  Long signedCompanyId, String name, Long typeCode, String signedDate,
                                                   String amosUserId) {
         if (ValidationUtil.isEmpty(companyId)) {
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
@@ -62,7 +62,7 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
                                                   @Condition(Operator.eq) Long signedCompanyId,
                                                   @Condition(Operator.like) String name,
                                                   @Condition(Operator.eq) Long typeCode,
-                                                  @Condition(Operator.likeLeft) Date signedDate) {
+                                                  @Condition(Operator.likeRight) String signedDate) {
         return this.queryForPage(page, null, false, isDelete, companyId, signedCompanyId, name, typeCode, signedDate);
     }
 

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

@@ -74,10 +74,12 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	/**
 	 * 列表查询 示例
 	 */
+	@Override
 	public List<KeySiteDto> queryForKeySiteList() {
 		return keySiteMapper.getKeySiteList();
 	}
 
+	@Override
 	public List<KeySiteExcleDto> exportToExcel() {
 		List<KeySiteDto> list = this.queryForKeySiteList();
 		List<KeySiteExcleDto> excleList = new ArrayList<>();
@@ -98,7 +100,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	}
 
 	@Override
-	public boolean deletebyId(Long id) {
+	public boolean deleteById(Long id) {
 		KeySite keySite = keySiteMapper.selectById(id);
 		if (keySite == null) {
 			return false;
@@ -117,7 +119,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		KeySite keySite = new KeySite();
 		Bean.copyExistPropertis(model, keySite);
 		this.save(keySite);
-		this.saveAttachments(model);
+		sourceFileService.saveAttachments(model.getSequenceNbr(), model.getAttachments());
 		// TODO Auto-generated method stub
 		return model;
 	}
@@ -163,7 +165,6 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		}
 		return false;
 	}
-
 	@Override
 	public List<OrgMenuDto> getOrguserTree() {
 		return	buildTreeParallel(orgUsrMapper.getCompanyAndCountDepartment());
@@ -199,14 +200,13 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		});
 		return result;
 	}
-
 	@Override
 	public KeySiteDto getSequenceNbr(Long sequenceNbr) {
 		return keySiteMapper.getSequenceNbr(sequenceNbr);
 	}
 
 	@Override
-	public boolean saveExcle(List<KeySiteExcleDto> excelDtoList) {
+	public boolean saveExcel(List<KeySiteExcleDto> excelDtoList) {
 		List<KeySite> excelList = new ArrayList<KeySite>();
 		for (KeySiteExcleDto keySiteExcleDto : excelDtoList) {
 			KeySite keySiteDto = new KeySite();

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

@@ -116,7 +116,7 @@ public class MaintenanceCompanyServiceImpl
 		try {
 			this.save(maintenanceCompany);
 
-			saveAttachments(maintenanceCompany);
+			sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -144,7 +144,7 @@ public class MaintenanceCompanyServiceImpl
 		try {
 			this.save(maintenanceCompany);
 
-			saveAttachments(maintenanceCompany);
+			sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
 		} catch (Exception e) {
 			return false;
 		}
@@ -152,35 +152,6 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	/**
-	 * 保存附件
-	 */
-	public void saveAttachments(MaintenanceCompany maintenanceCompany) {
-		if (!ValidationUtil.isEmpty(maintenanceCompany.getAttachments())) {
-			List<SourceFile> sourceFiles = Lists.newArrayList();
-			Map<String, List<AttachmentDto>> attachmentMap = maintenanceCompany.getAttachments();
-			attachmentMap.entrySet().forEach(entry -> {
-				List<AttachmentDto> atts = entry.getValue();
-				sourceFiles.addAll(attachment2SourceFile(entry.getKey(), atts));
-			});
-			sourceFileService.saveSourceFile(maintenanceCompany.getSequenceNbr(), sourceFiles);
-		}
-	}
-
-	private List<SourceFile> attachment2SourceFile(String type, List<AttachmentDto> attachmentDtoList) {
-		List<SourceFile> sourceFiles = Lists.newArrayList();
-		if (!ValidationUtil.isEmpty(attachmentDtoList)) {
-			attachmentDtoList.forEach(a -> {
-				SourceFile s = new SourceFile();
-				s.setFilePath(a.getUrl());
-				s.setFileName(a.getName());
-				s.setFileCategory(type);
-				sourceFiles.add(s);
-			});
-		}
-		return sourceFiles;
-	}
-
-	/**
 	 * 添加动态表单信息
 	 * 
 	 * @param maintenanceCompany
@@ -212,7 +183,7 @@ public class MaintenanceCompanyServiceImpl
 		try {
 			this.save(maintenanceCompany);
 
-			saveAttachments(maintenanceCompany);
+			sourceFileService.saveAttachments(maintenanceCompany.getSequenceNbr(), maintenanceCompany.getAttachments());
 		} catch (Exception e) {
 			return false;
 		}
@@ -350,7 +321,7 @@ public class MaintenanceCompanyServiceImpl
 		int current = Integer.parseInt(paramsMap.get("current").toString());
 		int size = Integer.parseInt(paramsMap.get("size").toString());
 		String maintenanceType = paramsMap.get("maintenanceType").toString().toUpperCase();
-		Map<String, String> filedParamsMap = null;
+		Map<String, String> filedParamsMap = Maps.newHashMap();
 
 		List<MaintenanceCompany> mainTableList;
 		String type;
@@ -434,6 +405,7 @@ public class MaintenanceCompanyServiceImpl
 		return mainMap;
 	}
 
+	@Override
 	public Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr) {
 		Map<String, List<AttachmentDto>> attachmentMap = Maps.newHashMap();
 		List<SourceFile> sourceFileList = sourceFileService.findBySourceId(sequenceNbr);
@@ -487,7 +459,7 @@ public class MaintenanceCompanyServiceImpl
 			this.updateById(model);
 
 			// 更新附件
-			saveAttachments(model);
+			sourceFileService.saveAttachments(model.getSequenceNbr(), model.getAttachments());
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;

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

@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -501,6 +502,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list;
 	}
 
+    public List<OrgUsr> selectCompanyList() {
+        List<OrgUsr> list =
+                list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getBizOrgType,
+                        "COMPANY"));
+        if (list == null) {
+            return new ArrayList<>();
+        }
+        list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+        return list;
+    }
+
 	@Override
 	public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();

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

@@ -34,8 +34,10 @@ public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto,
      * 分页查询
      */
     public Page<RescueEquipmentDto> queryForRescueEquipmentPage(Page<RescueEquipmentDto> page,
+                                                                @Condition(Operator.eq) Boolean isDelete,
+                                                                @Condition(Operator.eq) Long companyId,
                                                                 @Condition(Operator.eq) String vehicleTypeCode) {
-        return this.queryForPage(page, null, false, vehicleTypeCode);
+        return this.queryForPage(page, null, false, isDelete, companyId, vehicleTypeCode);
     }
 
     /**
@@ -60,11 +62,11 @@ public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto,
         return update;
     }
 
-    public HashMap<Object, Object> getRescueEquipmentList() throws Exception {
+    public HashMap<Object, Object> getRescueEquipmentList(Long companyId) throws Exception {
         // 查询所有岗位类型
         List<MenuFrom> menuList = dataDictionaryService.getGWMCDataDictionary("JYZBLX");
         // 查询已有数据的岗位类型
-        List<Long> vehicleCodeCodeList = this.baseMapper.getVehicleCodeCodeList(false);
+        List<Long> vehicleCodeCodeList = this.baseMapper.getVehicleCodeCodeList(false, companyId);
         // 排除已有数据的，返回
         for (int i = 0; i < menuList.size(); i++) {
             if (vehicleCodeCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.SourceFileMapper;
@@ -11,12 +13,14 @@ import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -76,4 +80,32 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
         boolean flag = this.saveOrUpdateBatch(sourceFiles);
         return flag ? sourceFiles : Collections.EMPTY_LIST;
     }
+
+    /**
+     * 保存附件
+     */
+    public void saveAttachments(Long sequenceNbr, Map<String, List<AttachmentDto>> attachmentMap) {
+        if (!ValidationUtil.isEmpty(attachmentMap)) {
+            List<SourceFile> sourceFiles = Lists.newArrayList();
+            attachmentMap.entrySet().forEach(entry -> {
+                List<AttachmentDto> attachments = entry.getValue();
+                sourceFiles.addAll(attachment2SourceFile(entry.getKey(), attachments));
+            });
+            saveSourceFile(sequenceNbr, sourceFiles);
+        }
+    }
+
+    private List<SourceFile> attachment2SourceFile(String type, List<AttachmentDto> attachmentDtoList) {
+        List<SourceFile> sourceFiles = Lists.newArrayList();
+        if (!ValidationUtil.isEmpty(attachmentDtoList)) {
+            attachmentDtoList.forEach(a -> {
+                SourceFile s = new SourceFile();
+                s.setFilePath(a.getUrl());
+                s.setFileName(a.getName());
+                s.setFileCategory(type);
+                sourceFiles.add(s);
+            });
+        }
+        return sourceFiles;
+    }
 }
\ 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/service/impl/SpecialPositionStaffServiceImpl.java

@@ -33,8 +33,10 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
      * 分页查询
      */
     public Page<SpecialPositionStaffDto> queryForSpecialPositionStaffPage(Page<SpecialPositionStaffDto> page,
+                                                                          @Condition(Operator.eq) Long companyId,
+                                                                          @Condition(Operator.eq) Boolean isDelete,
                                                                           @Condition(Operator.eq) String positionNameCode) {
-        return this.queryForPage(page, null, false, positionNameCode);
+        return this.queryForPage(page, null, false, companyId, isDelete, positionNameCode);
     }
 
     /**
@@ -59,11 +61,11 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
         return update;
     }
 
-    public HashMap<Object, Object> getSpecialPositionStaffList() throws Exception {
+    public HashMap<Object, Object> getSpecialPositionStaffList(Long companyId) throws Exception {
         // 查询所有岗位类型
         List<MenuFrom> menuList = dataDictionaryService.getGWMCDataDictionary("GWMC");
         // 查询已有数据的岗位类型
-        List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false);
+        List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false,companyId);
         // 排除已有数据的，返回
         for (int i = 0; i < menuList.size(); i++) {
             if (positionStaffCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java

@@ -71,7 +71,7 @@ public class ControllerAop {
 				throw new RuntimeException(e.getMessage());
 			}
              // 不需要添加请求头的接口
-            String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany"};
+            String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText"};
             // 获取请求路径
             if (Arrays.asList(url).contains(request.getRequestURI())) {
                 // 暂无需要

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

@@ -214,7 +214,8 @@ public class ExcelController extends BaseController {
                             firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
                     break;
                 case ExcelEnums.WBRY:
-                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel();
+                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList =
+                            maintenanceCompanyService.exportToMaintenancePersonExcel();
                     ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
                             maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
                     break;
@@ -275,30 +276,30 @@ public class ExcelController extends BaseController {
     }
 
     /**
-     * @author chenhao 
      * @param multipartFile
      * @param wbry
      * @throws Exception
+     * @author chenhao
      */
     @SuppressWarnings("unused")
     private void excelImportkeySite(MultipartFile multipartFile, String wbry) throws Exception {
         List<KeySiteExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
                 KeySiteExcleDto.class, 1);
-        keySiteService.saveExcle( excelDtoList);
+        keySiteService.saveExcel(excelDtoList);
     }
 
 
-    
     /**
-     * @author chenhao 
      * @param multipartFile
      * @param wbry
      * @throws Exception
+     * @author chenhao
      */
     private void excelImportMaintenancePerson(MultipartFile multipartFile, String wbry) throws Exception {
         List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
                 MaintenancePersonExcleDto.class, 1);
-          List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
+        List<DynamicFormColumn> columns =
+                dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
         List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>();
         List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>();
         for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) {
@@ -320,9 +321,10 @@ public class ExcelController extends BaseController {
             maintenanceCompany.setBizCode(sequence.nextId() + "");
             maintenanceCompany.setInstanceId(instanceId);
             maintenanceCompanyList.add(maintenanceCompany);
-      		maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
+            maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,
+                    maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
         }
-          maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList,dynamicFormInstanceList);
+        maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList, dynamicFormInstanceList);
     }
 
     private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
@@ -683,6 +685,15 @@ public class ExcelController extends BaseController {
         fireExpertsServiceImpl.saveBatch(excelEntityList);
     }
 
+    /**
+     * 导出值班模板
+     *
+     * @param response
+     * @param beginDate 值班开始日期
+     * @param endDate   值班结束日期
+     * @param excelDto  导出类型参数
+     * @param ids       部门或队伍的id列表，逗号分隔
+     */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出值班模板", notes = "导出值班模板")
     @GetMapping(value = "/duty_template")

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
@@ -15,9 +17,12 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
@@ -240,4 +245,13 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
     public List<AircraftDto> queryAircraftDtoForList(@Condition(Operator.eq) Boolean isDelete) {
         return this.queryForList("", false, isDelete);
     }
+
+	@Override
+	public Aircraft queryByaircraftModel(String seq) {
+		QueryWrapper<Aircraft> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("aircraftModel", seq);
+		// 警情动态表单数据
+		Aircraft aircraft = this.getOne(queryWrapper);	
+		return aircraft;
+	}
 }

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

@@ -214,7 +214,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if(result1!=null&&result1.size()>0){
             Map<String, Object>   combineResultMap =  new HashMap<String, Object>();
             result1.stream().forEach(obj ->{
-                combineResultMap.putAll(obj);
+            	 combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
             });
             list.stream().forEach(obj ->{
                 if(combineResultMap.containsKey(obj.getSequenceNbr())){
@@ -248,11 +248,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if(result1!=null&&result1.size()>0){
             Map<String, Object>   combineResultMap =  new HashMap<String, Object>();
             result1.stream().forEach(obj ->{
-                combineResultMap.putAll(obj);
+                combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
             });
             list.stream().forEach(obj ->{
-                if(combineResultMap.containsKey(obj.getSequenceNbr())){
-                    obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr()).toString()));
+                if(combineResultMap.containsKey(obj.getSequenceNbr().toString())){
+                    obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr().toString()).toString()));
                 }
             });
        }

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -36,3 +36,5 @@ spring.data.mongodb.uri=mongodb://172.16.3.41:27017/command_db
 
 ## file properties:
 file.url=http://39.98.45.134:9000/
+
+video.url=https://11.11.16.4:443/

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

@@ -54,7 +54,7 @@ mqtt.topic.alert.reporting=alertReporting
 mqtt.topic.command.alert.notice=alertNotice
 
 ## 跑马灯地震，天气预警信息
-mqtt.topic.command.seismometeorology.notice=seismometeorology
+mqtt.topic.command.meteorological.notice=meteorological
 
 mqtt.topic.command.power.deployment=power