96333修改提交

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/CtiUserDto.java

+package com.yeejoin.amos.boot.module.elevator.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 96333坐席信息
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "CtiUserDto", description = "坐席信息")
+public class CtiUserDto {
+
+	@ApiModelProperty(value = "坐席对应主叫号码")
+	private String callerNo;
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/ICtiService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.api.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.elevator.api.dto.CtiUserDto;
 
 import java.util.Map;
 
@@ -48,5 +49,5 @@ public interface ICtiService {
     /**
      * 根据坐席配置获取主叫号码
      */
-    String getCallPhone();
+    CtiUserDto getCallPhone(String userId);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/CtiController.java

@@ -2,10 +2,13 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.elevator.api.dto.CtiDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.CtiUserDto;
 import com.yeejoin.amos.boot.module.elevator.api.service.ICtiService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,8 +113,9 @@ public class CtiController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/callPhone")
 	@ApiOperation(httpMethod = "GET", value = "获取坐席技能组对应主叫号码信息", notes = "获取坐席技能组对应主叫号码信息")
-	public ResponseModel<String> getCallPhone() {
-		String callPhone = ctiService.getCallPhone();
-		return ResponseHelper.buildResponse(callPhone);
+	public ResponseModel<CtiUserDto> getCallPhone() {
+		ReginParams reginParams = getSelectedOrgInfo();
+		AgencyUserModel loginUserModel = reginParams.getUserModel();
+		return ResponseHelper.buildResponse(ctiService.getCallPhone(loginUserModel.getUserId()));
 	}
 }

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.enums.DictTypeEnum;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.elevator.api.dto.CtiUserDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzsCitInfo;
 import com.yeejoin.amos.boot.module.elevator.api.service.ICtiService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.HttpUtils;
@@ -236,16 +237,20 @@ public class CtiServiceImpl implements ICtiService {
     }
 
     @Override
-    public String getCallPhone() {
+    public CtiUserDto getCallPhone(String userId) {
+        CtiUserDto ctiUserDto = new CtiUserDto();
+        if (ValidationUtil.isEmpty(userId)) {
+            return ctiUserDto;
+        }
         AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
         LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TzsCitInfo::getCtiUserId,me.getUserId());
+        wrapper.eq(TzsCitInfo::getCtiUserId, userId);
         TzsCitInfo ctiInfo = ctiInfoService.getOne(wrapper);
         if (!ValidationUtil.isEmpty(ctiInfo)) {
             String groupCode = ctiInfo.getGid().split(",")[0];
             DataDictionary dataDictionary = dictionaryService.getByCode(groupCode, DictTypeEnum.坐席技能组.getType());
-            return dataDictionary.getName();
+            ctiUserDto.setCallerNo(dataDictionary.getName());
         }
-        return "";
+        return ctiUserDto;
     }
 }
\ No newline at end of file

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

@@ -218,9 +218,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 String trappedFloorNum = dynamicParms.get("trapped_floor_num") == null ? "" : dynamicParms.get("trapped_floor_num");
                 String isLight = dynamicParms.get("is_light") == null ? "" : dynamicParms.get("is_light");
                 String trappedTime = dynamicParms.get("trapped_time") == null ? "" : dynamicParms.get("trapped_time");
-                content = content.replace("$trapped_num",trappedNum).replace("$trapped_floor_num",trappedFloorNum);
-                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone);
-                content = content.replace("$is_light",isLight).replace("$trapped_time",trappedTime);
+                String injuredNum = dynamicParms.get("injured_num") == null ? "" : dynamicParms.get("injured_num");
+                String dieNum = dynamicParms.get("die_num") == null ? "" : dynamicParms.get("die_num");
+                String hasInjury = Integer.parseInt(injuredNum) + Integer.parseInt(dieNum) > 0 ? "有" : "无";
+                content = content.replace("$trapped_num",trappedNum).replace("$trapped_floor_num", trappedFloorNum);
+                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone", contactPhone);
+                content = content.replace("$is_light", isLight).replace("$trapped_time", trappedTime);
+                content = content.replace("$hasInjury", hasInjury);
                 break;
             case "GZWX" : // 故障维修
                 dispatchTaskDto.setIsSaveTask(false);