Merge branch 'develop' into develop-kjf-dev

# Conflicts:
#	kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserTradeServiceImpl.java

docker-compose.yml

@@ -170,51 +170,84 @@ services:
       - kxs_cloud_network
 
 #  kxs-rocket:
-#    image: apache/rocketmq:5.1.4
+#    image: xuchengen/rocketmq:5.1.3
 #    hostname: kxs-rocket
 #    container_name: kxs-rocket
 #    ports:
+#      - 8081:8081
+#      - 8080:8080
 #      - 9876:9876
-#    volumes:
-#      - ./logs/rocket:/home/rocketmq/logs
-#    command: sh mqnamesrv
-#    restart: on-failure
-#    networks:
-#      - kxs_cloud_network
-#
-#  kxs-rocket-broker:
-#    image: apache/rocketmq:5.1.4
-#    hostname: kxs-rocket-broker
-#    container_name: kxs-rocket-broker
-#    ports:
 #      - 10909:10909
 #      - 10911:10911
 #      - 10912:10912
 #    environment:
-#      JAVA_OPT_EXT: "-server -Xms128m -Xmx128m -Xmn128m"
-#    volumes:
-#      - ./data/broker/store:/home/rocketmq/store
-#      - ./kxs-visual/kxs-rocket/broker/broker.conf:/home/rocketmq/conf/broker.conf
-#    command: sh mqbroker -n kxs-rocket:9876 -c /home/rocketmq/conf/broker.conf
+#      # nameserver最小堆内存，默认1024m
+#      - NAMESRV_XMS=256m
+#      # nameserver最大堆内存，默认1024m
+#      - NAMESRV_XMX=256m
+#      # nameserver年轻代内存，默认256m
+#      - NAMESRV_XMN=256m
+#      # broker最小堆内存，默认1024m
+#      - BROKER_XMS=256m
+#      # broker最大堆内存，默认1024m
+#      - BROKER_XMX=256m
+#      # broker年轻代内存，默认256m
+#      - BROKER_XMN=256m
+#      # broker堆外内存，默认1024m
+#      - BROKER_MDM=256m
+#      # 控制台nameserver地址，默认localhost:9876
+#      - NAMESRV_ADDR=192.168.101.250:9876
 #    restart: on-failure
 #    networks:
 #      - kxs_cloud_network
-#    depends_on:
-#      - kxs-rocket
-#
-#  kxs-rocket-dashboard:
-#    image: apacherocketmq/rocketmq-dashboard:1.0.0
-#    container_name: kxs-rocket-dashboard
-#    hostname: kxs-rocket-dashboard
-#    ports:
-#      - 9870:8080
-#    environment:
-#      - JAVA_OPTS=-Drocketmq.namesrv.addr=kxs-rocket:9876
-#    restart: on-failure
-#    depends_on:
-#      - kxs-rocket-broker
-#    networks:
-#      - kxs_cloud_network
+  kxs-rocket:
+    image: apache/rocketmq:5.1.0
+    hostname: kxs-rocket
+    container_name: kxs-rocket
+    ports:
+      - 9876:9876
+    volumes:
+      - ./logs/rocket:/home/rocketmq/logs
+    command: sh mqnamesrv
+    restart: on-failure
+    networks:
+      - kxs_cloud_network
+
+  kxs-rocket-broker:
+    image: apache/rocketmq:5.1.0
+    hostname: kxs-rocket-broker
+    container_name: kxs-rocket-broker
+    ports:
+      - 8080:8081
+      - 8081:8081
+      - 10909:10909
+      - 10911:10911
+      - 10912:10912
+    environment:
+      JAVA_OPT_EXT: "-server -Xms128m -Xmx128m -Xmn128m"
+    volumes:
+      - ./data/broker/store:/home/rocketmq/store
+      - ./kxs-visual/kxs-rocket/broker/broker.conf:/home/rocketmq/conf/broker.conf
+    command: sh mqbroker -n kxs-rocket:9876 -c /home/rocketmq/conf/broker.conf  --enable-proxy
+    restart: on-failure
+    networks:
+      - kxs_cloud_network
+    depends_on:
+      - kxs-rocket
+
+  kxs-rocket-dashboard:
+    image: apacherocketmq/rocketmq-dashboard:1.0.0
+    container_name: kxs-rocket-dashboard
+    hostname: kxs-rocket-dashboard
+    ports:
+      - 9870:8080
+    environment:
+      - JAVA_OPTS=-Drocketmq.namesrv.addr=kxs-rocket:9876
+    restart: on-failure
+    depends_on:
+      - kxs-rocket-broker
+    networks:
+      - kxs_cloud_network
 
 
 networks:

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/model/KxsUserNewTrade.java

@@ -0,0 +1,108 @@
+package com.kxs.stat.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表实体类
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserNewTrade extends Model<KxsUserNewTrade> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 交易日
+     */
+    @Schema(description = "交易日")
+    private Integer tradeDate;
+
+
+    /**
+     * 交易月
+     */
+    @Schema(description = "交易月")
+    private Integer tradeMonth;
+
+
+    /**
+     * 创客ID
+     */
+    @Schema(description = "创客ID")
+    private Integer userId;
+
+
+    /**
+     * 统计类型 0个人 1团队
+     */
+    @Schema(description = "统计类型 0个人 1团队")
+    private Integer totalType;
+
+
+    /**
+     * 新增数量
+     */
+    @Schema(description = "新增数量")
+    private Integer newCount;
+
+
+
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/mapper/KxsUserNewTradeMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.stat.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.stat.api.model.KxsUserNewTrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+@Mapper
+public interface KxsUserNewTradeMapper extends BaseMapper<KxsUserNewTrade> {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/KxsUserNewTradeService.java

@@ -0,0 +1,15 @@
+package com.kxs.stat.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.stat.api.model.KxsUserNewTrade;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表服务接口
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+public interface KxsUserNewTradeService extends IService<KxsUserNewTrade> {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserNewTradeServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.stat.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.stat.biz.mapper.KxsUserNewTradeMapper;
+import com.kxs.stat.api.model.KxsUserNewTrade;
+import com.kxs.stat.biz.service.KxsUserNewTradeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+@Service("kxsUserNewTradeService")
+public class KxsUserNewTradeServiceImpl extends ServiceImpl<KxsUserNewTradeMapper, KxsUserNewTrade> implements KxsUserNewTradeService {
+
+}
+

kxs-stat/kxs-stat-biz/src/main/resources/mapper/KxsUserNewTradeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kxs.stat.biz.mapper.KxsUserNewTradeMapper">
+
+    <resultMap type="com.kxs.stat.api.model.KxsUserNewTrade" id="KxsUserNewTradeMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="trade_date" property="tradeDate" />
+        <result column="trade_month" property="tradeMonth" />
+        <result column="user_id" property="userId" />
+        <result column="total_type" property="totalType" />
+        <result column="new_count" property="newCount" />
+
+    </resultMap>
+
+</mapper>

kxs-transfer/pom.xml

@@ -34,7 +34,6 @@
             <artifactId>kafka-clients</artifactId>
             <version>2.7.0</version>
         </dependency>
-
         <!--注册中心客户端-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -105,6 +105,7 @@ public class DtsController {
     private final KxsUserLogoutTradeService kxsUserLogoutTradeService;
     private final KxsUserGdTradeService kxsUserGdTradeService;
     private final KxsZlbTradeService kxsZlbTradeService;
+    private final KxsUserNewTradeService kxsUserNewTradeService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -386,9 +387,14 @@ public class DtsController {
             if ("SimCardDaySummary".equals(dmlData.getTableName())) {
                 kxsUserGdTradeService.changeData(dmlData);
             }
+            //助力宝统计
             if ("HelpProfitUserTradeSummay".equals(dmlData.getTableName())) {
                 kxsZlbTradeService.changeData(dmlData);
             }
+            //创客新增统计表
+            if ("PullnewSummary".equals(dmlData.getTableName())) {
+                kxsUserNewTradeService.changeData(dmlData);
+            }
 
 
 

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/stat/KxsUserNewTradeMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.stat;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.stat.api.model.KxsUserNewTrade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+@Mapper
+@DS("stat")
+public interface KxsUserNewTradeMapper extends BaseMapper<KxsUserNewTrade> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineTrackService.java

@@ -53,7 +53,7 @@ public class KxsMachineTrackService extends ServiceImpl<KxsMachineTrackMapper, K
 
             switch (field) {
                 case "FromUserId":
-                    machineTrack.setBeforeUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    machineTrack.setBeforeUserId(Long.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "ToUserId":
                     int userId = Integer.parseInt(validFieldDataMap.get(field).toString());

kxs-transfer/src/main/java/com/kxs/transfer/api/service/stat/KxsUserNewTradeService.java

@@ -0,0 +1,81 @@
+package com.kxs.transfer.api.service.stat;
+
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.stat.api.model.KxsUserNewTrade;
+import com.kxs.stat.api.model.KxsZlbTrade;
+import com.kxs.transfer.api.mapper.stat.KxsUserNewTradeMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 创客新增统计表(KxsUserNewTrade)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-05-16 11:07:42
+ */
+@Service("kxsUserNewTradeService")
+public class KxsUserNewTradeService extends ServiceImpl<KxsUserNewTradeMapper, KxsUserNewTrade> {
+
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //全部字段值
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsUserNewTrade userNewTrade = new KxsUserNewTrade();
+
+        OperationType operation = dmlData.getOperation();
+
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
+        if (fieldDataMap.get("UserId").getValue() != null) {
+            userNewTrade.setUserId(Integer.valueOf(fieldDataMap.get("UserId").getValue().toString()));
+        }
+        if (fieldDataMap.get("StatMonth").getValue() != null) {
+            userNewTrade.setTradeMonth(Integer.valueOf(fieldDataMap.get("StatMonth").getValue().toString()));
+        }
+        if (fieldDataMap.get("StatDate").getValue() != null) {
+            userNewTrade.setTradeDate(Integer.valueOf(fieldDataMap.get("StatDate").getValue().toString()));
+        }
+        if (fieldDataMap.get("SeoTitle").getValue() != null) {
+            String seoTitle = fieldDataMap.get("SeoTitle").getValue().toString();
+            if ("self".equals(seoTitle)) {
+                userNewTrade.setTotalType(0);
+            } else {
+                userNewTrade.setTotalType(1);
+            }
+        }
+        if (fieldDataMap.get("RecUserAuthNum").getValue() != null) {
+            userNewTrade.setNewCount(Integer.valueOf(fieldDataMap.get("TradeAmount").getValue().toString()));
+        }
+
+
+
+
+        KxsUserNewTrade kxsZlbTrade = baseMapper.selectOne(Wrappers.<KxsUserNewTrade>lambdaQuery()
+                .eq(KxsUserNewTrade::getUserId, userNewTrade.getUserId())
+                .eq(KxsUserNewTrade::getTotalType, userNewTrade.getTotalType())
+                .eq(KxsUserNewTrade::getTradeMonth, userNewTrade.getTradeMonth())
+                .eq(KxsUserNewTrade::getTradeDate, userNewTrade.getTradeDate()));
+        if(kxsZlbTrade == null){
+            baseMapper.insert(userNewTrade);
+        }else{
+            userNewTrade.setId(kxsZlbTrade.getId());
+            baseMapper.updateById(userNewTrade);
+        }
+    }
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsMachineAdvanceService.java

@@ -129,9 +129,10 @@ public class KxsMachineAdvanceService extends ServiceImpl<KxsMachineAdvanceMappe
                     machineAdvanceInfo.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "ApplyDate":
-                    machineAdvanceInfo.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    if(validFieldDataMap.get(field) != null){
+                        machineAdvanceInfo.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    }
                     break;
-
             }
         }
         if (operation.equals(OperationType.UPDATE)) {

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsShdScoreServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -92,8 +93,8 @@ public class KxsShdScoreServiceImpl extends ServiceImpl<KxsShdScoreMapper, KxsSh
             }
             //获取上级用户
             KxsUser kxsUser = kxsUserMapper.getParenUser(integralStatDTO.getUserId());
-            String exclude = "605,608,15600";
-            if(kxsUser == null || exclude.contains(kxsUser.getId().toString())){
+            List<Integer> exclude = Arrays.asList(605,608,15600);
+            if(kxsUser == null || exclude.contains(kxsUser.getId())){
                 continue;
             }
             //查询记录

kxs-visual/kxs-rocket/broker/broker.conf

@@ -7,3 +7,11 @@ brokerRole = ASYNC_MASTER
 flushDiskType = ASYNC_FLUSH
 # 注意，宿主IP是你计算机网卡的IP
 brokerIP1 = 192.168.101.250
+# 在发送消息时，自动创建服务器不存在的topic，默认创建的队列数
+defaultTopicQueueNums=4
+
+# 是否允许 Broker 自动创建 Topic，建议线下开启，线上关闭 ！！！这里仔细看是 false，false，false
+autoCreateTopicEnable=true
+
+# 是否允许 Broker 自动创建订阅组，建议线下开启，线上关闭
+autoCreateSubscriptionGroup=true