Skip to content

A
amos-boot-biz
Commit 951f94ce authored by kongfm's avatar kongfm
Browse files
Options

优化代码

parent 03cf25ae
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 104 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/TzsCommonParam.java 0 → 100644
View file @ 951f94ce
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
* @author kongfm
* @date 2021/8/16.
*/
public class TzsCommonParam {
public static final String SAVE_FEEDBACK_TIME = "save_feedback_time";
public static final String SAVE_FEEDBACK_USER = "save_feedback_user";
public static final String SAVE_FEEDBACK_UID = "save_feedback_uid";
public static final String SAVE_FEEDBACK_RESULT = "save_feedback_result";
public static final String FIX_RESULT = "fix_result";
public static final String ERROR_RESULT = "error_result";
public static final String FIX_REMARK = "fix_remark";
public static final String FIX_FEEDBACK_TIME = "fix_feedback_time";
public static final String FEEDBACK_RESULT = "feedback_result";
public static final String FIX_FEEDBACK_TYPE = "fix_feedback_type";
public static final String FIX_FEEDBACK_UNAME = "fix_feedback_uname";
public static final String FIX_FEEDBACK_UID = "fix_feedback_uid";
public static final String CONSULT_FEEDBACK_TIME = "consult_feedback_time";
public static final String ACTION_RESULT = "action_result";
public static final String CONSULT_FEEDBACK_TYPE = "consult_feedback_type";
public static final String CONSULT_FEEDBACK_UNAME = "consult_feedback_uname";
public static final String CONSULT_FEEDBACK_UID = "consult_feedback_uid";
public static final String MAIN_FEEDBACK_RESULT = "main_feedback_result";
public static final String PQ = "PQ";
public static final String JYHF = "JYHF";
public static final String WXJG = "WXJG";
public static final String GZYY = "GZYY";
public static final String WXFK = "WXFK";
public static final String BXFK = "BXFK";
public static final String FKFS = "FKFS";
public static final String TSRFK = "TSRFK";
public static final String CZJG = "CZJG";
public static final String FKJG = "FKJG";
public static final String WXFK_TS = "WXFK_TS";
public static final String DD = "DD";
public static final String JC = "JC";
}
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
View file @ 951f94ce
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertFormInitDto;
......@@ -20,6 +21,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.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchPaperMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchPaperService;
import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
......@@ -31,8 +33,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
......@@ -201,7 +201,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
rescueProcessServiceImpl.updateByAlertId(rescueProcessDto,null);
}
// 修改警情到派遣阶段
alertCalledServiceImpl.updateAlertStageByAlertId(alertId,"PQ");
alertCalledServiceImpl.updateAlertStageByAlertId(alertId,TzsCommonParam.PQ);
return dispatchPaperFormDto;
}
......@@ -252,23 +252,22 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dynamicFormAlert.stream().forEach(alertFormValue -> {
String value = null;
switch (alertFormValue.getFieldCode()) {
case "save_feedback_time":
case TzsCommonParam.SAVE_FEEDBACK_TIME:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchSaveFeedbackDto.setSaveFeedbackTime(null);
} else {
try {
dispatchSaveFeedbackDto.setSaveFeedbackTime(sdf.parse(value));
} catch (ParseException e) {
dispatchSaveFeedbackDto.setSaveFeedbackTime(DateUtils.longStr2Date(value));
} catch (Exception e) {
throw new BadRequest("救援时间格式错误");
}
}
break;
case "save_feedback_user":
case TzsCommonParam.SAVE_FEEDBACK_USER:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchSaveFeedbackDto.setSaveFeedbackUser(null);
......@@ -276,7 +275,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchSaveFeedbackDto.setSaveFeedbackUser(value);
}
break;
case "save_feedback_uid":
case TzsCommonParam.SAVE_FEEDBACK_UID:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchSaveFeedbackDto.setSaveFeedbackUid(null);
......@@ -284,19 +283,19 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchSaveFeedbackDto.setSaveFeedbackUid(value);
}
break;
case "save_feedback_result":
case TzsCommonParam.SAVE_FEEDBACK_RESULT:
value = alertFormValue.getFieldValue();
dispatchSaveFeedbackDto.setSaveFeedbackResult(value);
break;
case "fix_result":
case TzsCommonParam.FIX_RESULT:
value = alertFormValue.getFieldValueCode();
dispatchSaveFeedbackDto.setFixResult(value);
break;
case "error_result":
case TzsCommonParam.ERROR_RESULT:
value = alertFormValue.getFieldValueCode();
dispatchSaveFeedbackDto.setErrorResult(value);
break;
case "fix_remark":
case TzsCommonParam.FIX_REMARK:
value = alertFormValue.getFieldValueCode();
dispatchSaveFeedbackDto.setFixRemark(value);
break;
......@@ -316,49 +315,48 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dynamicFormAlert.stream().forEach(alertFormValue -> {
switch (alertFormValue.getFieldCode()) {
case "save_feedback_time":
case TzsCommonParam.SAVE_FEEDBACK_TIME:
if (dispatchSaveFeedbackDto.getSaveFeedbackTime() != null) {
if(alertFormValue.getFieldValue() == null ) {
// 坐席回访
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"JYHF",null,user);
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.JYHF,null,user);
// 修改警情到救援反馈
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),"JYHF");
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.JYHF);
}
alertFormValue.setFieldValue(sdf.format(dispatchSaveFeedbackDto.getSaveFeedbackTime()));
alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchSaveFeedbackDto.getSaveFeedbackTime()));
}
break;
case "save_feedback_user":
case TzsCommonParam.SAVE_FEEDBACK_USER:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getSaveFeedbackUser()))
alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getSaveFeedbackUser());
break;
case "save_feedback_uid":
case TzsCommonParam.SAVE_FEEDBACK_UID:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getSaveFeedbackUid()))
alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getSaveFeedbackUid());
break;
case "save_feedback_result":
case TzsCommonParam.SAVE_FEEDBACK_RESULT:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getSaveFeedbackResult()))
alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getSaveFeedbackResult());
break;
case "fix_remark":
case TzsCommonParam.FIX_REMARK:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getFixRemark()))
alertFormValue.setFieldValue(dispatchSaveFeedbackDto.getFixRemark());
break;
case "fix_result":
case TzsCommonParam.FIX_RESULT:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getFixResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "WXJG").eq("code", dispatchSaveFeedbackDto.getFixResult());
queryWrapper.eq("type", TzsCommonParam.WXJG).eq("code", dispatchSaveFeedbackDto.getFixResult());
DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(fixResult.getName());
alertFormValue.setFieldValueCode(fixResult.getCode());
}
break;
case "error_result":
case TzsCommonParam.ERROR_RESULT:
if (StringUtils.isNotBlank(dispatchSaveFeedbackDto.getErrorResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "GZYY").eq("code", dispatchSaveFeedbackDto.getErrorResult());
queryWrapper.eq("type", TzsCommonParam.GZYY).eq("code", dispatchSaveFeedbackDto.getErrorResult());
DataDictionary errorResult = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(errorResult.getName());
alertFormValue.setFieldValueCode(errorResult.getCode());
......@@ -377,9 +375,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
if(taskId == null) {
throw new BadRequest("未找到反馈任务单");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),"WXFK",taskId,user);
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK,taskId,user);
// 修改警情到维修反馈
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),"WXFK");
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK);
}
dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
// 保存动态表单数据
......@@ -441,31 +439,30 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dynamicFormAlert.stream().forEach(alertFormValue -> {
String value = null;
switch (alertFormValue.getFieldCode()) {
case "fix_feedback_time": //报修反馈时间
case TzsCommonParam.FIX_FEEDBACK_TIME: //报修反馈时间
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchRepairFeedbackDto.setFixFeedbackTime(null);
} else {
try {
dispatchRepairFeedbackDto.setFixFeedbackTime(sdf.parse(value));
} catch (ParseException e) {
dispatchRepairFeedbackDto.setFixFeedbackTime(DateUtils.longStr2Date(value));
} catch (Exception e) {
throw new BadRequest("维修反馈时间格式错误");
}
}
break;
case "feedback_result"://报修结果
case TzsCommonParam.FEEDBACK_RESULT://报修结果
value = alertFormValue.getFieldValueCode();
dispatchRepairFeedbackDto.setFeedbackResult(value);
break;
case "fix_feedback_type":// 保修反馈方式
case TzsCommonParam.FIX_FEEDBACK_TYPE:// 保修反馈方式
value = alertFormValue.getFieldValueCode();
dispatchRepairFeedbackDto.setFixFeedbackType(value);
break;
case "fix_feedback_uname":
case TzsCommonParam.FIX_FEEDBACK_UNAME:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchRepairFeedbackDto.setFixFeedbackUname(null);
......@@ -473,7 +470,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchRepairFeedbackDto.setFixFeedbackUname(value);
}
break;
case "fix_feedback_uid":
case TzsCommonParam.FIX_FEEDBACK_UID:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchRepairFeedbackDto.setFixFeedbackUid(null);
......@@ -481,15 +478,15 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchRepairFeedbackDto.setFixFeedbackUid(value);
}
break;
case "fix_result":
case TzsCommonParam.FIX_RESULT:
value = alertFormValue.getFieldValueCode();
dispatchRepairFeedbackDto.setFixResult(value);
break;
case "error_result":
case TzsCommonParam.ERROR_RESULT:
value = alertFormValue.getFieldValueCode();
dispatchRepairFeedbackDto.setErrorResult(value);
break;
case "fix_remark":
case TzsCommonParam.FIX_REMARK:
value = alertFormValue.getFieldValue();
dispatchRepairFeedbackDto.setFixRemark(value);
break;
......@@ -509,63 +506,62 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Map<String,Boolean> tempMap = new HashMap<String,Boolean>();
dynamicFormAlert.stream().forEach(alertFormValue -> {
switch (alertFormValue.getFieldCode()) {
case "fix_feedback_time":
case TzsCommonParam.FIX_FEEDBACK_TIME:
if (dispatchRepairFeedbackDto.getFixFeedbackTime() != null) {
if(alertFormValue.getFieldValue() == null) {
tempMap.put("BXFK",true);
tempMap.put(TzsCommonParam.BXFK,true);
}
alertFormValue.setFieldValue(sdf.format(dispatchRepairFeedbackDto.getFixFeedbackTime()));
alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchRepairFeedbackDto.getFixFeedbackTime()));
}
break;
case "feedback_result":
case TzsCommonParam.FEEDBACK_RESULT:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFeedbackResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "WXJG").eq("code", dispatchRepairFeedbackDto.getFeedbackResult());
queryWrapper.eq("type", TzsCommonParam.WXJG).eq("code", dispatchRepairFeedbackDto.getFeedbackResult());
DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(feedbackType.getName());
alertFormValue.setFieldValueCode(feedbackType.getCode());
}
break;
case "fix_feedback_type":
case TzsCommonParam.FIX_FEEDBACK_TYPE:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixFeedbackType())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "FKFS").eq("code", dispatchRepairFeedbackDto.getFixFeedbackType());
queryWrapper.eq("type", TzsCommonParam.FKFS).eq("code", dispatchRepairFeedbackDto.getFixFeedbackType());
DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(feedbackType.getName());
alertFormValue.setFieldValueCode(feedbackType.getCode());
}
break;
case "fix_feedback_uname":
case TzsCommonParam.FIX_FEEDBACK_UNAME:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixFeedbackUname()))
alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFixFeedbackUname());
break;
case "fix_feedback_uid":
case TzsCommonParam.FIX_FEEDBACK_UID:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixFeedbackUid()))
alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFixFeedbackUid());
break;
case "fix_result":
case TzsCommonParam.FIX_RESULT:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "WXJG").eq("code", dispatchRepairFeedbackDto.getFixResult());
queryWrapper.eq("type", TzsCommonParam.WXJG).eq("code", dispatchRepairFeedbackDto.getFixResult());
DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(fixResult.getName());
alertFormValue.setFieldValueCode(fixResult.getCode());
}
break;
case "error_result":
case TzsCommonParam.ERROR_RESULT:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getErrorResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "GZYY").eq("code", dispatchRepairFeedbackDto.getErrorResult());
queryWrapper.eq("type", TzsCommonParam.GZYY).eq("code", dispatchRepairFeedbackDto.getErrorResult());
DataDictionary errorResult = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(errorResult.getName());
alertFormValue.setFieldValueCode(errorResult.getCode());
}
break;
case "fix_remark":
case TzsCommonParam.FIX_REMARK:
if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFixRemark()))
alertFormValue.setFieldValue(dispatchRepairFeedbackDto.getFixRemark());
break;
......@@ -661,35 +657,34 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dynamicFormAlert.stream().forEach(alertFormValue -> {
String value = null;
switch (alertFormValue.getFieldCode()) {
case "consult_feedback_time": //咨询反馈时间
case TzsCommonParam.CONSULT_FEEDBACK_TIME: //咨询反馈时间
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchConsultFeedbackDto.setConsultFeedbackTime(null);
} else {
try {
dispatchConsultFeedbackDto.setConsultFeedbackTime(sdf.parse(value));
} catch (ParseException e) {
dispatchConsultFeedbackDto.setConsultFeedbackTime(DateUtils.longStr2Date(value));
} catch (Exception e) {
throw new BadRequest("咨询反馈时间格式错误");
}
}
break;
case "action_result"://处置结果
case TzsCommonParam.ACTION_RESULT://处置结果
value = alertFormValue.getFieldValueCode();
dispatchConsultFeedbackDto.setActionResult(value);
break;
case "feedback_result"://咨询反馈结果
case TzsCommonParam.FEEDBACK_RESULT://咨询反馈结果
value = alertFormValue.getFieldValueCode();
dispatchConsultFeedbackDto.setFeedbackResult(value);
break;
case "consult_feedback_type":// 咨询反馈方式
case TzsCommonParam.CONSULT_FEEDBACK_TYPE:// 咨询反馈方式
value = alertFormValue.getFieldValueCode();
dispatchConsultFeedbackDto.setConsultFeedbackType(value);
break;
case "consult_feedback_uname":
case TzsCommonParam.CONSULT_FEEDBACK_UNAME:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchConsultFeedbackDto.setConsultFeedbackUname(null);
......@@ -697,7 +692,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchConsultFeedbackDto.setConsultFeedbackUname(value);
}
break;
case "consult_feedback_uid":
case TzsCommonParam.CONSULT_FEEDBACK_UID:
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchConsultFeedbackDto.setConsultFeedbackUid(null);
......@@ -705,7 +700,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchConsultFeedbackDto.setConsultFeedbackUid(value);
}
break;
case "main_feedback_result":
case TzsCommonParam.MAIN_FEEDBACK_RESULT:
value = alertFormValue.getFieldValue();
dispatchConsultFeedbackDto.setMainFeedbackResult(value);
break;
......@@ -724,52 +719,51 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
// 动态字段
List<AlertFormValue> dynamicFormAlert = dispatchPaperFormDto.getDynamicFormAlert();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Map<String,Boolean> tempMap = new HashMap<String,Boolean>();
dynamicFormAlert.stream().forEach(alertFormValue -> {
switch (alertFormValue.getFieldCode()) {
case "consult_feedback_time":
case TzsCommonParam.CONSULT_FEEDBACK_TIME:
if (dispatchConsultFeedbackDto.getConsultFeedbackTime() != null) {
if(alertFormValue.getFieldValue() == null ) {
tempMap.put("TSRFK",true);
tempMap.put(TzsCommonParam.TSRFK,true);
}
alertFormValue.setFieldValue(sdf.format(dispatchConsultFeedbackDto.getConsultFeedbackTime()));
alertFormValue.setFieldValue(DateUtils.date2LongStr(dispatchConsultFeedbackDto.getConsultFeedbackTime()));
}
break;
case "action_result":
case TzsCommonParam.ACTION_RESULT:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getActionResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "CZJG").eq("code", dispatchConsultFeedbackDto.getActionResult());
queryWrapper.eq("type", TzsCommonParam.CZJG).eq("code", dispatchConsultFeedbackDto.getActionResult());
DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(feedbackType.getName());
alertFormValue.setFieldValueCode(feedbackType.getCode());
}
break;
case "consult_feedback_type":
case TzsCommonParam.CONSULT_FEEDBACK_TYPE:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getConsultFeedbackType())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "FKFS").eq("code", dispatchConsultFeedbackDto.getConsultFeedbackType());
queryWrapper.eq("type", TzsCommonParam.FKFS).eq("code", dispatchConsultFeedbackDto.getConsultFeedbackType());
DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(feedbackType.getName());
alertFormValue.setFieldValueCode(feedbackType.getCode());
}
break;
case "consult_feedback_uname":
case TzsCommonParam.CONSULT_FEEDBACK_UNAME:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getConsultFeedbackUname()))
alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getConsultFeedbackUname());
break;
case "consult_feedback_uid":
case TzsCommonParam.CONSULT_FEEDBACK_UID:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getConsultFeedbackUid()))
alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getConsultFeedbackUid());
break;
case "main_feedback_result":
case TzsCommonParam.MAIN_FEEDBACK_RESULT:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getMainFeedbackResult()))
alertFormValue.setFieldValue(dispatchConsultFeedbackDto.getMainFeedbackResult());
break;
case "feedback_result":
case TzsCommonParam.FEEDBACK_RESULT:
if (StringUtils.isNotBlank(dispatchConsultFeedbackDto.getFeedbackResult())) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "FKJG").eq("code", dispatchConsultFeedbackDto.getFeedbackResult());
queryWrapper.eq("type", TzsCommonParam.FKJG).eq("code", dispatchConsultFeedbackDto.getFeedbackResult());
DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
alertFormValue.setFieldValue(feedbackType.getName());
alertFormValue.setFieldValueCode(feedbackType.getCode());
......@@ -798,8 +792,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
throw new BadRequest("未找到反馈任务单");
}
// 修改警情到维修反馈
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"WXFK");
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"WXFK-TS",taskId,user);
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),TzsCommonParam.WXFK);
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),TzsCommonParam.WXFK_TS,taskId,user);
}
if(tempMap.get("TSRFK") != null) {
// 修改警情到投诉人反馈
......@@ -808,8 +802,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
if(taskId == null) {
throw new BadRequest("未找到反馈任务单");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),"TSRFK",taskId,user);
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),"TSRFK");
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchConsultFeedbackDto.getAlertId(),TzsCommonParam.TSRFK,taskId,user);
alertCalledServiceImpl.updateAlertStageByAlertId(dispatchConsultFeedbackDto.getAlertId(),TzsCommonParam.TSRFK);
}
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/DispatchTaskServiceImpl.java
View file @ 951f94ce
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
......@@ -105,8 +106,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
String content = template.getContent();
// 替换模板内容
// 通用替换字段 报修时间 地址 电梯识别码 使用单位分类
SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
String createTime = sdf.format(alertCalledDto.getCallTime());
String createTime = DateUtils.date2LongStr(alertCalledDto.getCallTime());
String rescueCode = alertCalledDto.getDeviceId();
String emergencyCall = alertCalledDto.getEmergencyCall() == null ? "" : alertCalledDto.getEmergencyCall();
......
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
View file @ 951f94ce
......@@ -16,6 +16,7 @@ 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.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.tzs.api.mapper.RepairConsultMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
......@@ -83,7 +84,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
AlertCalledDto alertCalledVo = alertCallFrom.getAlertCalledDto();
// 获取模板 拼接json
QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
if("WXFK-TS".equals(type)) {
if(TzsCommonParam.WXFK_TS.equals(type)) {
templateQueryWrapper.eq("type_code","RECORD-WXFK");
} else {
templateQueryWrapper.eq("type_code","RECORD-" + type);
......@@ -107,7 +108,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
throw new BadRequest("警情类型缺失");
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)) {
} else if(TzsCommonParam.PQ.equals(type)) {
String createUser = user.getUserName();
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String unit = dispatchTask.getResponseOrgName();
......@@ -129,25 +130,25 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
}
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)) {
} else if(TzsCommonParam.DD.equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
String FKFS = rescueProcessDto.getArriveFeedbackType();
content = content.replace("$FKFS",FKFS);
} else if("JC".equals(type)) {
} else if(TzsCommonParam.JC.equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(alertId);
String FKFS = rescueProcessDto.getArriveFeedbackType();
content = content.replace("$FKFS",FKFS);
} else if("JYHF".equals(type)) {
} else if(TzsCommonParam.JYHF.equals(type)) {
String createUser = user.getUserName();
String create = alertCalledVo.getEmergencyPerson();
content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
} else if("WXFK".equals(type)) { //从派遣单获取数据
} else if(TzsCommonParam.WXFK.equals(type)) { //从派遣单获取数据
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
......@@ -156,12 +157,12 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
Map<String,String> tempMap = new HashMap<String,String>();
dynamicForm.stream().forEach(alertFormValue -> {
if("fix_result".equals(alertFormValue.getFieldCode())) {
if(TzsCommonParam.FIX_RESULT.equals(alertFormValue.getFieldCode())) {
tempMap.put("fixResult",alertFormValue.getFieldValue());
}
});
content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
} else if("WXFK-TS".equals(type)) { //从派遣单获取数据
} else if(TzsCommonParam.WXFK_TS.equals(type)) { //从派遣单获取数据
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
......@@ -170,13 +171,13 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
Map<String,String> tempMap = new HashMap<String,String>();
dynamicForm.stream().forEach(alertFormValue -> {
if("action_result".equals(alertFormValue.getFieldCode())) {
if(TzsCommonParam.ACTION_RESULT.equals(alertFormValue.getFieldCode())) {
tempMap.put("fixResult",alertFormValue.getFieldValue());
}
});
content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
type = "WXFK";
} else if("BXFK".equals(type)) {
type = TzsCommonParam.WXFK;
} else if(TzsCommonParam.BXFK.equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
......@@ -184,14 +185,14 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
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())) {
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());
}
});
content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$feedbackResult",tempMap.get("fixResult"));
} else if("TSRFK".equals(type)) {
content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("fixResult"));
} else if(TzsCommonParam.TSRFK.equals(type)) {
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String person = dispatchTask.getResponseUserName();
content = content.replace("$createTime",createTime).replace("$person",person);
......@@ -199,13 +200,13 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
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())) {
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());
}
});
content = content.replace("$FKFS",tempMap.get("FKFS")).replace("$feedbackResult",tempMap.get("action_result"));
content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("action_result"));
}
repairConsult.setType(AlertStageEnums.getEnumByCode(type).getId());
repairConsult.setAlertStageCode(AlertStageEnums.getEnumByCode(type).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/RescueProcessServiceImpl.java
View file @ 951f94ce
......@@ -96,7 +96,6 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
if(arriveTime != null && dispatchTime != null) {
Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");//这里想要只保留分秒可以写成"mm:ss"
formatter.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
String hms = formatter.format(arriveTimes);
rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
rescueProcessDto.setArriveUseTime(hms);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment