机构类型

src/main/java/com/zswl/dataservice/controller/TestController.java

@@ -2,8 +2,7 @@ package com.zswl.dataservice.controller;
 
 import com.zswl.dataservice.model.mqtt.SendMessageModel;
 import com.zswl.dataservice.service.artemis.ArtemisService;
-import com.zswl.dataservice.service.base.ScanExecuteService;
-import com.zswl.dataservice.service.user.impl.UserServiceImpl;
+import com.zswl.dataservice.service.other.ScanExecuteService;
 import com.zswl.dataservice.utils.result.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/zswl/dataservice/httpRequest/ApiRequestService.java

@@ -8,7 +8,7 @@ import com.zswl.dataservice.httpRequest.apiConf.ApiConfParam;
 import com.zswl.dataservice.httpRequest.conf.FullCardAPIConfig;
 import com.zswl.dataservice.httpRequest.conf.FullCardConf;
 import com.zswl.dataservice.service.base.SuperService;
-import com.zswl.dataservice.service.payment.RequestInfoService;
+import com.zswl.dataservice.service.other.RequestInfoService;
 import com.zswl.dataservice.utils.net.apache.HttpClientUtil;
 import com.zswl.dataservice.utils.net.apache.HttpModel;
 import com.zswl.dataservice.utils.net.apache.ResponseModel;

src/main/java/com/zswl/dataservice/init/ScanMqttEventExecuteRunner.java

@@ -1,13 +1,12 @@
 package com.zswl.dataservice.init;
 
-import com.zswl.dataservice.service.base.ScanExecuteService;
+import com.zswl.dataservice.service.other.ScanExecuteService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /**

src/main/java/com/zswl/dataservice/service/artemis/ArtemisService.java

@@ -110,6 +110,7 @@ public class ArtemisService extends SuperService {
             operationMessage.setDataId(id);
             operationMessage.setIsTimeOut(isTimeOut);
             operationMessage.setEvent(event);
+
             operationMessageService.addOperationMessage(operationMessage);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/zswl/dataservice/service/payment/RequestInfoService.java → src/main/java/com/zswl/dataservice/service/other/RequestInfoService.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.service.payment;
+package com.zswl.dataservice.service.other;
 
 import com.zswl.dataservice.dao.payment.RequestInfoDao;
 import com.zswl.dataservice.domain.payment.RequestInfo;

src/main/java/com/zswl/dataservice/service/base/ScanExecuteService.java → src/main/java/com/zswl/dataservice/service/other/ScanExecuteService.java

@@ -1,4 +1,4 @@
-package com.zswl.dataservice.service.base;
+package com.zswl.dataservice.service.other;
 
 import com.zswl.dataservice.dao.other.ExecuteMethodInfoDao;
 import com.zswl.dataservice.domain.ExecuteAnnotationService;

src/main/java/com/zswl/dataservice/service/base/ScanSupport.java → src/main/java/com/zswl/dataservice/service/other/ScanSupport.java

@@ -1,6 +1,5 @@
-package com.zswl.dataservice.service.base;
+package com.zswl.dataservice.service.other;
 
-import com.zswl.dataservice.helper.ApplicationContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;

src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -13,6 +13,7 @@ import com.zswl.dataservice.model.hxz.ConsumTransactionsResult;
 import com.zswl.dataservice.model.payment.ServerTimeModel;
 import com.zswl.dataservice.model.payment.ServerTimeResult;
 import com.zswl.dataservice.service.base.SuperService;
+import com.zswl.dataservice.service.other.RequestInfoService;
 import com.zswl.dataservice.utils.net.JsonUtil;
 import com.zswl.dataservice.utils.result.ResultContent;
 import lombok.extern.slf4j.Slf4j;