.idea/jwUser.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

pom.xml

@@ -19,44 +19,6 @@
         <lombok.version>1.18.38</lombok.version>
         <slf4j.version>2.0.17</slf4j.version>
     </properties>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-
-            <!-- 核心新增：Spring Boot打包插件（生成可运行的胖包） -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <!-- 关键：重新打包为可运行的JAR（包含所有依赖） -->
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- 必须指定Spring Boot启动类（替换为你的实际启动类全路径） -->
-                    <mainClass>com.link.TestApplication</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -168,13 +130,6 @@
             <version>11.2.1.jre8</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.3.0</version>
-        </dependency>
-
-
     </dependencies>
 
 </project>

src/main/java/com/link/controller/AnchorUserTypeStatController.java

@@ -5,11 +5,13 @@ import com.link.domain.Result;
 import com.link.domain.dto.AnchorUserTypeStatDTO;
 import com.link.service.AnchorUserTypeStatService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/toAnchorUserTypeStat")
-@CrossOrigin
 public class AnchorUserTypeStatController {
 
     @Autowired
@@ -17,7 +19,7 @@ public class AnchorUserTypeStatController {
 
     @PostMapping("/getDetails")
     public Result getDetails(@RequestBody AnchorUserTypeStatDTO dto) {
-        Object result = anchorUserTypeStatService.getAnchorUserTypeStat(dto.getJwCodes());
+        Object result = anchorUserTypeStatService.getAnchorUserTypeStat(dto.getJwCodes(),dto.getStartTime());
         return Result.ok("success",result);
     }
 }

src/main/java/com/link/controller/CRMCountController.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/toCRM")
-@CrossOrigin
 public class CRMCountController {
 
     @Autowired

src/main/java/com/link/controller/NotRegisteredController.java

@@ -5,11 +5,13 @@ import com.link.domain.Result;
 import com.link.domain.dto.NotRegisteredDTO;
 import com.link.service.NotRegisteredService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/toNotRegistered")
-@CrossOrigin
 public class NotRegisteredController {
     @Autowired
     private NotRegisteredService notRegisteredService;

src/main/java/com/link/controller/UserCountController.java

@@ -1,35 +1,35 @@
 package com.link.controller;
 
-import com.link.domain.PageQuery;
 import com.link.domain.Result;
 import com.link.domain.dto.UserCountDTO;
 import com.link.service.UserCountService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/toUserCount")
-@CrossOrigin
 public class UserCountController {
     @Autowired
     private UserCountService userCountService;
 
     @PostMapping("/toEmail")
     public Result getEmailUserCount(@RequestBody UserCountDTO dto) {
-
-        Object result = userCountService.getEmailUserCount(dto);
+        Object result = userCountService.getEmailUserCount(dto.getStartTime());
         return Result.ok("success",result);
     }
 
     @PostMapping("/toGoogle")
     public Result getGoogleUserCount(@RequestBody UserCountDTO dto) {
-        Object result = userCountService.getGoogleUserCount(dto);
+        Object result = userCountService.getGoogleUserCount(dto.getStartTime());
         return Result.ok("success",result);
     }
 
     @PostMapping("/toMessage")
     public Result getMessageUserCount(@RequestBody UserCountDTO dto) {
-        Object result = userCountService.getMessageUserCount(dto);
+        Object result = userCountService.getMessageUserCount(dto.getStartTime());
         return Result.ok("success",result);
     }
 }

src/main/java/com/link/domain/PageQuery.java

@@ -1,19 +0,0 @@
-package com.link.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class PageQuery {
-
-    private Integer page; //当前页数
-    private Integer offset; //数据偏移量 即当前页的数据是从第几个数据开始的
-    private Integer pageSize; //每页数据量
-    private Integer total; //数据总量
-    private List list; //总数列表
- }

src/main/java/com/link/domain/dto/AnchorUserTypeStatDTO.java

@@ -15,4 +15,6 @@ import java.util.List;
 public class AnchorUserTypeStatDTO {
 
     private List<String> jwCodes;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private LocalDate startTime;
 }

src/main/java/com/link/domain/dto/UserCountDTO.java

@@ -11,15 +11,6 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserCountDTO {
-
-    private Integer page=1;
-    private Integer pageSize=20;
-
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
-
-    public Integer getStart(){
-        return (page-1)*pageSize;
-    }
-
 }

src/main/java/com/link/mapper/UserCountMapper.java

@@ -1,6 +1,5 @@
 package com.link.mapper;
 
-import com.link.domain.PageQuery;
 import com.link.domain.vo.UserCountVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,15 +11,9 @@ import java.util.List;
 @Mapper
 @Qualifier("hljwSqlSessionTemplate")
 public interface UserCountMapper {
-    List<UserCountVO> getEmailUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
+    List<UserCountVO> getEmailUserCount(@Param("startTime") LocalDateTime startTime);
 
-    Integer getEmailUserTotal(@Param("startTime") LocalDateTime startTime);
+    List<UserCountVO> getGoogleUserCount(@Param("startTime") LocalDateTime startTime);
 
-    List<UserCountVO> getGoogleUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
-
-    Integer getGoogleUserTotal(@Param("startTime") LocalDateTime startTime);
-
-    List<UserCountVO> getMessageUserList(@Param("startTime") LocalDateTime startTime,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
-
-    Integer getMessageUserTotal(@Param("startTime") LocalDateTime startTime);
+    List<UserCountVO> getMessageUserCount(@Param("startTime") LocalDateTime startTime);
 }

src/main/java/com/link/mapperwechart/AnchorUserTypeStatMapper.java

@@ -12,5 +12,5 @@ import java.util.List;
 @Mapper
 @Qualifier("wechartSqlSessionTemplate")
 public interface AnchorUserTypeStatMapper {
-    List<AnchorUserTypeStatVO> getAnchorUserTypeStat(@Param("jwCodes") List<String> jwCodes);
+    List<AnchorUserTypeStatVO> getAnchorUserTypeStat(@Param("jwCodes") List<String> jwCodes, @Param("startTime") LocalDate startTime);
 }

src/main/java/com/link/service/AnchorUserTypeStatService.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface AnchorUserTypeStatService {
 
-    List<AnchorUserTypeStatVO> getAnchorUserTypeStat(List<String> jwCodes);
+    List<AnchorUserTypeStatVO> getAnchorUserTypeStat(List<String> jwCodes, LocalDate startTime);
 }

src/main/java/com/link/service/UserCountService.java

@@ -1,8 +1,5 @@
 package com.link.service;
 
-import com.link.domain.PageQuery;
-import com.link.domain.Result;
-import com.link.domain.dto.UserCountDTO;
 import com.link.domain.vo.UserCountVO;
 
 import java.time.LocalDateTime;
@@ -10,10 +7,10 @@ import java.util.List;
 
 public interface UserCountService {
 
-    PageQuery getEmailUserCount(UserCountDTO dto);
+    List<UserCountVO> getEmailUserCount(LocalDateTime startTime);
 
-    PageQuery getGoogleUserCount(UserCountDTO dto);
+    List<UserCountVO> getGoogleUserCount(LocalDateTime startTime);
 
-    PageQuery getMessageUserCount(UserCountDTO dto);
+    List<UserCountVO> getMessageUserCount(LocalDateTime startTime);
 
 }

src/main/java/com/link/serviceImpl/AnchorUserTypeStatServiceImpl.java

@@ -17,7 +17,7 @@ public class AnchorUserTypeStatServiceImpl implements AnchorUserTypeStatService
     private AnchorUserTypeStatMapper anchorUserTypeStatMapper;
 
     @Override
-    public List<AnchorUserTypeStatVO> getAnchorUserTypeStat(List<String> jwCodes) {
-        return anchorUserTypeStatMapper.getAnchorUserTypeStat(jwCodes);
+    public List<AnchorUserTypeStatVO> getAnchorUserTypeStat(List<String> jwCodes, LocalDate startTime) {
+        return anchorUserTypeStatMapper.getAnchorUserTypeStat(jwCodes, startTime);
     }
 }

src/main/java/com/link/serviceImpl/UserCountServiceImpl.java

@@ -1,19 +1,12 @@
 package com.link.serviceImpl;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.link.domain.PageQuery;
-import com.link.domain.Result;
-import com.link.domain.dto.UserCountDTO;
 import com.link.domain.vo.UserCountVO;
 import com.link.mapper.UserCountMapper;
 import com.link.service.UserCountService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -22,42 +15,17 @@ public class UserCountServiceImpl implements UserCountService {
     @Autowired
     private UserCountMapper userCountMapper;
     @Override
-    public PageQuery getEmailUserCount(UserCountDTO dto) {
-        List<UserCountVO> userCountVOList =userCountMapper.getEmailUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize());
-        Integer userCountVOTotal= userCountMapper.getEmailUserTotal(dto.getStartTime());
-        PageQuery result = new PageQuery();
-        result.setPage(dto.getPage());
-        result.setOffset(dto.getStart());
-        result.setPageSize(dto.getPageSize());
-        result.setTotal(userCountVOTotal);
-        result.setList(userCountVOList);
-        return result;
+    public List<UserCountVO> getEmailUserCount(LocalDateTime startTime) {
+        return userCountMapper.getEmailUserCount(startTime);
     }
 
     @Override
-    public PageQuery getGoogleUserCount(UserCountDTO dto) {
-
-        List<UserCountVO> userCountVOList =userCountMapper.getGoogleUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize());
-        Integer userCountVOTotal= userCountMapper.getGoogleUserTotal(dto.getStartTime());
-        PageQuery result = new PageQuery();
-        result.setPage(dto.getPage());
-        result.setOffset(dto.getStart());
-        result.setPageSize(dto.getPageSize());
-        result.setTotal(userCountVOTotal);
-        result.setList(userCountVOList);
-        return result;
+    public List<UserCountVO> getGoogleUserCount(LocalDateTime startTime) {
+        return userCountMapper.getGoogleUserCount(startTime);
     }
 
     @Override
-    public PageQuery getMessageUserCount(UserCountDTO dto) {
-        List<UserCountVO> userCountVOList =userCountMapper.getMessageUserList(dto.getStartTime(),dto.getStart(),dto.getPageSize());
-        Integer userCountVOTotal= userCountMapper.getMessageUserTotal(dto.getStartTime());
-        PageQuery result = new PageQuery();
-        result.setPage(dto.getPage());
-        result.setOffset(dto.getStart());
-        result.setPageSize(dto.getPageSize());
-        result.setTotal(userCountVOTotal);
-        result.setList(userCountVOList);
-        return result;
+    public List<UserCountVO> getMessageUserCount(LocalDateTime startTime) {
+        return userCountMapper.getMessageUserCount(startTime);
     }
 }

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
         maximum-pool-size: 50
 
     wechart:
-      jdbc-url: jdbc:sqlserver://18.142.225.183:1455;databaseName=wechart;loginTimeout=30;connectTimeout=30000;encrypt=true;trustServerCertificate=true;sslProtocol=TLSv1
+      jdbc-url: jdbc:sqlserver://18.142.225.183:1455;databaseName=wechart;loginTimeout=30;connectTimeout=30000;encrypt=true;enabledTLSProtocols=TLSv1.2;trustServerCertificate=true
       username: query_hz
       password: 8HxsYzefFBsLc8kksxa
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -29,4 +29,4 @@ logging:
     com.system.mapper: debug
 
 server:
-  port: 8082
+  port: 8080

src/main/resources/com/link/mapper/UserCountMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.link.mapper.UserCountMapper">
 
-    <sql id="EmailUser">
+    <select id="getEmailUserCount" resultType="com.link.domain.vo.UserCountVO">
         select t1 as businessDate, count(*) as userCount
         from (
                  select distinct
@@ -29,67 +29,28 @@
                       ) b
              ) c
         where tt >= #{startTime}
-        group by t1
-    </sql>
-
-    <select id="getEmailUserList" resultType="com.link.domain.vo.UserCountVO">
-        <include refid="EmailUser"></include>
-        order by t1 desc
-        limit #{offset}, #{pageSize};
-    </select>
-
-    <select id="getEmailUserTotal" resultType="integer">
-        select count(*)
-        from(
-        <include refid="EmailUser"></include>
-        ) as total;
+        group by t1;
     </select>
 
-    <sql id="GoogleUser">
+    <select id="getGoogleUserCount" resultType="com.link.domain.vo.UserCountVO">
         select t1 as businessDate,count(*) as userCount from
-        (select distinct case when hh &lt;28800 then date_format(date_add(tt,interval -1 day),'%Y-%m-%d') else date_format(tt,'%Y-%m-%d') end t1,hh,openId,date_format(tt,'%Y-%m-%d %H:%i') tt from (
+        (select distinct case when hh &lt; 28800 then date_format(date_add(tt,interval -1 day),'%Y-%m-%d') else date_format(tt,'%Y-%m-%d') end t1,hh,openId,date_format(tt,'%Y-%m-%d %H:%i') tt from (
         select  timestampdiff(second,date_format(tt,'%Y-%m-%d 00:00:00'),tt) hh,openId,tt from (
         select distinct openId,date_format(from_unixtime(time),'%Y-%m-%d %H:%i') tt,time from fx_member_google where 1=1 and time is not null
         )a)b)c
-        where tt>=#{startTime}
-        group by t1
-    </sql>
-
-    <select id="getGoogleUserList" resultType="com.link.domain.vo.UserCountVO">
-        <include refid="GoogleUser"></include>
-        order by t1 desc
-        limit #{offset}, #{pageSize};
+        where tt>= #{startTime}
+        group by t1;
     </select>
 
-    <select id="getGoogleUserTotal" resultType="integer">
-        select count(*)
-        from(
-            <include refid="GoogleUser"></include>
-            ) as total;
-    </select>
-
-    <sql id="MessageUser">
+    <select id="getMessageUserCount" resultType="com.link.domain.vo.UserCountVO">
         select t1 as businessDate,count(*) as userCount from
         (select distinct case when hh &lt; 28800 then date_format(date_add(tt,interval -1 day),'%Y-%m-%d') else date_format(tt,'%Y-%m-%d') end t1,hh,username,date_format(tt,'%Y-%m-%d %H:%i') tt from (
         select  timestampdiff(second,date_format(tt,'%Y-%m-%d 00:00:00'),tt) hh,username,tt from (
         select username,min(date_format(from_unixtime(time),'%Y-%m-%d %H:%i')) tt from fx_code where 1=1
         group by username
         )a)b)c
-        where tt>=#{startTime}
-        group by t1
-    </sql>
-
-    <select id="getMessageUserList" resultType="com.link.domain.vo.UserCountVO">
-        <include refid="MessageUser"></include>
-        order by t1 desc
-        limit #{offset}, #{pageSize};
-    </select>
-
-    <select id="getMessageUserTotal" resultType="integer">
-        select count(*)
-        from(
-            <include refid="MessageUser"></include>
-            ) as total;
+        where tt>= #{startTime}
+        group by t1;
     </select>
 
 </mapper>

src/main/resources/com/link/mapperwechart/AnchorUserTypeStatMapper.xml

@@ -24,7 +24,7 @@
         DATEADD(SECOND, CAST(nc.addTime AS INT), '1970-01-01 08:00:00') AS registrationDate,
         na.name,
         CASE
-        WHEN DATEADD(SECOND, CAST(nc.addTime AS INT), '1970-01-01 08:00:00') < '2024-06-24'
+        WHEN DATEADD(SECOND, CAST(nc.addTime AS INT), '1970-01-01 08:00:00') < #{startTime}
         THEN 'Old User'
         ELSE   'New User'
         END AS user_type