新增服务地址接口

src/main/java/com/unissoft/mapper/PublicMapper.java

@@ -3,6 +3,8 @@ package com.unissoft.mapper;
 import com.unissoft.dto.BaseDto;
 import com.unissoft.model.OauthClientDetailsModel;
 import com.unissoft.model.SysUser;
+import com.unissoft.model.SysUserPO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +20,6 @@ public interface PublicMapper {
     OauthClientDetailsModel getOauthClientDetailsByClientId(String clientId);
 
     String getResourceIdsByClientId(String clientId);
+
+    SysUserPO getByUserName(@Param("userName") String userName);
 }

src/main/java/com/unissoft/service/MyUserDetailService.java

@@ -5,6 +5,7 @@ import com.unissoft.dto.BaseDto;
 import com.unissoft.exception.MyRuntimeException;
 import com.unissoft.mapper.PublicMapper;
 import com.unissoft.model.SysUser;
+import com.unissoft.model.SysUserPO;
 import com.unissoft.result.ResultEnum;
 import com.unissoft.result.ResultView;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,14 +38,14 @@ public class MyUserDetailService implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String name) throws UsernameNotFoundException {
         //查用户
-        SysUser SysUser = publicMapper.getUserByName(name);
-        if (SysUser == null) {
+        SysUserPO sysUser = publicMapper.getByUserName(name);
+        if (sysUser == null) {
             throw new MyRuntimeException(ResultView.error(ResultEnum.CODE_5));
         }
         System.err.println("当前登录的用户是：" + name);
 
         //查该用户拥有的角色
-        List<BaseDto> roleDtos = publicMapper.getRoleByUserId(SysUser.getuId());
+        List<BaseDto> roleDtos = publicMapper.getRoleByUserId(sysUser.getuId());
         List<SimpleGrantedAuthority> authorities = new ArrayList<>();
         if (roleDtos.size() == 0) {
             authorities.add(new SimpleGrantedAuthority("ROLE_NoRole"));
@@ -55,11 +56,9 @@ public class MyUserDetailService implements UserDetailsService {
             }
         }
 
-//        String password = {noop} + SysUser.getPassword();
-        String jsonString = JSONObject.toJSONString(SysUser);
-        String password = new BCryptPasswordEncoder().encode(SysUser.getuPassword());
+        String jsonString = JSONObject.toJSONString(sysUser);
+        String password = new BCryptPasswordEncoder().encode(sysUser.getuPassword());
         User user = new User(jsonString, password, authorities);
-//        User user = new User(name, password, authorities);
         return user;
     }
 }

src/main/resources/mapper/PublicMapper.xml

@@ -4,24 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="UserMap" type="com.unissoft.model.SysUser">
-        <id column="u_id" property="uId" />
-        <result column="u_name" property="uName" />
-        <result column="u_nickname" property="uNickname" />
-        <result column="u_password" property="uPassword" />
-        <result column="u_photo" property="uPhoto" />
-        <result column="u_sex" property="uSex" />
-        <result column="u_birthday" property="uBirthday" />
-        <result column="u_phone" property="uPhone" />
-        <result column="u_mail" property="uMail" />
-        <result column="u_address" property="uAddress" />
-        <result column="u_explain" property="uExplain" />
-        <result column="u_user_source" property="uUserSource" />
-        <result column="u_status" property="uStatus" />
-        <result column="u_create_by" property="uCreateBy" />
-        <result column="u_create_time" property="uCreateTime" />
-        <result column="u_update_by" property="uUpdateBy" />
-        <result column="u_update_time" property="uUpdateTime" />
-        <result column="u_remark" property="uRemark" />
+        <id column="u_id" property="uId"/>
+        <result column="u_name" property="uName"/>
+        <result column="u_nickname" property="uNickname"/>
+        <result column="u_password" property="uPassword"/>
+        <result column="u_photo" property="uPhoto"/>
+        <result column="u_sex" property="uSex"/>
+        <result column="u_birthday" property="uBirthday"/>
+        <result column="u_phone" property="uPhone"/>
+        <result column="u_mail" property="uMail"/>
+        <result column="u_address" property="uAddress"/>
+        <result column="u_explain" property="uExplain"/>
+        <result column="u_user_source" property="uUserSource"/>
+        <result column="u_status" property="uStatus"/>
+        <result column="u_create_by" property="uCreateBy"/>
+        <result column="u_create_time" property="uCreateTime"/>
+        <result column="u_update_by" property="uUpdateBy"/>
+        <result column="u_update_time" property="uUpdateTime"/>
+        <result column="u_remark" property="uRemark"/>
     </resultMap>
 
     <resultMap id="OauthClientDetailsMap" type="com.unissoft.model.OauthClientDetailsModel">
@@ -43,6 +43,30 @@
         <result column="name" property="name"/>
     </resultMap>
 
+    <!-- 自封装查询映射结果 -->
+    <resultMap id="BaseResultMapPO" type="com.unissoft.model.SysUserPO">
+        <id column="uId" property="uId"/>
+        <result column="uName" property="uName"/>
+        <result column="uPassword" property="uPassword"/>
+        <result column="homeType" property="homeType"/>
+        <result column="depotId" property="depotId"/>
+        <result column="storehouseIds" property="storehouseIds"/>
+        <result column="roleIds" property="roleIds"/>
+        <result column="roleName" property="roleName"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_ListPO">
+        u.u_id uId,
+        u.u_name uName,
+        u.u_password uPassword,
+        u.home_type homeType,
+        p.depot_id depotId,
+        p.storehouse_ids storehouseIds,
+        r.r_id roleIds,
+        r.r_name roleName
+    </sql>
+
     <select id="getUserByName" resultMap="UserMap">
         SELECT u_id,u_name,u_password FROM sys_user WHERE u_name = #{name}
     </select>
@@ -61,4 +85,17 @@
         SELECT resource_ids FROM `oauth_client_details` WHERE `client_id` = #{clientId}
     </select>
 
+    <select id="getByUserName" resultMap="BaseResultMapPO">
+        SELECT
+        <include refid="Base_Column_ListPO"/>
+        FROM
+        sys_user u
+        LEFT JOIN sys_personnel p ON u.personnel_id = p.p_id
+        LEFT JOIN sys_user_role ur ON u.u_id = ur.user_id
+        LEFT JOIN sys_role r ON ur.role_id = r.r_id
+        WHERE
+        u.u_status = 1
+        AND u.u_name = #{userName}
+    </select>
+
 </mapper>