diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java index d81610a89..3a64dc26d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java @@ -10,7 +10,7 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; -import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; import com.jsowell.pile.vo.uniapp.PileConnectorVO; import com.jsowell.service.PileService; @@ -31,7 +31,7 @@ public class JumpController extends BaseController { private PileService pileService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; /** * 查询充电桩详情 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java index 64fd02cb5..a0907947a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpXixiaoController.java @@ -9,7 +9,7 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; -import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; import com.jsowell.pile.vo.uniapp.PileConnectorVO; import com.jsowell.service.PileService; @@ -30,7 +30,7 @@ public class JumpXixiaoController extends BaseController { private PileService pileService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; /** * 查询充电桩详情 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index fa8345460..fb19ab085 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -15,9 +15,9 @@ import com.jsowell.common.util.SMSUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.MemberPlateNumberRelationService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -43,13 +43,13 @@ public class MemberController extends BaseController { private MemberService memberService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; /** * 下发短信接口 business diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java index e99ca125b..993bab4f5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java @@ -11,7 +11,7 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.dto.QueryOccupyOrderDTO; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.OrderPileOccupyService; import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; @@ -35,7 +35,7 @@ public class OccupyOrderController extends BaseController { private OrderPileOccupyService orderPileOccupyService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; /** * 查询站点占桩费率 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java index 88bf58bcd..3c6d046c7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java @@ -11,7 +11,7 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IMemberBasicInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.OrderVO; import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO; @@ -45,7 +45,7 @@ public class OrderController extends BaseController { private WxAppletRemoteService wxAppletRemoteService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; /** * 生成订单 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 80023c631..f1d88d7f0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -13,8 +13,8 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.pile.vo.uniapp.PayModeVO; @@ -47,13 +47,13 @@ public class PayController extends BaseController { private RedisCache redisCache; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private MemberService memberService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 充值余额支付/微信余额充值 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java index 7c0fdbae7..7aa1bdf49 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java @@ -10,8 +10,8 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.PileMemberBindingDTO; import com.jsowell.pile.dto.QueryPersonPileDTO; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -37,10 +37,10 @@ public class PersonPileController extends BaseController { private PileService pileService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; /** diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 65a67c294..eadfbc560 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -31,16 +31,16 @@ import java.util.List; public class PileController extends BaseController { @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private OrderPileOccupyService orderPileOccupyService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 0220bbe81..6fbc5b99c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -47,7 +47,7 @@ public class TempController extends BaseController { private OrderBasicInfoService orderBasicInfoService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; @Autowired private AdapayMemberAccountService adapayMemberAccountService; @@ -56,16 +56,16 @@ public class TempController extends BaseController { private AdapayService adapayMemberService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private OrderService orderService; @Autowired - private ISettleOrderReportService settleOrderReportService; + private SettleOrderReportService settleOrderReportService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 临时刷数据接口 diff --git a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java index 19786245e..3600abe9b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java @@ -15,7 +15,7 @@ import com.jsowell.pile.domain.agentDev.AuditItem; import com.jsowell.pile.domain.agentDev.CategoryInfo; import com.jsowell.pile.domain.agentDev.UserInfoSetting; import com.jsowell.pile.dto.agentDev.*; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.agentDev.AuthInfoVO; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -47,7 +47,7 @@ public class AgentDevService { private RedisCache redisCache; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 第三方平台 appid diff --git a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java index 703100e29..6cc6d1173 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java @@ -2,10 +2,6 @@ package com.jsowell.service; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.model.ObjectMetadata; -import com.jsowell.common.config.AliyunOssConfig; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; @@ -15,16 +11,13 @@ import com.jsowell.common.util.file.ImageUtils; import com.jsowell.common.util.sign.MD5Util; import com.jsowell.netty.server.mqtt.BootNettyMqttChannelInboundHandler; import com.jsowell.pile.domain.PileCameraInfo; -import com.jsowell.pile.dto.GenerateOccupyOrderDTO; import com.jsowell.pile.dto.camera.Camera2GroundLockCommand; import com.jsowell.pile.dto.camera.CameraHeartBeatDTO; import com.jsowell.pile.dto.camera.CameraIdentifyResultsDTO; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IPileCameraInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileCameraInfoService; import com.jsowell.pile.service.OrderPileOccupyService; import com.jsowell.pile.vo.uniapp.MemberVO; -import io.netty.channel.Channel; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,11 +28,6 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.Base64; import javax.imageio.ImageIO; @@ -60,7 +48,7 @@ public class CameraService { private RedisCache redisCache; @Autowired - private IPileCameraInfoService pileCameraInfoService; + private PileCameraInfoService pileCameraInfoService; @Autowired private OrderPileOccupyService orderPileOccupyService; @@ -69,7 +57,7 @@ public class CameraService { private BootNettyMqttChannelInboundHandler handler; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; public void receiveIdentifyResults(JSONObject jsonObject) throws InterruptedException { diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index c35eb9780..312983364 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -66,22 +66,22 @@ public class MemberService { private TransactionService transactionService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private WxAppletRemoteService wxAppletRemoteService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; @Autowired private PileAuthCardService pileAuthCardService; @Autowired - private IMemberInvoiceTitleService memberInvoiceTitleService; + private MemberInvoiceTitleService memberInvoiceTitleService; @Autowired private MemberWalletInfoService memberWalletInfoService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 93a39604f..d9b54799a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -78,7 +78,7 @@ public class OrderService { private MemberService memberService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private OrderPayRecordService orderPayRecordService; @@ -87,25 +87,25 @@ public class OrderService { private WechatPayService wechatPayService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IOrderInvoiceRecordService orderInvoiceRecordService; + private OrderInvoiceRecordService orderInvoiceRecordService; @Autowired - private IPileStationWhitelistService pileStationWhitelistService; + private PileStationWhitelistService pileStationWhitelistService; @Autowired private AdapayCallbackRecordService adapayCallbackRecordService; @Autowired - private IMemberInvoiceTitleService memberInvoiceTitleService; + private MemberInvoiceTitleService memberInvoiceTitleService; @Autowired - private IAdapayRefundRecordService adapayRefundRecordService; + private AdapayRefundRecordService adapayRefundRecordService; @Autowired private AdapayMemberAccountService adapayMemberAccountService; @@ -120,7 +120,7 @@ public class OrderService { private OrderPileOccupyService orderPileOccupyService; @Resource - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Resource private MemberWalletLogService memberWalletLogService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index c5e5b7e2a..42a3de857 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -66,25 +66,25 @@ public class PileService { private SnUtils snUtils; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileMemberRelationService pileMemberRelationService; + private PileMemberRelationService pileMemberRelationService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private MemberService memberService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index fefca3f2b..8828fbe19 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -65,10 +65,10 @@ public class TempService { private WxpayRefundCallbackService wxpayRefundCallbackService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private ISettleOrderReportService settleOrderReportService; + private SettleOrderReportService settleOrderReportService; @Autowired private AdapayMemberAccountService adapayMemberAccountService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java index 4e5f5d173..0ad802722 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.IndexQueryDTO; -import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.vo.web.IndexOrderInfoVO; @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/index") public class indexController extends BaseController { @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 1efbe9ae6..07ee2e2a6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -20,9 +20,9 @@ import com.jsowell.pile.dto.CreateMerchantVipDTO; import com.jsowell.pile.dto.PlatformTesterDTO; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IMemberTransactionRecordService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.MemberPlateNumberRelationService; +import com.jsowell.pile.service.MemberTransactionRecordService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; @@ -50,13 +50,13 @@ import java.util.List; @RequestMapping("/member/info") public class MemberBasicInfoController extends BaseController { @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; /** * 查询会员基础信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderAbnormalRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderAbnormalRecordController.java index 7baa776e6..751a2e8ad 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderAbnormalRecordController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderAbnormalRecordController.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderAbnormalRecord; -import com.jsowell.pile.service.IOrderAbnormalRecordService; +import com.jsowell.pile.service.OrderAbnormalRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -32,7 +32,7 @@ import java.util.List; @RequestMapping("/order/abnormalRecord") public class OrderAbnormalRecordController extends BaseController { @Autowired - private IOrderAbnormalRecordService orderAbnormalRecordService; + private OrderAbnormalRecordService orderAbnormalRecordService; /** * 查询订单异常记录列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index dd6ff00ed..72dab7bdd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -15,8 +15,8 @@ import com.jsowell.pile.dto.ApplyRefundDTO; import com.jsowell.pile.dto.ManualSettlementDTO; import com.jsowell.pile.dto.QueryMerchantOrderDTO; import com.jsowell.pile.dto.QueryOrderDTO; -import com.jsowell.pile.service.IPileMerchantInfoService; -import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; +import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.web.OrderListVO; @@ -45,10 +45,10 @@ public class OrderBasicInfoController extends BaseController { private OrderService orderService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; /** * 查询订单列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java index 3662385d8..ac1d0fa36 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java @@ -3,16 +3,13 @@ package com.jsowell.web.controller.pile; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; -import com.jsowell.common.core.domain.model.LoginUser; -import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; -import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.dto.GetInvoiceInfoDTO; -import com.jsowell.pile.service.IOrderInvoiceRecordService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.OrderInvoiceRecordService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -38,10 +35,10 @@ import java.util.List; @RequestMapping("/order/invoice") public class OrderInvoiceRecordController extends BaseController { @Autowired - private IOrderInvoiceRecordService orderInvoiceRecordService; + private OrderInvoiceRecordService orderInvoiceRecordService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 查询申请开票列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java index e96410831..bdf255138 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java @@ -14,8 +14,8 @@ import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.dto.BatchCreatePileDTO; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.ReplaceMerchantStationDTO; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.service.PileService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,13 +42,13 @@ import java.util.List; @RequestMapping("/pile/basic") public class PileBasicInfoController extends BaseController { @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private PileService pileService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; /** * 查询设备管理列表 */ diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java index 356f5f0cc..1dac8d0ae 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java @@ -12,7 +12,7 @@ import com.jsowell.pile.domain.PileBillingTemplate; import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO; import com.jsowell.pile.dto.ImportBillingTemplateDTO; import com.jsowell.pile.dto.PublishBillingTemplateDTO; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.service.PileRemoteService; import io.swagger.annotations.Api; @@ -42,7 +42,7 @@ import java.util.List; @RequestMapping("/billing/template") public class PileBillingTemplateController extends BaseController { @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private PileRemoteService pileRemoteService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileCameraInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileCameraInfoController.java index a08818775..894f71661 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileCameraInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileCameraInfoController.java @@ -18,7 +18,7 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.enums.BusinessType; import com.jsowell.pile.domain.PileCameraInfo; -import com.jsowell.pile.service.IPileCameraInfoService; +import com.jsowell.pile.service.PileCameraInfoService; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.core.page.TableDataInfo; @@ -32,7 +32,7 @@ import com.jsowell.common.core.page.TableDataInfo; @RequestMapping("/pile/camera") public class PileCameraInfoController extends BaseController { @Autowired - private IPileCameraInfoService pileCameraInfoService; + private PileCameraInfoService pileCameraInfoService; /** * 查询车位相机信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index 43522e00d..31b5494ce 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -11,7 +11,7 @@ import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; -import com.jsowell.pile.service.IPileConnectorInfoService; +import com.jsowell.pile.service.PileConnectorInfoService; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,7 +34,7 @@ import java.util.List; @RequestMapping("/pile/connector") public class PileConnectorInfoController extends BaseController { @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; /** * 查询充电桩枪口信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java index 83836f41c..ffa4b6138 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileFirmwareInfo; -import com.jsowell.pile.service.IPileFirmwareInfoService; +import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/pile/firmware") public class PileFirmwareInfoController extends BaseController { @Autowired - private IPileFirmwareInfoService pileFirmwareInfoService; + private PileFirmwareInfoService pileFirmwareInfoService; /** * 查询充电桩固件信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileLicenceInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileLicenceInfoController.java index 714e6da88..4df0c74c9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileLicenceInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileLicenceInfoController.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileLicenceInfo; -import com.jsowell.pile.service.IPileLicenceInfoService; +import com.jsowell.pile.service.PileLicenceInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; public class PileLicenceInfoController extends BaseController { @Autowired - private IPileLicenceInfoService pileLicenceInfoService; + private PileLicenceInfoService pileLicenceInfoService; /** * 查询充电桩证书信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index 0c295e5aa..ca78727d9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -11,7 +11,7 @@ import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; import com.jsowell.pile.dto.QueryMerchantInfoDTO; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -29,7 +29,7 @@ import java.util.List; @RequestMapping("/pile/merchant") public class PileMerchantInfoController extends BaseController { @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 查询充电桩运营商信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileModelInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileModelInfoController.java index 6ae56c102..22189e2e0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileModelInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileModelInfoController.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileModelInfo; -import com.jsowell.pile.service.IPileModelInfoService; +import com.jsowell.pile.service.PileModelInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RequestMapping("/pile/model") public class PileModelInfoController extends BaseController { @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; /** * 查询充电桩型号信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java index d1c7a7e43..215beb9bd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java @@ -5,12 +5,11 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; -import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.dto.SimRenewDTO; -import com.jsowell.pile.service.IPileSimInfoService; +import com.jsowell.pile.service.PileSimInfoService; import com.jsowell.pile.service.SimCardService; import com.jsowell.pile.vo.web.SimCardInfoVO; import com.jsowell.pile.vo.web.SimRenewResultVO; @@ -38,7 +37,7 @@ import java.util.List; @RequestMapping("/pile/sim") public class PileSimInfoController extends BaseController { @Autowired - private IPileSimInfoService pileSimInfoService; + private PileSimInfoService pileSimInfoService; @Autowired private SimCardService simCardService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index 01b9af3ee..8995fb872 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -23,10 +23,10 @@ import com.jsowell.pile.dto.PushStationInfoDTO; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.amap.EditAmapFlagDTO; import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO; -import com.jsowell.pile.service.IPileStationInfoService; -import com.jsowell.pile.service.IThirdPartyParkingConfigService; -import com.jsowell.pile.service.IThirdPartyStationRelationService; -import com.jsowell.pile.service.IThirdPartySettingInfoService; +import com.jsowell.pile.service.PileStationInfoService; +import com.jsowell.pile.service.ThirdPartyParkingConfigService; +import com.jsowell.pile.service.ThirdPartyStationRelationService; +import com.jsowell.pile.service.ThirdPartySettingInfoService; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.service.PileService; import com.jsowell.thirdparty.lianlian.service.LianLianService; @@ -50,13 +50,13 @@ import java.util.List; @RequestMapping("/pile/station") public class PileStationInfoController extends BaseController { @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private PileService pileService; @Autowired - private IThirdPartySettingInfoService thirdPartySettingInfoService; + private ThirdPartySettingInfoService thirdPartySettingInfoService; @Autowired private LianLianService lianLianService; @@ -71,10 +71,10 @@ public class PileStationInfoController extends BaseController { private YCBCService ycbcService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Autowired - private IThirdPartyParkingConfigService parkingConfigService; + private ThirdPartyParkingConfigService parkingConfigService; /** diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java index dd8355611..701a435ec 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java @@ -10,7 +10,7 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileStationWhitelist; -import com.jsowell.pile.service.IPileStationWhitelistService; +import com.jsowell.pile.service.PileStationWhitelistService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -35,7 +35,7 @@ import java.util.List; @RequestMapping("/pile/whitelist") public class PileStationWhitelistController extends BaseController { @Autowired - private IPileStationWhitelistService pileStationWhitelistService; + private PileStationWhitelistService pileStationWhitelistService; /** * 查询站点白名单列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java index 73d02b495..f173d42c6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java @@ -10,7 +10,7 @@ import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.MerchantOrderReportDTO; import com.jsowell.pile.dto.SettleOrderReportDTO; -import com.jsowell.pile.service.ISettleOrderReportService; +import com.jsowell.pile.service.SettleOrderReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -28,7 +28,7 @@ import java.util.List; @RequestMapping("/order/report") public class SettleOrderReportController extends BaseController { @Autowired - private ISettleOrderReportService settleOrderReportService; + private SettleOrderReportService settleOrderReportService; /** * 查询结算订单报列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyPlatformConfigController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyPlatformConfigController.java index a8fc7149f..e52661d01 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyPlatformConfigController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyPlatformConfigController.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.ThirdPartyPlatformConfig; -import com.jsowell.pile.service.IThirdPartyPlatformConfigService; +import com.jsowell.pile.service.ThirdPartyPlatformConfigService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +32,7 @@ import com.jsowell.common.core.page.TableDataInfo; @RequestMapping("/thirdParty/thirdPartyConfig") public class ThirdPartyPlatformConfigController extends BaseController { @Autowired - private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; /** * 查询对接平台配置信息列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java index 6343dc2d3..1df4ccbf8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartySettingInfoController.java @@ -18,7 +18,7 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.enums.BusinessType; import com.jsowell.pile.domain.ThirdPartySettingInfo; -import com.jsowell.pile.service.IThirdPartySettingInfoService; +import com.jsowell.pile.service.ThirdPartySettingInfoService; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.core.page.TableDataInfo; @@ -32,7 +32,7 @@ import com.jsowell.common.core.page.TableDataInfo; @RequestMapping("/thirdParty/thirdPartySetting") public class ThirdPartySettingInfoController extends BaseController { @Autowired - private IThirdPartySettingInfoService thirdPartySettingInfoService; + private ThirdPartySettingInfoService thirdPartySettingInfoService; /** * 查询第三方平台配置列表 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java index cb54b0c97..522e6c3c3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java @@ -9,7 +9,6 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IThirdPartyPlatformConfigService; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java index b1c48461a..1031b909c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java @@ -11,7 +11,6 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.PushInfoParamDTO; import com.jsowell.pile.dto.PushStationInfoDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; -import com.jsowell.pile.service.IThirdPartyPlatformConfigService; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 10c96c1d9..357d857ed 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -126,10 +126,10 @@ public class SpringBootTestController { private AdapayMemberAccountService adapayMemberAccountService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private YKCPushCommandService ykcPushBusinessService; @@ -153,7 +153,7 @@ public class SpringBootTestController { private OrderService orderService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private MemberBasicInfoMapper memberBasicInfoMapper; @@ -162,7 +162,7 @@ public class SpringBootTestController { private SimCardService simCardService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private WechatPayService wechatPayService; @@ -186,7 +186,7 @@ public class SpringBootTestController { private LianLianService lianLianService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; static final String MAC_KEY = "53TtFpc4gdVZbF3x"; @@ -196,7 +196,7 @@ public class SpringBootTestController { private AdapayCallbackRecordService adapayCallbackRecordService; @Autowired - private IAdapayRefundRecordService adapayRefundRecordService; + private AdapayRefundRecordService adapayRefundRecordService; @Autowired private AdapayService adapayService; @@ -205,13 +205,13 @@ public class SpringBootTestController { private AMapService aMapService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private TransactionRecordsRequestHandler transactionRecordsRequestHandler; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; @@ -226,7 +226,7 @@ public class SpringBootTestController { private LTYTService ltytService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private MemberAdapayRecordService memberAdapayRecordService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java index 3b7a83694..ea3077bf7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java @@ -5,7 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.vo.web.BillingTemplateVO; import io.netty.channel.Channel; @@ -26,7 +26,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_CODE.getBytes()); @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java index 9f572c10d..539bf3afc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,7 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_VALIDATE_CODE.getBytes()); @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index 04e260a6e..b4ad9e980 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -10,8 +10,8 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.ThirdPartyStationRelation; -import com.jsowell.pile.service.IThirdPartySettingInfoService; -import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.ThirdPartySettingInfoService; +import com.jsowell.pile.service.ThirdPartyStationRelationService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; @@ -41,7 +41,7 @@ public class ChargeEndHandler extends AbstractHandler{ private OrderBasicInfoService orderBasicInfoService; @Autowired - private IThirdPartySettingInfoService thirdPartySettingInfoService; + private ThirdPartySettingInfoService thirdPartySettingInfoService; @Autowired private LianLianService lianLianService; @@ -53,7 +53,7 @@ public class ChargeEndHandler extends AbstractHandler{ private XDTService xdtService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 44ca253d1..8fc05bd60 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -17,8 +17,8 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.GenerateOrderDTO; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.MemberPlateNumberRelationService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileAuthCardService; import io.netty.channel.Channel; @@ -47,10 +47,10 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ private OrderBasicInfoService orderBasicInfoService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java index fa58b08e4..2c35e7676 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java @@ -7,7 +7,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.PileBasicInfoService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,7 @@ public class HeartbeatRequestHandler extends AbstractHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.HEART_BEAT_CODE.getBytes()); @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java index b2eeab229..f1c0942b9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java @@ -14,8 +14,8 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -32,13 +32,13 @@ public class LoginRequestHandler extends AbstractHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.LOGIN_CODE.getBytes()); @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; private List newProgramVersionList = Lists.newArrayList("c6-30"); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java index c7b6b8d46..f0c1e2d36 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java @@ -6,7 +6,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.PileMsgRecordService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +24,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_ANSWER_CODE.getBytes()); @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 1dddaa76f..5bcd445e1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -73,13 +73,13 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { private RedisCache redisCache; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Autowired private OrderBasicInfoService orderBasicInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private LianLianService lianLianService; @@ -97,10 +97,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { private XDTService xdtService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private LTYTService ltytService; @@ -109,7 +109,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { private RJService rjService; @Autowired - private IThirdPartyParkingConfigService thirdPartyParkingConfigService; + private ThirdPartyParkingConfigService thirdPartyParkingConfigService; public static void main(String[] args) { BigDecimal totalElectricity = new BigDecimal("23.73"); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index f167a059b..96e8e93cf 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -17,9 +17,9 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.ThirdPartyStationRelation; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileConnectorInfoService; +import com.jsowell.pile.service.ThirdPartyStationRelationService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; @@ -55,13 +55,13 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { } @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private LianLianService lianLianService; @@ -70,7 +70,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { private YCBCService ycbcService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Autowired private RedisCache redisCache; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index 0fb55c9cf..6885155be 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -9,8 +9,8 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.netty.handler.AbstractHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.PileConnectorInfoService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; @@ -24,10 +24,10 @@ import org.springframework.stereotype.Service; public class YKCBusinessServiceImpl implements YKCBusinessService { @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 76033a8f0..8737447bf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -77,10 +77,10 @@ public class AdapayService { private ClearingBillInfoService clearingBillInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; /** * 获取支付参数 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayRefundRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayRefundRecordService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayRefundRecordService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayRefundRecordService.java index d2a97d095..90ffecad9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayRefundRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayRefundRecordService.java @@ -10,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2023-05-31 */ -public interface IAdapayRefundRecordService { +public interface AdapayRefundRecordService { /** * 查询【请填写功能名称】 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderPayRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderPayRecordService.java deleted file mode 100644 index 3f77fc1a9..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderPayRecordService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsowell.pile.service; - -import com.jsowell.pile.domain.OrderPayRecord; -import com.jsowell.pile.vo.web.OrderDetailInfoVO; - -import java.util.List; - -public interface IOrderPayRecordService { - - int updateByPrimaryKeySelective(OrderPayRecord record); - - /** - * 批量保存订单支付记录 - * @param payRecordList - * @return - */ - int batchInsert(List payRecordList); - - List getOrderPayRecordList(String orderCode); - - List selectOrderPayInfoList(String orderCode); -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java index c27c9fad0..74c416089 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java @@ -17,7 +17,7 @@ import java.util.List; * @author jsowell * @date 2022-10-12 */ -public interface IMemberBasicInfoService { +public interface MemberBasicInfoService { /** * 查询会员基础信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java index 28de9254c..22b481b3d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java @@ -11,7 +11,7 @@ import java.util.List; * @author jsowell * @date 2023-04-13 */ -public interface IMemberInvoiceTitleService { +public interface MemberInvoiceTitleService { InvoiceTitleVO selectByTitleId(String titleId); /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java index 8fced8082..a56eab5af 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java @@ -10,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2023-03-06 */ -public interface IMemberPlateNumberRelationService +public interface MemberPlateNumberRelationService { /** * 查询用户车牌对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberTransactionRecordService.java similarity index 92% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/MemberTransactionRecordService.java index 918ac9b7f..16db8bf99 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberTransactionRecordService.java @@ -5,7 +5,7 @@ import com.jsowell.pile.vo.web.MemberTransactionVO; import java.util.List; -public interface IMemberTransactionRecordService { +public interface MemberTransactionRecordService { /** * 保存交易记录 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderAbnormalRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderAbnormalRecordService.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderAbnormalRecordService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/OrderAbnormalRecordService.java index 923a689dc..f2c518c9d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderAbnormalRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderAbnormalRecordService.java @@ -10,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2023-02-13 */ -public interface IOrderAbnormalRecordService { +public interface OrderAbnormalRecordService { /** * 查询订单异常记录 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderInvoiceRecordService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/OrderInvoiceRecordService.java index 70639d25c..19dcf5146 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderInvoiceRecordService.java @@ -15,7 +15,7 @@ import java.util.List; * @author jsowell * @date 2023-04-10 */ -public interface IOrderInvoiceRecordService { +public interface OrderInvoiceRecordService { /** * 查询申请开票 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java similarity index 99% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java index 68d41eb03..689f600f9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java @@ -20,7 +20,7 @@ import java.util.List; * @author jsowell * @date 2022-08-26 */ -public interface IPileBasicInfoService { +public interface PileBasicInfoService { /** * 查询设备管理 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java index 5012dff99..d00a19519 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java @@ -19,7 +19,7 @@ import java.util.List; * @author jsowell * @date 2022-09-20 */ -public interface IPileBillingTemplateService { +public interface PileBillingTemplateService { /** * 查询计费模板 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileCameraInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileCameraInfoService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileCameraInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileCameraInfoService.java index 8936d222d..9c87844c8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileCameraInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileCameraInfoService.java @@ -10,7 +10,7 @@ import com.jsowell.pile.domain.PileCameraInfo; * @author jsowell * @date 2023-12-09 */ -public interface IPileCameraInfoService { +public interface PileCameraInfoService { /** * 查询车位相机信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java index 5a83fa83d..a51a370d7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java @@ -17,7 +17,7 @@ import java.util.Map; * @author jsowell * @date 2022-08-31 */ -public interface IPileConnectorInfoService { +public interface PileConnectorInfoService { /** * 查询充电桩枪口信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileFirmwareInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileFirmwareInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java index 9ab42d8f3..021aebe9c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileFirmwareInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java @@ -10,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2023-06-28 */ -public interface IPileFirmwareInfoService { +public interface PileFirmwareInfoService { /** * 查询充电桩固件信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileLicenceInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileLicenceInfoService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileLicenceInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileLicenceInfoService.java index 5e7eec071..7c21a9312 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileLicenceInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileLicenceInfoService.java @@ -10,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2022-08-27 */ -public interface IPileLicenceInfoService +public interface PileLicenceInfoService { /** * 查询充电桩证书信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMemberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMemberRelationService.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMemberRelationService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileMemberRelationService.java index cfa613594..3bca1aa31 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMemberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMemberRelationService.java @@ -1,7 +1,6 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.PileMemberRelation; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; import java.util.List; @@ -11,7 +10,7 @@ import java.util.List; * @author jsowell * @date 2023-02-21 */ -public interface IPileMemberRelationService +public interface PileMemberRelationService { /** * 查询桩与用户绑定关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java index 7ad82f9bb..fbb84ccb3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java @@ -14,7 +14,7 @@ import java.util.List; * @author jsowell * @date 2022-08-27 */ -public interface IPileMerchantInfoService { +public interface PileMerchantInfoService { /** * 查询充电桩运营商信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileModelInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileModelInfoService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileModelInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileModelInfoService.java index b397ae7d1..90e1a4f4c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileModelInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileModelInfoService.java @@ -11,7 +11,7 @@ import java.util.List; * @author jsowell * @date 2022-08-26 */ -public interface IPileModelInfoService { +public interface PileModelInfoService { /** * 查询充电桩型号信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMsgRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMsgRecordService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java index 1a7536f4a..2ece4bd18 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMsgRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java @@ -4,7 +4,7 @@ import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.PileMsgRecord; import com.jsowell.pile.dto.QueryPileDTO; -public interface IPileMsgRecordService { +public interface PileMsgRecordService { /** * 保存报文 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index d967ca7b4..78ca307ef 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -27,16 +27,16 @@ public class PileRemoteService { private final Logger log = LoggerFactory.getLogger(this.getClass()); @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; @Autowired - private IPileFirmwareInfoService pileFirmwareInfoService; + private PileFirmwareInfoService pileFirmwareInfoService; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSimInfoService.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileSimInfoService.java index 19ccad410..591f52204 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileSimInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSimInfoService.java @@ -3,8 +3,6 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.vo.web.SimCardInfoVO; -import com.jsowell.pile.vo.web.SimCardVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,7 +12,7 @@ import java.util.List; * @author jsowell * @date 2022-08-26 */ -public interface IPileSimInfoService +public interface PileSimInfoService { /** * 查询充电桩SIM卡信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index 0aabea74f..ea3322210 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -19,7 +19,7 @@ import java.util.List; * @author jsowell * @date 2022-08-30 */ -public interface IPileStationInfoService { +public interface PileStationInfoService { /** * 查询充电站信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationWhitelistService.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationWhitelistService.java index 6d2469e87..beaaada8b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationWhitelistService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationWhitelistService.java @@ -10,7 +10,7 @@ import com.jsowell.pile.domain.PileStationWhitelist; * @author jsowell * @date 2023-04-19 */ -public interface IPileStationWhitelistService { +public interface PileStationWhitelistService { /** * 查询站点白名单 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java index be44d52d2..ffb2b14b7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java @@ -16,7 +16,7 @@ import java.util.Map; * @author jsowell * @date 2023-06-05 */ -public interface ISettleOrderReportService { +public interface SettleOrderReportService { /** * 查询结算订单报 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java index 19b8d7e89..e627f524a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/SimCardService.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; public class SimCardService { @Autowired - private IPileSimInfoService pileSimInfoService; + private PileSimInfoService pileSimInfoService; protected final Logger logger = LoggerFactory.getLogger(SimCardService.class); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyParkingConfigService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyParkingConfigService.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyParkingConfigService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyParkingConfigService.java index 4c8c402a3..4d3b57bd2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyParkingConfigService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyParkingConfigService.java @@ -10,7 +10,7 @@ import java.util.List; * @author Lemon * @Date 2023/8/25 13:42 */ -public interface IThirdPartyParkingConfigService { +public interface ThirdPartyParkingConfigService { /** * delete by primary key * @param id primaryKey diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyPlatformConfigService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyPlatformConfigService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyPlatformConfigService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyPlatformConfigService.java index 6c0cbf659..59f5e22c1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyPlatformConfigService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyPlatformConfigService.java @@ -9,7 +9,7 @@ import com.jsowell.pile.domain.ThirdPartyPlatformConfig; * @author jsowell * @date 2023-05-27 */ -public interface IThirdPartyPlatformConfigService +public interface ThirdPartyPlatformConfigService { /** * 查询对接平台配置信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartySettingInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartySettingInfoService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartySettingInfoService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartySettingInfoService.java index faaa4aa71..63a6476d4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartySettingInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartySettingInfoService.java @@ -10,7 +10,7 @@ import com.jsowell.pile.domain.ThirdPartySettingInfo; * @author jsowell * @date 2023-05-24 */ -public interface IThirdPartySettingInfoService { +public interface ThirdPartySettingInfoService { /** * 查询第三方平台配置 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyStationRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyStationRelationService.java rename to jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java index d2ecd3564..ba5b0d7a6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IThirdPartyStationRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java @@ -11,7 +11,7 @@ import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; * @author jsowell * @date 2023-06-06 */ -public interface IThirdPartyStationRelationService { +public interface ThirdPartyStationRelationService { /** * 查询站点、第三方推送平台配置对应 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index a30a33fbe..5407e8ac6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -9,7 +9,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.mapper.AdapayMemberAccountMapper; import com.jsowell.pile.service.AdapayMemberAccountService; -import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.service.PileStationInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic private AdapayMemberAccountMapper adapayMemberAccountMapper; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private RedisCache redisCache; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayRefundRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayRefundRecordServiceImpl.java index 9e62aa3f4..fedb32c6c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayRefundRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayRefundRecordServiceImpl.java @@ -11,7 +11,7 @@ import com.jsowell.pile.domain.AdapayCallbackRecord; import com.jsowell.pile.domain.AdapayRefundRecord; import com.jsowell.pile.mapper.AdapayRefundRecordMapper; import com.jsowell.pile.service.AdapayCallbackRecordService; -import com.jsowell.pile.service.IAdapayRefundRecordService; +import com.jsowell.pile.service.AdapayRefundRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.util.List; */ @Slf4j @Service -public class AdapayRefundRecordServiceImpl implements IAdapayRefundRecordService { +public class AdapayRefundRecordServiceImpl implements AdapayRefundRecordService { @Autowired private AdapayRefundRecordMapper adapayRefundRecordMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java index 96edb7e2d..3ca39637c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java @@ -13,7 +13,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ClearingWithdrawInfo; import com.jsowell.pile.mapper.ClearingWithdrawInfoMapper; import com.jsowell.pile.service.ClearingWithdrawInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.web.ClearingBillVO; import com.jsowell.pile.vo.web.WithdrawInfoVO; import org.apache.commons.collections4.CollectionUtils; @@ -31,7 +31,7 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ private AdapayService adapayService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Resource private ClearingWithdrawInfoMapper clearingWithdrawInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index a5baf8d13..3862089a1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -50,7 +50,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { +public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { @Autowired private MemberBasicInfoMapper memberBasicInfoMapper; @@ -64,7 +64,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { private MemberWalletLogMapper memberWalletLogMapper; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private MemberPlateNumberRelationMapper memberPlateNumberRelationMapper; @@ -73,13 +73,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { private RedisCache redisCache; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; /** * 查询会员基础信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java index 485747749..99d8c6a9d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java @@ -4,7 +4,7 @@ import com.jsowell.common.enums.TitleTypeEnum; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberInvoiceTitle; import com.jsowell.pile.mapper.MemberInvoiceTitleMapper; -import com.jsowell.pile.service.IMemberInvoiceTitleService; +import com.jsowell.pile.service.MemberInvoiceTitleService; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * @date 2023-04-13 */ @Service -public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService { +public class MemberInvoiceTitleServiceImpl implements MemberInvoiceTitleService { @Autowired private MemberInvoiceTitleMapper memberInvoiceTitleMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java index af9233ca5..cb17fbc3d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java @@ -7,7 +7,7 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; -import com.jsowell.pile.service.IMemberPlateNumberRelationService; +import com.jsowell.pile.service.MemberPlateNumberRelationService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +23,7 @@ import java.util.Locale; */ @Slf4j @Service -public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberRelationService { +public class MemberPlateNumberRelationServiceImpl implements MemberPlateNumberRelationService { @Autowired private MemberPlateNumberRelationMapper memberPlateNumberRelationMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java index 344302604..13dea3d29 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java @@ -5,7 +5,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.pile.domain.MemberTransactionRecord; import com.jsowell.pile.mapper.MemberTransactionRecordMapper; -import com.jsowell.pile.service.IMemberTransactionRecordService; +import com.jsowell.pile.service.MemberTransactionRecordService; import com.jsowell.pile.vo.web.MemberTransactionVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import javax.annotation.Resource; import java.util.List; @Service -public class MemberTransactionRecordServiceImpl implements IMemberTransactionRecordService { +public class MemberTransactionRecordServiceImpl implements MemberTransactionRecordService { @Resource private MemberTransactionRecordMapper memberTransactionRecordMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java index 8227148e2..d971ecfe6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java @@ -4,7 +4,7 @@ import com.google.common.collect.Lists; import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.mapper.MemberWalletInfoMapper; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.MemberWalletInfoService; import com.jsowell.pile.vo.base.MemberWalletVO; import org.apache.commons.collections4.CollectionUtils; @@ -21,7 +21,7 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { private MemberWalletInfoMapper memberWalletInfoMapper; @Resource - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Override public int deleteByPrimaryKey(Integer id) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderAbnormalRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderAbnormalRecordServiceImpl.java index c5d0f5de1..370cbce01 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderAbnormalRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderAbnormalRecordServiceImpl.java @@ -2,7 +2,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.pile.domain.OrderAbnormalRecord; import com.jsowell.pile.mapper.OrderAbnormalRecordMapper; -import com.jsowell.pile.service.IOrderAbnormalRecordService; +import com.jsowell.pile.service.OrderAbnormalRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * @date 2023-02-13 */ @Service -public class OrderAbnormalRecordServiceImpl implements IOrderAbnormalRecordService { +public class OrderAbnormalRecordServiceImpl implements OrderAbnormalRecordService { @Autowired private OrderAbnormalRecordMapper orderAbnormalRecordMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 410932289..63ad2c9fd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -100,7 +100,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private OrderPayRecordService orderPayRecordService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private WxpayCallbackRecordService wxpayCallbackRecordService; @@ -112,22 +112,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private WechatPayService wechatPayService; @Autowired - private IOrderAbnormalRecordService orderAbnormalRecordService; + private OrderAbnormalRecordService orderAbnormalRecordService; @Autowired private TransactionService pileTransactionService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private WxpayRefundCallbackService wxpayRefundCallbackService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private PileAuthCardService pileAuthCardService; @@ -136,19 +136,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private OrderMonitorDataService orderMonitorDataService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IMemberPlateNumberRelationService memberPlateNumberRelationService; + private MemberPlateNumberRelationService memberPlateNumberRelationService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Autowired - private ISettleOrderReportService settleOrderReportService; + private SettleOrderReportService settleOrderReportService; @Autowired private AdapayMemberAccountService adapayMemberAccountService; @@ -157,7 +157,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private PileRemoteService pileRemoteService; @Autowired - private IPileStationWhitelistService pileStationWhitelistService; + private PileStationWhitelistService pileStationWhitelistService; @Autowired private AdapayService adapayService; @@ -169,7 +169,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private ClearingBillInfoService clearingBillInfoService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Autowired private ClearingBillDetailService clearingBillDetailService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index cda01f32e..e3617920a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -6,8 +6,8 @@ import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; import com.jsowell.pile.mapper.OrderInvoiceRecordMapper; -import com.jsowell.pile.service.IMemberInvoiceTitleService; -import com.jsowell.pile.service.IOrderInvoiceRecordService; +import com.jsowell.pile.service.MemberInvoiceTitleService; +import com.jsowell.pile.service.OrderInvoiceRecordService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.OrderAmountDetailVO; @@ -29,12 +29,12 @@ import java.util.List; * @date 2023-04-10 */ @Service -public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService { +public class OrderInvoiceRecordServiceImpl implements OrderInvoiceRecordService { @Autowired private OrderInvoiceRecordMapper orderInvoiceRecordMapper; @Autowired - private IMemberInvoiceTitleService memberInvoiceTitleService; + private MemberInvoiceTitleService memberInvoiceTitleService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index 596dc822b..677433ec3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -33,7 +33,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { private AdapayCallbackRecordService adapayCallbackRecordService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index a99971480..ac56f6731 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -54,19 +54,19 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { private OrderPileOccupyMapper orderPileOccupyMapper; @Resource - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Resource private OrderBasicInfoService orderBasicInfoService; @Resource - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Resource private AdapayService adapayService; @Resource - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index dc4577a1f..4b3094ca1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -8,8 +8,8 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.mapper.PileAuthCardMapper; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.PileAuthCardService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.LoginUserDetailVO; @@ -37,10 +37,10 @@ public class PileAuthCardServiceImpl implements PileAuthCardService { private PileAuthCardMapper pileAuthCardMapper; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 查询充电站鉴权卡 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 6d912948f..e24179906 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -54,24 +54,24 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class PileBasicInfoServiceImpl implements IPileBasicInfoService { +public class PileBasicInfoServiceImpl implements PileBasicInfoService { @Autowired private PileBasicInfoMapper pileBasicInfoMapper; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileSimInfoService pileSimInfoService; + private PileSimInfoService pileSimInfoService; @Autowired private SimCardService simCardService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 49d68ea23..77f6dd9f5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -19,8 +19,8 @@ import com.jsowell.pile.dto.BillingTimeDTO; import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO; import com.jsowell.pile.dto.ImportBillingTemplateDTO; import com.jsowell.pile.mapper.PileBillingTemplateMapper; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.transaction.dto.BillingTemplateTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.UserUtils; @@ -51,7 +51,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class PileBillingTemplateServiceImpl implements IPileBillingTemplateService { +public class PileBillingTemplateServiceImpl implements PileBillingTemplateService { @Autowired private PileBillingTemplateMapper pileBillingTemplateMapper; @@ -59,7 +59,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi private TransactionService transactionService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private RedisCache redisCache; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileCameraInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileCameraInfoServiceImpl.java index 986dfdc83..b55b223ff 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileCameraInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileCameraInfoServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.PileCameraInfoMapper; import com.jsowell.pile.domain.PileCameraInfo; -import com.jsowell.pile.service.IPileCameraInfoService; +import com.jsowell.pile.service.PileCameraInfoService; /** * 车位相机信息Service业务层处理 @@ -16,7 +16,7 @@ import com.jsowell.pile.service.IPileCameraInfoService; * @date 2023-12-09 */ @Service -public class PileCameraInfoServiceImpl implements IPileCameraInfoService { +public class PileCameraInfoServiceImpl implements PileCameraInfoService { @Autowired private PileCameraInfoMapper pileCameraInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 610bed032..79cb52bec 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { +public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { @Autowired private PileConnectorInfoMapper pileConnectorInfoMapper; @@ -59,16 +59,16 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { private PileBasicInfoMapper pileBasicInfoMapper; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private RedisCache redisCache; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java index 8dac1741e..d49d6fcd6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java @@ -3,7 +3,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.PileFirmwareInfo; import com.jsowell.pile.mapper.PileFirmwareInfoMapper; -import com.jsowell.pile.service.IPileFirmwareInfoService; +import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * @date 2023-06-28 */ @Service -public class PileFirmwareInfoServiceImpl implements IPileFirmwareInfoService { +public class PileFirmwareInfoServiceImpl implements PileFirmwareInfoService { @Autowired private PileFirmwareInfoMapper pileFirmwareInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileLicenceInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileLicenceInfoServiceImpl.java index 2116b2a05..0262a2c66 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileLicenceInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileLicenceInfoServiceImpl.java @@ -4,7 +4,7 @@ import com.google.common.collect.Lists; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.PileLicenceInfo; import com.jsowell.pile.mapper.PileLicenceInfoMapper; -import com.jsowell.pile.service.IPileLicenceInfoService; +import com.jsowell.pile.service.PileLicenceInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,7 +17,7 @@ import java.util.List; * @date 2022-08-27 */ @Service -public class PileLicenceInfoServiceImpl implements IPileLicenceInfoService +public class PileLicenceInfoServiceImpl implements PileLicenceInfoService { @Autowired private PileLicenceInfoMapper pileLicenceInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java index a14073edb..acee2f8a0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java @@ -1,20 +1,14 @@ package com.jsowell.pile.service.impl; -import com.google.common.collect.Lists; import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileMemberRelation; import com.jsowell.pile.mapper.PileMemberRelationMapper; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IPileMemberRelationService; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; -import org.apache.commons.collections4.CollectionUtils; +import com.jsowell.pile.service.PileConnectorInfoService; +import com.jsowell.pile.service.PileMemberRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 桩与用户绑定关系Service业务层处理 @@ -23,12 +17,12 @@ import java.util.Map; * @date 2023-02-21 */ @Service -public class PileMemberRelationServiceImpl implements IPileMemberRelationService { +public class PileMemberRelationServiceImpl implements PileMemberRelationService { @Autowired private PileMemberRelationMapper pileMemberRelationMapper; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; /** * 查询桩与用户绑定关系 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 3e7a1654a..8d65aea31 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -14,7 +14,7 @@ import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.CreateMerchantDTO; import com.jsowell.pile.dto.QueryMerchantInfoDTO; import com.jsowell.pile.mapper.PileMerchantInfoMapper; -import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.web.MerchantSettleInfoVO; @@ -40,7 +40,7 @@ import java.util.concurrent.CompletableFuture; */ @Slf4j @Service -public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { +public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { @Autowired private PileMerchantInfoMapper pileMerchantInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileModelInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileModelInfoServiceImpl.java index 7d20b3bca..5f0f84c70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileModelInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileModelInfoServiceImpl.java @@ -6,7 +6,7 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.PileModelInfo; import com.jsowell.pile.mapper.PileModelInfoMapper; -import com.jsowell.pile.service.IPileModelInfoService; +import com.jsowell.pile.service.PileModelInfoService; import com.jsowell.pile.vo.web.PileModelInfoVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ import java.util.Objects; * @date 2022-08-26 */ @Service -public class PileModelInfoServiceImpl implements IPileModelInfoService { +public class PileModelInfoServiceImpl implements PileModelInfoService { @Autowired private PileModelInfoMapper pileModelInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 9c1c1458e..7b4f32724 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -11,7 +11,7 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.pile.domain.PileMsgRecord; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.mapper.PileMsgRecordMapper; -import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.vo.web.PileCommunicationLogVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; @Service -public class PileMsgRecordServiceImpl implements IPileMsgRecordService { +public class PileMsgRecordServiceImpl implements PileMsgRecordService { @Autowired private PileMsgRecordMapper pileMsgRecordMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java index 46405c44e..b73a81fbd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java @@ -6,10 +6,9 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.mapper.PileSimInfoMapper; -import com.jsowell.pile.service.IPileSimInfoService; +import com.jsowell.pile.service.PileSimInfoService; import com.jsowell.pile.service.SimCardService; import com.jsowell.pile.vo.web.SimCardInfoVO; -import com.jsowell.pile.vo.web.SimCardVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -18,8 +17,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * 充电桩SIM卡信息Service业务层处理 @@ -29,7 +26,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class PileSimInfoServiceImpl implements IPileSimInfoService { +public class PileSimInfoServiceImpl implements PileSimInfoService { @Autowired private PileSimInfoMapper pileSimInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 15fadd075..06e86592d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -57,24 +57,24 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class PileStationInfoServiceImpl implements IPileStationInfoService { +public class PileStationInfoServiceImpl implements PileStationInfoService { @Autowired private PileStationInfoMapper pileStationInfoMapper; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private SysDeptService sysDeptService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired private RedisCache redisCache; @@ -83,7 +83,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { private SysUserService userService; @Autowired - private IThirdPartyParkingConfigService parkingConfigService; + private ThirdPartyParkingConfigService parkingConfigService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index b68050938..564475344 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -7,10 +7,10 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.PileStationWhitelist; import com.jsowell.pile.mapper.PileStationWhitelistMapper; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; -import com.jsowell.pile.service.IPileStationInfoService; -import com.jsowell.pile.service.IPileStationWhitelistService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; +import com.jsowell.pile.service.PileStationInfoService; +import com.jsowell.pile.service.PileStationWhitelistService; import com.jsowell.pile.vo.web.PileStationVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -25,18 +25,18 @@ import java.util.List; * @date 2023-04-19 */ @Service -public class PileStationWhitelistServiceImpl implements IPileStationWhitelistService { +public class PileStationWhitelistServiceImpl implements PileStationWhitelistService { @Autowired private PileStationWhitelistMapper pileStationWhitelistMapper; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; /** * 查询站点白名单 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 51f80f4ec..c9072b601 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -54,7 +54,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class SettleOrderReportServiceImpl implements ISettleOrderReportService { +public class SettleOrderReportServiceImpl implements SettleOrderReportService { @Autowired private SettleOrderReportMapper settleOrderReportMapper; @@ -62,7 +62,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { private OrderBasicInfoMapper orderBasicInfoMapper; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private AdapayCallbackRecordMapper adapayCallbackRecordMapper; @@ -71,7 +71,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { private AdapayService adapayService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyParkingConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyParkingConfigServiceImpl.java index 9cd620479..b5b6ad5e7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyParkingConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyParkingConfigServiceImpl.java @@ -2,7 +2,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.pile.domain.ThirdpartyParkingConfig; import com.jsowell.pile.mapper.ThirdpartyParkingConfigMapper; -import com.jsowell.pile.service.IThirdPartyParkingConfigService; +import com.jsowell.pile.service.ThirdPartyParkingConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * @Date 2023/8/25 13:43 */ @Service -public class ThirdPartyParkingConfigServiceImpl implements IThirdPartyParkingConfigService { +public class ThirdPartyParkingConfigServiceImpl implements ThirdPartyParkingConfigService { @Autowired private ThirdpartyParkingConfigMapper thirdpartyParkingConfigMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyPlatformConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyPlatformConfigServiceImpl.java index 4d3ef0eb6..f0dc96cd7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyPlatformConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyPlatformConfigServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.ThirdPartyPlatformConfigMapper; import com.jsowell.pile.domain.ThirdPartyPlatformConfig; -import com.jsowell.pile.service.IThirdPartyPlatformConfigService; +import com.jsowell.pile.service.ThirdPartyPlatformConfigService; /** * 对接平台配置信息Service业务层处理 @@ -16,7 +16,7 @@ import com.jsowell.pile.service.IThirdPartyPlatformConfigService; * @date 2023-05-27 */ @Service -public class ThirdPartyPlatformConfigServiceImpl implements IThirdPartyPlatformConfigService { +public class ThirdPartyPlatformConfigServiceImpl implements ThirdPartyPlatformConfigService { @Autowired private ThirdPartyPlatformConfigMapper thirdPartyPlatformConfigMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java index 61de78b8c..c1760973c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.ThirdPartySettingInfoMapper; import com.jsowell.pile.domain.ThirdPartySettingInfo; -import com.jsowell.pile.service.IThirdPartySettingInfoService; +import com.jsowell.pile.service.ThirdPartySettingInfoService; /** * 第三方平台配置Service业务层处理 @@ -16,7 +16,7 @@ import com.jsowell.pile.service.IThirdPartySettingInfoService; * @date 2023-05-24 */ @Service -public class ThirdPartySettingInfoServiceImpl implements IThirdPartySettingInfoService { +public class ThirdPartySettingInfoServiceImpl implements ThirdPartySettingInfoService { @Autowired private ThirdPartySettingInfoMapper thirdPartySettingInfoMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyStationRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyStationRelationServiceImpl.java index 1f1b29959..28cbdae4e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyStationRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyStationRelationServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.ThirdPartyStationRelationMapper; import com.jsowell.pile.domain.ThirdPartyStationRelation; -import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.ThirdPartyStationRelationService; /** * 站点、第三方推送平台配置对应Service业务层处理 @@ -17,7 +17,7 @@ import com.jsowell.pile.service.IThirdPartyStationRelationService; * @date 2023-06-06 */ @Service -public class ThirdPartyStationRelationServiceImpl implements IThirdPartyStationRelationService { +public class ThirdPartyStationRelationServiceImpl implements ThirdPartyStationRelationService { @Autowired private ThirdPartyStationRelationMapper thirdPartyStationRelationMapper; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/WechatPayServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/WechatPayServiceImpl.java index acf112cdb..c6f103a4f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/WechatPayServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/WechatPayServiceImpl.java @@ -19,8 +19,8 @@ import com.jsowell.pile.domain.WxpayCallbackRecord; import com.jsowell.pile.domain.WxpayRefundCallback; import com.jsowell.pile.dto.PaymentScenarioDTO; import com.jsowell.pile.dto.WeixinPayDTO; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IMemberTransactionRecordService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.MemberTransactionRecordService; import com.jsowell.pile.service.WechatPayService; import com.jsowell.pile.service.WxpayCallbackRecordService; import com.jsowell.pile.service.WxpayRefundCallbackService; @@ -59,10 +59,10 @@ public class WechatPayServiceImpl implements WechatPayService { private WxpayRefundCallbackService wxpayRefundCallbackService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Autowired - private IMemberTransactionRecordService memberTransactionRecordService; + private MemberTransactionRecordService memberTransactionRecordService; @Override public Map weixinPayV3(WeixinPayDTO dto) throws Exception { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index a7fd44283..940cf0742 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -35,22 +35,22 @@ import java.util.Objects; @Service public class YKCPushCommandServiceImpl implements YKCPushCommandService { @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileMsgRecordService pileMsgRecordService; + private PileMsgRecordService pileMsgRecordService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; // 需要记录报文的数据帧类型 private final List frameTypeList = Lists.newArrayList( diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 5e1216117..fe8c00dc7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -55,16 +55,16 @@ public abstract class AbstractProgramLogic implements InitializingBean { protected OrderBasicInfoService orderBasicInfoService; @Autowired - protected IPileBasicInfoService pileBasicInfoService; + protected PileBasicInfoService pileBasicInfoService; @Autowired - protected IPileStationInfoService pileStationInfoService; + protected PileStationInfoService pileStationInfoService; @Autowired - protected IPileBillingTemplateService pileBillingTemplateService; + protected PileBillingTemplateService pileBillingTemplateService; @Autowired - protected IMemberBasicInfoService memberBasicInfoService; + protected MemberBasicInfoService memberBasicInfoService; @Autowired protected MemberAdapayRecordService memberAdapayRecordService; @@ -73,7 +73,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { protected OrderPayRecordService orderPayRecordService; @Autowired - protected IMemberTransactionRecordService memberTransactionRecordService; + protected MemberTransactionRecordService memberTransactionRecordService; @Autowired protected AdapayService adapayService; @@ -82,7 +82,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { protected AdapayMemberAccountService adapayMemberAccountService; @Autowired - protected IPileMerchantInfoService pileMerchantInfoService; + protected PileMerchantInfoService pileMerchantInfoService; @Autowired protected TransactionService transactionService; @@ -94,7 +94,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { protected PileAuthCardService pileAuthCardService; @Autowired - protected IMemberPlateNumberRelationService memberPlateNumberRelationService; + protected MemberPlateNumberRelationService memberPlateNumberRelationService; @Autowired protected WxAppletRemoteService wxAppletRemoteService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java index b496c0be4..51f3a30ea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java @@ -5,7 +5,7 @@ import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileBasicInfo; -import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.PileBasicInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ public class SnUtils { private RedisCache redisCache; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; private String prefix = "88"; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java index 27152b6b5..74bb9578d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/UserUtils.java @@ -10,9 +10,9 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.util.SecurityUtils; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.domain.PileStationInfo; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; -import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileMerchantInfoService; +import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import lombok.extern.slf4j.Slf4j; @@ -32,16 +32,16 @@ import java.util.stream.Collectors; public class UserUtils { // 2.注入想引用的对象的静态实例 - private static IMemberBasicInfoService memberBasicInfoService; + private static MemberBasicInfoService memberBasicInfoService; - private static IPileMerchantInfoService pileMerchantInfoService; + private static PileMerchantInfoService pileMerchantInfoService; - private static IPileStationInfoService pileStationInfoService; + private static PileStationInfoService pileStationInfoService; // 3.初始化有参构造器 @Autowired - public UserUtils(IMemberBasicInfoService memberBasicInfoService, IPileMerchantInfoService pileMerchantInfoService, - IPileStationInfoService pileStationInfoService) { + public UserUtils(MemberBasicInfoService memberBasicInfoService, PileMerchantInfoService pileMerchantInfoService, + PileStationInfoService pileStationInfoService) { UserUtils.memberBasicInfoService = memberBasicInfoService; UserUtils.pileMerchantInfoService = pileMerchantInfoService; UserUtils.pileStationInfoService = pileStationInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java index 59c1eb05d..5bf77ef3e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java @@ -14,8 +14,8 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.http.HttpUtils; import com.jsowell.pile.domain.MemberBasicInfo; -import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.MemberBasicInfoService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; import com.jsowell.pile.vo.uniapp.SendMessageVO; @@ -53,10 +53,10 @@ public class WxAppletRemoteService { private OrderBasicInfoService orderBasicInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IMemberBasicInfoService memberBasicInfoService; + private MemberBasicInfoService memberBasicInfoService; @Value("${weixin.login.appid}") private String appid; diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index af2793b77..58cd2810f 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -35,16 +35,16 @@ public class JsowellTask { private OrderBasicInfoService orderBasicInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired private YKCPushCommandService ykcPushCommandService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired private RedisCache redisCache; @@ -53,7 +53,7 @@ public class JsowellTask { private AMapService aMapService; @Autowired - private ISettleOrderReportService settleOrderReportService; + private SettleOrderReportService settleOrderReportService; /** * 关闭15分钟未支付的订单 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index 2c955a40d..3e67aba83 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -52,19 +52,19 @@ import java.util.stream.Collectors; public class AMapServiceImpl implements AMapService { @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index ed3eb5dcd..acc99d1a2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -72,19 +72,19 @@ public class LianLianServiceImpl implements LianLianService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; @@ -96,16 +96,16 @@ public class LianLianServiceImpl implements LianLianService { private YCBCService ycbcService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IThirdPartySettingInfoService thirdPartySettingInfoService; + private ThirdPartySettingInfoService thirdPartySettingInfoService; @Autowired - private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Override public void pushMerchantInfo(Long merchantId) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index 10e9c0ebc..67b3e94b2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -60,31 +60,31 @@ import java.util.stream.Collectors; public class NRServiceImpl implements NRService { @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Autowired - private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; @Autowired private LianLianService lianLianService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java index d2d2b215e..3cbbd9934 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java @@ -40,16 +40,16 @@ public class NXJTServiceImpl implements NXJTService { private LianLianService lianLianService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired private OrderBasicInfoService orderBasicInfoService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java index 0e24482c5..73f4ab85c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java @@ -11,7 +11,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.ThirdPartyStationRelationService; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lianlian.util.Cryptos; @@ -48,7 +48,7 @@ public class YCBCServiceImpl implements YCBCService { private LianLianService lianLianService; @Autowired - private IThirdPartyStationRelationService relationService; + private ThirdPartyStationRelationService relationService; @Autowired private RedisCache redisCache; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index c8fa43cbc..0a8121045 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -14,7 +14,6 @@ import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; @@ -57,28 +56,28 @@ public class ZDLServiceImpl implements ZDLService { private YCBCService ycbcService; @Autowired - private IPileStationInfoService pileStationInfoService; + private PileStationInfoService pileStationInfoService; @Autowired - private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; @Autowired - private IPileBasicInfoService pileBasicInfoService; + private PileBasicInfoService pileBasicInfoService; @Autowired - private IPileModelInfoService pileModelInfoService; + private PileModelInfoService pileModelInfoService; @Autowired - private IPileMerchantInfoService pileMerchantInfoService; + private PileMerchantInfoService pileMerchantInfoService; @Autowired - private IPileConnectorInfoService pileConnectorInfoService; + private PileConnectorInfoService pileConnectorInfoService; @Autowired - private IThirdPartyStationRelationService thirdPartyStationRelationService; + private ThirdPartyStationRelationService thirdPartyStationRelationService; @Autowired - private IPileBillingTemplateService pileBillingTemplateService; + private PileBillingTemplateService pileBillingTemplateService; /** * 获取令牌