diff --git a/src/main/java/com/sqx/modules/es/controller/EsCoreController.java b/src/main/java/com/sqx/modules/es/controller/EsCoreController.java index 06a5980f..680335b7 100644 --- a/src/main/java/com/sqx/modules/es/controller/EsCoreController.java +++ b/src/main/java/com/sqx/modules/es/controller/EsCoreController.java @@ -1,10 +1,7 @@ package com.sqx.modules.es.controller; -import cn.hutool.json.JSONUtil; import com.sqx.common.utils.Result; -import com.sqx.modules.es.dao.EsPayDetailDao; import com.sqx.modules.es.service.EsCoreService; -import com.sqx.modules.pay.entity.PayDetails; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import javax.annotation.Resource; import java.util.Map; /** @@ -30,19 +26,10 @@ public class EsCoreController { @Autowired private EsCoreService esCoreService; - @Resource - private EsPayDetailDao esPayDetailsDao; - @ApiOperation("同步") @PostMapping("/sync") public Result sync(@ApiIgnore @RequestParam Map params) { - PayDetails payDetails = esPayDetailsDao.selectByOrderId("1000001851456083"); - System.out.println(JSONUtil.toJsonPrettyStr(payDetails)); - PayDetails payDetails1 = esPayDetailsDao.getBaseEsMapper().selectById(3306L); - System.out.println(JSONUtil.toJsonPrettyStr(payDetails1)); - PayDetails payDetails2 = esPayDetailsDao.getOriginalDao().selectById(3306L); - System.out.println(JSONUtil.toJsonPrettyStr(payDetails2)); - //esCoreService.sync(); + esCoreService.sync(); return Result.success(); } } diff --git a/src/main/java/com/sqx/modules/es/service/IEsService.java b/src/main/java/com/sqx/modules/es/service/IEsService.java index 6691d1c8..6a310f56 100644 --- a/src/main/java/com/sqx/modules/es/service/IEsService.java +++ b/src/main/java/com/sqx/modules/es/service/IEsService.java @@ -1,5 +1,6 @@ package com.sqx.modules.es.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.easyes.core.kernel.BaseEsMapper; /** @@ -8,4 +9,6 @@ import org.dromara.easyes.core.kernel.BaseEsMapper; */ public interface IEsService { BaseEsMapper getBaseEsMapper(); + + IService getOriginalService(); } diff --git a/src/main/java/com/sqx/modules/es/service/impl/EsOrdersServiceImpl.java b/src/main/java/com/sqx/modules/es/service/impl/EsOrdersServiceImpl.java index 345d03fc..908b3823 100644 --- a/src/main/java/com/sqx/modules/es/service/impl/EsOrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/es/service/impl/EsOrdersServiceImpl.java @@ -4,20 +4,14 @@ import com.sqx.modules.es.mapper.EsOrdersMapper; import com.sqx.modules.es.service.EsOrdersService; import com.sqx.modules.orders.entity.Orders; import com.sqx.modules.orders.service.OrdersService; - -import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * @author tankaikai * @since 2025-01-16 9:51 */ -public class EsOrdersServiceImpl extends EsServiceImpl implements EsOrdersService { +@Service +public class EsOrdersServiceImpl extends EsServiceImpl implements EsOrdersService { - @Resource - private OrdersService ordersService; - - public OrdersService getOriginalService() { - return ordersService; - } } diff --git a/src/main/java/com/sqx/modules/es/service/impl/EsServiceImpl.java b/src/main/java/com/sqx/modules/es/service/impl/EsServiceImpl.java index 63d07fd2..023929c3 100644 --- a/src/main/java/com/sqx/modules/es/service/impl/EsServiceImpl.java +++ b/src/main/java/com/sqx/modules/es/service/impl/EsServiceImpl.java @@ -1,21 +1,25 @@ package com.sqx.modules.es.service.impl; +import com.baomidou.mybatisplus.extension.service.IService; import com.sqx.modules.es.service.IEsService; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.dromara.easyes.core.kernel.BaseEsMapper; - -import javax.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; /** * @author tankaikai * @since 2025-01-16 9:45 */ -public class EsServiceImpl, T> implements IEsService { +public class EsServiceImpl, S extends IService,T> implements IEsService { protected Log log = LogFactory.getLog(this.getClass()); - @Resource + + @Autowired protected M baseEsMapper; + @Autowired + protected S originalService; + public EsServiceImpl() { } @@ -23,4 +27,8 @@ public class EsServiceImpl, T> implements IEsService