优化代码

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

+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/DispatchTaskServiceImpl.java

@@ -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

@@ -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

@@ -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);