8.19修改数据同步

src/main/java/com/example/demo/Mysql/MysqlController.java

@@ -26,7 +26,7 @@ public class MysqlController {
     MysqlService mysqlService;
     @RequestMapping
     public Result Mysql () throws Exception {
-        mysqlService.getSqlserverData2();
+        mysqlService.getSqlserverData();
         return Result.success();
     }
 }

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -80,7 +80,7 @@ public class MysqlServiceImpl implements MysqlService {
                 //退款类型 61：ERP退款（退金币）
                 String insertSql = "INSERT INTO user_gold_record (order_code,jwcode,sum_gold,permanent_gold,free_june,free_december," +
                         "task_gold,pay_platform,goods_name,refund_type,refund_model,remark,type,admin_id," +
-                        "audit_status,create_time,flag,update_time) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+                        "audit_status,create_time,flag,update_time,audit_time) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
                 try (PreparedStatement mysqlStmt = mysqlConn.prepareStatement(insertSql)) {
                     while (resultSet.next()) {
                         int gtype = resultSet.getInt("gtype");
@@ -136,12 +136,12 @@ public class MysqlServiceImpl implements MysqlService {
                         mysqlStmt.setInt(4,buy_jb);
                         // 判断月份
                         if(currentMonth.getValue() >= 7){
-                            mysqlStmt.setInt(5, free);
-                            mysqlStmt.setInt(6, 0);
+                            mysqlStmt.setInt(6, free);
+                            mysqlStmt.setInt(5, 0);
                         }
                         if(currentMonth.getValue() < 7){
-                            mysqlStmt.setInt(5, 0);
-                            mysqlStmt.setInt(6, free);
+                            mysqlStmt.setInt(6, 0);
+                            mysqlStmt.setInt(5, free);
                         }
                         mysqlStmt.setInt(7, core_jb);
                         if (operation_platform.equals("1")){
@@ -172,6 +172,7 @@ public class MysqlServiceImpl implements MysqlService {
                             mysqlStmt.setInt(17, 1);
                         }
                         mysqlStmt.setTimestamp(18, created_at);
+                        mysqlStmt.setTimestamp(19, created_at);
 
                        // 更新时的值
                         mysqlStmt.addBatch();
@@ -242,10 +243,22 @@ public class MysqlServiceImpl implements MysqlService {
                             }
 
                             if(currentMonth.getValue() >= 7){
-                                user.setCurrentFreeJune(user.getCurrentFreeJune().add(BigDecimal.valueOf(free)));
+                                if(user.getCurrentFreeJune().add(BigDecimal.valueOf(free)).compareTo(BigDecimal.ZERO)>=0){
+                                    user.setCurrentFreeJune(user.getCurrentFreeJune().add(BigDecimal.valueOf(free)));
+                                } else {
+                                    BigDecimal remaining = user.getCurrentFreeJune().add(BigDecimal.valueOf(free));
+                                    user.setCurrentFreeJune(BigDecimal.ZERO);
+                                    user.setCurrentFreeDecember(user.getCurrentFreeDecember().add(remaining));
+                                }
                             }
                             if(currentMonth.getValue() <7){
-                                user.setCurrentFreeDecember(user.getCurrentFreeDecember().add(BigDecimal.valueOf(free)));
+                                if(user.getCurrentFreeDecember().add(BigDecimal.valueOf(free)).compareTo(BigDecimal.ZERO)>=0){
+                                    user.setCurrentFreeDecember(user.getCurrentFreeDecember().add(BigDecimal.valueOf(free)));
+                                } else {
+                                    BigDecimal remaining = user.getCurrentFreeDecember().add(BigDecimal.valueOf(free));
+                                    user.setCurrentFreeDecember(BigDecimal.ZERO);
+                                    user.setCurrentFreeJune(remaining);
+                                }
                             }
 
                             user.setCurrentPermanentGold(user.getCurrentPermanentGold().add(BigDecimal.valueOf(buy_jb)));

src/main/java/com/example/demo/RabbitMQ/LogAspect.java

@@ -70,7 +70,7 @@ public class LogAspect {
         logDTO.setUsername(username);
         logDTO.setAction(action);
         logDTO.setIp(ip);
-        logDTO.setMethod(className + "." + methodName);
+        logDTO.setMethod(methodName);
         logDTO.setArgs(argsJson);
         logDTO.setCreateTime(LocalDateTime.now());
         System.out.println(logDTO);

src/main/java/com/example/demo/controller/coin/GeneralController.java

@@ -29,7 +29,7 @@ public class GeneralController {
 
     @Autowired
     private GeneralService generalService;
-    @Log("获取全部地区")
+//    @Log("获取全部地区")
     @PostMapping("/market")
     public Result getMarket()
     {
@@ -74,7 +74,7 @@ public class GeneralController {
         return Result.success(list);
     }
     //获取活动名称
-    @Log("获取活动名称")
+//    @Log("获取活动名称")
     @PostMapping("/activity")
     public Result getActivity()
     {

src/main/java/com/example/demo/controller/coin/MarketController.java

@@ -19,7 +19,7 @@ public class MarketController {
     @Autowired
     private MarketService marketService;
 
-    @Log("获取市场")
+//    @Log("获取市场")
     @RequestMapping("/selectMarket")
     public Result selectMarket()
     {

src/main/java/com/example/demo/controller/coin/MenuController.java

@@ -32,7 +32,7 @@ public class MenuController {
     private MenuService menuService;
 
    //获取权限树
-    @Log("获取权限树")
+//    @Log("获取权限树")
     @PostMapping("/tree")
     public Result getPermissionTree(@RequestBody RoleVo roleVo) {
         List<MenuVo> permissionTree = menuService.getPermissionTree(roleVo.getId());

src/main/java/com/example/demo/controller/coin/PermissionController.java

@@ -33,12 +33,12 @@ import java.util.List;
 @CrossOrigin
 public class PermissionController {
     private final PermissionService permissionService;
-    @Log("获取职位名称列表")
+//    @Log("获取职位名称列表")
     @PostMapping("/getposition")
     public Result getposition(@RequestBody String token){
         return Result.success(permissionService.getposition(token));
     }
-    @Log("获取市场名称列表")
+//    @Log("获取市场名称列表")
     @PostMapping("/getmarket")
     public Result getmarket(@RequestBody String token){
         return Result.success(permissionService.getmarket(token));

src/main/java/com/example/demo/controller/coin/RefundController.java

@@ -121,7 +121,7 @@ public class RefundController {
     }
 
     //筛选产品
-    @Log("筛选商品")
+//    @Log("筛选商品")
     @PostMapping("/selectGoods")
     public Result getSelectGoods(@RequestBody RefundUser refundUser) {
         List<RefundUser> list = refundService.selectGoods(refundUser.getJwcode());

src/main/java/com/example/demo/controller/coin/RoleController.java

@@ -75,7 +75,7 @@ public class RoleController {
         return Result.success(list);
     }
     //获取当前角色的上级角色
-    @Log("获取当前角色的上级角色")
+//    @Log("获取当前角色的上级角色")
     @PostMapping("/selectFather")
     public Result selectFather(@RequestBody RoleVo roleVo) {
         Integer id = roleVo.getId();

src/main/java/com/example/demo/controller/coin/StatisticsController.java

@@ -31,25 +31,25 @@ public class StatisticsController {
     @Autowired
     private GeneralService generalService;
     //测试定时任务part1
-    @Log("更新各市场当日余量统计数据")
+//    @Log("更新各市场当日余量统计数据")
     @PostMapping("/Hourly1")
     public void  HourlyTask1() {
         statisticsService.runHourlyTaskPart1();
     }
     //测试定时任务part2
-    @Log("更新各市场当日订单统计数据")
+//    @Log("更新各市场当日订单统计数据")
     @PostMapping("/Hourly2")
     public void  HourlyTask2() {
         statisticsService.runHourlyTaskPart2();
     }
     //测试定时任务年度
-    @Log("更新各市场年度订单统计数据")
+//    @Log("更新各市场年度订单统计数据")
     @PostMapping("/HourlyYear")
     public void  HourlyYear() {
         statisticsService.runHourlyTaskYear();
     }
     //测试一周内定时任务part2
-    @Log("更新各市场一周内订单统计数据")
+//    @Log("更新各市场一周内订单统计数据")
     @PostMapping("/Daily2")
     public void  DailyTask2() {
         statisticsService.runDailyTaskPart2();

src/main/java/com/example/demo/controller/coin/UserController.java

@@ -73,7 +73,7 @@ public class UserController {
         }
     }
     //检查并更新所有用户的首充时间（若有变化）
-    @Log("检查并更新所有用户的首充时间（若有变化）")
+//    @Log("检查并更新所有用户的首充时间（若有变化）")
     @PostMapping("/updateFirstRecharge")
     public Result updateFirstRecharge() {
         try {

src/main/java/com/example/demo/security/SecurityConfig.java

@@ -60,7 +60,7 @@ public class SecurityConfig {
                         request
                                 .requestMatchers( HttpMethod.POST,
                                         // 用户不登录就可以访问的路径
-                                        "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/statistics/**").permitAll()
+                                        "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/statistics/**","/Mysql").permitAll()
                                 .requestMatchers(
                                         "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**"
                                 ).permitAll()

src/main/resources/application-dev.yml

@@ -44,7 +44,7 @@ spring:
         pool-name: mysql5HikariCP
         maximum-pool-size: 10
     sqlserver1:
-      jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
+      jdbc-url: jdbc:sqlserver://10.19.183.6:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
       username: gjb_test
       password: qweuio!@#$2
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -76,6 +76,15 @@ spring:
           max-active: 20
           max-wait: -1
           max-idle: 5
+  rabbitmq:
+    host: 54.255.212.181
+    port: 5672
+    username: gold
+    password: gold
+    virtual-host: /
+    listener:
+      simple:
+        trusted-packages: com.example.demo.domain.DTO
 
 file:
   upload:

src/main/resources/application-prod.yml

@@ -44,7 +44,7 @@ spring:
         pool-name: mysql5HikariCP
         maximum-pool-size: 10
     sqlserver1:
-      jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
+      jdbc-url: jdbc:sqlserver://10.19.183.6:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
       username: gjb_test
       password: qweuio!@#$2
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -77,6 +77,15 @@ spring:
           max-active: 20
           max-wait: -1
           max-idle: 5
+  rabbitmq:
+    host: 54.255.212.181
+    port: 5672
+    username: gold
+    password: gold
+    virtual-host: /
+    listener:
+      simple:
+        trusted-packages: com.example.demo.domain.DTO
 
 
 file:

src/main/resources/application-test.yml

@@ -66,10 +66,10 @@ spring:
 
 
   rabbitmq:
-    host: localhost
+    host: 54.255.212.181
     port: 5672
-    username: guest
-    password: guest
+    username: gold
+    password: gold
     virtual-host: /
     listener:
       simple:
@@ -78,9 +78,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 54.255.212.181
-      port: 10703
-      password: Ngc0FYUTA6h3wC5J
+      host: localhost
+      port: 6379
+      password: 123456
 
       lettuce:
         pool: