Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -54,6 +54,12 @@ public class AlertCalledMobDto {
     @ApiModelProperty(value = "结束时间")
     String endTime;
 
+    @ApiModelProperty(value = "总人数")
+    String totalPeople;
+    @ApiModelProperty(value = "总水量")
+    String totalWater;
+    @ApiModelProperty(value = "总泡沫")
+    String totalFoam;
 
 
 }

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

@@ -54,6 +54,9 @@ public class PowerTransferCompanyResources extends BaseEntity {
     @ApiModelProperty(value = "任务备注")
     private String  remarks;
 
+    @ApiModelProperty(value = "车辆到场时间")
+    private String  arrivalTime;
+
     @ApiModelProperty(value = "任务状态")
     @TableField(exist = false)
     private String statusName;

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

@@ -138,7 +138,8 @@
         b.company_name companyName,
         c.resources_name carName,
         c.resources_num carNum,
-		c.resources_id id
+		c.resources_id id,
+		c.arrival_time arrivalTime
     FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
@@ -155,7 +156,8 @@
         b.company_name companyName,
         c.resources_name carName,
         c.resources_num carNum,
-		c.resources_id id
+		c.resources_id id,
+		c.arrival_time arrivalTime
     FROM
         jc_power_transfer a
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanStatusEnum.java

@@ -14,7 +14,9 @@ public enum PlanStatusEnum {
     EXAMINE_FORMULATE("已审核/检查内容未制定",4, 5),
     EXAMINE_DEVELOPED("检查内容已制定/未执行",5, 6),
     IN_EXECUTION("执行中",6, 7),
-    COMPLETED("已完成",7, 7);
+    COMPLETED("已完成",7, 7),
+    OUT_TIME("已超时",8, 8);
+
 
     /**
      * 名称

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

@@ -52,6 +52,12 @@
           <version>1.0.0</version>
           <scope>compile</scope>
       </dependency>
+      <dependency>
+          <groupId>com.amosframework.boot</groupId>
+          <artifactId>amos-boot-module-command-biz</artifactId>
+          <version>1.0.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
 <repositories>

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

@@ -15,7 +15,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -76,6 +78,10 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
                 // 更新所有车辆状态为执勤
                 equipFeignClient.updateCarStatus(carStatusInfoDtoList);
             } else {
+                if (FireCarStatusEnum.到场.getCode().equals(code)){
+                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    powerTransferCompanyResources.setArrivalTime(format.format(new Date()));
+                }
                 powerTransferCompanyResources.setCarStatus(code);
                 powerTransferCompanyResources.setRemarks(remarks);
                 powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);

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

@@ -396,7 +396,23 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			}
 			// 计划已过期,则更新status = 7,已完成
 			if (!vo.getIsGenData()) {
-				paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
+				int num = 0;
+				//根据计划id查询关联的任务
+				List<PlanTask> planTaskByRouteId = planTaskMapper.getPlanTaskByRouteId(plan.getId());
+				if (!ValidationUtil.isEmpty(planTaskByRouteId)){
+					HashMap<String, Object> param = new HashMap<String, Object>();
+					param.put("pointId",plan.getId());
+					//根据任务id查询关联的任务是否存在未完成的  如果存在 则修改状态为已超时
+					List<Map<String, Object>> planTaskPoints = planTaskMapper.getPlanTaskPoints(param);
+					if (!ValidationUtil.isEmpty(planTaskPoints)){
+						num = (int) planTaskPoints.stream().filter(c -> c.containsKey("finish") && !String.valueOf(c.get("finish")).equals("2")).count();
+					}
+					if (num >= 1){
+						paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
+					}else {
+						paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
+					}
+				}
 				planMapper.updPlanStatusOrGenDate(paramMap);
 				continue;
 			}

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

@@ -398,7 +398,9 @@
         <if test="taskType != null and taskType != ''">and ppn.check_type_id = #{taskType}</if>
         <if test="planTaskId != null and planTaskId > 0 ">and ptd.task_no = #{planTaskId}</if>
         <if test="orderBy != null and orderBy != ''">order by ${orderBy}</if>
-        limit #{offset},#{pageSize}
+        <if test="offset != null and pageSize != null">
+            limit #{offset},#{pageSize}
+        </if>
     </select>
 
     <select id="getPlanTaskPointsCount" resultType="long">