dev

evps-comm-server/build.gradle

@@ -52,3 +52,8 @@ test {
 jar {
     enabled = false
 }
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:unchecked'
+    options.deprecation = true
+}

evps-comm-server/src/main/java/com/evps/comm/server/config/KafkaConfig.java

@@ -41,7 +41,7 @@ public class KafkaConfig {
     }
 
     public Map<String, Object> getConsumerPropertiesMap() {
-        Map<String, Object> properties = new HashMap();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, this.bootstrapServers);
         properties.put(ConsumerConfig.GROUP_ID_CONFIG, getGroupId());
         properties.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");

evps-comm-server/src/main/java/com/evps/comm/server/process/dbms/DbmsData.java

@@ -4,6 +4,9 @@ import com.evps.common.dto.EvpsCenter;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Getter
 @Setter
 public class DbmsData {

evps-comm-server/src/main/java/com/evps/comm/server/process/dbms/DbmsDataProcess.java

@@ -78,6 +78,7 @@ public class DbmsDataProcess {
     public void process(DbmsData data) {
         int result = -1;
         int type = -1;
+        String typeDesc = "";
         EvpsCenter center = data.getCenter();
         try {
             MDC.put("id", center.getLogKey());
@@ -86,39 +87,47 @@ public class DbmsDataProcess {
             type = data.getType();
             switch(type) {
                 case DbmsData.DBMS_DATA_INS_SERVICE:
+                    typeDesc = "DBMS_DATA_INS_SERVICE";
                     KafkaEvpsServiceDto newService = (KafkaEvpsServiceDto)data.getData();
                     result = this.serviceMapper.insertEvpService(newService);
                     break;
                 case DbmsData.DBMS_DATA_UPD_SERVICE:
+                    typeDesc = "DBMS_DATA_UPD_SERVICE";
                     KafkaEvpsServiceDto updService = (KafkaEvpsServiceDto)data.getData();
                     result = this.serviceMapper.updateEvpService(updService);
                     break;
 
                 case DbmsData.DBMS_DATA_INS_EVENT:
+                    typeDesc = "DBMS_DATA_INS_EVENT";
                     KafkaEvpsEventDto event = (KafkaEvpsEventDto)data.getData();
                     result = this.serviceMapper.insertEvpEvent(event);
                     break;
                 case DbmsData.DBMS_DATA_INS_ROUTE:
-                    List<HashMap<String, Object>> routeList = (List<HashMap<String, Object>>)data.getData();
+                    typeDesc = "DBMS_DATA_INS_ROUTE";
+                    List<HashMap<String, Object>> routeList = (List<HashMap<String, Object>>) data.getData();
                     result = this.evpCommServerDao.insertEvpRoute(routeList);
                     break;
                 case DbmsData.DBMS_DATA_INS_NODE:
+                    typeDesc = "DBMS_DATA_INS_NODE";
                     List<HashMap<String, Object>> nodeList = (List<HashMap<String, Object>>)data.getData();
                     result = this.evpCommServerDao.insertEvpNode(nodeList);
                     break;
 
                 case DbmsData.DBMS_DATA_INS_PHASE:
+                    typeDesc = "DBMS_DATA_INS_PHASE";
                     List<HashMap<String, Object>> phaseList = (List<HashMap<String, Object>>)data.getData();
                     result = this.evpCommServerDao.insertEvpPhase(phaseList);
                     break;
 
                 case DbmsData.DBMS_DATA_INS_SIGNAL:
+                    typeDesc = "DBMS_DATA_INS_SIGNAL";
                     List<HashMap<String, Object>> signalList = (List<HashMap<String, Object>>)data.getData();
                     result = this.evpCommServerDao.insertEvpSignal(signalList);
                     break;
 
 
                 case DbmsData.DBMS_DATA_CENTER_STTS_UPDATE:
+                    typeDesc = "DBMS_DATA_CENTER_STTS_UPDATE";
                     TbRegionCenterComm updStts = (TbRegionCenterComm) data.getData();
 //                    this.centerMapper.updateCommState(updStts);
                     break;
@@ -127,12 +136,15 @@ public class DbmsDataProcess {
                     TbRegionCenterComm stts = (TbRegionCenterComm) data.getData();
                     switch(stts.getCommState()) {
                         case TbRegionCenterComm.CENTER_COMM_START:
+                            typeDesc = "CENTER_COMM_START";
                             result = this.evpsCenterMapper.updateCommStateConnect(stts.getCenterId());
                             break;
                         case TbRegionCenterComm.CENTER_COMM_STOP:
+                            typeDesc = "CENTER_COMM_STOP";
                             result = this.evpsCenterMapper.updateCommStateDisconnect(stts.getCenterId());
                             break;
                         case TbRegionCenterComm.CENTER_COMM_LAST:
+                            typeDesc = "CENTER_COMM_LAST";
                             result = this.evpsCenterMapper.updateCommLastComm(stts.getCenterId());
                             break;
                     }
@@ -142,7 +154,7 @@ public class DbmsDataProcess {
                     break;
             }
             log.info("DbmsDataProcess.run: [{}]. {}, {} EA. {}",
-                    center.getLogKey(), type, result, Elapsed.elapsedTimeStr(elapsed1.nanoSeconds()));
+                    center.getLogKey(), typeDesc, result, Elapsed.elapsedTimeStr(elapsed1.nanoSeconds()));
         }
         catch (Exception e) {
             log.error("DbmsJobProcess.process: [{}]. {}, Exception: {}", center.getLogKey(), type, e.toString());

evps-comm-server/src/main/java/com/evps/comm/server/xnet/server/handler/EvpsCommServerInboundMessageHandler.java

@@ -96,7 +96,7 @@ public class EvpsCommServerInboundMessageHandler extends SimpleChannelInboundHan
             log.error("channelInactive: Unknown Center: [{}].", NettyUtils.getAddress(ctx.channel()));
             return;
         }
-        log.info("channelInactive: [{}].", center.getCenterId());
+        log.info("channelInactive: [{}]. CenterId: {}.", NettyUtils.getAddress(ctx.channel()), center.getCenterId());
         center.getNetState().disConnect();
 
         ApplicationRepository.setCenterObject(ctx.channel(), null);

evps-common/build.gradle

@@ -48,3 +48,8 @@ task runInstallJarLibrary(type:Exec) {
     }
 }
 jar.finalizedBy runInstallJarLibrary
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:unchecked'
+    options.deprecation = true
+}

evps-consumer/build.gradle

@@ -38,4 +38,9 @@ test {
 
 jar {
     enabled = false
-}
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:unchecked'
+    options.deprecation = true
+}