* init

src/main/java/com/tdba/cxb/ares/api/config/CorsConfig.java

@@ -1,20 +0,0 @@
-package com.tdba.cxb.ares.api.config;
-
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * @program: order-web
- * @description:
- * @author: libo
- * @create: 2022-06-10 11:13:38
- */
-public class CorsConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**").allowedOrigins("*")
-                .allowedMethods("GET", "HEAD", "POST","PUT", "DELETE", "OPTIONS")
-                .allowCredentials(true).maxAge(3600);
-    }
-}

src/main/java/com/tdba/cxb/ares/api/config/CorsFilter.java

@@ -1,41 +0,0 @@
-package com.tdba.cxb.ares.api.config;
-
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @program: order-web
- * @description:
- * @author: libo
- * @create: 2022-06-10 11:11:28
- */
-@Component
-@WebFilter(urlPatterns = "/*", filterName = "CorsFilter")
-public class CorsFilter implements Filter {
-
-    @Override
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) res;
-        HttpServletRequest reqs = (HttpServletRequest) req;
-        String curOrigin = reqs.getHeader("Origin");
-        response.setHeader("Access-Control-Allow-Origin", "*");
-//        response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Methods", "GET,POST,PATCH,PUT,DELETE,OPTIONS,DELETE");
-        response.setHeader("Access-Control-Allow-Headers", " X-Token, user-token, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With");
-        chain.doFilter(req, res);
-    }
-
-
-    @Override
-    public void init(FilterConfig filterConfig) {
-    }
-
-
-    @Override
-    public void destroy() {}
-}

src/main/java/com/tdba/cxb/ares/api/config/FIlterConfig.java

@@ -14,6 +14,7 @@ import java.util.List;
 /**
  * 过滤器配置
  */
+@Configuration
 public class FIlterConfig {
 
     private CorsConfiguration buildConfig() {

src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -7,10 +7,7 @@ import com.tdba.cxb.ares.api.service.UserService;
 import com.tdba.cxb.ares.api.util.DateUtil;
 import com.tdba.cxb.ares.api.util.TDBAController;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;

src/main/java/com/tdba/cxb/ares/api/model/UserBind.java

@@ -28,6 +28,9 @@ public class UserBind {
     /** 类型:0正常统计1统计时过滤*/
     private Integer type;
 
+    /** 名称*/
+    private String name;
+
     public Integer getId() {
         return id;
     }
@@ -76,6 +79,14 @@ public class UserBind {
         this.type = type;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public static final class UserBindBuilder {
         private Integer id;
         private Integer uid;
@@ -83,6 +94,7 @@ public class UserBind {
         private Integer del_flag;
         private Integer bind_uid;
         private Integer type;
+        private String name;
 
         private UserBindBuilder() {
         }
@@ -121,6 +133,11 @@ public class UserBind {
             return this;
         }
 
+        public UserBindBuilder withName(String name) {
+            this.name = name;
+            return this;
+        }
+
         public UserBind build() {
             UserBind userBind = new UserBind();
             userBind.setId(id);
@@ -129,6 +146,7 @@ public class UserBind {
             userBind.setDel_flag(del_flag);
             userBind.setBind_uid(bind_uid);
             userBind.setType(type);
+            userBind.setName(name);
             return userBind;
         }
     }

src/main/java/com/tdba/cxb/ares/api/model/UserVo.java

@@ -14,7 +14,7 @@ public class UserVo {
     private Integer id;
 
     /** 用户名称*/
-    private String name;
+    private String nickname;
 
     /** 手机号*/
     @Sensitive
@@ -27,7 +27,7 @@ public class UserVo {
     private Integer status;
 
     /** 团队名称*/
-    private String teamName;
+    private String name;
 
     public Integer getId() {
         return id;
@@ -37,12 +37,12 @@ public class UserVo {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
+    public String getNickname() {
+        return nickname;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
     public String getMobile() {
@@ -69,21 +69,21 @@ public class UserVo {
         this.status = status;
     }
 
-    public String getTeamName() {
-        return teamName;
+    public String getName() {
+        return name;
     }
 
-    public void setTeamName(String teamName) {
-        this.teamName = teamName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public static final class UserVoBuilder {
         private Integer id;
-        private String name;
+        private String nickname;
         private String mobile;
         private String avatar;
         private Integer status;
-        private String teamName;
+        private String name;
 
         private UserVoBuilder() {
         }
@@ -97,8 +97,8 @@ public class UserVo {
             return this;
         }
 
-        public UserVoBuilder withName(String name) {
-            this.name = name;
+        public UserVoBuilder withNickname(String nickname) {
+            this.nickname = nickname;
             return this;
         }
 
@@ -117,19 +117,19 @@ public class UserVo {
             return this;
         }
 
-        public UserVoBuilder withTeamName(String teamName) {
-            this.teamName = teamName;
+        public UserVoBuilder withName(String name) {
+            this.name = name;
             return this;
         }
 
         public UserVo build() {
             UserVo userVo = new UserVo();
             userVo.setId(id);
-            userVo.setName(name);
+            userVo.setNickname(nickname);
             userVo.setMobile(mobile);
             userVo.setAvatar(avatar);
             userVo.setStatus(status);
-            userVo.setTeamName(teamName);
+            userVo.setName(name);
             return userVo;
         }
     }

src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -166,9 +166,14 @@ public class UserService {
             }
         });
         if(!resultList.isEmpty()){
-            //相同用户ID，日期合并
-//            resultList.stream().
-            userCountMapper.insertSelectiveForeach(resultList);
+            //相同用户ID
+            userCountMapper.insertSelectiveForeach(resultList.stream().collect(Collectors.groupingBy(UserCount::getUid)).entrySet().stream()
+                    .map(row -> UserCount.UserCountBuilder.anUserCount()
+                            .withUid(row.getKey())
+                            .withUser_type(UserTypeEnum.DACANG.ordinal())
+                            .withDate(localDate)
+                            .withCreate_time(currentTime)
+                            .build()).toList());
         }
     }
 
@@ -404,6 +409,7 @@ public class UserService {
         userBindMapper.insertSelective(UserBind.UserBindBuilder.anUserBind()
                 .withBind_uid(baseUser.getId())
                 .withUid(userVo.getId())
+                .withName(param.getName())
                 .withCreate_time(LocalDateTime.now())
                 .withType(isFilter? 1: 0).build());
     }

src/main/resources/mapper/UserBindMapper.xml

@@ -20,6 +20,9 @@
             <if test="null != type">
                 type,
             </if>
+            <if test="null != name">
+                name,
+            </if>
         </trim>
 
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -38,6 +41,9 @@
             <if test="null != type">
                 #{ type },
             </if>
+            <if test="null != name">
+                #{name},
+            </if>
         </trim>
     </insert>
 
@@ -59,6 +65,9 @@
             <if test="null != type">
                 type = #{ type },
             </if>
+            <if test="null != name">
+                type = #{name},
+            </if>
         </set>
         where id = #{id}
     </update>

src/main/resources/mapper/UserMapper.xml

@@ -122,8 +122,9 @@
         select
             u.account 'mobile',
                 u.uid 'id',
-                u.nickname 'name',
+                u.nickname,
                 u.avatar,
+                ub.name,
             '1' as 'status'
         from
             user_bind ub