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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IWorkflowExcuteService.java

@@ -9,7 +9,7 @@ public interface IWorkflowExcuteService{
 	 * @param key 流程定义的key
 	 * @param condition 执行控制条件
 	 */
-	void startAndComplete(String key,String condition)throws Exception;	
+	String startAndComplete(String key,String condition)throws Exception;	
 	
 	/**
 	 * 检查当前登录人有没有流程操作权限

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

@@ -24,10 +24,10 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 
 	@Transactional
 	@Override
-	public void startAndComplete(String key, String condition) throws Exception {
+	public String startAndComplete(String key, String condition) throws Exception {
 		JSONObject body = new JSONObject();
-		  String businessKey = buildOrderNo();
-	        body.put("businessKey", businessKey);
+		String businessKey = buildOrderNo();
+		body.put("businessKey", businessKey);
 		body.put("processDefinitionKey", key);
 		JSONObject jsonObject = workflowFeignService.startByVariable(body);
 		if (jsonObject == null || jsonObject.getJSONObject("data") == null) {
@@ -39,6 +39,7 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 				throw new RuntimeException("初始执行任务失败");
 			}
 		}
+		return jsonObject.getJSONObject("data").getString("id");
 	}
 
 	@Override
@@ -105,15 +106,20 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 	@Override
 	public Object setTaskAssign(String processInstanceId, String userId) {
 		JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
-		if (ObjectUtils.isNotEmpty(teskObject)) {
-			JSONArray taskDetailArray = teskObject.getJSONArray("data");
-			for (Object obj : taskDetailArray) {
-				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
-				try {
+		if (ObjectUtils.isEmpty(teskObject)) {
+			throw new RuntimeException("设置任务执行人失败, 任务不存在，请检查processInstanceId" + processInstanceId + "是否正确");
+		}
+		JSONArray taskDetailArray = teskObject.getJSONArray("data");
+		for (Object obj : taskDetailArray) {
+			JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+			JSONObject taskGroupNameObject = workflowFeignService.getTaskGroupName(detail.getString("id"));
+			try {
+				if (taskGroupNameObject.getJSONArray("data") == null
+						&& taskGroupNameObject.getJSONArray("data").size() < 1) {
 					workflowFeignService.setTaskUser(detail.getString("id"), userId);
-				} catch (Exception e) {
-					throw new RuntimeException("设置任务执行人失败");
 				}
+			} catch (Exception e) {
+				throw new RuntimeException("设置任务执行人失败");
 			}
 		}
 		return true;
@@ -135,14 +141,15 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 		}
 		return true;
 	}
-	  public static String buildOrderNo() {
-	        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	        String newDate = sdf.format(new Date());
-	        String result = "";
-	        Random random = new Random();
-	        for (int i = 0; i < 3; i++) {
-	            result += random.nextInt(10);
-	        }
-	        return newDate + result;
-	    }
+
+	public static String buildOrderNo() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String newDate = sdf.format(new Date());
+		String result = "";
+		Random random = new Random();
+		for (int i = 0; i < 3; i++) {
+			result += random.nextInt(10);
+		}
+		return newDate + result;
+	}
 }

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

@@ -18,10 +18,11 @@ public class OrgusrDataxDto {
 
    @ApiModelProperty(value = "单位基本信息")
    private  OrgUsrzhDto  OrgUsrzhDto;
-   @ApiModelProperty(value = "现场图片")
+   @ApiModelProperty(value = "消防通道布置图")
    private List<String> scenePicture;
-   @ApiModelProperty(value = "平面图")
+   @ApiModelProperty(value = "建筑平面图")
    private List<String> planePicture;
-
+   @ApiModelProperty(value = "建筑立面图")
+   private List<String> facadePicture;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/HiddenDanger.java

@@ -55,12 +55,11 @@ public class HiddenDanger extends BasicEntity {
     @Column(name = "danger_type")
     private Long dangerType;
 
-
     /**
      * 隐患类型名称
      */
     @Column(name = "danger_type_name")
-    private Long dangerTypeName;
+    private String dangerTypeName;
 
     /**
      * 创建者

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchPaperDto.java

@@ -90,4 +90,10 @@ public class DispatchPaperDto  extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "到达时间")
+    private Date arriveTime;
+
+    @ApiModelProperty(value = "救援完成时间")
+    private Date saveTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/DispatchPaper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -160,4 +161,16 @@ public class DispatchPaper extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 到达时间
+     */
+    @TableField("arrive_time")
+    private Date arriveTime;
+
+    /**
+     * 救援完成时间
+     */
+    @TableField("save_time")
+    private Date saveTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/DispatchTaskMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
 import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 派遣任务 Mapper 接口
@@ -11,4 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DispatchTaskMapper extends BaseMapper<DispatchTask> {
 
+    String returnDistanceByTaskId(@Param("taskId") Long taskId, @Param("lon")String lon, @Param("lat")String lat);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchTaskService.java

@@ -16,4 +16,6 @@ public interface IDispatchTaskService {
     Boolean createDispatchTask(DispatchTaskDto dispatchTaskDto, AgencyUserModel sendUser);
 
     DispatchTaskDto getTaskInfo(String orgTypeCode, Long alertId);
+
+    String returnDistanceByTaskId(Long taskId, String longitude, String latitude);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -2,4 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper">
 
+
+    <select id="returnDistanceByTaskId" resultType="java.lang.String">
+        select
+(
+		ACOS(
+			SIN(
+				(#{lat} * PI()) / 180
+			) * SIN(
+				(
+					el.latitude * PI()
+				) / 180
+			) + COS(
+				(#{lat} * PI()) / 180
+			) * COS(
+				(
+					el.latitude * PI()
+				) / 180
+			) * COS(
+				(#{lon} * PI()) / 180 - (
+					el.longitude * PI()
+				) / 180
+			)
+		) * 6371000
+	) AS distance
+from tz_dispatch_task ta
+left JOIN tz_alert_called al on al.sequence_nbr = ta.alert_id
+left JOIN tcb_elevator el on el.sequence_nbr = al.equipment_id
+
+where ta.sequence_nbr = #{taskId}
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/RescueStationMapper.xml

@@ -13,19 +13,19 @@
         	(
 		ACOS(
 			SIN(
-				(#{lat} * 3.1415) / 180
+				(#{lat} * PI()) / 180
 			) * SIN(
 				(
 					tcb_rescue_station.latitude * PI()
 				) / 180
 			) + COS(
-				(#{lat} * 3.1415) / 180
+				(#{lat} * PI()) / 180
 			) * COS(
 				(
 					tcb_rescue_station.latitude * PI()
 				) / 180
 			) * COS(
-				(#{lon} * 3.1415) / 180 - (
+				(#{lon} * PI()) / 180 - (
 					tcb_rescue_station.longitude * PI()
 				) / 180
 			)

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

@@ -845,11 +845,7 @@ public class CommandController extends BaseController {
                 buildId = orgUsrzhDto.get(0).getBuildId();
             }
         }
-        
-        //现场照片 待完成，
-
-        //平面图。待完成orgUsrzhDto.getBuildId()
-        if (buildId != null) {
+       if (buildId != null) {
             List<Map<String, Object>> list = equipFeignClient.findImgByFileCategory(buildId, "fourImg").getResult();
             List<String> url = new ArrayList<>();
             if (list != null && list.size() > 0) {
@@ -857,7 +853,26 @@ public class CommandController extends BaseController {
                     url.add(map.get("filePath").toString());
                 });
             }
+
+            //通道
+            List<Map<String, Object>> list1 = equipFeignClient.findImgByFileCategory(buildId, "secondImg").getResult();
+            List<String> url1 = new ArrayList<>();
+            if (list1 != null && list1.size() > 0) {
+                list1.stream().forEach(map -> {
+                    url1.add(map.get("filePath").toString());
+                });
+            }
+            //立面
+            List<Map<String, Object>> list2 = equipFeignClient.findImgByFileCategory(buildId, "threeImg").getResult();
+            List<String> url2 = new ArrayList<>();
+            if (list2 != null && list2.size() > 0) {
+                list2.stream().forEach(map -> {
+                    url2.add(map.get("filePath").toString());
+                });
+            }
             orgusrDataxDto.setPlanePicture(url);
+            orgusrDataxDto.setScenePicture(url1);
+            orgusrDataxDto.setFacadePicture(url2);
         }
         return ResponseHelper.buildResponse(orgusrDataxDto);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -5,13 +5,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatAccessDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.WechatRelation;
+import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IWechatService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatRelationServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +26,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.w3c.dom.Node;
@@ -62,6 +67,9 @@ public class WechatController extends BaseController {
 	@Autowired
 	WechatRelationServiceImpl wechatRelationServiceImpl;
 
+	@Autowired
+	IDispatchTaskService dispatchTaskService;
+
 
 
 	/**
@@ -182,7 +190,7 @@ public class WechatController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/getOpenIdTel/{code}")
 	@ApiOperation(httpMethod = "GET", value = "根据微信code获取openId和手机号接口", notes = "根据微信code获取openId和手机号接口")
-	public ResponseModel<WechatAccessDto> getAccessToken(@PathVariable String code) {
+	public ResponseModel<WechatAccessDto> getOpenIdTel(@PathVariable String code) {
 		WechatAccessDto wechatAccessDto = new WechatAccessDto();
 		String openId = wechatService.getOpenId(code);
 		if(StringUtils.isNotEmpty(openId)) {
@@ -195,6 +203,32 @@ public class WechatController extends BaseController {
 		return ResponseHelper.buildResponse(wechatAccessDto);
 	}
 
+	/**
+	 * 根据任务id 经纬度 返回现在距离任务距离
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/returnDistance")
+	@ApiOperation(httpMethod = "POST", value = "根据任务id 经纬度 返回现在距离任务距离", notes = "根据任务id 经纬度 返回现在距离任务距离")
+	public ResponseModel<String> returnDistance(@ApiParam(value = "任务id", required = true) @RequestParam(name = "taskId") Long taskId,
+														 @ApiParam(value = "经度", required = true)  @RequestParam(name = "longitude")  String longitude,
+														 @ApiParam(value = "纬度", required = true)  @RequestParam(name = "latitude")  String latitude) {
+		if (ValidationUtil.isEmpty(taskId)
+				|| ValidationUtil.isEmpty(longitude)
+				|| ValidationUtil.isEmpty(latitude)){
+			throw new BadRequest("参数校验失败.");
+		}
+		String distance = dispatchTaskService.returnDistanceByTaskId(taskId,longitude,latitude);
+		return ResponseHelper.buildResponse(distance);
+	}
+
+
+
+	/**
+	 * 创建验证码
+	 * @return
+	 */
 	public static String getrandom(){
 		String code = "";
 		Random random = new Random();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatRelationController.java

@@ -27,7 +27,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  * @date 2021-09-22
  */
 @RestController
-@Api(tags = "openId与手机号对应关系表")
+@Api(tags = "openId与手机号对应关系API")
 @RequestMapping(value = "/wechat-relation")
 public class WechatRelationController extends BaseController {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -168,6 +168,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         return dispatchTaskDto;
     }
 
+    @Override
+    public String returnDistanceByTaskId(Long taskId, String longitude, String latitude) {
+        return baseMapper.returnDistanceByTaskId(taskId, longitude, latitude);
+    }
+
     @Transactional
     @Override
     public Boolean createDispatchTask(DispatchTaskDto dispatchTaskDto, AgencyUserModel sendUser) {