commit

src/main/java/com/its/pis/entity/TbPisInfr.java

@@ -186,7 +186,7 @@ public class TbPisInfr {
 		ObjectMapper mapper = new ObjectMapper();
 		try {
 			String strMessage = mapper.writeValueAsString(message);
-			log.error("{}", strMessage);
+			//log.info("{}", strMessage);
 			TextMessage txtMessage = new TextMessage(strMessage);
 			getSession().sendMessage(request.getEvent_name(), txtMessage);
 		} catch (JsonProcessingException e) {

src/main/java/com/its/pis/process/DbmsDataProcess.java

@@ -63,7 +63,7 @@ public class DbmsDataProcess {
                         }
                     }
                     catch (Exception e) {
-                        log.error("DbmsDataProcess.Task: Exception: {}", e.getMessage(), e);
+                        log.error("DbmsDataProcess.Task: Exception: {}", e.getMessage());
                     }
                 }
             });
@@ -120,7 +120,7 @@ public class DbmsDataProcess {
                 case DbmsData.DBMS_DATA_RL_TIME_HS:
                     TbPrkPlceRtHs rtHs = (TbPrkPlceRtHs)data.getData();
                     int result = this.prkPlceMapper.insertPrkPlceRlTimeHs(rtHs);
-                    log.error("DATA_TYPE_RL_TIME_HS: {}, {} EA.", rtHs.getCrtnDt(), result);
+                    log.info("DATA_TYPE_RL_TIME_HS: {}, {} EA.", rtHs.getCrtnDt(), result);
                     break;
                 case DbmsData.DBMS_DATA_PIS_STTS:
                     List<TbPisInfrStts> pisSttsList = (List<TbPisInfrStts>)data.getData();
@@ -136,7 +136,7 @@ public class DbmsDataProcess {
                     this.prkPlceDao.updatePrkPlceStts(prltSttsList, data.isHistory());
                     if (data.isHistory()) {
                         int res = this.prkPlceDao.insertPrkPlceSttsHs(prltSttsList);
-                        log.error("DATA_TYPE_PRK_PLCE_STTS: {}, {}/{} EA. ", prltSttsList.get(0).getUPDT_DT(), prltSttsList.size(), res);
+                        log.info("DATA_TYPE_PRK_PLCE_STTS: {}, {}/{} EA. ", prltSttsList.get(0).getUPDT_DT(), prltSttsList.size(), res);
                     }
                     prltSttsList.clear();
                     break;
@@ -163,7 +163,7 @@ public class DbmsDataProcess {
                 log.error("DbmsDataProcess.add: Queue Full Error, Size: {} EA", DBMS_DATA_QUEUE.size());
             }
         } catch (Exception e) {
-            log.error("DbmsDataProcess.add: Exception: {}", e.getMessage(), e);
+            log.error("DbmsDataProcess.add: Exception: {}", e.getMessage());
         }
         return offer;
     }

src/main/java/com/its/pis/process/WorkDataProcess.java

@@ -73,7 +73,7 @@ public class WorkDataProcess {
      * @param data
      */
     public void runJob(WorkData data) {
-        log.error("WorkDataProcess.runJob: {}", Thread.currentThread().getName());
+        log.info("WorkDataProcess.runJob: {}", Thread.currentThread().getName());
         process(data);
     }
 
@@ -150,7 +150,7 @@ public class WorkDataProcess {
                 log.error("WorkDataProcess.add: Queue Full Error, Size: {} EA", WORK_DATA_QUEUE.size());
             }
         } catch (Exception e) {
-            log.error("WorkDataProcess.add: Exception: {}", e.getMessage(), e);
+            log.error("WorkDataProcess.add: Exception: {}", e.getMessage());
         }
         return offer;
     }

src/main/java/com/its/pis/service/PisInfrService.java

@@ -27,7 +27,7 @@ public class PisInfrService {
     private PrkPlceMapper prkPlceMapper;
     private DbmsDataProcess dbmsDataProcess;
 
-    private int sttsMin;
+    private int historyMin;
 
     @PostConstruct
     private void init() {
@@ -35,6 +35,7 @@ public class PisInfrService {
         this.pisInfrMapper = (PisInfrMapper) AppUtils.getBean(PisInfrMapper.class);
         this.prkPlceMapper = (PrkPlceMapper) AppUtils.getBean(PrkPlceMapper.class);
         this.dbmsDataProcess = (DbmsDataProcess) AppUtils.getBean(DbmsDataProcess.class);
+        this.historyMin = -1;
         log.info("PisInfrService.init: ..End.");
     }
 
@@ -175,9 +176,9 @@ public class PisInfrService {
         boolean insHs = false;
         Calendar cal = Calendar.getInstance();
         int min = cal.get(Calendar.MINUTE);
-        if ((min % 5) == 0) {
+        if ((min % 5) == 0 && this.historyMin != min) {
             insHs = true;
-            this.sttsMin = min;
+            this.historyMin = min;
         }
 
         if (insHs) {
@@ -250,7 +251,7 @@ public class PisInfrService {
             this.dbmsDataProcess.add(new DbmsData(DbmsData.DBMS_DATA_PRK_PLCE_STTS, insHs, prkPlceSttsList, null));
         }
         if (insHs) {
-            log.error("DATA_TYPE_PRK_PLCE_STTS: {}, {} EA.", UPDT_DT, prkPlceSttsList.size());
+            log.info("DATA_TYPE_PRK_PLCE_STTS: {}, {} EA.", UPDT_DT, prkPlceSttsList.size());
         }
         log.info("PisInfrService.updateCtlrStts: PIS, total {}, normal {}, error {}", normal + error, normal, error);
     }
@@ -259,7 +260,7 @@ public class PisInfrService {
         TbPrkPlceRtHs rtHs = TbPrkPlceRtHs.builder()
                 .crtnDt(SysUtils.getSysTimeHm())
                 .build();
-        log.error("insertPrkPlceRlTimeHs: {}", rtHs.getCrtnDt());
+        log.info("insertPrkPlceRlTimeHs: {}", rtHs.getCrtnDt());
         this.dbmsDataProcess.add(new DbmsData(DbmsData.DBMS_DATA_RL_TIME_HS, true, rtHs, null));
     }
 

src/main/java/com/its/pis/service/UnitSystService.java

@@ -37,7 +37,7 @@ public class UnitSystService {
     private final DbmsDataProcess dbmsDataProcess;
 
     private String processId;
-    private int sttsMin;
+    private int historyMin;
     public static String _srcIpAddr;
 
     @PostConstruct
@@ -45,6 +45,7 @@ public class UnitSystService {
         log.info("[INIT...] UnitSystService.init: start.");
         ProcessConfig processConfig = (ProcessConfig) AppUtils.getBean(ProcessConfig.class);
         this.processId = processConfig.getId();
+        this.historyMin = -1;
 
         try {
             InetAddress local = InetAddress.getLocalHost();
@@ -102,9 +103,9 @@ public class UnitSystService {
         boolean insHs = false;
         Calendar cal = Calendar.getInstance();
         int min = cal.get(Calendar.MINUTE);
-        if ((min % 5) == 0) {
+        if ((min % 5) == 0 && this.historyMin != min) {
             insHs = true;
-            this.sttsMin = min;
+            this.historyMin = min;
         }
 
         String SYST_STTS_CD = isRun ? "SPS1" : "SPS3";

src/main/java/com/its/pis/websocket/PisWebSocketHandlerC2F.java

@@ -56,8 +56,8 @@ public class PisWebSocketHandlerC2F extends PisWebSocketHandler {
 
         C2FMessage<C2FMessagePayload> c2fMessage = this.mapper.readValue(payloadMessage, new TypeReference<C2FMessage<C2FMessagePayload>>(){});
         if (c2fMessage.getCommand() == null) {
-            log.error("C2F: C2FMessage, {}", c2fMessage);
-            log.error("C2F: command data not found, session will be closed {}", session);
+            log.error("C2F: C2FMessage NULL, {}", c2fMessage);
+            log.error("C2F: C2FMessage NULL, command data not found, session will be closed {}", session);
             session.close();
             return;
         }

src/main/java/com/its/pis/websocket/PisWebSocketSession.java

@@ -28,7 +28,7 @@ public class PisWebSocketSession {
                 try {
                     this.session.sendMessage(message);
                 } catch (IOException e) {
-                    log.error("sendMessage: command: {}, session: {}", command, session);
+                    log.error("sendMessage: command: {}, session: {}, exception: {}", command, session, e.getMessage());
                 }
             }
         }

src/test/java/com/its/app/PisCommServerApplicationTests.java

@@ -23,8 +23,8 @@ public class PisCommServerApplicationTests {
         double sped1 = 14.3;
         double sped2 = 14.9;
 
-        log.error("SPED1: {}, {}, {}, {}", sped1, (int)sped1, String.valueOf(sped1), String.valueOf(Math.round(sped1)));
-        log.error("SPED2: {}, {}, {}, {}", sped2, (int)sped2, String.valueOf(sped2), String.valueOf(Math.round(sped2)));
+        log.info("SPED1: {}, {}, {}, {}", sped1, (int)sped1, String.valueOf(sped1), String.valueOf(Math.round(sped1)));
+        log.info("SPED2: {}, {}, {}, {}", sped2, (int)sped2, String.valueOf(sped2), String.valueOf(Math.round(sped2)));
 
     }