From 736ffc473323076b86fe4374ef9a200cd7003506 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Mon, 14 Jul 2025 18:08:01 +0800 Subject: [PATCH] =?UTF-8?q?7.14=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Export/ExportServiceImpl.java | 28 ++++++++++------------ .../example/demo/controller/AdminController.java | 1 + .../java/com/example/demo/mapper/AdminMapper.java | 1 + .../com/example/demo/service/AdminService.java | 1 + .../example/demo/serviceImpl/AdminServiceImpl.java | 5 ++++ .../demo/serviceImpl/GoldDetailServiceImpl.java | 9 +++++-- src/main/resources/application.yml | 6 ++--- src/main/resources/mapper/AdminMapper.xml | 4 ++++ src/main/resources/mapper/ConsumeMapper.xml | 8 +++---- src/main/resources/mapper/RechargeMapper.xml | 8 +++---- src/main/resources/mapper/RefundMapper.xml | 12 +++++----- 11 files changed, 49 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index 78cc419..1e177eb 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -5,10 +5,13 @@ import com.example.demo.domain.DTO.ConsumeDTO; import com.example.demo.domain.DTO.RechargeDTO; import com.example.demo.domain.DTO.RefundDTO; import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Result; import com.example.demo.exception.SystemException; import com.example.demo.mapper.GoldDetailMapper; import com.example.demo.Util.RedisUtil; +import com.example.demo.service.AdminService; +import com.example.demo.service.UserService; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +25,8 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; +import static net.sf.jsqlparser.util.validation.metadata.NamedObject.user; + /** * @program: GOLD * @ClassName ExportServiceImpl @@ -36,6 +41,8 @@ public class ExportServiceImpl implements ExportService{ private GoldDetailMapper goldDetailMapper; @Autowired private RedisUtil redisUtil; + @Autowired + private AdminService adminService; @Override public Result addExportRecharge(RechargeDTO dto) { @@ -48,10 +55,11 @@ public class ExportServiceImpl implements ExportService{ } catch (Exception e) { throw new RuntimeException(e.getMessage()); } + String admin = adminService.getName(String.valueOf(dto.getAccount())); // 生成文件名 String fileName = String.format("%s_%s_%s.xlsx", "充值明细", - "操作人", + admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); System.out.println(fileName); dto.setUrl(""); @@ -78,10 +86,6 @@ public class ExportServiceImpl implements ExportService{ // 手动构造请求数据（避免 toString() 只返回部分字段） Map requestData = new HashMap<>(); - requestData.put("text", dto.getText()); - requestData.put("sort", dto.getSort()); - requestData.put("field", dto.getField()); - requestData.put("deptId", dto.getDeptid()); requestData.put("rechargeUser", dto.getRechargeUser()); exportData.put("requestData", requestData); @@ -106,10 +110,11 @@ public class ExportServiceImpl implements ExportService{ } catch (Exception e) { throw new RuntimeException(e.getMessage()); } + String admin = adminService.getName(String.valueOf(dto.getAccount())); // 生成文件名 String fileName = String.format("%s_%s_%s.xlsx", "退款明细", - "操作人", + admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); System.out.println(fileName); dto.setUrl(""); @@ -135,10 +140,6 @@ public class ExportServiceImpl implements ExportService{ // 手动构造请求数据（避免 toString() 只返回部分字段） Map requestData = new HashMap<>(); - requestData.put("text", dto.getText()); - requestData.put("sort", dto.getSort()); - requestData.put("field", dto.getField()); - requestData.put("deptId", dto.getDeptid()); requestData.put("refundUser", dto.getRefundUser()); exportData.put("requestData", requestData); @@ -163,10 +164,11 @@ public class ExportServiceImpl implements ExportService{ } catch (Exception e) { throw new RuntimeException(e.getMessage()); } + String admin = adminService.getName(String.valueOf(dto.getAccount())); // 生成文件名 String fileName = String.format("%s_%s_%s.xlsx", "消耗明细", - "操作人", + admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); System.out.println(fileName); dto.setUrl(""); @@ -192,10 +194,6 @@ public class ExportServiceImpl implements ExportService{ // 手动构造请求数据（避免 toString() 只返回部分字段） Map requestData = new HashMap<>(); - requestData.put("text", dto.getText()); - requestData.put("sort", dto.getSort()); - requestData.put("field", dto.getField()); - requestData.put("deptId", dto.getDeptid()); requestData.put("consumeUser", dto.getConsumeUser()); exportData.put("requestData", requestData); diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java index 10269c3..e43a951 100644 --- a/src/main/java/com/example/demo/controller/AdminController.java +++ b/src/main/java/com/example/demo/controller/AdminController.java @@ -55,6 +55,7 @@ public class AdminController { System.out.println("1/*/*/*/*//*-*-*-*-*-*-1" + token); try { System.out.println("/+/+/+/+/+/+/+//" + JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class)); + return JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java index c1b34f5..91996df 100644 --- a/src/main/java/com/example/demo/mapper/AdminMapper.java +++ b/src/main/java/com/example/demo/mapper/AdminMapper.java @@ -19,4 +19,5 @@ public interface AdminMapper { void updatePassword(Admin admin); + String getName(String account); } diff --git a/src/main/java/com/example/demo/service/AdminService.java b/src/main/java/com/example/demo/service/AdminService.java index 106b9a3..220d97b 100644 --- a/src/main/java/com/example/demo/service/AdminService.java +++ b/src/main/java/com/example/demo/service/AdminService.java @@ -16,6 +16,7 @@ public interface AdminService { Admin login(Admin admin)throws Exception; String getId(String account); + String getName(String account); Result updatePassword(Password password); diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index a880423..4bdf81b 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -69,6 +69,11 @@ public class AdminServiceImpl implements AdminService { return adminMapper.getAdmin(account).getId().toString(); } + @Override + public String getName(String account) { + return adminMapper.getName(account); + } + private boolean hasPermissionToMachine(Admin admin, String targetMachineId) { if (targetMachineId == null || admin.getMachineId() == null) { return false; diff --git a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java index 98fa424..1b08c1d 100644 --- a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.*; import com.example.demo.exception.SystemException; import com.example.demo.mapper.GoldDetailMapper; +import com.example.demo.service.AdminService; import com.example.demo.service.GoldDetailService; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; @@ -42,6 +43,8 @@ public class GoldDetailServiceImpl implements GoldDetailService { private GoldDetailMapper goldDetailMapper; @Autowired private RedisUtil redisUtil; + @Autowired + private AdminService adminService; @Override public PageInfo getGoldDetail(Integer pageNum, Integer pageSize, GoldDetail goldDetail) { @@ -124,10 +127,11 @@ public class GoldDetailServiceImpl implements GoldDetailService { } catch (Exception e) { throw new RuntimeException(e.getMessage()); } + String admin = adminService.getName(String.valueOf(dto.getAccount())); // 生成文件名 String fileName = String.format("%s_%s_%s.xlsx", "客户金币明细", - "操作人", + admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); System.out.println(fileName); dto.setUrl(""); @@ -182,10 +186,11 @@ public class GoldDetailServiceImpl implements GoldDetailService { } catch (Exception e) { throw new RuntimeException(e.getMessage()); } + String admin = adminService.getName(String.valueOf(dto.getAccount())); // 生成文件名 String fileName = String.format("%s_%s_%s.xlsx", "金币余额明细", - "操作人", + admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); System.out.println(fileName); dto.setUrl(""); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ef7a018..8e726da 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai - username: hwgoldc - password: zB48T55wCsHC8KPz + jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true + username: hwgold + password: aDiw7MERSATdfGta driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql1HikariCP diff --git a/src/main/resources/mapper/AdminMapper.xml b/src/main/resources/mapper/AdminMapper.xml index 15f0e8b..83a9c7f 100644 --- a/src/main/resources/mapper/AdminMapper.xml +++ b/src/main/resources/mapper/AdminMapper.xml @@ -22,4 +22,8 @@ update_time = #{updateTime} where account = #{account} + diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 8263303..aa46c39 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -72,10 +72,10 @@ ugr.remark AS remark, a.admin_name AS adminName, ugr.create_time AS createTime - FROM user u - JOIN - user_gold_record ugr ON u.jwcode = ugr.jwcode - JOIN + FROM user_gold_record ugr + left JOIN + user u ON u.jwcode = ugr.jwcode + left JOIN admin a ON ugr.admin_id = a.id ugr.type = 1 diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index 3358e7a..84bd95d 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -79,10 +79,10 @@ ugr.admin_id AS adminId, a.admin_name AS adminName, ugr.pay_time AS payTime - FROM user u - JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode - JOIN admin a ON ugr.admin_id = a.id - JOIN rate r ON ugr.rate_id = r.id + FROM user_gold_record ugr + left JOIN user u ON u.jwcode = ugr.jwcode + left JOIN admin a ON ugr.admin_id = a.id + left JOIN rate r ON ugr.rate_id = r.id ugr.type = 0 AND ugr.audit_status IN (1,3) diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index df4aaea..c04a435 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -19,9 +19,9 @@ a.admin_name AS adminName, ugr.create_time AS createTime FROM user u - JOIN + left JOIN user_gold_record ugr ON u.jwcode = ugr.jwcode - JOIN + left JOIN admin a ON ugr.admin_id = a.id WHERE ugr.type = 2 AND ugr.audit_status IN (1,3) @@ -76,10 +76,10 @@ ugr.remark AS remark, a.admin_name AS adminName, ugr.create_time AS createTime - FROM user u - JOIN - user_gold_record ugr ON u.jwcode = ugr.jwcode - JOIN + FROM user_gold_record ugr + left JOIN + user u ON u.jwcode = ugr.jwcode + left JOIN admin a ON ugr.admin_id = a.id ugr.type = 2 AND ugr.audit_status IN (1,3)