From 9ec25fd51c7ffaa428c863fda1a57bd6162a2c4b Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 23 Jul 2025 16:54:08 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/RoleMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index 64add82..60ca414 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -75,6 +75,8 @@ r.priority AS priority, r.father_id AS fatherId, r.market AS market, + r.create_time AS createTime, + r.update_time AS updateTime, -- 通过自连接查询父角色名称 father.role_name AS fatherName FROM role r @@ -95,7 +97,7 @@ - ORDER BY r.priority DESC + ORDER BY r.update_time DESC,r.priority DESC SELECT u.name AS name, - u.jwcode AS jwcode, + ugr.jwcode AS jwcode, u.market AS market, ugr.goods_name AS goodsName, ugr.pay_platform AS payPlatform, @@ -74,7 +74,7 @@ SELECT u.name AS name, - u.jwcode AS jwcode, + ugr.jwcode AS jwcode, u.market AS market, ugr.activity AS activity, ugr.rate_id AS rateId, @@ -75,7 +75,7 @@ SELECT u.name AS name, - u.jwcode AS jwcode, + ugr.jwcode AS jwcode, u.market AS market, ugr.order_code AS orderCode, ugr.goods_name AS goodsName, @@ -75,7 +75,7 @@ + \ No newline at end of file From a2dd18226a7198e3abf8f497581f6835f4cbfd4e Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 23 Jul 2025 22:47:29 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/MenuServiceImpl.java | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java index cfce95d..5c8b052 100644 --- a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java @@ -12,9 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -109,6 +107,32 @@ public class MenuServiceImpl implements MenuService { } if(roleVo.getMenuIds() == null||roleVo.getMenuIds().isEmpty()) { return Result.error("角色权限为空"); + }else + { + List menuIds = new ArrayList<>(roleVo.getMenuIds()); // 创建副本避免修改原始列表 + Set processedIds = new HashSet<>(menuIds); // 使用Set快速检查存在性 + + // 处理每个菜单ID及其所有父菜单 + for (int i = 0; i < menuIds.size(); i++) { + Integer currentId = menuIds.get(i); + + // ID为1不处理 + if (currentId == 1) continue; + + // 获取父菜单ID + Integer fatherId = menuMapper.selectFatherId(currentId); + + // 递归添加所有父菜单 + while (fatherId != null) { + if (!processedIds.contains(fatherId)) { + menuIds.add(fatherId); + processedIds.add(fatherId); + } + // 继续向上查找父菜单的父菜单 + fatherId = menuMapper.selectFatherId(fatherId); + } + } + roleVo.setMenuIds(menuIds); } if(roleMapper.selectByRoleId(roleVo.getId())==null){ return Result.error("角色不存在"); From 1e2ad26b4e138e609a21c0a2083b8f15a3d11d7d Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 24 Jul 2025 00:15:26 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/GeneralController.java | 2 +- .../java/com/example/demo/mapper/GeneralMapper.java | 2 ++ .../java/com/example/demo/service/GeneralService.java | 4 +++- .../example/demo/serviceImpl/GeneralServiceImpl.java | 18 +++++++++++++++--- src/main/resources/mapper/GeneralMapper.xml | 3 +++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java index 93c6914..947cd4a 100644 --- a/src/main/java/com/example/demo/controller/GeneralController.java +++ b/src/main/java/com/example/demo/controller/GeneralController.java @@ -44,7 +44,7 @@ public class GeneralController { //获取角色地区权限 @PostMapping("/roleMarket") public Result getroleMarkets(@RequestBody RoleVo roleVo) throws Exception { - String market = generalService.getRoleMarket(roleVo.getId()); + List market = generalService.getRoleMarket(roleVo.getId()); return Result.success(market); } @PostMapping("/platform") diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/GeneralMapper.java index 49d6d76..02f53d0 100644 --- a/src/main/java/com/example/demo/mapper/GeneralMapper.java +++ b/src/main/java/com/example/demo/mapper/GeneralMapper.java @@ -26,4 +26,6 @@ public interface GeneralMapper { String getAdminMarket(String account); //获取角色地区列表 String getRoleMarket(Integer roleId); + + List getAllRoleMarket(); } diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java index f253d12..6e01eae 100644 --- a/src/main/java/com/example/demo/service/GeneralService.java +++ b/src/main/java/com/example/demo/service/GeneralService.java @@ -39,5 +39,7 @@ public interface GeneralService { //获取用户的地区权限列表(工作台图表专用) List getAdminMarket1(String account) ; //获取角色的地区 - String getRoleMarket(Integer roleId); + List getRoleMarket(Integer roleId); + //获取所有市场(地区) + List getAllRoleMarket(); } diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index e5235d4..082ae81 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -172,17 +172,29 @@ public class GeneralServiceImpl implements GeneralService { 获取觉得的地区列表 */ @Override - public String getRoleMarket(Integer roleId) { + public List getRoleMarket(Integer roleId) { try { String market = generalMapper.getRoleMarket(roleId); if (market == null) { throw new Exception("没有地区权限"); } - return market; + List list = Arrays.asList(market.split(",")); + //判断是否是总部 + if (list != null && list.contains("总部")) { + list=getAllRoleMarket();//总部有所有地区的权限 + } + return list; } catch (Exception e) { // 记录日志 log.error("获取地区权限失败", e); // 重新抛出异常,或者根据需要返回一个默认值或空列表 throw new RuntimeException("获取地区权限失败", e); } - }} + } + + @Override + public List getAllRoleMarket() { + List list = generalMapper.getAllRoleMarket(); + return list; + } +} diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml index 8fc1952..70795a1 100644 --- a/src/main/resources/mapper/GeneralMapper.xml +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -26,4 +26,7 @@ select market from role where id = #{roleId} + \ No newline at end of file From 02ba787eca608169b3554333e39a05a3913b4031 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 24 Jul 2025 10:21:14 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index 277b15d..1085fd5 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -44,7 +44,7 @@ public class StatisticsServiceImpl implements StatisticsService { @Override @Scheduled(cron = "0 10 * * * ?") // 每小时执行一次 public void runHourlyTaskPart1() { - LocalDate today = LocalDate.now().minusDays(1); //取当天日期 + LocalDate today = LocalDate.now(); //取当天日期 List list = statisticsMapper.listPart1All(today); if (!list.isEmpty()) { @@ -58,7 +58,7 @@ public class StatisticsServiceImpl implements StatisticsService { @Override @Scheduled(cron = "0 10 * * * ?") // 每小时执行一次 public void runHourlyTaskPart2() { - LocalDate today = LocalDate.now().minusDays(1); + LocalDate today = LocalDate.now(); Date start = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date end = Date.from( today.atTime(LocalTime.MAX) // 当天 23:59:59 From c8236d20a3f70a8859d55b4bc9505a51cc2aff62 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 24 Jul 2025 15:28:32 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=AE=A1=E6=A0=B8--?= =?UTF-8?q?=E9=A9=B3=E5=9B=9Ebug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/controller/GeneralController.java | 6 ++++++ .../java/com/example/demo/serviceImpl/AuditServiceImpl.java | 13 ++++++++----- src/main/resources/application.yml | 2 +- src/main/resources/mapper/AuditMapper.xml | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java index 947cd4a..b7af0fb 100644 --- a/src/main/java/com/example/demo/controller/GeneralController.java +++ b/src/main/java/com/example/demo/controller/GeneralController.java @@ -47,6 +47,12 @@ public class GeneralController { List market = generalService.getRoleMarket(roleVo.getId()); return Result.success(market); } + //获取全部的角色地区 + @PostMapping("/allRoleMarket") + public Result getAllRoleMarket(){ + List list = generalService.getAllRoleMarket(); + return Result.success(list); + } @PostMapping("/platform") public Result getPlatform() { diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 910addc..9d8630a 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -17,6 +17,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Date; @@ -44,6 +45,7 @@ public class AuditServiceImpl implements AuditService { /* 审核订单并修改用户余额等 */ + @Transactional @Override public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action,String rejectReason) { UserGoldRecord order=auditMapper.selectOrderByOrderCode(orderCode); @@ -56,11 +58,7 @@ public class AuditServiceImpl implements AuditService { updateOrder.setAuditId(auditId); //判断是通过还是驳回 if (action==2){ //驳回 - updateOrder.setAuditStatus(2); - updateOrder.setRejectReason(rejectReason); - updateOrder.setAuditTime(new Date()); - // 执行审核更新 - auditMapper.updateOrder(updateOrder); + if (order.getType()==2) { //退款 //2.获取对应的消费订单(退款订单号去掉开头"TK"即为对应消费订单) String consumeOrderCode = order.getOrderCode().replaceFirst("TK", ""); @@ -71,6 +69,11 @@ public class AuditServiceImpl implements AuditService { }else { throw new IllegalArgumentException("找不到对应的订单或不是有效订单"); } + updateOrder.setAuditStatus(2); + updateOrder.setRejectReason(rejectReason); + updateOrder.setAuditTime(new Date()); + // 执行审核更新 + auditMapper.updateOrder(updateOrder); } }else if (action==1) { //通过 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 024f557..cf3440a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: prod jackson: deserialization: fail-on-unknown-properties: false diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index b42e648..23778db 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -152,7 +152,7 @@ From f455296760ca5b396ca83dfac78e58d864678b1d Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Thu, 24 Jul 2025 15:28:34 +0800 Subject: [PATCH 11/26] =?UTF-8?q?7.23=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java | 3 +++ src/main/resources/application-dev.yml | 6 +++--- src/main/resources/mapper/PermissionMapper.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index 082ae81..a7beb67 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -131,6 +131,9 @@ public class GeneralServiceImpl implements GeneralService { List list = Arrays.asList(market.split(",")); //判断是否是总部 if (list != null && list.contains("总部")) { + + + List allMarkets = getMarket(); // 获取所有地区 allMarkets.add(0, "总部"); // 将“总部”添加到列表第一位 list = allMarkets; // 更新list diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 25718af..33590e4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -35,9 +35,9 @@ spring: data: redis: database: 0 - host: 18.143.76.3 - port: 10703 - password: Ngc0FYUTA6h3wC5J + host: localhost + port: 6379 + password: 123456 lettuce: pool: diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index 4e8be29..2b6285e 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -92,7 +92,7 @@ ) - order by admin.admin_status desc + order by admin.admin_status desc ,admin.update_time desc + diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index fb5c796..d6b30b7 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -125,4 +125,13 @@ AND s.current_datetime BETWEEN #{startDate} AND #{endDate} GROUP BY s.market; + + + + From 4cac592e7e5580b1127e36c90a334178693b250e Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 27 Jul 2025 13:06:59 +0800 Subject: [PATCH 25/26] =?UTF-8?q?7.27=E5=9C=B0=E5=8C=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/MarketController.java | 26 ++++++++++++++ .../com/example/demo/domain/entity/Market.java | 33 +++++++++++++++++ .../java/com/example/demo/mapper/MarketMapper.java | 9 +++++ .../com/example/demo/service/MarketService.java | 17 +++++++++ .../demo/serviceImpl/MarketServiceImpl.java | 42 ++++++++++++++++++++++ .../example/demo/serviceImpl/UserServiceImpl.java | 2 +- src/main/resources/mapper/MarketMapper.xml | 7 ++++ 7 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/controller/MarketController.java create mode 100644 src/main/java/com/example/demo/domain/entity/Market.java create mode 100644 src/main/java/com/example/demo/mapper/MarketMapper.java create mode 100644 src/main/java/com/example/demo/service/MarketService.java create mode 100644 src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java create mode 100644 src/main/resources/mapper/MarketMapper.xml diff --git a/src/main/java/com/example/demo/controller/MarketController.java b/src/main/java/com/example/demo/controller/MarketController.java new file mode 100644 index 0000000..afd8bc8 --- /dev/null +++ b/src/main/java/com/example/demo/controller/MarketController.java @@ -0,0 +1,26 @@ +package com.example.demo.controller; + +import com.example.demo.domain.vo.Result; +import com.example.demo.service.MarketService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/market") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class MarketController { + @Autowired + private MarketService marketService; + + @RequestMapping("/selectMarket") + public Result selectMarket() + { + return Result.success(marketService.selectMarket()); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/entity/Market.java b/src/main/java/com/example/demo/domain/entity/Market.java new file mode 100644 index 0000000..f79ec67 --- /dev/null +++ b/src/main/java/com/example/demo/domain/entity/Market.java @@ -0,0 +1,33 @@ +package com.example.demo.domain.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + + +/** + * @program: GOLD + * @ClassName Export + * @description: + * @author: huangqizhen + * @create: 2025−07-26 16:17 + * @Version 1.0 + **/ +@Data +@NoArgsConstructor +public class Market { + private Integer id; + private String name; + private Integer parentId; + private Date createTime; + private String treelist; + private Integer type; + + private List children; + + + +} diff --git a/src/main/java/com/example/demo/mapper/MarketMapper.java b/src/main/java/com/example/demo/mapper/MarketMapper.java new file mode 100644 index 0000000..91b99c6 --- /dev/null +++ b/src/main/java/com/example/demo/mapper/MarketMapper.java @@ -0,0 +1,9 @@ +package com.example.demo.mapper; + +import com.example.demo.domain.entity.Market; + +import java.util.List; + +public interface MarketMapper { + List getMarket(); +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/MarketService.java b/src/main/java/com/example/demo/service/MarketService.java new file mode 100644 index 0000000..85010d1 --- /dev/null +++ b/src/main/java/com/example/demo/service/MarketService.java @@ -0,0 +1,17 @@ +package com.example.demo.service; + +import com.example.demo.domain.entity.Market; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName MarketService + * @description: + * @author: huangqizhen + * @create: 2025−07-26 15:20 + * @Version 1.0 + **/ +public interface MarketService { + List selectMarket(); +} diff --git a/src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java new file mode 100644 index 0000000..64bd0a5 --- /dev/null +++ b/src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java @@ -0,0 +1,42 @@ +package com.example.demo.serviceImpl; + +import com.example.demo.domain.entity.Market; +import com.example.demo.domain.vo.MenuVo; +import com.example.demo.mapper.MarketMapper; +import com.example.demo.service.MarketService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +@Service +public class MarketServiceImpl implements MarketService { + @Autowired + private MarketMapper marketMapper; + @Override + public List selectMarket() { + List markets = marketMapper.getMarket(); + + // 2. 构建树形结构(根节点parentId=1) + return buildTree(markets, 1); + } + private List buildTree(List markets, Integer parentId) { + // 过滤出当前父节点的子菜单 + List children = markets.stream() + .filter(menu -> Objects.equals(menu.getParentId(), parentId)) + .collect(Collectors.toList()); + // 过滤出当前父节点的子菜单,同时过滤掉id为9的权限 +// List children = allMenus.stream() +// .filter(menu -> Objects.equals(menu.getParentId(), parentId) && !Objects.equals(menu.getId(), 9)) +// .collect(Collectors.toList()); + + // 递归为每个子菜单设置子节点 + for (Market child : children) { + child.setChildren(buildTree(markets, child.getId())); + } + + return children; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java index cc3eb57..7f51f31 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java @@ -81,7 +81,7 @@ public class UserServiceImpl implements UserService { 每小时更新用户首充时间 */ @Override - @Scheduled(cron = "0 0 0 * * ?") +// @Scheduled(cron = "0 0 0 * * ?") public void updateFirstRecharge() { List jwcodeList = userMapper.getAllJwcode(); for(Integer jwcode : jwcodeList){ diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml new file mode 100644 index 0000000..7a402b8 --- /dev/null +++ b/src/main/resources/mapper/MarketMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file From 0bc4bad11d414a20017f9560c6d8f87dd9539bd7 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Mon, 28 Jul 2025 13:46:44 +0800 Subject: [PATCH 26/26] =?UTF-8?q?7.28=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/config/Mysql1DataSourceConfig.java | 2 +- .../demo/config/Mysql2DataSourceConfig.java | 47 +++++++++++++++++ .../demo/config/Mysql3DataSourceConfig.java | 47 +++++++++++++++++ src/main/resources/application.yml | 61 ++++++++-------------- 4 files changed, 118 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java create mode 100644 src/main/java/com/example/demo/config/Mysql3DataSourceConfig.java diff --git a/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java index be58aa2..3687418 100644 --- a/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java +++ b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java @@ -20,7 +20,7 @@ public class Mysql1DataSourceConfig { @Bean(name = "mysql1DataSource") @ConfigurationProperties(prefix = "spring.datasource.mysql1") -public DataSource mysql2DataSource() { +public DataSource mysql1DataSource() { return DataSourceBuilder.create().type(HikariDataSource.class).build(); } @Bean(name = "mysql1SqlSessionFactory") diff --git a/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java new file mode 100644 index 0000000..2e94cf2 --- /dev/null +++ b/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java @@ -0,0 +1,47 @@ +package com.example.demo.config; + +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; + +import javax.sql.DataSource; + +@Slf4j +@Configuration +public class Mysql2DataSourceConfig { + + @Bean(name = "mysql2DataSource") + @ConfigurationProperties(prefix = "spring.datasource.mysql2") + public DataSource mysql2DataSource() { + return DataSourceBuilder.create().type(HikariDataSource.class).build(); + } + @Bean(name = "mysql2SqlSessionFactory") +// @Primary + public SqlSessionFactory mysql2SqlSessionFactory(@Qualifier("mysql2DataSource") DataSource dataSource, + @Qualifier("globalConfiguration2") org.apache.ibatis.session.Configuration globalConfiguration2) throws Exception { + SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + sessionFactory.setDataSource(dataSource); + sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:jindouMapper/*.xml")); + sessionFactory.setConfiguration(globalConfiguration2); + return sessionFactory.getObject(); + } + + @Bean(name = "mysql2SqlSessionTemplate") +// @Primary + public SqlSessionTemplate mysql2SqlSessionTemplate(@Qualifier("mysql2SqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } + @Bean + @ConfigurationProperties(prefix = "mybatis.configuration.mysql2") + public org.apache.ibatis.session.Configuration globalConfiguration2() { + return new org.apache.ibatis.session.Configuration(); + } +} diff --git a/src/main/java/com/example/demo/config/Mysql3DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql3DataSourceConfig.java new file mode 100644 index 0000000..52577d3 --- /dev/null +++ b/src/main/java/com/example/demo/config/Mysql3DataSourceConfig.java @@ -0,0 +1,47 @@ +package com.example.demo.config; + +import com.zaxxer.hikari.HikariDataSource; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; + +import javax.sql.DataSource; + +@Slf4j +@Configuration +public class Mysql3DataSourceConfig { + + @Bean(name = "mysql3DataSource") + @ConfigurationProperties(prefix = "spring.datasource.mysql3") + public DataSource mysql2DataSource() { + return DataSourceBuilder.create().type(HikariDataSource.class).build(); + } + @Bean(name = "mysql3SqlSessionFactory") +// @Primary + public SqlSessionFactory mysql3SqlSessionFactory(@Qualifier("mysql3DataSource") DataSource dataSource, + @Qualifier("globalConfiguration3") org.apache.ibatis.session.Configuration globalConfiguration3) throws Exception { + SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + sessionFactory.setDataSource(dataSource); + sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:jindouMapper/*.xml")); + sessionFactory.setConfiguration(globalConfiguration3); + return sessionFactory.getObject(); + } + + @Bean(name = "mysql3SqlSessionTemplate") +// @Primary + public SqlSessionTemplate mysql3SqlSessionTemplate(@Qualifier("mysql3SqlSessionFactory") SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } + @Bean + @ConfigurationProperties(prefix = "mybatis.configuration.mysql3") + public org.apache.ibatis.session.Configuration globalConfiguration3() { + return new org.apache.ibatis.session.Configuration(); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 06fbadb..4031b8d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,38 +13,23 @@ spring: hikari: pool-name: mysql1HikariCP maximum-pool-size: 10 - # mysql1: - # jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai - # username: hwgold - # password: AGX4Z3YMxiCG3GR2 - # driver-class-name: com.mysql.cj.jdbc.Driver - # hikari: - # pool-name: mysql1HikariCP - # maximum-pool-size: 10 -# mysql1: -# jdbc-url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai -# username: hwgold -# password: AGX4Z3YMxiCG3GR2 -# driver-class-name: com.mysql.cj.jdbc.Driver -# hikari: -# pool-name: mysql1HikariCP -# maximum-pool-size: 10 -# mysql2: -# jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai -# username: hljw -# password: 5dmWCCKfEk3TTeyn -# driver-class-name: com.mysql.cj.jdbc.Driver -# hikari: -# pool-name: mysql2HikariCP -# maximum-pool-size: 10 -# mysql3: -# jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai -# username: pay_xxcg_com -# password: 4hHmzxZH4rF4c5xr -# driver-class-name: com.mysql.cj.jdbc.Driver -# hikari: -# pool-name: mysql2HikariCP -# maximum-pool-size: 10 + + mysql2: + jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai + username: hljw + password: 5dmWCCKfEk3TTeyn + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + pool-name: mysql2HikariCP + maximum-pool-size: 10 + mysql3: + jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai + username: pay_xxcg_com + password: 4hHmzxZH4rF4c5xr + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + pool-name: mysql2HikariCP + maximum-pool-size: 10 sqlserver1: jdbc-url: jdbc:sqlserver://52.76.43.43:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; username: hwhc_gold_query @@ -88,12 +73,12 @@ mybatis: sqlserver1: map-underscore-to-camel-case: true # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -# mysql2: -# map-underscore-to-camel-case: true -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -# mysql3: -# map-underscore-to-camel-case: true -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mysql2: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mysql3: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl upload: path: D:\upload