From 2ae3c8e2799bb1b985e0eb7cb464845cec12bf54 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Fri, 6 Sep 2024 17:10:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B8=A0=E9=81=93=E7=B1=BB=E6=94=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntroller.java => EtChannelController.java} | 14 ++++++------- ....java => EtChannelWithdrawController.java} | 18 ++++++++-------- .../java/com/ruoyi/system/domain/Channel.java | 2 +- .../ruoyi/system/domain/ChannelWithdraw.java | 2 +- ...hannelMapper.java => EtChannelMapper.java} | 2 +- ...pper.java => EtChannelWithdrawMapper.java} | 2 +- ...nnelService.java => EtChannelService.java} | 2 +- ...ice.java => EtChannelWithdrawService.java} | 2 +- ...iceImpl.java => EtChannelServiceImpl.java} | 21 +++++++++---------- ...java => EtChannelWithdrawServiceImpl.java} | 20 +++++++++--------- ...{ChannelMapper.xml => EtChannelMapper.xml} | 12 +++++------ ...Mapper.xml => EtChannelWithdrawMapper.xml} | 12 +++++------ 12 files changed, 54 insertions(+), 55 deletions(-) rename electripper-admin/src/main/java/com/ruoyi/web/controller/system/{SmChannelController.java => EtChannelController.java} (83%) rename electripper-admin/src/main/java/com/ruoyi/web/controller/system/{ChannelWithdrawController.java => EtChannelWithdrawController.java} (78%) rename electripper-system/src/main/java/com/ruoyi/system/mapper/{ChannelMapper.java => EtChannelMapper.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/mapper/{ChannelWithdrawMapper.java => EtChannelWithdrawMapper.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/service/{ChannelService.java => EtChannelService.java} (98%) rename electripper-system/src/main/java/com/ruoyi/system/service/{ChannelWithdrawService.java => EtChannelWithdrawService.java} (97%) rename electripper-system/src/main/java/com/ruoyi/system/service/impl/{ChannelServiceImpl.java => EtChannelServiceImpl.java} (79%) rename electripper-system/src/main/java/com/ruoyi/system/service/impl/{ChannelWithdrawServiceImpl.java => EtChannelWithdrawServiceImpl.java} (76%) rename electripper-system/src/main/resources/mapper/system/{ChannelMapper.xml => EtChannelMapper.xml} (92%) rename electripper-system/src/main/resources/mapper/system/{ChannelWithdrawMapper.xml => EtChannelWithdrawMapper.xml} (94%) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java similarity index 83% rename from electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java rename to electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java index abc5c54..c49397c 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java @@ -10,7 +10,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.Channel; import com.ruoyi.system.domain.ChannelQuery; import com.ruoyi.system.domain.ChannelVO; -import com.ruoyi.system.service.ChannelService; +import com.ruoyi.system.service.EtChannelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -27,10 +27,10 @@ import java.util.List; */ @RestController @RequestMapping("/system/channel") -public class SmChannelController extends BaseController +public class EtChannelController extends BaseController { @Autowired - private ChannelService smChannelService; + private EtChannelService smEtChannelService; /** * 查询充值渠道列表 @@ -40,7 +40,7 @@ public class SmChannelController extends BaseController public TableDataInfo list(ChannelQuery smChannel) { startPage(); - List list = smChannelService.selectSmChannelList(smChannel); + List list = smEtChannelService.selectSmChannelList(smChannel); return getDataTable(list); } @@ -52,7 +52,7 @@ public class SmChannelController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ChannelQuery smChannel) { - List list = smChannelService.selectSmChannelList(smChannel); + List list = smEtChannelService.selectSmChannelList(smChannel); ExcelUtil util = new ExcelUtil(ChannelVO.class); util.exportExcel(response, list, "充值渠道数据"); } @@ -64,7 +64,7 @@ public class SmChannelController extends BaseController @GetMapping(value = "/{channelId}") public AjaxResult getInfo(@PathVariable("channelId") Long channelId) { - return success(smChannelService.selectSmChannelByChannelId(channelId)); + return success(smEtChannelService.selectSmChannelByChannelId(channelId)); } /** @@ -80,7 +80,7 @@ public class SmChannelController extends BaseController channel.setEnabled(form.getEnabled()); channel.setCostRate(form.getCostRate()); channel.setPicture(form.getPicture()); - return toAjax(smChannelService.updateSmChannel(channel)); + return toAjax(smEtChannelService.updateSmChannel(channel)); } } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java similarity index 78% rename from electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java rename to electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java index d5f076d..68fd8b6 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/ChannelWithdrawController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java @@ -9,7 +9,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.ChannelWithdraw; import com.ruoyi.system.domain.ChannelWithdrawQuery; import com.ruoyi.system.domain.ChannelWithdrawVO; -import com.ruoyi.system.service.ChannelWithdrawService; +import com.ruoyi.system.service.EtChannelWithdrawService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,10 +25,10 @@ import java.util.List; */ @RestController @RequestMapping("/ss/channelWithdraw") -public class ChannelWithdrawController extends BaseController +public class EtChannelWithdrawController extends BaseController { @Autowired - private ChannelWithdrawService channelWithdrawService; + private EtChannelWithdrawService etChannelWithdrawService; /** * 查询提现渠道列表 @@ -39,7 +39,7 @@ public class ChannelWithdrawController extends BaseController { startPage(); startOrderBy(); - List list = channelWithdrawService.selectChannelWithdrawList(query); + List list = etChannelWithdrawService.selectChannelWithdrawList(query); return getDataTable(list); } @@ -51,7 +51,7 @@ public class ChannelWithdrawController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, ChannelWithdrawQuery query) { - List list = channelWithdrawService.selectChannelWithdrawList(query); + List list = etChannelWithdrawService.selectChannelWithdrawList(query); ExcelUtil util = new ExcelUtil(ChannelWithdrawVO.class); util.exportExcel(response, list, "提现渠道数据"); } @@ -63,7 +63,7 @@ public class ChannelWithdrawController extends BaseController @GetMapping(value = "/{channelId}") public AjaxResult getInfo(@PathVariable("channelId") Long channelId) { - return success(channelWithdrawService.selectChannelWithdrawByChannelId(channelId)); + return success(etChannelWithdrawService.selectChannelWithdrawByChannelId(channelId)); } /** @@ -74,7 +74,7 @@ public class ChannelWithdrawController extends BaseController @PostMapping public AjaxResult add(@RequestBody ChannelWithdraw channelWithdraw) { - return toAjax(channelWithdrawService.insertChannelWithdraw(channelWithdraw)); + return toAjax(etChannelWithdrawService.insertChannelWithdraw(channelWithdraw)); } /** @@ -85,7 +85,7 @@ public class ChannelWithdrawController extends BaseController @PutMapping public AjaxResult edit(@RequestBody ChannelWithdraw channelWithdraw) { - return toAjax(channelWithdrawService.updateChannelWithdraw(channelWithdraw)); + return toAjax(etChannelWithdrawService.updateChannelWithdraw(channelWithdraw)); } /** @@ -96,6 +96,6 @@ public class ChannelWithdrawController extends BaseController @DeleteMapping("/{channelIds}") public AjaxResult remove(@PathVariable Long[] channelIds) { - return toAjax(channelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); + return toAjax(etChannelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); } } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java index d6775e7..3cdd8a1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -12,7 +12,7 @@ import javax.validation.constraints.Min; import java.math.BigDecimal; /** - * 充值渠道对象 sm_channel + * 充值渠道对象 et_channel * * @author ruoyi * @date 2024-04-15 diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java index 43dfcfc..4a4f0ca 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java @@ -9,7 +9,7 @@ import javax.validation.constraints.Min; import java.math.BigDecimal; /** - * 提现渠道对象 ss_channel_withdraw + * 提现渠道对象 et_channel_withdraw * * @author ruoyi * @date 2024-08-02 diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java rename to electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java index 9ef4923..d38e5d5 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @author ruoyi * @date 2024-04-15 */ -public interface ChannelMapper +public interface EtChannelMapper { /** * 查询充值渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java rename to electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java index d2bd489..209f494 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/ChannelWithdrawMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @author ruoyi * @date 2024-08-02 */ -public interface ChannelWithdrawMapper +public interface EtChannelWithdrawMapper { /** * 查询提现渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java similarity index 98% rename from electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java rename to electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java index 15aa168..a2a9172 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java @@ -14,7 +14,7 @@ import java.util.function.Function; * @author ruoyi * @date 2024-04-15 */ -public interface ChannelService +public interface EtChannelService { /** * 查询充值渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java similarity index 97% rename from electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java rename to electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java index c50546d..82fb45d 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/ChannelWithdrawService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java @@ -12,7 +12,7 @@ import java.util.List; * @author ruoyi * @date 2024-08-02 */ -public interface ChannelWithdrawService +public interface EtChannelWithdrawService { /** * 查询提现渠道 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java similarity index 79% rename from electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java rename to electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java index d52e8c4..7aa9ec2 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java @@ -3,9 +3,8 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.Channel; import com.ruoyi.system.domain.ChannelQuery; import com.ruoyi.system.domain.ChannelVO; -import com.ruoyi.system.mapper.ChannelMapper; -import com.ruoyi.system.service.ChannelService; -import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.system.mapper.EtChannelMapper; +import com.ruoyi.system.service.EtChannelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -21,10 +20,10 @@ import java.util.stream.Collectors; * @date 2024-04-15 */ @Service -public class ChannelServiceImpl implements ChannelService +public class EtChannelServiceImpl implements EtChannelService { @Resource - private ChannelMapper channelMapper; + private EtChannelMapper etChannelMapper; /** * 查询充值渠道 @@ -35,7 +34,7 @@ public class ChannelServiceImpl implements ChannelService @Override public ChannelVO selectSmChannelByChannelId(Long channelId) { - return channelMapper.selectSmChannelByChannelId(channelId); + return etChannelMapper.selectSmChannelByChannelId(channelId); } /** @@ -47,7 +46,7 @@ public class ChannelServiceImpl implements ChannelService @Override public List selectSmChannelList(ChannelQuery smChannel) { - return channelMapper.selectSmChannelList(smChannel); + return etChannelMapper.selectSmChannelList(smChannel); } /** @@ -59,7 +58,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int insertSmChannel(Channel channel) { - return channelMapper.insertSmChannel(channel); + return etChannelMapper.insertSmChannel(channel); } /** @@ -71,7 +70,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int updateSmChannel(Channel channel) { - return channelMapper.updateSmChannel(channel); + return etChannelMapper.updateSmChannel(channel); } /** @@ -83,7 +82,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int deleteSmChannelByChannelIds(Long[] channelIds) { - return channelMapper.deleteSmChannelByChannelIds(channelIds); + return etChannelMapper.deleteSmChannelByChannelIds(channelIds); } /** @@ -95,7 +94,7 @@ public class ChannelServiceImpl implements ChannelService @Override public int deleteSmChannelByChannelId(Long channelId) { - return channelMapper.deleteSmChannelByChannelId(channelId); + return etChannelMapper.deleteSmChannelByChannelId(channelId); } @Override diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java similarity index 76% rename from electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java rename to electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java index ab7025d..5c32610 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/ChannelWithdrawServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java @@ -3,8 +3,8 @@ package com.ruoyi.system.service.impl; import com.ruoyi.system.domain.ChannelWithdraw; import com.ruoyi.system.domain.ChannelWithdrawQuery; import com.ruoyi.system.domain.ChannelWithdrawVO; -import com.ruoyi.system.mapper.ChannelWithdrawMapper; -import com.ruoyi.system.service.ChannelWithdrawService; +import com.ruoyi.system.mapper.EtChannelWithdrawMapper; +import com.ruoyi.system.service.EtChannelWithdrawService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -17,10 +17,10 @@ import java.util.List; * @date 2024-08-02 */ @Service -public class ChannelWithdrawServiceImpl implements ChannelWithdrawService +public class EtChannelWithdrawServiceImpl implements EtChannelWithdrawService { @Resource - private ChannelWithdrawMapper channelWithdrawMapper; + private EtChannelWithdrawMapper etChannelWithdrawMapper; // @Autowired // private AccountService accountService; @@ -34,7 +34,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId) { - return channelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); + return etChannelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); } /** @@ -46,7 +46,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw) { - return channelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); + return etChannelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); } /** @@ -58,7 +58,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int insertChannelWithdraw(ChannelWithdraw channelWithdraw) { - return channelWithdrawMapper.insertChannelWithdraw(channelWithdraw); + return etChannelWithdrawMapper.insertChannelWithdraw(channelWithdraw); } /** @@ -70,7 +70,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int updateChannelWithdraw(ChannelWithdraw channelWithdraw) { - return channelWithdrawMapper.updateChannelWithdraw(channelWithdraw); + return etChannelWithdrawMapper.updateChannelWithdraw(channelWithdraw); } /** @@ -82,7 +82,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int deleteChannelWithdrawByChannelIds(Long[] channelIds) { - return channelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); } /** @@ -94,7 +94,7 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService @Override public int deleteChannelWithdrawByChannelId(Long channelId) { - return channelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); } @Override diff --git a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml similarity index 92% rename from electripper-system/src/main/resources/mapper/system/ChannelMapper.xml rename to electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml index 2bbbf5d..41d1272 100644 --- a/electripper-system/src/main/resources/mapper/system/ChannelMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sc.enabled, sc.cost_rate, sc.picture - from sm_channel sc + from et_channel sc @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sm_channel + insert into et_channel channel_id, `name`, @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sm_channel + update et_channel name = #{data.name}, enabled = #{data.enabled}, @@ -71,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_channel where channel_id = #{channelId} + delete from et_channel where channel_id = #{channelId} - delete from sm_channel where channel_id in + delete from et_channel where channel_id in #{channelId} diff --git a/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml similarity index 94% rename from electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml rename to electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml index 5df3456..cdbad92 100644 --- a/electripper-system/src/main/resources/mapper/system/ChannelWithdrawMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml @@ -2,7 +2,7 @@ - + @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scw.picture, scw.min_amount, scw.max_amount - from ss_channel_withdraw scw + from et_channel_withdraw scw @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ss_channel_withdraw + insert into et_channel_withdraw name, account_type, @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ss_channel_withdraw + update et_channel_withdraw name = #{data.name}, account_type = #{data.accountType}, @@ -93,11 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from ss_channel_withdraw where channel_id = #{channelId} + delete from et_channel_withdraw where channel_id = #{channelId} - delete from ss_channel_withdraw where channel_id in + delete from et_channel_withdraw where channel_id in #{channelId}