dev

src/main/java/com/its/op/controller/its/LoginController.java

@@ -62,8 +62,7 @@ public class LoginController {
      */
     @PostMapping("/login.do")
     public String postLogin(@ModelAttribute LoginDto.LoginReqDto login, Model model) {
-        log.error("postLogin: login, {}", login.toString());
-        log.error("postLogin: model, {}", model.toString());
+        log.info("postLogin: login, {}, model, {}", login.toString(), model.toString());
         model.addAttribute("login", login);
         return "success";
     }
@@ -71,7 +70,7 @@ public class LoginController {
     public ModelAndView getLogin(HttpServletRequest request, HttpServletResponse response) {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth != null) {
-            //log.error("getLogin3: auth, {}", auth.toString());
+            //log.info("getLogin3: auth, {}", auth.toString());
             expiredCookie(response, WebMvcConfig.USER_UUID);
             expiredCookie(response, WebMvcConfig.USER_TIME);
             new SecurityContextLogoutHandler().logout(request, response, auth);
@@ -120,7 +119,7 @@ public class LoginController {
                     .user_id(WebMvcConfig.decUserId(userId))
                     .login_hms(loginHms)
                     .build();
-            log.info("logout: {}", req.toString());
+            log.info("getSessionUserInfo: {}", req.toString());
             encUserId = userId;
         }
         return UserInfoDto.builder().userId(encUserId).build();
@@ -142,7 +141,7 @@ public class LoginController {
     public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
         Cookie[] cookies = request.getCookies();
         for (int ii = 0; ii < cookies.length; ii++) {
-            log.error("logout: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
+            log.info("logout: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
         }
         String encUserId = "";
         String loginHms = "";
@@ -173,7 +172,7 @@ public class LoginController {
 
         HttpSession session = request.getSession(false);
         if (session != null) {
-            log.error("session: {}", session.toString());
+            log.info("logout: session: {}", session);
             session.invalidate();   // session remove
         }
         new SecurityContextLogoutHandler().logout(request, response, SecurityContextHolder.getContext().getAuthentication());

src/main/java/com/its/op/scheduler/ItsApiScheduler.java

@@ -24,6 +24,7 @@ public class ItsApiScheduler {
     private final UnitSttsJobThread unitSttsJobThread;
     private final DbmsSttsJobThread dbmsSttsJobThread;
     private final TrafficJobThread trafficJobThread;
+    private final ItsOpSigPhaseListener sigPhaseListener;
 
     @PreDestroy
     public void onShutDown() {

src/main/java/com/its/op/scheduler/ItsOpSigPhaseListener.java

@@ -90,9 +90,9 @@ public class ItsOpSigPhaseListener {
 
         stopWatch.stop();
         long totalTimeMillis = stopWatch.getTotalTimeMillis();
-        if (totalTimeMillis > 1000) {
+        //if (totalTimeMillis > 1000) {
             log.info("--RUN: ItsOpSigPhaseListener.run: {}, {} ms.", Thread.currentThread().getName(), totalTimeMillis);
-        }
+        //}
 
         long delayMillis = delayMilliSeconds - totalTimeMillis;
         if (delayMillis < 0) {

src/main/java/com/its/op/service/its/oper/TbUserInfrService.java

@@ -125,11 +125,11 @@ public class TbUserInfrService {
     public TbUserInfrDto updatePswdById(String id, TbUserInfrDto.TbUserPswdUpdReq req) throws NoSuchElementException {
 
         TbUserInfr entity = requireOne(id);
+
         /**
          * 클라이언트 단에서 비밀번호 암호화 한 경우
          */
         String orgPswd = encoding(req.getPwd());
-
         if (req.getOldPwd().equals(orgPswd)) {
             // 비밀번호를 변경하지 않은 것임.(getPwd() => 암화화된 비밀번호가 들어가 있음)
             throw new NoSuchElementException("현재 비빌번호와 같습니다[1]: " + id);

src/main/java/com/its/op/service/its/vds/VdsControlService.java

@@ -320,7 +320,7 @@ public class VdsControlService {
                         }
                     }
                 } catch (IOException e) {
-                    log.error("Image Request. {}, {}, IOException", ipAddress, port);
+                    log.error("requestVdsCommandStopImage: Image Request. {}, {}, IOException", ipAddress, port);
                     String errMsg = "[VDS 서버: " + ipAddress + "." + port + "]";
                     taskResult = 2;
                     result.setResult(taskResult, "VDS 서버와 통신이 실패하였습니다.\r\n" + errMsg);

src/main/java/com/its/op/service/its/vms/TbVmsDsplHsService.java

@@ -51,15 +51,12 @@ public class TbVmsDsplHsService {
      */
     public List<TbVmsDsplHsDto> findAllByDateRange(String fromDt, String toDt, List<Long> ids) {
         List<TbVmsDsplHsDto> result = new ArrayList<>();
-        //log.error("SELECT");
         List<TbVmsDsplHs> data = this.repo.findAllByDateRange(fromDt, toDt, ids);
-        //log.error("FETCH");
         if (data != null) {
             data.forEach(obj -> {
                 result.add(obj.toDto());
             });
         }
-        //log.error("END");
         return result;
     }
 
@@ -81,7 +78,7 @@ public class TbVmsDsplHsService {
                     dto.setImagData(createVmsDsplImage(dto.getImagFmt(), obj.getVms(), id, obj.getVmsDsplMsgData(), obj.getPhase()));
                     result.add(dto);
                 } catch (IOException | ImageReadException e) {
-                    log.error("{}", e.getMessage());
+                    log.error("findAllImageByDateRange: {}", e.getMessage());
                 }
             });
         }
@@ -101,9 +98,9 @@ public class TbVmsDsplHsService {
      */
     public byte[] createVmsDsplImage(String imagFmt, TbVmsCtlr obj, Long id, String msgData, int phaseNum) throws IOException, ImageReadException {
 
-        String saveDir = ItsUtils.createUserDir("/image/vms/dspl-hs/");
+        //String saveDir = ItsUtils.createUserDir("/image/vms/dspl-hs/");
         if (obj == null || obj.getType() == null) {
-            log.error("Not Found VMS Controller: {}, {}", id, obj);
+            log.error("createVmsDsplImage: Not Found VMS Controller: {}, {}", id, obj);
             return null;
         }
 
@@ -177,11 +174,11 @@ public class TbVmsDsplHsService {
                             g2d.drawImage(imgBmp, left, top, imgBmp.getWidth(null), imgBmp.getHeight(null), null);
                         }
                         else {
-                            log.error("symbol image null id: {}, {}, {}", id, phaseNum, symbLibId);
+                            log.error("createVmsDsplImage: symbol image null id: {}, {}, {}", id, phaseNum, symbLibId);
                         }
                     }
                     else {
-                        log.error("Not found symbol id: {}, {}, {}", id, phaseNum, symbLibId);
+                        log.error("createVmsDsplImage: Not found symbol id: {}, {}, {}", id, phaseNum, symbLibId);
                     }
                 }
                 else if (objType == 3) { // draw traffic
@@ -222,11 +219,11 @@ public class TbVmsDsplHsService {
                                 }
                             }
                             else {
-                                log.error("symbol image null id: {}, {}, {}", id, phaseNum, symbLibId);
+                                log.error("createVmsDsplImage: symbol image null id: {}, {}, {}", id, phaseNum, symbLibId);
                             }
                         }
                         else {
-                            log.error("Not found symbol id: {}, {}, {}", id, phaseNum, symbLibId);
+                            log.error("createVmsDsplImage: Not found symbol id: {}, {}, {}", id, phaseNum, symbLibId);
                         }
                     }
                 }

src/main/java/com/its/op/service/its/vms/TbVmsDsplSchService.java

@@ -105,11 +105,11 @@ public class TbVmsDsplSchService {
         Integer phase = 0;
         String imagFmt = "png";
         if (vms == null || vms.getType() == null) {
-            log.error("Not Found VMS Controller: {}", vms);
+            log.error("createVmsTrafScheForm: Not Found VMS Controller: {}", vms);
             return dto.getVmsFormImag();
         }
         if (formObjs.size() == 0) {
-            log.error("VMS Objects zero: {}", vms);
+            log.error("createVmsTrafScheForm: VMS Objects zero: {}", vms);
             return dto.getVmsFormImag();
         }
 
@@ -126,7 +126,7 @@ public class TbVmsDsplSchService {
             ifscIds[2] = req.getThirVmsIfscId();
             ifscIds[3] = req.getFourVmsIfscId();
         } else {
-            log.error("VMS Form draw request object error");
+            log.error("createVmsTrafScheForm: VMS Form draw request object error");
             return null;
         }
         int formColorCd = formObjs.get(0).getVmsFormColrCd();
@@ -233,7 +233,7 @@ public class TbVmsDsplSchService {
                     }
                     g2d.drawImage(symbol, left, top, null);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("createVmsTrafScheForm: {}", e.getMessage());
                 }
             }
         });
@@ -271,7 +271,7 @@ public class TbVmsDsplSchService {
             // 교통정보 폼 그리기
             result.setVmsFormImag(createVmsTrafScheForm(obj, null, formObjs, req));
         } catch (IOException e) {
-            log.error("{}", e.getMessage());
+            log.error("drawTrafficForm: {}", e.getMessage());
         }
 
         return result;
@@ -306,7 +306,7 @@ public class TbVmsDsplSchService {
                 // 교통정보 폼 그리기
                 dto.setVmsFormImag(createVmsTrafScheForm(obj, dto, formObjs, null));
             } catch (IOException e) {
-                log.error("{}", e.getMessage());
+                log.error("findAllTraffic: {}", e.getMessage());
             }
         });
         return dtoList;
@@ -480,7 +480,7 @@ public class TbVmsDsplSchService {
                 result.add(obj);
             }
             catch (Exception e) {
-                log.error("Not Found: {}", key);
+                log.error("batchDeleteByIds: Not Found: {}", key);
             }
         });
         return result;
@@ -501,7 +501,7 @@ public class TbVmsDsplSchService {
         Map<Long, TbVmsCtlr> vmsMap = new HashMap<>();
         List<TbVmsCtlr> vmsList = this.vmsRepo.findAllListByTypeCd(vmsSizeType);
         if (vmsList.size() == 0) {
-            log.error("Not found VMS Size Type Data: {}", vmsSizeType);
+            log.error("findAllByAllEditVmsList: Not found VMS Size Type Data: {}", vmsSizeType);
             return result;
         }
 
@@ -524,7 +524,7 @@ public class TbVmsDsplSchService {
             /** 일괄 등록 인 경우 스케줄에 등록되지 않은 VMS 를 추가해 준다. **/
             vmsList.forEach(obj -> {
                 if (schSet.add(obj.getVmsCtlrNmbr())) {
-                    log.error("ADD: {}", obj.getVmsCtlrNmbr());
+                    //log.info("ADD: {}", obj.getVmsCtlrNmbr());
                     /** 등록되어 있지 않음 VMS 임 **/
                     TbVmsDsplSchVmsListDto dto = TbVmsDsplSchVmsListDto.builder()
                             .vmsCtlrNmbr(obj.getVmsCtlrNmbr())

src/main/java/com/its/op/xnettcp/client/VdsCommClientService.java

@@ -60,7 +60,7 @@ public class VdsCommClientService {
             List<Future<Object>> futures = this.executorService.invokeAll(this.clientTasks);
             log.info("VdsCommClientService.run: {}", futures);
         } catch(InterruptedException e) {
-            log.error("run: Exception: InterruptedException");
+            log.error("VdsCommClientService.run: Exception: InterruptedException");
         }
 
         log.info("===============================================================");

src/main/java/com/its/utils/ItsUtils.java

@@ -261,14 +261,14 @@ public final class ItsUtils
 			return out.toByteArray();
 		}
 		catch (IOException e) {
-			log.error("saveByteArrayToFile: IOException");
+			log.error("convertBmpToPng: IOException");
 		}
 		finally {
 			try {
 				out.close();
 				inStream.close();
 			} catch (IOException e) {
-				log.error("saveByteArrayToFile: out close IOException");
+				log.error("convertBmpToPng: out close IOException");
 			}
 		}
 		return null;

src/main/resources/logback-spring.xml

@@ -70,7 +70,7 @@
             <pattern>${LOG_PATTERN_ERROR}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ERROR}.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ERROR}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -83,7 +83,7 @@
             <pattern>${LOG_PATTERN_CENTER_COMM}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}CenterComm/${LOG_FILE_NAME_CENTER_COMM}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_CENTER_COMM}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -96,7 +96,7 @@
             <pattern>${LOG_PATTERN_CENTER_COMM}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}CenterComm/${LOG_FILE_NAME_NETWORK_CMD}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_NETWORK_CMD}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -109,7 +109,7 @@
             <pattern>${LOG_PATTERN_SQL}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}SQL/${LOG_FILE_NAME_SQL}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_SQL}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>
@@ -122,7 +122,7 @@
             <pattern>${LOG_PATTERN_SCHEDULE}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}Schedule/${LOG_FILE_NAME_SCHEDULE}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_SCHEDULE}.${LOG_FILE_NAME_PATTERN}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>