앱로그인 수정

src/main/java/com/oqpo/api/entity/oper/MemberEntity.java

@@ -43,6 +43,12 @@ public class MemberEntity implements Serializable, UserDetails {
     private String oqBrandId;
     private String oqStoreId;
 
+    private String deviId;
+    private String deviTpCd;
+    private String deviOsVer;
+    private String appReg;
+    private String appVer;
+
     private Collection<? extends GrantedAuthority> authorities;
 
     @Override

src/main/java/com/oqpo/api/mapper/oper/UserMngMapper.java

@@ -55,4 +55,7 @@ public interface UserMngMapper {
 
     String selectInitPwData(@Param("authTpCd") String authTpCd, @Param("serData") String serData) throws Exception;
 
+    int updateAppLoginDt(@Param("userId") String userId, @Param("deviId") String deviId, @Param("deviTpCd") String deviTpCd, @Param("deviOsVer") String deviOsVer, @Param("appReg") String appReg, @Param("appVer") String appVer) throws Exception;
+
+    int insertUserDevi(@Param("userId") String userId, @Param("deviId") String deviId, @Param("deviTpCd") String deviTpCd, @Param("deviOsVer") String deviOsVer, @Param("appReg") String appReg, @Param("appVer") String appVer) throws Exception;
 }

src/main/java/com/oqpo/api/service/SigninService.java

@@ -86,6 +86,10 @@ public class SigninService implements UserDetailsService {
                     memberEntity.getAuthTpNm());
             log.debug("connKey==>>>{}", connKey);
 
+
+            // 단말 정보 업데이트
+
+
             //로그인 이력 남기기
             userMngService.updateLoginDt(memberEntity.getUserId());
 
@@ -98,7 +102,7 @@ public class SigninService implements UserDetailsService {
     }
 
 
-    public JwtResponse signinApp(String brandId, String userId, String password) throws Exception {
+    public JwtResponse signinApp(String brandId, String userId, String password, String deviId, String deviTpCd, String deviOsVer, String appReg, String appVer) throws Exception {
         MemberEntity memberEntity = null;
         String connKey = "";
         try {
@@ -142,7 +146,8 @@ public class SigninService implements UserDetailsService {
             log.debug("connKey==>>>{}", connKey);
 
             //로그인 이력 남기기
-            userMngService.updateLoginDt(memberEntity.getUserId());
+            userMngService.updateAppLoginDt(memberEntity.getUserId(), deviId,  deviTpCd,  deviOsVer,  appReg,  appVer);
+
         } catch (GlobalException e) {
             System.out.println("==GlobalException=====================> ");
             e.printStackTrace();

src/main/java/com/oqpo/api/service/oper/UserMngService.java

@@ -260,6 +260,27 @@ public class UserMngService extends CommonService {
         }
     }
 
+    /*
+      사용자 앱 최종 로그인 날짜 정보
+     */
+    @Transactional
+    public void updateAppLoginDt(String userId, String deviId, String deviTpCd, String deviOsVer, String AppReg, String appVer) throws Exception {
+        try {
+            userMngMapper.updateAppLoginDt(userId, deviId, deviTpCd, deviOsVer, AppReg, appVer);
+
+            userMngMapper.insertUserDevi(userId, deviId, deviTpCd, deviOsVer, AppReg, appVer);
+        } catch (GlobalException e) {
+            e.getStackTrace();
+            throw new GlobalException(e.getSystemMessageCode());
+        } catch (Exception e) {
+            e.getStackTrace();
+            throw new RuntimeException();
+        }
+    }
+
+
+
+
     /*
       사용자 개인정보 수정 저장
      */

src/main/java/com/oqpo/api/web/controller/SigninController.java

@@ -68,7 +68,8 @@ public class SigninController {
         String brandId = signinAppRequest.getBrandId();
         String userId = CryptoUtil.decrypt(signinAppRequest.getUserId(), hashed);
         String password = CryptoUtil.decrypt(signinAppRequest.getPassword(), hashed);
-        return ResponseEntity.ok(signinService.signinApp(brandId, userId, password));
+
+        return ResponseEntity.ok(signinService.signinApp(brandId, userId, password,  signinAppRequest.getDeviId(), signinAppRequest.getDeviTpCd(), signinAppRequest.getDeviOsVer(), signinAppRequest.getAppReg(), signinAppRequest.getAppVer() ));
         /* 모바일 앱 네이티브로 로그인시 처리
         hashed = StringEscapeUtils.unescapeJava(hashed);
         String brandId = signinAppRequest.getBrandId();

src/main/java/com/oqpo/api/web/dto/request/sign/SigninAppRequest.java

@@ -22,4 +22,19 @@ public class SigninAppRequest {
     @NotBlank
     @ApiModelProperty(value = "패스워드")
     private String password;
+
+    @ApiModelProperty(value = "단말기아이디")
+    private String deviId;
+
+    @ApiModelProperty(value = "단말기타입")
+    private String deviTpCd;
+
+    @ApiModelProperty(value = "단말OS버전")
+    private String deviOsVer;
+
+    @ApiModelProperty(value = "앱레지스터")
+    private String appReg;
+
+    @ApiModelProperty(value = "앱버전")
+    private String appVer;
 }

src/main/resources/mybatis/sqlmaps/oper/UserMng.xml

@@ -318,9 +318,33 @@
         </if>
     </select>
 
+    <update id="updateAppLoginDt">
+        update np_user_info /* updateLoginDt */
+        set    first_login_dt = case when first_login_dt is null then DATE_FORMAT(now(),'%Y%m%d%H%s%i') else first_login_dt end
+              ,last_login_dt = DATE_FORMAT(now(),'%Y%m%d%H%s%i')
+              ,devi_id = #{deviId}
+              ,devi_tp_cd = #{deviTpCd}
+              ,devi_os_ver = #{deviOsVer}
+              ,app_reg = #{appReg}
+              ,app_ver = #{appVer}
+        where user_id = #{userId}
+    </update>
 
-
-
+    <insert id="insertUserDevi">
+        insert into np_user_devi /** Merge updateAuthDtl */
+        (user_id, devi_id, devi_tp_cd, devi_os_ver, app_reg, app_ver, chg_dt,chg_id, add_dt, add_id)
+        values
+            ( #{userId},#{deviId},#{deviTpCd},#{deviOsVer},#{appReg}, #{appVer}, now(), #{userId}, now(), #{userId})
+        on duplicate key
+        update
+        chg_dt       = now()
+        , chg_id       = #{userId}
+        , devi_id       = VALUES(devi_id)
+        , devi_tp_cd        = VALUES(devi_tp_cd)
+        , devi_os_ver        = VALUES(devi_os_ver)
+        , app_reg        = VALUES(app_reg)
+        , app_ver        = VALUES(app_ver)        ;
+    </insert>