dev

src/main/java/com/its/op/dto/its/oper/TbUserCnncHsDto.java

@@ -17,15 +17,19 @@ import java.io.Serializable;
 public class TbUserCnncHsDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("로그인시각")  // N VARCHAR(14)
+    @ApiModelProperty("운영시스템ID(WEB:웹관리자로그인)")  // N VARCHAR2(7)
+    @JsonProperty("oper_syst_id")
+    private String operSystId;
+
+    @ApiModelProperty("로그인시각")  // N VARCHAR2(14)
     @JsonProperty("login_hms")
     private String loginHms;
 
-    @ApiModelProperty("사용자ID")  // N VARCHAR(20)
+    @ApiModelProperty("사용자ID(웹사용자 email)")  // N VARCHAR2(50)
     @JsonProperty("user_id")
     private String userId;
 
-    @ApiModelProperty("로그아웃시각")  // Y VARCHAR(14)
+    @ApiModelProperty("로그아웃시각")  // Y VARCHAR2(14)
     @JsonProperty("logout_hms")
     private String logoutHms;
 

src/main/java/com/its/op/entity/its/oper/TbUserCnncHs.java

@@ -22,22 +22,28 @@ import java.io.Serializable;
 public class TbUserCnncHs implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("로그인시각")  // N VARCHAR(14)
+    @ApiModelProperty("운영시스템ID(WEB:웹관리자로그인)")  // N VARCHAR2(7)
+    @Id
+    @Column(name = "OPER_SYST_ID", nullable = false, length = 7)
+    private String operSystId;
+
+    @ApiModelProperty("로그인시각")  // N VARCHAR2(14)
     @Id
     @Column(name = "LOGIN_HMS", nullable = false, length = 14)
     private String loginHms;
 
-    @ApiModelProperty("사용자ID")  // N VARCHAR(20)
+    @ApiModelProperty("사용자ID(웹사용자 email)")  // N VARCHAR2(50)
     @Id
-    @Column(name = "USER_ID", nullable = false, length = 20)
+    @Column(name = "USER_ID", nullable = false, length = 50)
     private String userId;
 
-    @ApiModelProperty("로그아웃시각")  // Y VARCHAR(14)
+    @ApiModelProperty("로그아웃시각")  // Y VARCHAR2(14)
     @Column(name = "LOGOUT_HMS", length = 14)
     private String logoutHms;
 
     public TbUserCnncHsDto toDto() {
         return TbUserCnncHsDto.builder()
+                .operSystId(this.operSystId)
                 .loginHms(this.loginHms)
                 .userId(this.userId)
                 .logoutHms(this.logoutHms)

src/main/java/com/its/op/entity/its/oper/TbUserCnncHsKey.java

@@ -15,10 +15,13 @@ import java.io.Serializable;
 public class TbUserCnncHsKey implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    // LOGIN_HMS, 로그인시각  // N VARCHAR(14)
+    // OPER_SYST_ID, 운영시스템ID(WEB:웹관리자로그인)  // N VARCHAR2(7)
+    private String operSystId;
+
+    // LOGIN_HMS, 로그인시각  // N VARCHAR2(14)
     private String loginHms;
 
-    // USER_ID, 사용자ID  // N VARCHAR(20)
+    // USER_ID, 사용자ID(웹사용자 email)  // N VARCHAR2(50)
     private String userId;
 
 }

src/main/java/com/its/op/entity/its/oper/TbUserInfr.java

@@ -126,7 +126,7 @@ public class TbUserInfr implements Serializable {
     public UserInfrVo toVo() {
         return UserInfrVo.builder()
                 .userId(this.userId)
-                .pwd(this.pwd)
+                .pwd(this.pswd)
                 .name(this.name)
                 .comp(this.comp)
                 .tel(this.tel)

src/main/java/com/its/op/security/WebLoginSuccessHandler.java

@@ -48,6 +48,7 @@ public class WebLoginSuccessHandler implements AuthenticationSuccessHandler {
         String remoteIp = ItsUtils.getHttpServletRemoteIP(request);
         log.info("UserLogin: {}, {}", userInfr.getUserId(), remoteIp);
         TbUserCnncHs cnncHs = TbUserCnncHs.builder()
+                .operSystId("ITS_OP")
                 .userId(userInfr.getUserId())
                 .loginHms(ItsUtils.getSysTime())
                 .logoutHms("")

src/main/java/com/its/op/security/WebMvcConfig.java

@@ -24,7 +24,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
         registry.addInterceptor(new ApiInterceptor())
                 .addPathPatterns("/api/**")                         // API Controller interceptors
-                .excludePathPatterns("/facility/**", "/wall/**")    // 해당 경로는 인터셉터가 가로채지 않는다.
+                .excludePathPatterns("/facility/**", "/wall/**", "/dash-board/**")    // 해당 경로는 인터셉터가 가로채지 않는다.
                 ;
     }
 

src/main/java/com/its/op/security/WebSecurityConfig.java

@@ -66,7 +66,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/swagger-ui.html", "/swagger/**", "/swagger-resources/**", "/webjars/**", "/v2/api-docs").permitAll()
                     // 웹소켓 권한 설정하지
                     .antMatchers("/ws/**").permitAll()
-                    .antMatchers("/api/**").permitAll()
+//                    .antMatchers("/api/**").permitAll()
                     // API 권한 설정하지
                     //.antMatchers("/api/**").permitAll()
                     // 지도 URI 권한 설정하지
@@ -76,14 +76,15 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 //                    .antMatchers("/application/facility/**", "/facility/**").permitAll()
                     .antMatchers("/application/**", "/facility/**").permitAll()
                     .antMatchers("/application/wall/**", "/wall/**").permitAll()
+                    .antMatchers("/application/dash-board/**", "/dash-board/**").permitAll()
                     .antMatchers("/application/login/**").permitAll()
                     .antMatchers("/api/auth/**").permitAll()
 //                .antMatchers("/api/**").permitAll()
                     .anyRequest().authenticated()
                     .and()
                     .formLogin()
-//                    .loginPage("/application/login/login.html")
-                    .loginPage("/application/op/00.main/main.html")
+                    .loginPage("/application/login/login.html")
+                    //.loginPage("/api/auth/login.do")
                     .loginProcessingUrl("/api/auth/login.do")
                     .defaultSuccessUrl("/application/op/00.main/main.html", true)
                     .usernameParameter("username")