Commit 89e05eda authored by zhangsen's avatar zhangsen

Merge remote-tracking branch 'origin/developer' into developer

parents 01dd19c8 fce8e773
...@@ -39,4 +39,7 @@ public class MapRegionDto extends BaseDto { ...@@ -39,4 +39,7 @@ public class MapRegionDto extends BaseDto {
@ApiModelProperty(value = "片区中心点") @ApiModelProperty(value = "片区中心点")
private CameraInfo cameraInfo; private CameraInfo cameraInfo;
@ApiModelProperty(value = "片区code")
private String areaCode;
} }
...@@ -27,6 +27,9 @@ public class StationInfoDto { ...@@ -27,6 +27,9 @@ public class StationInfoDto {
@ApiModelProperty(value ="场站id") @ApiModelProperty(value ="场站id")
private Long stationId; private Long stationId;
@ApiModelProperty(value ="平台id")
private String platformStationId;
@ApiModelProperty(value = "场站名称") @ApiModelProperty(value = "场站名称")
private String stationName; private String stationName;
......
...@@ -13,6 +13,9 @@ public class StationRecordInfo { ...@@ -13,6 +13,9 @@ public class StationRecordInfo {
@ApiModelProperty(value = "场站id") @ApiModelProperty(value = "场站id")
private Long stationId; private Long stationId;
@ApiModelProperty(value = "平台id")
private String platformStationId;
@ApiModelProperty(value = "场站名称") @ApiModelProperty(value = "场站名称")
private String stationName; private String stationName;
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("indicator") @TableName("map_indicator")
public class Indicator extends BaseEntity { public class Indicator extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -54,4 +54,10 @@ public class MapRegion extends BaseEntity { ...@@ -54,4 +54,10 @@ public class MapRegion extends BaseEntity {
*/ */
@TableField(value = "cameraInfo", typeHandler = FastjsonTypeHandler.class) @TableField(value = "cameraInfo", typeHandler = FastjsonTypeHandler.class)
private CameraInfo cameraInfo; private CameraInfo cameraInfo;
/**
* 片区文字显示的省份
*/
@TableField("area_code")
private String areaCode;
} }
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value = "monitor_fan_indicator" ,autoResultMap = true) @TableName(value = "monitor_fan_indicator_copy3" ,autoResultMap = true)
public class MonitorFanIndicator extends BaseEntity { public class MonitorFanIndicator extends BaseEntity {
......
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo"> <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo">
select select
station_basic.sequence_nbr stationId, station_basic.sequence_nbr stationId,
station_basic.platform_station_id platformStationId,
station_basic.station_name stationName , station_basic.station_name stationName ,
station_basic.station_type stationType, station_basic.station_type stationType,
station_basic.station_flag stationFlag, station_basic.station_flag stationFlag,
......
...@@ -172,7 +172,7 @@ public class StationBasicController extends BaseController { ...@@ -172,7 +172,7 @@ public class StationBasicController extends BaseController {
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据") @ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
@GetMapping(value = "/listforMap") @GetMapping(value = "/listforMap")
public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false,defaultValue = "qj") String type) { public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode,@RequestParam(value = "type", required = false,defaultValue = "qj") String type) {
......
...@@ -311,6 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio ...@@ -311,6 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
list.forEach(stationRecordInfo -> { list.forEach(stationRecordInfo -> {
StationInfoDto stationInfoDto = new StationInfoDto(); StationInfoDto stationInfoDto = new StationInfoDto();
stationInfoDto.setStationId(stationRecordInfo.getStationId()); stationInfoDto.setStationId(stationRecordInfo.getStationId());
stationInfoDto.setPlatformStationId(stationRecordInfo.getPlatformStationId());
stationInfoDto.setStationName(stationRecordInfo.getStationName()); stationInfoDto.setStationName(stationRecordInfo.getStationName());
stationInfoDto.setType(stationRecordInfo.getStationType()); stationInfoDto.setType(stationRecordInfo.getStationType());
//url 暂时写死 //url 暂时写死
......
package com.yeejoin.amos.boot.module.tzs.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;
}
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.service; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.tzs.api.dto.CtiUserDto;
import java.util.Map; import java.util.Map;
...@@ -48,5 +49,5 @@ public interface ICtiService { ...@@ -48,5 +49,5 @@ public interface ICtiService {
/** /**
* 根据坐席配置获取主叫号码 * 根据坐席配置获取主叫号码
*/ */
String getCallPhone(); CtiUserDto getCallPhone(String userId);
} }
...@@ -2,10 +2,13 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller; ...@@ -2,10 +2,13 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; 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.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil; import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.tzs.api.dto.CtiDto; import com.yeejoin.amos.boot.module.tzs.api.dto.CtiDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.CtiUserDto;
import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService; import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -110,8 +113,9 @@ public class CtiController extends BaseController { ...@@ -110,8 +113,9 @@ public class CtiController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/callPhone") @GetMapping(value = "/callPhone")
@ApiOperation(httpMethod = "GET", value = "获取坐席技能组对应主叫号码信息", notes = "获取坐席技能组对应主叫号码信息") @ApiOperation(httpMethod = "GET", value = "获取坐席技能组对应主叫号码信息", notes = "获取坐席技能组对应主叫号码信息")
public ResponseModel<String> getCallPhone() { public ResponseModel<CtiUserDto> getCallPhone() {
String callPhone = ctiService.getCallPhone(); ReginParams reginParams = getSelectedOrgInfo();
return ResponseHelper.buildResponse(callPhone); AgencyUserModel loginUserModel = reginParams.getUserModel();
return ResponseHelper.buildResponse(ctiService.getCallPhone(loginUserModel.getUserId()));
} }
} }
...@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.enums.DictTypeEnum; ...@@ -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.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.CtiUserDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzsCitInfo; import com.yeejoin.amos.boot.module.tzs.api.entity.TzsCitInfo;
import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService; import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils; import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
...@@ -236,16 +237,19 @@ public class CtiServiceImpl implements ICtiService { ...@@ -236,16 +237,19 @@ public class CtiServiceImpl implements ICtiService {
} }
@Override @Override
public String getCallPhone() { public CtiUserDto getCallPhone(String userId) {
AgencyUserModel me = Privilege.agencyUserClient.getme().getResult(); CtiUserDto ctiUserDto = new CtiUserDto();
if (ValidationUtil.isEmpty(userId)) {
return ctiUserDto;
}
LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TzsCitInfo::getCtiUserId,me.getUserId()); wrapper.eq(TzsCitInfo::getCtiUserId, userId);
TzsCitInfo ctiInfo = ctiInfoService.getOne(wrapper); TzsCitInfo ctiInfo = ctiInfoService.getOne(wrapper);
if (!ValidationUtil.isEmpty(ctiInfo)) { if (!ValidationUtil.isEmpty(ctiInfo)) {
String groupCode = ctiInfo.getGid().split(",")[0]; String groupCode = ctiInfo.getGid().split(",")[0];
DataDictionary dataDictionary = dictionaryService.getByCode(groupCode, DictTypeEnum.坐席技能组.getType()); DataDictionary dataDictionary = dictionaryService.getByCode(groupCode, DictTypeEnum.坐席技能组.getType());
return dataDictionary.getName(); ctiUserDto.setCallerNo(dataDictionary.getName());
} }
return ""; return ctiUserDto;
} }
} }
\ No newline at end of file
...@@ -218,9 +218,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc ...@@ -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 trappedFloorNum = dynamicParms.get("trapped_floor_num") == null ? "" : dynamicParms.get("trapped_floor_num");
String isLight = dynamicParms.get("is_light") == null ? "" : dynamicParms.get("is_light"); String isLight = dynamicParms.get("is_light") == null ? "" : dynamicParms.get("is_light");
String trappedTime = dynamicParms.get("trapped_time") == null ? "" : dynamicParms.get("trapped_time"); String trappedTime = dynamicParms.get("trapped_time") == null ? "" : dynamicParms.get("trapped_time");
content = content.replace("$trapped_num",trappedNum).replace("$trapped_floor_num",trappedFloorNum); String injuredNum = dynamicParms.get("injured_num") == null ? "" : dynamicParms.get("injured_num");
content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone); String dieNum = dynamicParms.get("die_num") == null ? "" : dynamicParms.get("die_num");
content = content.replace("$is_light",isLight).replace("$trapped_time",trappedTime); 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; break;
case "GZWX" : // 故障维修 case "GZWX" : // 故障维修
dispatchTaskDto.setIsSaveTask(false); dispatchTaskDto.setIsSaveTask(false);
......
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