oracle

pom.xml

@@ -67,11 +67,11 @@
         </dependency>
         <!--  oracle -->
         <!-- 数据库相关, 驱动、mybatis、分页插件 -->
-        <!--<dependency>-->
-            <!--<groupId>com.oracle</groupId>-->
-            <!--<artifactId>ojdbc6</artifactId>-->
-            <!--<version>11.2.0.3</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0</version>
+        </dependency>
 
         <!--  连接池druid  -->
         <dependency>
@@ -202,12 +202,6 @@
 <!--        </dependency>-->
 
 
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
-        </dependency>
-
     </dependencies>
 
     <build>

src/main/java/com/hzjt/HZJTApplication.java

@@ -46,8 +46,8 @@ public class HZJTApplication {
         return new Receiver();
     }
 
-    @Value("${ip.host}")
-    private String ip;
+//    @Value("${ip.host}")
+//    private String ip;
 //
 //    @Bean
 //    public RestTemplate restTemplate(RestTemplateBuilder builder) {

src/main/java/com/hzjt/controller/TraffController.java

@@ -106,7 +106,7 @@ public class TraffController {
 
     @PostMapping("/alarmevent")
     public ResultObj rece(@RequestBody Alarm trffClientMessage) {
-//        log.info("alarmevent--------------");
+    log.info("alarmevent--------------"+trffClientMessage.toString());
         if (!TYPE.equals(trffClientMessage.getType())) {
             return ResultObj.error(ResponseEnum.E_1002.getCode(), "type类型不正确");
         }
@@ -116,18 +116,18 @@ public class TraffController {
             return ResultObj.error(ResponseEnum.E_1004.getCode(), "img_urls值不能为空");
         }
         if (StringUtils.isBlank(trffClientMessage.getIncident_type())) {
-//            log.info("incident_type值不能为空" + trffClientMessage.toString());
+            log.info("incident_type值不能为空" + trffClientMessage.toString());
             return ResultObj.error(ResponseEnum.E_1004.getCode(), "incident_type值不能为空");
         }
         String videoId = trffClientMessage.getVideo_id();
 
         if (StringUtils.isBlank(videoId)) {
-//            log.info("video_id值异常 值为:" + videoId);
+            log.info("video_id值异常 值为:" + videoId);
             return ResultObj.error(ResponseEnum.E_1002.getCode(), "video_id值异常 值为:" + videoId);
         }
         /* 限流 */
         if (!getRateLimiter(videoId).tryAcquire()) {
-//            log.info("[事件推送]->设备" + videoId + "-推送已达到限流限制");
+            log.info("[事件推送]->设备" + videoId + "-推送已达到限流限制");
             return ResultObj.error(ResponseEnum.E_9999.getCode(), "设备" + videoId + "请求过于频繁");
         }
         String sbbh="";
@@ -143,12 +143,12 @@ public class TraffController {
 
         List<Sbtdspsr> sbtdspsrs = sbtdspsrMapper.selectBySbbh(sbbh, tdbh);
         if (sbtdspsrs.isEmpty()) {
-//            log.info("设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
+            log.info("设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
             return ResultObj.error(ResponseEnum.E_1002.getCode(), "设备为:" + sbbh + ",通道为:" + tdbh + "未录入(备案)");
         }
         String xzbh = sbtdspsrs.get(0).getXzbh();
         if (xzbh.length() != 12) {
-//            log.info("设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划" + xzbh + "不合规");
+            log.info("设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划" + xzbh + "不合规");
             return ResultObj.error(ResponseEnum.E_1002.getCode(), "设备为:" + sbbh + ",通道为:" + tdbh + "配置的行政区划不合规");
         }
         //ts  時間轉成正常時間
@@ -171,7 +171,7 @@ public class TraffController {
         traffAlarmRecord.setAreaid(Long.valueOf(trffClientMessage.getDept()));
         traffAlarmRecord.setRecordtype(trffClientMessage.getIncident_type().toLowerCase());
         traffAlarmRecord.setRecordtime(new Date(Long.valueOf(trffClientMessage.getTs())));
-        Integer channelid=0;
+        Integer channelid=Integer.valueOf(0);
         if(trffClientMessage.getVideo_id().contains("_")&& trffClientMessage.getVideo_id().split("_").length == 2) {
             String[] videoIdArr = trffClientMessage.getVideo_id().split("_");
             traffAlarmRecord.setFdid(videoIdArr[0]);
@@ -179,6 +179,7 @@ public class TraffController {
         }
         else{
             traffAlarmRecord.setFdid(trffClientMessage.getVideo_id());
+
         }
         traffAlarmRecord.setChannelid(channelid);
 
@@ -256,7 +257,7 @@ public class TraffController {
             Map<String, Object> transferRecordMap = new HashMap<>();
             FileTransferManager.fetchUrlsFromRecord(traffAlarmRecord, transferRecordMap);
             List<TransferResult> results = FileTransferManager.transferFile(transferRecordMap, ftp, basepath);
-//            log.info("缓存数据上传结果：" + results.toString());
+            log.info("缓存数据上传结果：" + results.toString());
             Traffalarmrecord recordBak = FileTransferManager.traffAlarmRecordUrlUpdate(results);
             traffAlarmRecord.setImg2path(recordBak.getImg2path());
             traffAlarmRecord.setImg3path(recordBak.getImg3path());
@@ -286,7 +287,7 @@ public class TraffController {
                                 String ftputl = FTPUtil.getFtpUrl(ftp) + basepath + "/" + fileName;
                                 if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
                                     InputStream inputStream = connection.getInputStream();
-//                                    log.info("url:", url, " --- " + "key:", key);
+                                    log.info("url:", url, " --- " + "key:", key);
                                     boolean r = FTPUtil.uploadFile(ftp, basepath, fileName, inputStream);
                                     if (r) traffAlarmRecord.setVideopath(ftputl);
                                     //只更新监控
@@ -296,12 +297,12 @@ public class TraffController {
                                         //推送给第三方
                                         if(!manualStatus.equalsIgnoreCase("1")) {
                                             ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
-//                                        log.info("send to guangda:HTTP_OK" + obj.toString());
+                                        log.info("send to guangda:HTTP_OK" + obj.toString());
                                         }
                                     }
                                 } else {
                                     ResultObj obj = eventWriteService.updateAndAutoSendEvent(traffAlarmRecord);
-//                                    log.info("send to guangda HttpURLConnection.HTTP_Fail--->response message:" + obj.toString());
+                                    log.info("send to guangda HttpURLConnection.HTTP_Fail--->response message:" + obj.toString());
                                 }
                             } catch (IOException e) {
                                 System.out.println(e.toString());