96333问题修复

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

@@ -2,7 +2,6 @@ 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.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -40,7 +39,6 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
-import com.yeejoin.amos.boot.module.tzs.biz.controller.WechatController;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -55,12 +53,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -187,7 +184,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         // 电梯数据
         Elevator elevator = elevatorServiceImpl.selectByAlertId(alertId);
         String address = elevator.getAddress()  == null ? "" : elevator.getAddress();
-        String useSiteCategory = elevator.getUseSiteCategory()  == null ? "" : elevator.getUseSiteCategory() ;
+        String useSiteCategory = "";
+        if (!ValidationUtil.isEmpty(elevator.getUseSiteCategory())) {
+            String categoryCode = elevator.getUseSiteCategory();
+            DataDictionary categoryDict = iDataDictionaryService.getByCode(categoryCode, "USE_SITE_CATEGORY");
+            useSiteCategory = categoryDict.getName();
+        }
         String useUnit = elevator.getUseUnit();
         content = content.replace("$call_time",createTime).replace("$address",address).replace("$rescue_code",rescueCode).replace("$use_site_category",useSiteCategory);
         String typeCode = "";
@@ -921,9 +923,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             }
             if(infoCode.indexOf("1") != -1 && StringUtils.isNotBlank(dispatchTaskDto.getResponseUserTel())) { // 下发了短信
                 HashMap<String, String>  params = new HashMap<>();
-                params.put("smsCode","SMS_JCS_0001");
-                params.put("mobile",dispatchTaskDto.getResponseUserTel());
-                params.put("address","测试传参短信通知");
+                params.put("smsCode","SMS_TZS_0006");
+                params.put("content",dispatchTaskDto.getDispatchContext());
                 FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendCommonSms(params);
             }
             // mqtt 通知新派遣