7.14数据同步修改

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<String, Object> 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<String, Object> 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<String, Object> 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);
 

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);

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -19,4 +19,5 @@ public interface AdminMapper {
     void updatePassword(Admin admin);
 
 
+    String getName(String account);
 }

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);
 

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;

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<GoldDetail> 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("");

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

src/main/resources/mapper/AdminMapper.xml

@@ -22,4 +22,8 @@
             update_time = #{updateTime}
         where account = #{account}
     </update>
+    <select id="getName" resultType="java.lang.String">
+        select admin_name from admin
+        where account= #{account}
+    </select>
 </mapper>

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
         <where>
             ugr.type = 1

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
         <where>
             ugr.type = 0 AND ugr.audit_status IN (1,3)
             <if test="jwcode != null and jwcode != ''">

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)
         <trim prefix="ORDER BY" suffixOverrides=",">
@@ -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
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3)