报送警情和调派的时候添加对应技能组

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

@@ -166,5 +166,8 @@ public class AlertCalledDto  extends BaseDto {
     @ApiModelProperty(value = "现场照片")
     private List<AttachmentDto> images;
 
+    @ApiModelProperty(value = "技能组")
+    private String skillGroup;
+
    private String equipment;
 }

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

@@ -232,4 +232,8 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "现场照片")
     private List<AttachmentDto> images;
 
+    @ApiModelProperty(value = "技能组")
+    @TableField("skill_group")
+    private String skillGroup;
+
 }

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

@@ -221,4 +221,11 @@ public class DispatchPaper extends BaseEntity {
      */
     @TableField("save_time")
     private Date saveTime;
+
+
+    /**
+     * 技能组
+     */
+    @TableField("skill_group")
+    private String skillGroup;
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -131,4 +132,10 @@ public class DispatchTask extends BaseEntity {
     @TableField("save_time")
 	private Date saveTime;
 
+    /**
+     * 技能组
+     */
+    @TableField("skill_group")
+    private String skillGroup;
+
 }

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

@@ -132,9 +132,11 @@ public class AlertCalledController extends BaseController {
 		if(ObjectUtils.isEmpty(map)) {
 			throw new BadRequest("未找到相关电梯.");
 		}
-		List<AgencyUserModel> userModels = FeignUtil.remoteCall(()->Privilege.agencyUserClient.queryByIds(RequestContext.getExeUserId(),false));
-		//由于查询的当前登录的用户信息 所以一定有 未作冗余判空
-		AgencyUserModel userModel = userModels.get(0);
+		ReginParams reginParams = getSelectedOrgInfo();
+		if(ObjectUtils.isEmpty(reginParams)){
+			throw new BadRequest("当前登录用户失效，请重新登录.");
+		}
+		AgencyUserModel userModel = reginParams.getUserModel();
 		alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, userModel);
 
 		// 坐席接警后，辅屏由常态化切换为处置态

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

@@ -533,7 +533,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             String code= getCode.get(alertCalledObjsDto.getAlertCalledDto().getEquipment().toString());
             alertCalled.setEquipmentClassificationCode(code);
             alertCalled.setCallTime(DateUtils.longStr2Date(alertCalled.getCallTimeStr()));
-
+            String groupCode = ctiService.getSkillGroup(user.getUserId());
+            alertCalled.setSkillGroup(groupCode);
             // 判断是否归并警情
             if (alertCalled.getFatherAlert() != null) {
                 // 警情归并，设置当前警情状态为结束。

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

@@ -114,6 +114,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
     private EmqKeeper emqKeeper;
 
     @Autowired
+    CtiServiceImpl ctiService;
+
+    @Autowired
     private ElevatorMapper elevatorMapper;
 
     @Autowired
@@ -810,6 +813,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         // 创建派遣单
         dispatchTaskDto.setDispatchTime(new Date());
         DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
+
+        String groupCode = ctiService.getSkillGroup(sendUser.getUserId());
+        dispatchTask.setSkillGroup(groupCode);
+        dispatchPaper.setSkillGroup(groupCode);
+
         if(AlertStageEnums.KRJY.getId().equals(dispatchTaskDto.getAlertCode())) {
             dispatchTask.setIsSaveTask(true);
         }