加油站通知

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -1,6 +1,7 @@
 package com.zswl.cloud.springBtach.server.core.controller;
 
 import com.github.microservice.auth.client.content.ResultContent;
+import com.xiaoju.open.oil.commons.OilRequest;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
 import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
@@ -23,9 +24,9 @@ public class XiaoJuController {
 
     @ApiOperation("同步加油站信息")
     @RequestMapping(value = "receivingGasStation", method = RequestMethod.POST)
-    public ResponseDTO receivingGasStation(@RequestBody NotificationPushStoreInfoRequest notificationPushStoreInfoRequest) {
+    public ResponseDTO receivingGasStation(@RequestBody OilRequest oilRequest) {
 
-        return xiaoJuService.notificationPushStoreInfoRequest(notificationPushStoreInfoRequest);
+        return xiaoJuService.notificationPushStoreInfoRequest(oilRequest);
     }
     @ApiOperation("查看加油站详情")
     @RequestMapping(value = "queryStoreDetail", method = RequestMethod.POST)

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/XiaoJuService.java

@@ -1,9 +1,11 @@
 package com.zswl.cloud.springBtach.server.core.service;
 
 
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.helper.AuthHelper;
+import com.xiaoju.open.oil.commons.OilRequest;
 import com.xiaoju.open.oil.commons.config.OilConfig;
 import com.xiaoju.open.oil.core.QueryClient;
 import com.xiaoju.open.oil.core.QueryClientFactory;
@@ -11,6 +13,7 @@ import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
 import com.xiaoju.open.oil.interfaces.request.QueryStoreDetailRequest;
 import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
+import com.xiaoju.open.oil.security.secret.SecurityService;
 import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 import org.slf4j.Logger;
@@ -34,11 +37,14 @@ public class XiaoJuService {
     OilConfig oilConfig;
 
     // 查询加油站详情
-    public ResponseDTO notificationPushStoreInfoRequest(NotificationPushStoreInfoRequest notificationPushStoreInfoRequest){
+    public ResponseDTO notificationPushStoreInfoRequest(OilRequest oilRequest){
 
-        log.info("通知 加油站详情：{}", JSONUtil.toJsonStr(notificationPushStoreInfoRequest));
-        XiaoJuStore xiaoJuStore = new XiaoJuStore();
-        BeanUtils.copyProperties(notificationPushStoreInfoRequest, xiaoJuStore);
+        log.info("加油站通知原始数据：{}", oilRequest);
+
+        String s = SecurityService.genDecodeData(oilRequest.getData(), oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
+
+        log.info("通知 加油站详情：{}", s);
+        XiaoJuStore xiaoJuStore = JSONUtil.toBean(s, XiaoJuStore.class);
         xiaoJuStoreDao.save(xiaoJuStore);
         ResponseDTO responseDTO = new ResponseDTO();
         responseDTO.setAppKey(oilConfig.getAppId());