add

mqtt信息发送

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/AppHospitalVO.java

@@ -12,4 +12,6 @@ public class AppHospitalVO implements Serializable {
     private String id;
     @ApiModelProperty("医院名称")
     private String name;
+
+    private String uerId;
 }

nb-service/app-doctor/src/main/java/com/nb/app/doctor/auth/AppDoctorUserAccountOperator.java

@@ -6,6 +6,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nb.app.doctor.controller.vo.DoctorUserVo;
 import com.nb.app.doctor.api.entity.AppDoctorUserEntity;
@@ -17,6 +18,7 @@ import com.nb.auth.controller.vo.UserInfoVO;
 import com.nb.auth.enums.GrantTypeEnum;
 import com.nb.auth.granter.IAccountOperator;
 import com.nb.auth.utils.SecurityUtil;
+import com.nb.common.config.annotation.TenantIgnore;
 import com.nb.common.config.context.TenantContextHolder;
 import com.nb.core.exception.CustomException;
 import lombok.AllArgsConstructor;
@@ -43,9 +45,14 @@ public class AppDoctorUserAccountOperator implements IAccountOperator<DoctorUser
     }
 
     @Override
+    @TenantIgnore
     public UserInfoVO getUserInfo() {
         UserInfoVO userInfoVO = new UserInfoVO();
-        AppDoctorUserEntity user = doctorUserService.getById(SecurityUtil.getStpLogic().getLoginIdAsString());
+        AppDoctorUserEntity user = doctorUserService.getOne(new LambdaQueryWrapper<AppDoctorUserEntity>()
+                        .eq(AppDoctorUserEntity::getUsername, SecurityUtil.getUsername())
+                        .eq(AppDoctorUserEntity::getTenantId, SecurityUtil.getTenantId())
+                .last("limit 1")
+              );
         if(ObjectUtil.isNull(user)){
             StpLogic stpLogic = SecurityUtil.getStpLogic();
             stpLogic.logout();

nb-service/web-service/src/main/resources/mapper/bus/BusHospitalMapper.xml

@@ -4,10 +4,12 @@
     <resultMap id="hospitalList" type="com.nb.web.api.feign.result.AppHospitalVO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
+        <result property="userId" column="user_id"/>
     </resultMap>
 
     <select id="selectUserHospitalListByUsername" resultMap="hospitalList">
         select
+            adu.id as user_id,
             bh.tenant_id as id,
                 bh.name as name
         from app_doctor_user as adu join bus_hospital as bh on bh.tenant_id=adu.tenant_id where adu.username=#{username}