解决冲突

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

@@ -65,7 +65,7 @@
 		<if test="bizOrgCode != null and bizOrgCode !=''">
 			AND c.`biz_org_code` like concat(#{bizOrgCode},'%')
 		</if>
-		order by c.rec_date desc
+		order by c.sequence_nbr desc
 	</select>
 
 	<select id="getSequenceNbr"

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/pom.xml

@@ -26,6 +26,11 @@
 			<version>${amos-biz-boot.version}</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gavaghan</groupId>
+			<artifactId>geodesy</artifactId>
+			<version>1.1.3</version>
+		</dependency>
 	</dependencies>
 
 </project>

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

@@ -46,6 +46,10 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.gavaghan.geodesy.Ellipsoid;
+import org.gavaghan.geodesy.GeodeticCalculator;
+import org.gavaghan.geodesy.GeodeticCurve;
+import org.gavaghan.geodesy.GlobalCoordinates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -72,6 +76,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1337,6 +1342,15 @@ public class CommandController extends BaseController {
             if(es!=null){
                 e.put("longitude", es.getLongitude());
                 e.put("latitude",es.getLatitude());
+                GlobalCoordinates source = new GlobalCoordinates( par.getLatitude(), par.getLongitude());
+                GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(es.getLatitude()), Double.valueOf(es.getLongitude()));
+                double meter2 = getDistanceMeter(source,target, Ellipsoid.WGS84);
+
+                BigDecimal two = new BigDecimal(meter2);
+                //换算公里
+             //   two.divide(BigDecimal.valueOf(1000.00), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                meter2 = two.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                e.put("distance",meter2);
             }
 
             //同步力量调派车辆任务状态
@@ -1351,6 +1365,12 @@ public class CommandController extends BaseController {
         /*bug 2583 地图屏，消防车辆类型时，左侧车辆状态显示错误 2021-10-26 陈召 结束 */
     }
 
+    public static  double getDistanceMeter(GlobalCoordinates gpsFrom, GlobalCoordinates gpsTo, Ellipsoid ellipsoid){
+        //创建GeodeticCalculator,调用计算方法,传入坐标系,经纬度用于计算距离
+        GeodeticCurve geoCurve = new GeodeticCalculator().calculateGeodeticCurve(ellipsoid, gpsFrom, gpsTo);
+        return geoCurve.getEllipsoidalDistance();
+    }
+
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/fireCar")
     @ApiOperation(httpMethod = "GET", value = "车辆资源详情", notes = "车辆资源详情")

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

@@ -135,8 +135,8 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         Page page = new Page();
         if (current > 0){
             page.setCurrent((long) (current - 1) *size);
-            page.setSize(size);
         }
+        page.setSize(size);
         if (!params.isEmpty()&&params !=null){
            if (!params.get("sort").isEmpty() && params.get("sort") != null){
                String[] sorts = params.get("sort").split(",");

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

@@ -129,9 +129,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	@Transactional
 	public LinkageUnitDto saveModel(LinkageUnitDto linkageUnitDto) {
 		if (linkageUnitDto.getAddress() != null) {
-			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
-			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
 			String[] addressArr = linkageUnitDto.getAddress().split("@address@");
+			linkageUnitDto.setAddress(addressArr[0]);
 			JSONObject jsonObject = JSONObject.parseObject(addressArr[1]);
 			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LONGITUDE))) {
 				linkageUnitDto.setLongitude(Double.valueOf(jsonObject.getString(BizConstant.LONGITUDE)));

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

@@ -489,7 +489,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				resultMap.put("downUnit", true);
 			}
 			// 人员数量
-			Map<String, Object> countPerson = new HashMap<>();
+	/*		Map<String, Object> countPerson = new HashMap<>();
 			downUnitColumnMap.put("is_delete", CommonConstant.IS_DELETE_00);
 			countPerson.put("parent_id", company.getSequenceNbr());
 			countPerson.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -499,7 +499,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			resultMap.put("personNum", personNum);
 			if (0 == personNum) {
 				continue;
-			}
+			}*/
 			List<Map<String, Object>> personList = new ArrayList<>();
 			// 查询动态表单Phone
 			Map<String, Object> phone = new HashMap<>();
@@ -526,6 +526,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				return person;
 			}).collect(Collectors.toList());
 			resultMap.put("children", personList);
+			resultMap.put("personNum", personList!=null?personList.size():0);
 			companyPersonMsg.add(resultMap);
 		}
 		return companyPersonMsg;
@@ -2998,7 +2999,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		// 2.保存cb_dynamic_form_instance表 人员基本信息
 		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto);
-
 		if (!ObjectUtils.isEmpty(orgUsrDto.getSequenceNbr())) {
 			peopleInfoDto.getFirefightersContacts().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
 			peopleInfoDto.getFirefighters().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
@@ -3007,7 +3007,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			peopleInfoDto.getPostEduDtoObj().getFirefightersPost().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
 			peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString());
 		}
-
 		if (peopleInfoDto.getFirefighters() != null && "1601".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
 			// 3.同步保存cb_firefighters消防人员基础信息
 			saveFirefighters(peopleInfoDto);
@@ -3118,7 +3117,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(peopleInfoDto.getFirefighters().getJobTitleCode()).getName());
 			}
-			if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode())){
+			if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName());
 			}
 			String fieldCode = dynamicFormInstance.getFieldCode();
@@ -3366,7 +3365,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		deleteFirefightersPost(String.valueOf(id));
 
 		// 3.根据type是否删除消防人员
-		if ("2".equals(type)) {
+		if ("1601".equals(type)) {
 			deleteFirefighters(id);
 		}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -38,16 +38,14 @@ public class PersonIdentifyAspect {
     @Autowired
     private JcsFeign jcsFeignClient;
 
-//    package com.yeejoin.equipmanage.controller;
-//    com.yeejoin.amos.boot.biz.common.controller.BaseController
-//    @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
-//    public void userDate() {
-//
-//    }
+   @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
+   public void userDate() {
 
+   }
 
-    @Before(value = "@annotation(com.yeejoin.equipmanage.config.PersonIdentify) && @annotation(permission)")
-    public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) {
+
+    @Before("userDate()")
+    public void personIdentity(JoinPoint joinPoint) {
         if(RequestContext.getToken() != null && RequestContext.getExeUserId() != null){
             ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -59,7 +57,9 @@ public class PersonIdentifyAspect {
                         if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HttpStatus.OK.value()) {
                             throw new RuntimeException(responseModel.getDevMessage());
                         }
-                        ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
+                        String s = JSONObject.toJSONString(responseModel.getResult());
+                        ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
+                        //ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
                         reginParam.setPersonIdentity(personIdentity);
                         redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
                     }

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

@@ -543,7 +543,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 alertSubmitted.setSchedulingTypeCode(alertSchedulingTypeEnum.get().getCode());
                 alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
                 alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
-
+                alertSubmitted.setSender(alertCalled.getRecUserName());
                 alertSubmitted.setUpdateTime(new Date());
                 alertSubmitted.setSubmissionTime(new Date());
 

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

@@ -142,7 +142,7 @@ public class ESAlertCalledService {
 			esAlertCalled.setLandingTime(time);
 		}
 		if (alertCalled.getTaskTime() != null) {
-			long time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(alertCalled.getLandingTime()).getTime();
+			long time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(alertCalled.getTaskTime()).getTime();
 			esAlertCalled.setTaskTime(time);
 		}
 		if (alertCalled.getAlertStatus()) {
@@ -296,8 +296,8 @@ public class ESAlertCalledService {
 		BoolQueryBuilder qb6 = QueryBuilders.boolQuery()
 				.mustNot(QueryBuilders.termQuery("alertTypeCode", "1214"));
 
-		//航空器救援规则
-		if (!ValidationUtil.isEmpty(alertCalledVo.getAlertFormValue()) && AlertStageEnums.HKJY.getCode().equals(alertCalled.getAlertTypeCode())) {
+		//航空器救援规则  需求变更只匹配通用规则
+	/*	if (!ValidationUtil.isEmpty(alertCalledVo.getAlertFormValue()) && AlertStageEnums.HKJY.getCode().equals(alertCalled.getAlertTypeCode())) {
 			List<AlertFormValue> alertFormValue = alertCalledVo.getAlertFormValue();
 			for (AlertFormValue formValue : alertFormValue) {
 				if (formValue.getFieldCode().equals("forcedLandingTrack") && formValue.getFieldValue() != null) {
@@ -318,7 +318,7 @@ public class ESAlertCalledService {
 			}
 		}
 
-		//漏油保障规则和专机保障规则
+		//漏油保障规则和专机保障规则  需求变更只匹配通用规则
 		if (!ValidationUtil.isEmpty(alertCalledVo.getAlertFormValue()) &&AlertStageEnums.LYXC.getCode().equals(alertCalled.getAlertTypeCode()) ||AlertStageEnums.ZJBZ.getCode().equals(alertCalled.getAlertTypeCode()) ) {
 				List<AlertFormValue> alertFormValue = alertCalledVo.getAlertFormValue();
 				for (AlertFormValue formValue : alertFormValue) {
@@ -334,7 +334,7 @@ public class ESAlertCalledService {
 						boolMust.must(qb11);
 					}
 				}
-		}
+		}*/
 
 		/**
 		 * 一般火灾，条件构造

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

@@ -1589,13 +1589,20 @@ public class ExcelServiceImpl {
     	
     }
 	private void initDutyFirstAidData(XSSFSheet sheet, List<Map<String, Object>> dataList, List<Date> dayByMonth) {
-		for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
+		for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) {
 			DutyFirstAidDto dutyFirstAidDto = new DutyFirstAidDto();
 			// row是一行数据，row.getCell(i),代表拿到这一行，第i列数据
 			Row row = sheet.getRow(i);
 			if (row == null) {
 				continue;
 			}
+			if (i == 0){
+				if ( !row.getCell(4).toString().equals("120急救站")){
+					throw new BadRequest("上传模板类型不正确");
+				}else {
+					continue;
+				}
+			}
 			Cell cell = row.getCell(2);
 			if (cell == null) {
 				continue;
@@ -1678,13 +1685,20 @@ public class ExcelServiceImpl {
 
 	private void initDutyCarData(XSSFSheet sheet, List<Map<String, Object>> dataList, List<Date> dayByMonth) {
 		// 遍历行，i = 1，从第二行开始，第一行是表头跳过。
-		for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
+		for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) {
 			DutyCarDto dutyCarDto = new DutyCarDto();
 			// row是一行数据，row.getCell(i),代表拿到这一行，第i列数据
 			Row row = sheet.getRow(i);
 			if (row == null) {
 				continue;
 			}
+			if (i == 0){
+				if ( !row.getCell(4).toString().contains("车辆名称")){
+					throw new BadRequest("上传模板类型不正确");
+				}else {
+					continue;
+				}
+			}
 			Cell cell4 = row.getCell(4);
 			if(cell4 ==null) {
 				continue;
@@ -1802,13 +1816,20 @@ public class ExcelServiceImpl {
 
 	private void initDutyFireFightingData(XSSFSheet sheet, List<Map<String, Object>> dataList, List<Date> dayByMonth) {
 		// 遍历行，i = 1，从第二行开始，第一行是表头跳过。
-		for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
+		for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) {
 			DutyFireFightingDto dutyFireFightingDto = new DutyFireFightingDto();
 			// row是一行数据，row.getCell(i),代表拿到这一行，第i列数据
 			Row row = sheet.getRow(i);
 			if (row == null) {
 				continue;
 			}
+			if (i == 0){
+				if ( !row.getCell(4).toString().equals("微型消防站")){
+					throw new BadRequest("上传模板类型不正确");
+				}else {
+					continue;
+				}
+			}
 			Cell cell = row.getCell(4);
 			if (cell == null) {
 				continue;