TZS我的业务相关代码

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

@@ -28,7 +28,7 @@ public class DispatchConsultFeedbackDto extends BaseDto {
     private String emergencyCall;
 
     @ApiModelProperty(value = "投诉反馈方式")
-    private String consultFeedbackType;
+    private String consultFeedbackCode;
 
     @ApiModelProperty(value = "投诉反馈结果")
     private String feedbackResult;

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

@@ -28,7 +28,7 @@ public class DispatchRepairFeedbackDto extends BaseDto {
     private String emergencyCall;
 
     @ApiModelProperty(value = "报修反馈方式")
-    private String fixFeedbackType;
+    private String fixFeedbackCode;
 
     @ApiModelProperty(value = "报修反馈结果")
     private String feedbackResult;

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 微信公众号维修反馈dto 类
+ */
+@Data
+@ApiModel(value="WechatUserFeedbackDto", description="微信公众号上报人反馈DTO")
+public class WechatUserFeedbackDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertId;
+
+    @ApiModelProperty(value = "结果评价")
+    private String feedBackResult;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "现场照片")
+    private List<AttachmentDto>  imgs;
+
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/AlertStageEnums.java

@@ -19,9 +19,9 @@ public  enum  AlertStageEnums {
 	TSZX("962","TSZX",	"投诉咨询"),
 
 	// 来源类型JQLYLX
-	DHBJ("963","233","电话报警"),
-	// 来源类型JQLYLX
-	GZHSB("972","APPJJ","移动端上报"),
+	DHBJ("963","96333","电话报警"),
+	WLJR("1014","WLJR","物联接入"),
+	APPJJ("1015","APPJJ","移动端上报"),
 
 	// 警情阶段 JQJD
 	JJ("964","JJ","接警"),

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

@@ -5,8 +5,10 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MainPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMessageDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatUserFeedbackDto;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,5 +48,7 @@ public interface IDispatchTaskService {
 
     List<MainPersonDto> todayTaskPerson();
 
+    WechatMyBussinessDto saveUserFeed(WechatUserFeedbackDto wechatUserFeedbackDto);
+
 
 }

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MainPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatUserFeedbackDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -14,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 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;
 
@@ -46,6 +59,15 @@ public class DispatchTaskController extends BaseController {
 	@Autowired
 	RedisUtils redisUtils;
 
+	@Autowired
+	ISourceFileService sourceFileService;
+
+	@Autowired
+	IDispatchTaskService dispatchTaskService;
+
+	@Autowired
+	AlertFormValueServiceImpl iAlertFormValueService;
+
 	/**
 	 * 根据派遣单位类型和警情id 获取任务模板
 	 * @param orgTypeCode
@@ -111,4 +133,206 @@ public class DispatchTaskController extends BaseController {
 		List<MainPersonDto> list = dispatchTaskServiceImpl.todayTaskPerson();
 		return ResponseHelper.buildResponse(list);
 	}
+
+
+	/**
+	 * 微信公众号维修反馈接口
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveUserFeed")
+	@ApiOperation(httpMethod = "POST", value = "微信公众号上报人反馈接口", notes = "微信公众号上报人反馈接口")
+	public ResponseModel<WechatMyBussinessDto> saveUserFeed(@RequestBody WechatUserFeedbackDto model) {
+		return ResponseHelper.buildResponse(dispatchTaskServiceImpl.saveUserFeed(model));
+	}
+
+	/**
+	 * 点击到达触发事件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/taskArrive/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "点击到达触发事件", notes = "点击到达触发事件")
+	public ResponseModel<WechatMyTaskDto> taskArrive(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		if(dispatchTaskServiceImpl.taskArrive(taskId)) {
+			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+		} else {
+			return ResponseHelper.buildResponse(new WechatMyTaskDto());
+		}
+	}
+
+
+	/**
+	 * 点击救援完成触发事件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/saveFinish/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "点击救援完成触发事件", notes = "点击救援完成触发事件")
+	public ResponseModel<WechatMyTaskDto> saveFinish(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		if(dispatchTaskServiceImpl.saveFinish(taskId)) {
+			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+		} else {
+			return ResponseHelper.buildResponse(new WechatMyTaskDto());
+		}
+	}
+
+
+	/**
+	 * 获取任务详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getTaskInfo/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "获取任务详情", notes = "获取任务详情")
+	public ResponseModel<WechatMyTaskDto> getTaskInfo(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+	}
+
+
+
+
+	private WechatMyTaskDto getTaskDtoByTaskId(Long taskId) {
+		WechatMyTaskDto temp = dispatchTaskService.getTaskInfoByTaskId(taskId);
+		List<AlertFormValue> paperList = null;
+		Map<String, List<AttachmentDto>> imgMap = null;
+		List<AttachmentDto> imgDtos = null;
+		Map<String, List<AttachmentDto>> errorImgMap = null;
+		List<AttachmentDto> errorImgDtos = null;
+		List<AttachmentDto> feedbackDtos = null;
+		LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+		switch (temp.getTaskTypeCode()) {
+			case "960" : // 困人救援
+				temp.setHasDeadHurt("无");
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getAlertId());
+				// 警情动态表单数据
+				List<AlertFormValue> alertList = iAlertFormValueService.list(queryWrapper);
+				alertList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("trapped_floor_num".equals(t.getFieldCode())) {
+						// 被困楼层
+						temp.setTrappedFloorNum(value);
+					} else if("trapped_num".equals(t.getFieldCode())) {
+						// 被困人数
+						temp.setTrappedNum(value);
+					} else if("injured_num".equals(t.getFieldCode())) {
+						// 受伤人数
+						if(StringUtils.isNotEmpty(value)) {
+							temp.setHasDeadHurt("有");
+						}
+					} else if("die_num".equals(t.getFieldCode())) {
+						// 死亡人数
+						if(StringUtils.isNotEmpty(value)) {
+							temp.setHasDeadHurt("有");
+						}
+					}
+				});
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("save_time".equals(t.getFieldCode())) {
+						// 救援完成时间
+						if(StringUtils.isNotBlank(value)) {
+							temp.setSaveTime(DateUtils.longStr2Date(value));
+						}
+					} else if("error_result".equals(t.getFieldCode())) {
+						// 故障原因
+						temp.setErrorResult(value);
+					} else if("fix_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFixResult(value);
+					} else if("fix_remark".equals(t.getFieldCode())) {
+						// 维修备注
+						temp.setRemark(value);
+					}
+				});
+
+
+				imgMap = sourceFileService.getAttachments(temp.getPaperId());
+				imgDtos = imgMap.get("imgs");
+				temp.setFixImgs(imgDtos);
+
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+			case "961" : // 故障维修
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("save_time".equals(t.getFieldCode())) {
+						// 救援完成时间
+						if(StringUtils.isNotBlank(value)) {
+							temp.setSaveTime(DateUtils.longStr2Date(value));
+						}
+					} else if("error_result".equals(t.getFieldCode())) {
+						// 故障原因
+						temp.setErrorResult(value);
+					} else if("fix_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFixResult(value);
+					} else if("fix_remark".equals(t.getFieldCode())) {
+						// 维修备注
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 反馈结果
+						temp.setFeedbackResult(value);
+					}
+				});
+
+
+				imgMap = sourceFileService.getAttachments(temp.getPaperId());
+				imgDtos = imgMap.get("imgs");
+				temp.setFixImgs(imgDtos);
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+			case "962" : // 投诉建议
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("action_result".equals(t.getFieldCode())) {
+						//	处置结果
+						temp.setActionResult(value);
+					}
+				});
+
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+		}
+
+
+
+
+		return temp;
+	}
 }

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

@@ -125,6 +125,7 @@ public class WechatController extends BaseController {
 	@Autowired
 	ISourceFileService sourceFileService;
 
+
 	/**
 	 * 获取微信回调信息返回验证是否通过
 	 * @param signature
@@ -426,20 +427,6 @@ public class WechatController extends BaseController {
 	}
 
 
-	/**
-	 * 获取任务详情
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/getTaskInfo/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "获取任务详情", notes = "获取任务详情")
-	public ResponseModel<WechatMyTaskDto> getTaskInfo(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
-			throw new BadRequest("参数校验失败.");
-		}
-		return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-	}
 
 	/**
 	 * 获取业务详情
@@ -456,45 +443,6 @@ public class WechatController extends BaseController {
 		return ResponseHelper.buildResponse(getBussinessDtoById(bussinessId));
 	}
 
-	/**
-	 * 点击到达触发事件
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/taskArrive/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "点击到达触发事件", notes = "点击到达触发事件")
-	public ResponseModel<WechatMyTaskDto> taskArrive(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
-			throw new BadRequest("参数校验失败.");
-		}
-		if(dispatchTaskService.taskArrive(taskId)) {
-			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-		} else {
-			return ResponseHelper.buildResponse(new WechatMyTaskDto());
-		}
-	}
-
-
-	/**
-	 * 点击救援完成触发事件
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/saveFinish/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "点击救援完成触发事件", notes = "点击救援完成触发事件")
-	public ResponseModel<WechatMyTaskDto> saveFinish(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
-			throw new BadRequest("参数校验失败.");
-		}
-		if(dispatchTaskService.saveFinish(taskId)) {
-			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-		} else {
-			return ResponseHelper.buildResponse(new WechatMyTaskDto());
-		}
-	}
-
 
 	/**
 	 * 获取任务列表
@@ -561,122 +509,7 @@ public class WechatController extends BaseController {
 		return ResponseHelper.buildResponse(urlString);
 	}
 
-	private WechatMyTaskDto getTaskDtoByTaskId(Long taskId) {
-		WechatMyTaskDto temp = dispatchTaskService.getTaskInfoByTaskId(taskId);
-		List<AlertFormValue> paperList = null;
-		Map<String, List<AttachmentDto>> imgMap = null;
-		List<AttachmentDto> imgDtos = null;
-		Map<String, List<AttachmentDto>> errorImgMap = null;
-		List<AttachmentDto> errorImgDtos = null;
-		LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
-		switch (temp.getTaskTypeCode()) {
-			case "960" : // 困人救援
-				temp.setHasDeadHurt("无");
-				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getAlertId());
-				// 警情动态表单数据
-				List<AlertFormValue> alertList = iAlertFormValueService.list(queryWrapper);
-				alertList.stream().forEach(t -> {
-					String value = t.getFieldValue();
-					if("trapped_floor_num".equals(t.getFieldCode())) {
-						// 被困楼层
-						temp.setTrappedFloorNum(value);
-					} else if("trapped_num".equals(t.getFieldCode())) {
-						// 被困人数
-						temp.setTrappedNum(value);
-					} else if("injured_num".equals(t.getFieldCode())) {
-						// 受伤人数
-						if(StringUtils.isNotEmpty(value)) {
-							temp.setHasDeadHurt("有");
-						}
-					} else if("die_num".equals(t.getFieldCode())) {
-						// 死亡人数
-						if(StringUtils.isNotEmpty(value)) {
-							temp.setHasDeadHurt("有");
-						}
-					}
-				});
-				queryWrapper = new LambdaQueryWrapper<>();
-				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
-				// 派遣动态表单
-				paperList = iAlertFormValueService.list(queryWrapper);
-				paperList.stream().forEach(t -> {
-					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
-						// 故障原因
-						temp.setErrorResult(value);
-					} else if("fix_result".equals(t.getFieldCode())) {
-						// 维修结果
-						temp.setFixResult(value);
-					} else if("fix_remark".equals(t.getFieldCode())) {
-						// 维修备注
-						temp.setRemark(value);
-					}
-				});
-
-
-				imgMap = sourceFileService.getAttachments(temp.getPaperId());
-				imgDtos = imgMap.get("imgs");
-				temp.setFixImgs(imgDtos);
-
-				break;
-			case "961" : // 故障维修
-				queryWrapper = new LambdaQueryWrapper<>();
-				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
-				// 派遣动态表单
-				paperList = iAlertFormValueService.list(queryWrapper);
-				paperList.stream().forEach(t -> {
-					String value = t.getFieldValue();
-					if("save_time".equals(t.getFieldCode())) {
-						// 救援完成时间
-						if(StringUtils.isNotBlank(value)) {
-							temp.setSaveTime(DateUtils.longStr2Date(value));
-						}
-					} else if("error_result".equals(t.getFieldCode())) {
-						// 故障原因
-						temp.setErrorResult(value);
-					} else if("fix_result".equals(t.getFieldCode())) {
-						// 维修结果
-						temp.setFixResult(value);
-					} else if("fix_remark".equals(t.getFieldCode())) {
-						// 维修备注
-						temp.setRemark(value);
-					} else if("feedback_result".equals(t.getFieldCode())) {
-						// 反馈结果
-						temp.setFeedbackResult(value);
-					}
-				});
-
 
-				imgMap = sourceFileService.getAttachments(temp.getPaperId());
-				imgDtos = imgMap.get("imgs");
-				temp.setFixImgs(imgDtos);
-
-
-				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
-				errorImgDtos = errorImgMap.get("imgs");
-				temp.setErrorImgs(errorImgDtos);
-				break;
-			case "962" : // 投诉建议
-				queryWrapper = new LambdaQueryWrapper<>();
-				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
-				// 派遣动态表单
-				paperList = iAlertFormValueService.list(queryWrapper);
-				paperList.stream().forEach(t -> {
-					String value = t.getFieldValue();
-					if("action_result".equals(t.getFieldCode())) {
-						//	处置结果
-						temp.setActionResult(value);
-					}
-				});
-				break;
-		}
-		return temp;
-	}
 
 
 	private WechatMyBussinessDto getBussinessDtoById(Long alertId) {
@@ -688,6 +521,7 @@ public class WechatController extends BaseController {
 		List<AttachmentDto> imgDtos = null;
 		Map<String, List<AttachmentDto>> errorImgMap = null;
 		List<AttachmentDto> errorImgDtos = null;
+		List<AttachmentDto> feedbackDtos = null;
 		LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
 		switch (temp.getTaskTypeCode()) {
 			case "960" : // 困人救援
@@ -775,11 +609,11 @@ public class WechatController extends BaseController {
 				imgMap = sourceFileService.getAttachments(temp.getPaperId());
 				imgDtos = imgMap.get("imgs");
 				temp.setFixImgs(imgDtos);
-
-
 				errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
 				errorImgDtos = errorImgMap.get("imgs");
 				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
 				break;
 			case "962" : // 投诉建议
 				queryWrapper = new LambdaQueryWrapper<>();
@@ -793,6 +627,11 @@ public class WechatController extends BaseController {
 						temp.setActionResult(value);
 					}
 				});
+				errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
 				break;
 		}
 		return temp;

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

@@ -465,8 +465,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
             // 警情报送
             alertCalled.setAlertStatus(false);
-            alertCalled.setAlertSource(AlertStageEnums.GZHSB.getValue());
-            alertCalled.setAlertSourceCode(AlertStageEnums.GZHSB.getCode());
+            alertCalled.setAlertSource(AlertStageEnums.APPJJ.getValue());
+            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getCode());
             alertCalled.setIsDelete(false);
             alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
             alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
@@ -64,6 +65,10 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
     @Autowired
     RescueProcessServiceImpl rescueProcessServiceImpl;
 
+
+    @Autowired
+    AlertFormValueServiceImpl iAlertFormValueService;
+
     @Autowired
     private EmqKeeper emqKeeper;
 
@@ -197,15 +202,19 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             String person = dispatchTask.getResponseUserName();
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
-            DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
                  if(TzsCommonParam.FIX_RESULT.equals(alertFormValue.getFieldCode())) {
                     tempMap.put("fixResult",alertFormValue.getFieldValue());
                 }
+                if(TzsCommonParam.FIX_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                }
             });
-            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
+            // 反馈方式从动态表单中取得
+            String FKFS = tempMap.get("FKFS") == null ? "" :  tempMap.get("FKFS");
+            content = content.replace("$FKFS",FKFS).replace("$fixResult",tempMap.get("fixResult"));
         } else if(TzsCommonParam.WXFK_TS.equals(type)) { //从派遣单获取数据
             //投诉的维修反馈修改成维保已处置
             CZHJ = DispatchPaperEnums.disposed;
@@ -219,44 +228,40 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             dynamicForm.stream().forEach(alertFormValue -> {
                 if(TzsCommonParam.ACTION_RESULT.equals(alertFormValue.getFieldCode())) {
                     tempMap.put("fixResult",alertFormValue.getFieldValue());
+                } else if(TzsCommonParam.CONSULT_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
+            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$fixResult",tempMap.get("fixResult"));
             type = TzsCommonParam.WXFK;
         } else if(TzsCommonParam.BXFK.equals(type)) {
             //报修反馈
             CZHJ = DispatchPaperEnums.reportorBack;
-            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
-            String person = dispatchTask.getResponseUserName();
+            String person = alertCalledVo.getEmergencyPerson() + "(" + alertCalledVo.getEmergencyCall() + ")";
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
-                if(TzsCommonParam.FIX_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
-                } else if(TzsCommonParam.FIX_RESULT.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put("fixResult",alertFormValue.getFieldValue());
+                if(TzsCommonParam.FEEDBACK_RESULT.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("feedbackResult",alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("fixResult"));
+            content = content.replace("$FKFS",dispatchPaperFormDto.getDispatchPaper().getFeedbackType()).replace("$feedbackResult",tempMap.get("feedbackResult"));
         } else if(TzsCommonParam.TSRFK.equals(type)) {
             //投诉人已反馈
             CZHJ = DispatchPaperEnums.complainantBack;
-            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
-            String person = dispatchTask.getResponseUserName();
+            String person = alertCalledVo.getEmergencyPerson() + "(" + alertCalledVo.getEmergencyCall() + ")";
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
-                if(TzsCommonParam.CONSULT_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
-                } else if(TzsCommonParam.ACTION_RESULT.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put("action_result",alertFormValue.getFieldValue());
+                if(TzsCommonParam.FEEDBACK_RESULT.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("feedbackResult",alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("action_result"));
+            content = content.replace("$FKFS",dispatchPaperFormDto.getDispatchPaper().getFeedbackType()).replace("$feedbackResult",tempMap.get("feedbackResult"));
         }
         AlertStageEnums RZHJ = AlertStageEnums.getEnumByCode(type);
         repairConsult.setType(RZHJ.getCode());

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

@@ -42,9 +42,9 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 tzs.cti.url=http://36.46.151.113:8000
 
 tzs.wechat.url=https://api.weixin.qq.com
-##wechatAPPID wx79aca5bb1cb4af92  wx8918c1aaad956617
-tzs.wechat.appid=wx79aca5bb1cb4af92
-##wechatSECRET 337c3d8f3e749140d4f9aedc8311033b  f3a12323ba731d282c3d4698c27c3e97
+##wechatAPPID wx79aca5bb1cb4af92   uat-wx8918c1aaad956617
+tzs.wechat.appid=wx8918c1aaad956617
+##wechatSECRET f3a12323ba731d282c3d4698c27c3e97 uat-337c3d8f3e749140d4f9aedc8311033b
 tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
 
 ##wechatToken