96333bug修改

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

@@ -150,12 +150,12 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 wrapper.eq(DataDictionary::getCode, alertCalledDto.getUseSiteCategory());
                 DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
                 if (!ValidationUtil.isEmpty(dataDictionary)) {
-                    alertCalledDto.setUseUnit(dataDictionary.getName());
+                    alertCalledDto.setUseSiteCategory(dataDictionary.getName());
                 } else {
-                    alertCalledDto.setUseUnit("");
+                    alertCalledDto.setUseSiteCategory("");
                 }
             } else {
-                alertCalledDto.setUseUnit("");
+                alertCalledDto.setUseSiteCategory("");
             }
             String voiceRecord = "";
             VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));

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

@@ -17,6 +17,8 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
@@ -38,6 +40,8 @@ import java.util.Map;
 @Service
 public class CtiServiceImpl implements ICtiService {
 
+    private static final Logger logger = LogManager.getLogger(CtiServiceImpl.class);
+
     @Autowired
     RedisUtils redisUtils;
 
@@ -65,6 +69,9 @@ public class CtiServiceImpl implements ICtiService {
     public String getAccessToken() {
         if(redisUtils.hasKey(RedisKey.CTI_TOKEN)){
             Object obj= redisUtils.get(RedisKey.CTI_TOKEN);
+            logger.info("getAccessToken redis cti_token============>" + RedisKey.CTI_TOKEN);
+            logger.info("getAccessToken redis obj============>" + obj);
+            logger.info("getAccessToken redis obj.toString()============>" + obj.toString());
             return obj.toString();
         } else {
             String tokenAccessUrl = ctiUrl+ "/openauth/getAccessToken";
@@ -85,6 +92,7 @@ public class CtiServiceImpl implements ICtiService {
             if(response.getInteger("code") == 0) { // 获取token 成功
                 try {
                     String token = response.getJSONObject("data").getString("accessToken");
+                    logger.info("getAccessToken response token============>" + token);
                     redisUtils.set(RedisKey.CTI_TOKEN, token,time);
                     return token;
                 } catch (Exception e) {
@@ -143,6 +151,7 @@ public class CtiServiceImpl implements ICtiService {
     public Map<Object, Object> getUserStatus(){
         Map<Object, Object> map = new HashMap<>();
         String token = this.getAccessToken();
+        logger.info("cti access token===========> " + token);
         Map<String,Object> params = new HashMap<>();
         params.put("accessToken",token);
         String loginUrl = ctiUrl + "/cti/getagentinfomonitor" + "?accessToken=" + token;
@@ -150,6 +159,7 @@ public class CtiServiceImpl implements ICtiService {
         JSONObject response = null;
         try {
             response = JSONObject.parseObject(responseStr);
+            logger.info("cti response===========> " + response);
         } catch (Exception e) {
             throw  new BadRequest("获取登录状态出错：" + e.getMessage());
         }
@@ -161,6 +171,7 @@ public class CtiServiceImpl implements ICtiService {
             JSONObject jsonObject = JSON.parseObject(String.valueOf(object));
             map.put(jsonObject.get("code"),jsonObject.get("state"));
         }
+        logger.info("cti map===========> " + map);
         return map;
     }
 
@@ -242,7 +253,6 @@ public class CtiServiceImpl implements ICtiService {
         if (ValidationUtil.isEmpty(userId)) {
             return ctiUserDto;
         }
-        AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
         LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TzsCitInfo::getCtiUserId, userId);
         TzsCitInfo ctiInfo = ctiInfoService.getOne(wrapper);

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

@@ -191,7 +191,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             useSiteCategory = ValidationUtil.isEmpty(categoryDict) ? "" : categoryDict.getName();
         }
         String useUnit = elevator.getUseUnit();
-        content = content.replace("$call_time",createTime).replace("$address",address).replace("$rescue_code",rescueCode).replace("$use_site_category",useSiteCategory);
+        content = content.replace("$call_time", createTime).replace("$address", address).replace("$rescue_code", rescueCode).replace("$use_site_category", useSiteCategory);
         String typeCode = "";
         if(AlertStageEnums.KRJY.toString().equals(alertTypeCode)) {
             typeCode  = AlertStageEnums.KRJY.getId();
@@ -228,14 +228,14 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 break;
             case "GZWX" : // 故障维修
                 dispatchTaskDto.setIsSaveTask(false);
-                desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
-                content = content.replace("$use_unit",useUnit).replace("$desc",desc);
+                desc = dynamicParms.get("fault_report") == null ? "" : dynamicParms.get("fault_report");
+                content = content.replace("$use_unit", useUnit).replace("$desc", desc);
                 break;
             case "TSZX" : // 投诉咨询
                 dispatchTaskDto.setIsSaveTask(false);
-                desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
-                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone);
-                content = content.replace("$use_unit",useUnit).replace("$desc",desc);
+                desc = dynamicParms.get("complaint_consulttation") == null ? "" : dynamicParms.get("complaint_consulttation");
+                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone", contactPhone);
+                content = content.replace("$use_unit", useUnit).replace("$desc", desc);
                 break;
         }
         dispatchTaskDto.setDispatchContext(content);

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

@@ -118,7 +118,7 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
                 model.setTelStartTime(telStartTime);
                 model.setTelEndTime(telEndTime);
                 if(1 == recordInfo.getInteger("callType")) {
-                    model.setFileType("客户呼入");
+                    model.setFileType("呼入");
                 } else if(2 == recordInfo.getInteger("callType")) {
                     model.setFileType("坐席呼出");
                 }