fix: 填报端getInfo接口

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java

@@ -4,6 +4,7 @@ import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.annotation.Log;
 import com.acupuncture.common.constant.Constants;
 import com.acupuncture.common.core.domain.AjaxResult;
+import com.acupuncture.common.core.domain.BaseDto;
 import com.acupuncture.common.core.domain.JsonResponse;
 import com.acupuncture.common.core.domain.entity.SysUser;
 import com.acupuncture.common.core.domain.model.LoginBody;
@@ -14,14 +15,22 @@ import com.acupuncture.common.utils.SecurityUtils;
 import com.acupuncture.framework.web.service.SysPermissionService;
 import com.acupuncture.framework.web.service.TokenService;
 import com.acupuncture.framework.web.service.WebDmsLoginService;
+import com.acupuncture.system.domain.dto.FmsFollowupDto;
 import com.acupuncture.system.domain.po.DmsTenant;
 import com.acupuncture.system.domain.vo.DmsLoginUserVo;
+import com.acupuncture.system.domain.vo.FmsFollowupVo;
 import com.acupuncture.system.service.DmsLoginService;
+import com.acupuncture.system.service.FmsFollowupQueueService;
+import com.acupuncture.system.service.FmsFollowupService;
 import com.acupuncture.system.service.ISysUserService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -48,6 +57,8 @@ public class DmsLoginController {
     private DmsLoginService dmsLoginService;
     @Resource
     private ISysUserService sysUserService;
+    @Resource
+    private FmsFollowupQueueService fmsFollowupQueueService;
 
     /**
      * 登录方法
@@ -66,25 +77,6 @@ public class DmsLoginController {
         return ajax;
     }
 
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
-    @GetMapping("getInfo")
-    public AjaxResult getInfo() {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        //获取用户从库信息
-        SysUser user = sysUserService.selectUserByTenantId(loginUser.getTenantId(), loginUser.getUsername());
-        //刷新token
-        tokenService.refreshToken(loginUser);
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", user);
-        ajax.put("tenantId", loginUser.getTenantId());
-        ajax.put("scoreId", loginUser.getScoreId());
-        return ajax;
-    }
-
     /**
      * 重置密码
      */
@@ -118,16 +110,48 @@ public class DmsLoginController {
         return AjaxResult.error("修改密码异常，请联系管理员");
     }
 
+    @ApiOperation("查询公共队列")
+    @PostMapping("/commonQueue")
+    @DataSource(DataSourceType.MASTER)
+    public JsonResponse<PageInfo<FmsFollowupVo.FollowupQueueVO>> queryCommonQueue(@RequestBody @Validated BaseDto<FmsFollowupDto.QueueQuery> dto) {
+        if (dto.getPageNum() > 0) {
+            PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+        }
+        return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName())));
+    }
 
-//    @PutMapping("/resetPwd")
+    /**
-//    public JsonResponse<Integer> resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) {
+     * 获取用户信息，暂时先从主库获取
-////        webDmsLoginService.checkUserAllowed(user);
+     * @return 用户信息
-////        webDmsLoginService.checkUserDataScope(user.getUserId());
+     */
-//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+    @ApiOperation("用户信息")
-//        return JsonResponse.ok(dmsLoginService.resetPwd(user));
+    @GetMapping("/getInfo")
-//    }
+    @DataSource(DataSourceType.MASTER)
+    public AjaxResult getInfo() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        //获取用户从库信息
+        DmsLoginUserVo.DmsUserVo tenantUser = dmsLoginService.selectTenantUserById(loginUser.getUserId());
+        SysUser user = new SysUser();
+        user.setUserId(tenantUser.getId());
+        user.setUserName(tenantUser.getUserName());
+        user.setNickName(tenantUser.getNickName());
+        user.setTenantId(tenantUser.getTenantId());
+        user.setTenantName(tenantUser.getTenantName());
+        user.setTenantPhone(tenantUser.getTenantPhone());
+        //刷新token
+        tokenService.refreshToken(loginUser);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        return ajax;
+    }
 
+    /**
+     * 筛查接口，此接口已添加白名单，所以不需要@annomous
+     * @param dto
+     * @return
+     */
     @PostMapping("/queryTenantById")
+    @DataSource(DataSourceType.MASTER)
     public JsonResponse<DmsTenant> queryTenantById(@RequestBody DmsLoginUserVo.Query dto){
         return JsonResponse.ok(dmsLoginService.queryById(dto.getId()));
     }

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java

@@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import com.acupuncture.common.annotation.Anonymous;
+import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.core.domain.BaseDto;
 import com.acupuncture.common.core.domain.JsonResponse;
+import com.acupuncture.common.enums.DataSourceType;
 import com.acupuncture.common.utils.SecurityUtils;
 import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder;
 import com.acupuncture.system.domain.dto.FmsFollowupDto;
@@ -47,22 +49,9 @@ import java.util.List;
 @RestController
 @RequestMapping("/followup")
 public class FmsFollowupController {
-    @Resource
-    private FmsFollowupQueueService fmsFollowupQueueService;
     @Resource
     private FmsFollowupService fmsFollowupService;
 
-
-    @ApiOperation("查询公共队列")
-    @PostMapping("/commonQueue")
-    @Anonymous
-    public JsonResponse<PageInfo<FmsFollowupVo.FollowupQueueVO>> queryCommonQueue(@RequestBody @Validated BaseDto<FmsFollowupDto.QueueQuery> dto) {
-        if (dto.getPageNum() > 0) {
-            PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
-        }
-        return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName())));
-    }
-
     @ApiOperation("查询随访队列")
     @PostMapping("/query")
     public JsonResponse<PageInfo<FmsFollowupVo.FollowupQueueVO>> queryQueue(@RequestBody @Validated BaseDto<FmsFollowupDto.FollowupQueueQueryDTO> dto) {

acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java

@@ -24,6 +24,8 @@ public class DmsLoginUserVo {
     public static class DmsUserVo {
         private Long id;
         private Long tenantId;
+        private String tenantName;
+        private String tenantPhone;
         private String userName;
 
         private String password;

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java

@@ -45,4 +45,11 @@ public interface DmsUserDao {
     DmsLoginUserVo.DmsUserVo checkUserNameUnique(String userName);
 
     DmsLoginUserVo.DmsUserVo checkPhoneUnique(String phonenumber);
+
+    /**
+     * 根据租户用户id，查询租户用户信息
+     * @param userId
+     * @return
+     */
+    DmsLoginUserVo.DmsUserVo queryTenantUserById(Long userId);
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java

@@ -50,4 +50,6 @@ public interface DmsLoginService {
     boolean checkPhoneUnique(AdminTenantUserDto.AddDto dto);
 
     DmsTenant queryById(Long id);
+
+    DmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId);
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java

@@ -19,7 +19,6 @@ public interface FmsFollowupQueueService {
      * 查询公共队列
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     List<FmsFollowupVo.FollowupQueueVO> queryCommonQueue(String name);
 
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java

@@ -101,5 +101,10 @@ public class DmsLoginServiceImpl implements DmsLoginService {
         return dmsTenantMapper.selectByPrimaryKey(id);
     }
 
+    @Override
+    public DmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId) {
+        return dmsUserDao.queryTenantUserById(userId);
+    }
+
 
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java

@@ -29,7 +29,6 @@ public class FmsFollowupQueueServiceImpl implements FmsFollowupQueueService {
     public static String COMMON_FOLLOWUP_QUEUE = "common_followup_queue";
 
     @Override
-    @DataSource(DataSourceType.MASTER)
     public List<FmsFollowupVo.FollowupQueueVO> queryCommonQueue(String name) {
         redisCache.deleteObject(COMMON_FOLLOWUP_QUEUE);
         List<FmsFollowupVo.FollowupQueueVO> followupQueueVOS = fmsFollowupDao.queryCommonQueue(name);

acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml → acupuncture-system/src/main/resources/mapper/dao/DmsUserDao.xml

@@ -86,4 +86,21 @@
     <select id="checkPhoneUnique" parameterType="String" resultType="com.acupuncture.system.domain.vo.DmsLoginUserVo$DmsUserVo">
         select id, user_name from dms_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
     </select>
+    <select id="queryTenantUserById" resultType="com.acupuncture.system.domain.vo.DmsLoginUserVo$DmsUserVo">
+        select
+            u.id,
+            u.nick_name as nickName,
+            u.user_name as userName,
+            u.tenant_id as tenantId,
+            u.phonenumber as phonenumber,
+            u.email as email,
+            u.sex as sex,
+            t.`name` as tenantName,
+            t.contact_phone as tenantPhone
+        from
+            dms_user u join dms_tenant t on u.tenant_id = t.id
+        WHERE
+            u.del_flag = 0
+          and u.id = #{userId}
+    </select>
 </mapper>