農家Login

farm-common/src/main/java/jp/yamoto/farm/common/core/domain/entity/MastNoka.java

@@ -5,7 +5,7 @@ import jp.yamoto.farm.common.core.domain.BaseEntity;
 /**
  * 農家マスタ
  */
-public class MastNoka extends BaseEntity
+public class MastNokaLoginInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

farm-common/src/main/java/jp/yamoto/farm/common/core/domain/model/LoginUser.java

@@ -1,7 +1,7 @@
 package jp.yamoto.farm.common.core.domain.model;
 
 import com.alibaba.fastjson2.annotation.JSONField;
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 import jp.yamoto.farm.common.core.domain.entity.SysUser;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -70,7 +70,7 @@ public class LoginUser implements UserDetails
     /**
      * 農家 User
      */
-    private MastNoka mastNoka;
+    private MastNokaLoginInfo mastNoka;
 
     public LoginUser()
     {
@@ -83,7 +83,7 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, MastNoka user, Set<String> permissions)
+    public LoginUser(Long userId, MastNokaLoginInfo user, Set<String> permissions)
     {
         this.userId = userId;
         this.mastNoka = user;
@@ -241,11 +241,11 @@ public class LoginUser implements UserDetails
         this.user = user;
     }
 
-    public MastNoka getMastNoka() {
+    public MastNokaLoginInfo getMastNoka() {
         return mastNoka;
     }
 
-    public void setMastNoka(MastNoka mastNoka) {
+    public void setMastNoka(MastNokaLoginInfo mastNoka) {
         this.mastNoka = mastNoka;
     }
 

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/user/mapper/MastNokaMapper.java

@@ -1,6 +1,6 @@
 package jp.yamoto.farm.sankin.biz.user.mapper;
 
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -16,7 +16,7 @@ public interface MastNokaMapper {
      * @param nokaCd ユーザーネーム
      * @return ユーザーオブジェクト情報
      */
-    public MastNoka selectUserByUserName(String nokaCd);
+    public MastNokaLoginInfo selectUserByUserName(String nokaCd);
 
     /**
      * ユーザーIDでユーザーを查詢
@@ -24,7 +24,7 @@ public interface MastNokaMapper {
      * @param nokaId ユーザーID
      * @return ユーザーオブジェクト情報
      */
-    public MastNoka selectUserById(Long nokaId);
+    public MastNokaLoginInfo selectUserById(Long nokaId);
 
     /**
      * ユーザーパスワードをリセット

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/user/security/UserDetailsServiceImpl.java

@@ -1,6 +1,6 @@
 package jp.yamoto.farm.sankin.biz.user.security;
 
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
 import jp.yamoto.farm.common.core.service.SysPasswordService;
 import jp.yamoto.farm.common.enums.UserStatus;
@@ -35,7 +35,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
-        MastNoka user = userService.selectUserByUserName(username);
+        MastNokaLoginInfo user = userService.selectUserByUserName(username);
         if (StringUtils.isNull(user))
         {
             log.info("ログインユーザ:{}は存在しません.", username);
@@ -53,7 +53,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
         return createLoginUser(user);
     }
 
-    public UserDetails createLoginUser(MastNoka user)
+    public UserDetails createLoginUser(MastNokaLoginInfo user)
     {
         return new LoginUser(user.getNokaId(), user, null);
     }

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/user/service/IMastNokaService.java

@@ -1,6 +1,6 @@
 package jp.yamoto.farm.sankin.biz.user.service;
 
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 
 /**
  * ユーザー・ビジネス・レベル
@@ -15,7 +15,7 @@ public interface IMastNokaService
      * @param userName ユーザー名
      * @return ユーザー情報
      */
-    public MastNoka selectUserByUserName(String userName);
+    public MastNokaLoginInfo selectUserByUserName(String userName);
 
     /**
      * ユーザーのパスワードをリセットする

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/user/service/impl/MastNokaServiceImpl.java

@@ -1,7 +1,7 @@
 package jp.yamoto.farm.sankin.biz.user.service.impl;
 
 import jakarta.validation.Validator;
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 import jp.yamoto.farm.sankin.biz.user.mapper.MastNokaMapper;
 import jp.yamoto.farm.sankin.biz.user.service.IMastNokaService;
 import org.slf4j.Logger;
@@ -32,7 +32,7 @@ public class MastNokaServiceImpl implements IMastNokaService
      * @return ユーザー情報
      */
     @Override
-    public MastNoka selectUserByUserName(String userName)
+    public MastNokaLoginInfo selectUserByUserName(String userName)
     {
         return mastNokaMapper.selectUserByUserName(userName);
     }

farm-sankin-biz/src/main/resources/mapper/crm/MastNokaMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="jp.yamoto.farm.sankin.biz.user.mapper.MastNokaMapper">
 
-    <resultMap type="MastNoka" id="MastNokaResult">
+    <resultMap type="MastNokaLoginInfo" id="MastNokaResult">
         <id     property="nokaCd"       column="noka_cd"      />
         <result property="nokaMei"      column="noka_mei"    />
         <result property="nokaMeiKn"    column="noka_mei_kn"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.noka_id = #{nokaId}
 	</select>
 
-	<update id="resetUserPwd" parameterType="MastNoka">
+	<update id="resetUserPwd" parameterType="MastNokaLoginInfo">
  		update mast_noka set user_pwd = #{userPwd} where noka_cd = #{nokaCd}
 	</update>
 	

farm-sankin/src/main/java/jp/yamoto/farm/sankin/web/controller/SysLoginController.java

@@ -2,7 +2,7 @@ package jp.yamoto.farm.sankin.web.controller;
 
 import jp.yamoto.farm.common.constant.Constants;
 import jp.yamoto.farm.common.core.domain.AjaxResult;
-import jp.yamoto.farm.common.core.domain.entity.MastNoka;
+import jp.yamoto.farm.common.core.domain.entity.MastNokaLoginInfo;
 import jp.yamoto.farm.common.core.domain.model.LoginBody;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
 import jp.yamoto.farm.common.utils.SecurityUtils;
@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Set;
-
 /**
  * ログイン認証
  * 
@@ -50,7 +48,7 @@ public class SysLoginController
     @GetMapping("getInfo")
     public AjaxResult getInfo() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        MastNoka user = loginUser.getMastNoka();
+        MastNokaLoginInfo user = loginUser.getMastNoka();
 
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);