提交NGN日志

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/DZMTSJServiceImpl.java

@@ -36,11 +36,13 @@ public class DZMTSJServiceImpl implements IJXDZService {
 
     @Override
     public void backupData(List list, Long dateTime) {
+        Date date = new Date();
         if (CollectionUtil.isNotEmpty(list)) {
             List<StationDailyDataEntity> stationDailyDataEntityList = new ArrayList<>();
             list.forEach(item -> {
                 StationDailyDataEntity stationDailyDataEntity = BeanUtil.copyProperties(item, StationDailyDataEntity.class);
                 stationDailyDataEntity.setDateTime(dateTime);
+                stationDailyDataEntity.setRecDate(date);
                 stationDailyDataEntityList.add(stationDailyDataEntity);
             });
             stationDailyDataService.saveBatch(stationDailyDataEntityList);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/FDZJCServiceImpl.java

@@ -31,11 +31,13 @@ public class FDZJCServiceImpl implements IJXDZService {
 
     @Override
     public void backupData(List list, Long dateTime) {
+        Date date = new Date();
         if (CollectionUtil.isNotEmpty(list)) {
             List<WindStationDataEntity> windStationDataEntityList = new ArrayList<>();
             list.forEach(item -> {
                 WindStationDataEntity windStationDataEntity = BeanUtil.copyProperties(item, WindStationDataEntity.class);
                 windStationDataEntity.setDateTime(dateTime);
+                windStationDataEntity.setRecDate(date);
                 windStationDataEntityList.add(windStationDataEntity);
             });
             windStationDataService.saveBatch(windStationDataEntityList);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/FDZSBJCServiceImpl.java

@@ -17,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class FDZSBJCServiceImpl implements IJXDZService {
@@ -33,11 +30,13 @@ public class FDZSBJCServiceImpl implements IJXDZService {
 
     @Override
     public void backupData(List list, Long dateTime) {
+        Date date = new Date();
         if (CollectionUtil.isNotEmpty(list)) {
             List<WindDeviceDataEntity> windDeviceDataEntityList = new ArrayList<>();
             list.forEach(item -> {
                 WindDeviceDataEntity windDeviceDataEntity = BeanUtil.copyProperties(item, WindDeviceDataEntity.class);
                 windDeviceDataEntity.setDateTime(dateTime);
+                windDeviceDataEntity.setRecDate(date);
                 windDeviceDataEntityList.add(windDeviceDataEntity);
             });
             windDeviceDataService.saveBatch(windDeviceDataEntityList);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/GFDZJCServiceImpl.java

@@ -31,11 +31,13 @@ public class GFDZJCServiceImpl implements IJXDZService {
 
     @Override
     public void backupData(List list, Long dateTime) {
+        Date date = new Date();
         if (CollectionUtil.isNotEmpty(list)) {
             List<PvStationDataEntity> pvStationDataEntityList = new ArrayList<>();
             list.forEach(item -> {
                 PvStationDataEntity pvStationDataEntity = BeanUtil.copyProperties(item, PvStationDataEntity.class);
                 pvStationDataEntity.setDateTime(dateTime);
+                pvStationDataEntity.setRecDate(date);
                 pvStationDataEntityList.add(pvStationDataEntity);
             });
             pvStationDataService.saveBatch(pvStationDataEntityList);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/factory/GFDZSBJCServiceImpl.java

@@ -18,10 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class GFDZSBJCServiceImpl implements IJXDZService {
@@ -34,11 +31,13 @@ public class GFDZSBJCServiceImpl implements IJXDZService {
 
     @Override
     public void backupData(List list, Long dateTime) {
+        Date date = new Date();
         if (CollectionUtil.isNotEmpty(list)) {
             List<PvDeviceDataEntity> pvDeviceDataEntityList = new ArrayList<>();
             list.forEach(item -> {
                 PvDeviceDataEntity pvDeviceDataEntity = BeanUtil.copyProperties(item, PvDeviceDataEntity.class);
                 pvDeviceDataEntity.setDateTime(dateTime);
+                pvDeviceDataEntity.setRecDate(date);
                 pvDeviceDataEntityList.add(pvDeviceDataEntity);
             });
             pvDeviceDataService.saveBatch(pvDeviceDataEntityList);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/jxdz/utils/JXDZUtils.java

@@ -138,6 +138,7 @@ public class JXDZUtils {
         log.info("发送GET请求,请求地址{}", reqUrl);
         HttpEntity entity = new HttpEntity<>(buildHttpHeaders());
         try {
+            log.info("发送GET请求，请求报文{}",entity);
             ResponseEntity<JSONObject> response = restTemplate.exchange(reqUrl, HttpMethod.GET, entity, JSONObject.class);
             if (HttpStatus.OK == response.getStatusCode()) {
                 log.info("发送请求成功，请求返回体{}", response.getBody());
@@ -163,6 +164,7 @@ public class JXDZUtils {
         log.info("发送POST请求,请求地址{}", reqUrl);
         HttpEntity<JSONObject> entity = new HttpEntity<>(buildBody(needDataVO.getPlatformId(), needDataVO.getDateTime(), data, accessType, needDataVO.getReaccessId()), buildHttpHeaders());
         try {
+            log.info("发送POST请求，请求报文{}",entity);
             ResponseEntity<JSONObject> response = restTemplate.postForEntity(reqUrl, entity, JSONObject.class);
             if (HttpStatus.OK == response.getStatusCode()) {
                 JSONObject body = response.getBody();
@@ -219,6 +221,7 @@ public class JXDZUtils {
         }
         jsonObject.put("time", time);
         jsonObject.put("data", data);
+        log.info("发送的原始数据{}",jsonObject);
         return dataEncrypt(jsonObject.toJSONString(), publicKey);
     }
 }