接口测试修正

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,8 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author tb
@@ -212,8 +209,8 @@ public class ElevatorDto extends BaseDto {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
-    @ApiModelProperty(value = "附件")
-    private Map<String, List<AttachmentDto>> attachments;
+   // @ApiModelProperty(value = "附件")
+    //private Map<String, List<AttachmentDto>> attachments;
 
     @ApiModelProperty(value = "经度")
     private String longitude;

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

@@ -8,33 +8,36 @@ package com.yeejoin.amos.boot.module.tzs.api.enums;
 public  enum  AlertStageEnums {
 
 	
-	//报警类型
-	JQCB("297","警情初报"),
-	JQGB("298","警情归并"),
+	//报警类型BJLX
+	JQCB("958","JQCB","警情初报"),
+	JQGB("959","JQGB","警情归并"),
 
-	//警情类型
+	//警情类型JQLX
 	
-	KRJY("247","困人救援"),
-	GZWX("248",	"故障维修"),
-	TSZX("249",	"投诉咨询"),
+	KRJY("960","KRJY","困人救援"),
+	GZWX("961","GZWX",	"故障维修"),
+	TSZX("962","TSZX",	"投诉咨询"),
 
-	// 来源类型
-	DHBJ("233","电话报警"),
+	// 来源类型JQLYLX
+	DHBJ("963","233","电话报警"),
 
-	// 警情阶段
-	JJ("JJQK-247","接警"),
-	PQ("241","派遣"),
-	DD("242","抵达"),
-	HF("243","回访"),
-	WX("244","维修"),
-	FK("245","反馈");
+	// 警情阶段 JQJD
+	JJ("964","JJ","接警"),
+	PQ("965","PQ","派遣"),
+	DD("966","DD","抵达"),
+	JC("967","JC","救出"),
+	JYHF("968","JYHF","救援回访"),
+	WXFK("969","WXFK","维修反馈"),
+	BXFK("970","BXFK","报修反馈"),
+	TSRFK("971","TSRFK","投诉人反馈");
 
 
 
-	
+	private String id;
 	private String code;
 	private String value;
-	AlertStageEnums(String code, String value) {
+	AlertStageEnums(String id, String code, String value) {
+		this.id = id;
 		this.code=code;
 		this.value=value;
 	}
@@ -51,5 +54,36 @@ public  enum  AlertStageEnums {
 		this.value = value;
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public static AlertStageEnums getEnumById(String id)
+	{
+		for (AlertStageEnums status : AlertStageEnums.values())
+		{
+			if (status.getId().equals(id))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+
+	public static AlertStageEnums getEnumByCode(String code)
+	{
+		for (AlertStageEnums status : AlertStageEnums.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
 	
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
+
 /**
  * 警情接警填报记录接口类
  *
@@ -15,4 +17,11 @@ public interface IAlertCalledService {
      *
      * **/
     Object selectAlertCalledById( Long id);
+
+    /**
+     *
+     * 根据警情返回信息，不读取缓存
+     *
+     * **/
+    AlertCalledFormDto selectAlertCalledByIdNoCache(Long id);
 }

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

@@ -9,4 +9,13 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
  */
 public interface IRepairConsultService {
 
+    /**
+     * 根据警情id 和类型记录处置过程
+     * @param alertId
+     * @param type
+     * @param taskId
+     * @return
+     */
+    Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -94,4 +96,7 @@ public class MaintenanceUnitVo extends BaseEntity {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -67,4 +69,7 @@ public class RescueStationVo extends BaseEntity {
     @ApiModelProperty(value = "经纬度")
     private String longitudeLatitude;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -73,4 +75,7 @@ public class UseUnitVo extends BaseEntity {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
+import com.yeejoin.amos.boot.module.tzs.api.vo.DutyPersonVo;
 import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitNameVo;
 import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo;
 import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -30,7 +32,9 @@ 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 java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -251,6 +255,21 @@ public class MaintenanceUnitController extends BaseController {
         if (ValidationUtil.isEmpty(maintenanceUnit))
             throw new BadRequest("维保单位未找到");
         MaintenanceUnitVo maintenanceUnitVo = BeanDtoVoUtils.convert(maintenanceUnit, MaintenanceUnitVo.class);
+        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
+        DutyPersonVo principal = new DutyPersonVo();
+        principal.setDeptName("主要负责人1");
+        principal.setPhone(maintenanceUnitVo.getPrincipalFirstPhone());
+        principal.setUserId(maintenanceUnitVo.getPrincipalFirstId()+"");
+        principal.setUserName(maintenanceUnitVo.getPrincipalFirst());
+        dutyPersonList.add(principal);
+        DutyPersonVo manager = new DutyPersonVo();
+        manager.setDeptName("主要负责人2");
+        manager.setPhone(maintenanceUnitVo.getPrincipalSecondPhone());
+        manager.setUserId(maintenanceUnitVo.getPrincipalSecondId()+"");
+        manager.setUserName(maintenanceUnitVo.getPrincipalSecond());
+        dutyPersonList.add(manager);
+        maintenanceUnitVo.setDutyPersonList(dutyPersonList);
+
         return ResponseHelper.buildResponse(maintenanceUnitVo);
     }
 

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

@@ -33,7 +33,7 @@ import java.util.List;
  * @date 2021-08-03
  */
 @RestController
-@Api(tags = "警情填报业务数据项Api")
+@Api(tags = "处置过程Api")
 @RequestMapping(value = "/tzs/repair-consult")
 public class RepairConsultController extends BaseController {
 
@@ -54,64 +54,6 @@ public class RepairConsultController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新警情填报业务数据项", notes = "根据sequenceNbr更新警情填报业务数据项")
-	public ResponseModel<RepairConsultDto> updateBySequenceNbrRepairConsult(@RequestBody RepairConsultDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.updateWithModel(model));
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除警情填报业务数据项", notes = "根据sequenceNbr删除警情填报业务数据项")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(repairConsultServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个警情填报业务数据项",  notes = "根据sequenceNbr查询单个警情填报业务数据项")
-	public ResponseModel<RepairConsultDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "警情填报业务数据项分页查询",  notes = "警情填报业务数据项分页查询")
-	public ResponseModel<Page<RepairConsultDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<RepairConsultDto> page = new Page<RepairConsultDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.queryForRepairConsultPage(page));
-	}
-
-	/**
 	 * 根据警情id 查找处置过程日志
 	 *
 	 * @return

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

@@ -10,10 +10,12 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
+import com.yeejoin.amos.boot.module.tzs.api.vo.DutyPersonVo;
 import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -31,7 +33,9 @@ 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 java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 //import com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService;
 
@@ -215,6 +219,20 @@ public class UseUnitController extends BaseController {
         if (ValidationUtil.isEmpty(useUnit))
             throw new BadRequest("使用单位未找到");
         UseUnitVo useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitVo.class);
+        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
+        DutyPersonVo principal = new DutyPersonVo();
+        principal.setDeptName("主要负责人");
+        principal.setPhone(useUnitVo.getPrincipalPhone());
+        principal.setUserId(useUnitVo.getPrincipalId()+"");
+        principal.setUserName(useUnitVo.getPrincipal());
+        dutyPersonList.add(principal);
+        DutyPersonVo manager = new DutyPersonVo();
+        manager.setDeptName("电梯安全管理员");
+        manager.setPhone(useUnitVo.getManagerPhone());
+        manager.setUserId(useUnitVo.getManagerId()+"");
+        manager.setUserName(useUnitVo.getManager());
+        dutyPersonList.add(manager);
+        useUnitVo.setDutyPersonList(dutyPersonList);
         return ResponseHelper.buildResponse(useUnitVo);
     }
 }

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

@@ -54,64 +54,6 @@ public class VoiceRecordFileController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新通话记录附件", notes = "根据sequenceNbr更新通话记录附件")
-	public ResponseModel<VoiceRecordFileDto> updateBySequenceNbrVoiceRecordFile(@RequestBody VoiceRecordFileDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.updateWithModel(model));
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除通话记录附件", notes = "根据sequenceNbr删除通话记录附件")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个通话记录附件",  notes = "根据sequenceNbr查询单个通话记录附件")
-	public ResponseModel<VoiceRecordFileDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "通话记录附件分页查询",  notes = "通话记录附件分页查询")
-	public ResponseModel<Page<VoiceRecordFileDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<VoiceRecordFileDto> page = new Page<VoiceRecordFileDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.queryForVoiceRecordFilePage(page));
-	}
-
-	/**
 	 * 根据警情id 查找通话记录信息
 	 *
 	 * @return

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

@@ -116,6 +116,41 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
     }
 
+    @Override
+    public AlertCalledFormDto selectAlertCalledByIdNoCache(Long id) {
+        // 警情基本信息
+        AlertCalled alertCalled = this.getById(id);
+        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("alert_called_id", id);
+        // 警情动态表单数据
+        List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
+        List<FormValue> formValue = new ArrayList<FormValue>();
+        if(list!=null&&list.size()>0) {
+            for (AlertFormValue alertFormValue : list) {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
+                formValue.add(value);
+            }
+        }
+        AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
+        AlertCalledVo alertCalledVo = AlertBeanDtoVoUtils.convertAlertCalledDtoToVo(alertCalledDto);
+        QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
+        elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
+        elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
+        Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
+        if(null !=  elevator) {
+            alertCalledVo.setAddress(elevator.getAddress());
+            alertCalledVo.setProvince(elevator.getProvince());
+            alertCalledVo.setCity(elevator.getCity());
+            alertCalledVo.setDistrict(elevator.getDistrict());
+            alertCalledVo.setUseStatus(elevator.getUseStatus());
+            alertCalledVo.setUseSiteCategory(elevator.getUseSiteCategory());
+            alertCalledVo.setUseUnit(elevator.getUseUnit());
+            alertCalledVo.setRegionCode(elevator.getRegionCode());
+        }
+        AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledVo, formValue);
+        return alertCalledFormVo;
+    }
+
 
     /**
      *

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

@@ -204,7 +204,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId) {
         DispatchSaveFeedbackDto dispatchSaveFeedbackDto = new DispatchSaveFeedbackDto();
         dispatchSaveFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchSaveFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -353,9 +353,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setRemark(dispatchSaveFeedbackDto.getRemark());
         dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 
@@ -363,7 +363,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId) {
         DispatchRepairFeedbackDto dispatchRepairFeedbackDto = new DispatchRepairFeedbackDto();
         dispatchRepairFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchRepairFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -543,9 +543,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setRemark(dispatchRepairFeedbackDto.getRemark());
         dispatchPaper.setFeedbackTime(dispatchRepairFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 
@@ -553,7 +553,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId) {
         DispatchConsultFeedbackDto dispatchConsultFeedbackDto = new DispatchConsultFeedbackDto();
         dispatchConsultFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo =  alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchConsultFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -720,9 +720,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUname(dispatchConsultFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchConsultFeedbackDto.getRemark());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RepairConsult;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
+import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.RepairConsultMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 警情填报业务数据项服务实现类
@@ -24,10 +44,175 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         return this.queryForPage(page, null, false);
     }
 
+    @Autowired
+    TemplateServiceImpl templateServiceImpl;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Autowired
+    private AlertCalledServiceImpl alertCalledServiceImpl;
+
+    @Autowired
+    DispatchPaperServiceImpl dispatchPaperServiceImpl;
+
+    @Autowired
+    DispatchTaskServiceImpl dispatchTaskServiceImpl;
+
     /**
      * 列表查询 示例
      */
     public List<RepairConsultDto> queryForRepairConsultList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId) {
+        Boolean flag = false;
+        RepairConsult repairConsult = new RepairConsult();
+        repairConsult.setParentId(alertId);
+        AlertCalledFormDto alertCallFrom = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
+        if(alertCallFrom == null || alertCallFrom.getAlertCalledVo() == null) {
+            throw new BadRequest("未找到警情信息");
+        }
+        AlertCalledVo alertCalledVo  = alertCallFrom.getAlertCalledVo();
+        // 获取模板 拼接json
+        QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
+        templateQueryWrapper.eq("type_code","RECORD-" + type);
+        Template template = templateServiceImpl.getOne(templateQueryWrapper);
+        String content = template.getContent();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String createTime = sdf.format(new Date());
+        if("JJ".equals(type)) {
+            String createUser = getUser().getUserName();
+            String emergency_call = alertCalledVo.getEmergencyCall();
+            String area = alertCalledVo.getAddress();
+            String alertType = alertCalledVo.getAlarmType();
+            content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$call",emergency_call);
+            content = content.replace("$area",area).replace("$alertType",alertType);
+        } else if("PQ".equals(type)) {
+            String createUser = getUser().getUserName();
+
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String unit = dispatchTask.getResponseOrgName();
+            String person = dispatchTask.getResponseUserName();
+            String phone = dispatchTask.getResponseUserTel();
+            String taskType = "";
+            if("960".equals( alertCalledVo.getAlarmTypeCode())) {
+                taskType = "救援任务单";
+            } else if("961".equals( alertCalledVo.getAlarmTypeCode())) {
+                taskType = "故障维修单";
+            } else if("962".equals( alertCalledVo.getAlarmTypeCode())) {
+                taskType = "投诉处理单";
+            }
+            content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$unit",unit);
+            content = content.replace("$person",person).replace("$phone",phone).replace("$taskType",taskType);
+        } else if("DD".equals(type)) {
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
+            List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
+            content = content.replace("$createTime",createTime).replace("$person",person);
+            dynamicForm.stream().forEach(alertFormValue -> {
+                if("arrive_feedback_type".equals(alertFormValue.getFieldCode())) {
+                    String FKFS = alertFormValue.getFieldValue();
+                    repairConsult.setDescription(FKFS);
+                }
+            });
+            content = content.replace("$FKFS",repairConsult.getDescription());
+        } else if("JC".equals(type)) {
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
+            List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
+            Map<String,String> tempMap = new HashMap<String,String>();
+            content = content.replace("$createTime",createTime).replace("$person",person);
+            dynamicForm.stream().forEach(alertFormValue -> {
+                if("arrive_feedback_type".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                }
+            });
+            content = content.replace("$FKFS",tempMap.get("FKFS"));
+        } else if("JYHF".equals(type)) {
+            String createUser = getUser().getUserName();
+            String create = alertCalledVo.getEmergencyPerson();
+            content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
+        } else if("WXFK".equals(type)) {
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            String fix_result =
+                    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("fix_feedback_type".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                } else if("fix_result".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("fixResult",alertFormValue.getFieldValue());
+                }
+            });
+            content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$fixResult",tempMap.get("fixResult"));
+        } else if("BXFK".equals(type)) {
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            String fix_result =
+                    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("fix_feedback_type".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                } else if("fix_result".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("fixResult",alertFormValue.getFieldValue());
+                }
+            });
+            content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$feedbackResult",tempMap.get("fixResult"));
+        } else if("TSRFK".equals(type)) {
+            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
+            String person = dispatchTask.getResponseUserName();
+            String fix_result =
+                    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("consult_feedback_type".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                } else if("action_result".equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("action_result",alertFormValue.getFieldValue());
+                }
+            });
+            content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$feedbackResult",tempMap.get("action_result"));
+        }
+        repairConsult.setType(type);
+        repairConsult.setAlertStageCode(AlertStageEnums.getEnumByCode(type).getId());
+        repairConsult.setAlertStatus(AlertStageEnums.getEnumByCode(type).getValue());
+        repairConsult.setDescription(content);
+        flag = this.save(repairConsult);
+        return flag;
+    }
+
+    private AgencyUserModel getUser() {
+        ReginParams reginParams =
+                JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
+                        redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+        return  reginParams.getUserModel();
+    }
+
+    protected String buildKey(String token) {
+        // 由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时，
+        return "region_" + token;
+
+    }
+
+    /**
+     * 获取token
+     **/
+    protected String getToken() {
+        return RequestContext.getToken();
+    }
+
+
 }
\ No newline at end of file