修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -166,4 +166,12 @@ public class AlertCalled extends BaseEntity {
     @TableField(exist=false)
     @ApiModelProperty(value = "落地时间")
     private String landingTime;
+
+    @TableField(exist=false)
+    @ApiModelProperty(value = "任务时间")
+    private String taskTime;
+
+    @TableField(exist=false)
+    @ApiModelProperty(value = "任务时间")
+    private String seat;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ESAlertCalled.java

@@ -115,5 +115,11 @@ public class ESAlertCalled {
     @Field(type = FieldType.Text)
     private String flightNumber;
 
+    /**
+     * 落地时间
+     */
+    @Field(type = FieldType.Long)
+    private Long taskTime;
+
 
 }

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

@@ -327,14 +327,14 @@
         </where>) b
     </select>
 
-
+<!--bug 8954  历史警情数据缺失 过滤了经纬度导致-->
     <select id="alertCalledListByAlertStatusCount" resultType="Integer">
     SELECT
     COUNT(*)
     FROM jc_alert_called a
     where a.is_delete=0  and a.alert_type_code <![CDATA[ <> ]]> 1214
-    AND a.coordinate_x IS NOT NULL
-    AND a.coordinate_y IS NOT NULL
+/*    AND a.coordinate_x IS NOT NULL
+    AND a.coordinate_y IS NOT NULL*/
     <if test='par.status==0'>
         and a.alert_status =0
     </if>

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

@@ -580,9 +580,17 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			Map<Date, Long> dutyPersonShiftMap = dutyPersonShiftsDb.stream()
 					.collect(Collectors.toMap(DutyPersonShift::getDutyDate, DutyPersonShift::getSequenceNbr));
 			// todo: 只更新当天及值班之后数据
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+			String format = simpleDateFormat.format(new Date());
+			Date date = null;
+			try {
+				date = simpleDateFormat.parse(format);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			Date finalDate = date;
 			Set<DutyPersonShift> needToDb = shiftDtos.stream()
-					.filter(s -> DateUtils.dateCompare(s.getDutyDate(), new Date()) >= 0).map(shiftDto -> {
-						DutyPersonShift dutyPersonShift = new DutyPersonShift();
+					.filter(s -> DateUtils.dateCompare(s.getDutyDate(), finalDate) >= 0).map(shiftDto -> {						DutyPersonShift dutyPersonShift = new DutyPersonShift();
 						Bean.copyExistPropertis(shiftDto, dutyPersonShift);
 						dutyPersonShift.setInstanceId(finalInstanceId);
 						dutyPersonShift.setAppKey(RequestContext.getAppKey());

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

@@ -128,12 +128,17 @@ 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));
-			linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
-			linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
+			String[] addressArr = linkageUnitDto.getAddress().split("@address@");
+			JSONObject jsonObject = JSONObject.parseObject(addressArr[1]);
+			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LONGITUDE))) {
+				linkageUnitDto.setLongitude(Double.valueOf(jsonObject.getString(BizConstant.LONGITUDE)));
+			}
+			if (StringUtils.isNotEmpty(jsonObject.getString(BizConstant.LATITUDE))) {
+				linkageUnitDto.setLatitude(Double.valueOf(jsonObject.getString(BizConstant.LATITUDE)));
+			}
 		}
 		// 1.保存行数据
 		String groupCode = this.getGroupCode();

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

@@ -104,6 +104,9 @@ public class ShiftChangeController extends BaseController {
     public ResponseModel queryForPage(
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size) {
+        if (current >= 1){
+            current = (current-1)*size;
+        }
         return ResponseHelper.buildResponse(iShiftChangeService.queryForShiftChangePage(current, size));
     }
 

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

@@ -310,7 +310,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		});
 		Map<String, Integer> statusCountMap = alertCalledMapper.queryAlertStatusCount(beginDate, endDate);
 		Integer unFinishedCount = this
-				.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, false));// bug2532
+				.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, false).eq(AlertCalled::getAlertTypeCode,"1214"));// bug2532
 		// 未结案警情统计错误
 		// bykongfm
 
@@ -540,6 +540,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				});
 			}
 
+			if (AlertStageEnums.LYXC.getCode().equals(alertCalled.getAlertTypeCode()) ||AlertStageEnums.ZJBZ.getCode().equals(alertCalled.getAlertTypeCode()) ) {
+				alertFormValuelist.stream().forEach(alertFormValue -> {
+					if (alertFormValue.getFieldCode().equals("taskTime")) {
+						alertCalled.setTaskTime(alertFormValue.getFieldValue());
+					}
+					if (alertFormValue.getFieldCode().equals("seat")) {
+						alertCalled.setSeat(alertFormValue.getFieldValue());
+					}
+				});
+			}
+
 			// 判断是否归并警情
 			if (alertCalled.getFatherAlert() != null) {
 				// 警情归并，设置当前警情状态为结束。
@@ -752,7 +763,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		});
 		Map<String, Integer> statusCountMap = alertCalledMapper.queryAlertStatusCount(beginDate, endDate);
 		Integer unFinishedCount = this
-				.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, false));// bug2532
+				.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, false).notIn(AlertCalled::getAlertTypeCode,"1214"));// bug2532
 		// 未结案警情统计错误
 		// bykongfm
 

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

@@ -302,7 +302,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     definitions.put("$casualtiesNum",ValidationUtil.isEmpty(alertCalled.getCasualtiesNum()) ? "" : String.valueOf(alertCalled.getCasualtiesNum()));
                     definitions.put("$contactPhone",ValidationUtil.isEmpty(alertCalled.getContactPhone()) ? "" :  alertCalled.getContactPhone());
 
-                   String  companyName = JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()).getString("$companyName") ;
+                   String  companyName = JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()).getString("companyName") ;
 
                     JSONObject jsonObject = null;
                     if(!ValidationUtil.isEmpty(alertCalled.getUpdateTime())) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/CheckMapper.java

@@ -21,6 +21,8 @@ public interface CheckMapper extends BaseMapper {
 
     List<CheckInfoVo> getCheckInfo(CheckInfoPageParam param);
 
+   List<Check> getCheckByTaskId(String taskId);
+
     List<Map> queryUnqualifiedInputItem(@Param(value = "checkId") int checkId);
 
     List<Map> queryCheckPointInputItem(@Param(value = "planTaskId") int planTaskId, @Param(value = "pointId") int pointId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckReportServiceImpl.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
 import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckReportService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
+import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanCheckLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanFrequencyEnum;
@@ -84,6 +85,9 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
     HiddenDangerMapper hiddenDangerMapper;
 
     @Autowired
+    CheckMapper checkMapper;
+
+    @Autowired
     IPlanDao planDao;
 
     @Autowired
@@ -142,6 +146,14 @@ public class CheckReportServiceImpl extends BaseService<CheckReportDto, CheckRep
                 // 获取复查信息
                 getReviewInfo(checkReport);
 
+                List<Check> list = checkMapper.getCheckByTaskId(String.valueOf(planTask.getId()));
+                //拿去第一条和最后一条检查记录给检查时间赋值
+                if (list != null){
+                    Check check = list.get(0);
+                    Check check1 = list.get(list.size() - 1);
+                    checkReport.setEndCheckDate(check.getCheckTime());
+                    checkReport.setStartCheckDate(check1.getCheckTime());
+                }
                 checkReportMapper.insert(checkReport);
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -275,7 +275,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     }
 
     @Override
-    public Map<String, Object> buildBizInfo(HiddenDangerDto hiddenDangerDto) throws Exception {
+    public Map<String, Object>         buildBizInfo(HiddenDangerDto hiddenDangerDto) throws Exception {
         Map<String, Object> result = new HashMap<>(32);
         Optional<Plan> op = iPlanDao.findById(hiddenDangerDto.getPlanId());
         Plan plan = op.orElseThrow((() -> new RuntimeException("计划不存在")));

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -149,6 +149,11 @@
         </choose>
     </select>
 
+
+    <select id="getCheckByTaskId" resultType="com.yeejoin.amos.supervision.dao.entity.Check">
+        select * from  p_check where plan_task_id = #{taskId} order by check_time DESC
+    </select>
+
     <select id="queryUnqualifiedInputItem" resultType="Map" parameterType="int">
 		SELECT
 			ii.name,