123

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityDTO.java

@@ -23,5 +23,6 @@ public class ActivityDTO extends PageParam {
      private Long startTime;
      private Long endTime;
      private Integer goodsType;
+     private Integer type;
 
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Activity.java

@@ -27,6 +27,13 @@ public class Activity implements Serializable {
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("")
     private Integer id;
+
+
+
+
+	@Column(name = "type")
+	@ApiModelProperty(value = "活动类型：见枚举")
+	private Integer type;
 	
 	    /**
      *  活动类型：1--房车；2--机车；3--游艇

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityType.java

+package com.xxfc.platform.activity.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ *
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-10-08 09:48:35
+ */
+@Data
+@Table(name = "activity_type")
+public class ActivityType implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("")
+    private Integer id;
+
+
+
+	@Column(name = "type")
+	@ApiModelProperty(value = "类型")
+	private Integer type;
+	
+
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "删除（0正常，1删除）")
+    private Integer isDel;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityVo.java

@@ -26,4 +26,5 @@ public class ActivityVo extends Activity {
     private String nickname;
     private String headimgurl;
     private String realname;
+    private String typeName;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityBiz.java

 package com.xxfc.platform.activity.biz;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.dto.ActivityDTO;
-import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
-import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import com.xxfc.platform.activity.vo.ActivityVo;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.Activity;
 import com.xxfc.platform.activity.mapper.ActivityMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 峰会活动表
@@ -27,9 +28,15 @@ import java.util.List;
  */
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
+
+
+
     @Autowired
     private UserFeign userFeign;
 
+
+
+
     public ObjectRestResponse<PageDataVO<ActivityVo>> getAllByPage(ActivityDTO activityDTO) {
         Integer page = activityDTO.getPage() == null ? 1 : activityDTO.getPage();
         Integer limit = activityDTO.getLimit() == null ? 10 : activityDTO.getLimit();
@@ -37,15 +44,22 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         activityDTO.setLimit(limit);
         Query query = new Query(activityDTO);
         PageDataVO<ActivityVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByPage(query.getSuper()));
-        List<ActivityVo>list = pageDataVO.getData();
-        for(ActivityVo activityVo : list){
-            if(activityVo.getCtrUser() != null && activityVo.getCtrUser() > 0){
-                ObjectRestResponse<AppUserDTO> data = userFeign.userDetailById(activityVo.getCtrUser());
-                AppUserDTO appUserDTO = data.getData();
-                activityVo.setHeadimgurl(appUserDTO.getHeadimgurl());
-                activityVo.setNickname(appUserDTO.getNickname());
-                activityVo.setRealname(appUserDTO.getRealname());
-                activityVo.setUsername(appUserDTO.getUsername());
+        List<ActivityVo>  list = pageDataVO.getData();
+        if (CollectionUtils.isNotEmpty(list)){
+            List<Integer> userIds = list.stream().map(ActivityVo::getCtrUser).distinct().collect(Collectors.toList());
+            List<AppUserVo> appUserVos = userFeign.getByUserIds(userIds).getData();
+            Map<Integer, AppUserVo> userMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(appUserVos)){
+                 userMap = appUserVos.stream().collect(Collectors.toMap(AppUserVo::getUserid, Function.identity()));
+            }
+            for(ActivityVo activityVo : list){
+                AppUserVo appUserVo = userMap.get(activityVo.getCtrUser());
+                if (appUserVo != null){
+                    activityVo.setHeadimgurl(appUserVo.getHeadimgurl());
+                    activityVo.setNickname(appUserVo.getNickname());
+                    activityVo.setRealname(appUserVo.getRealname());
+                    activityVo.setUsername(appUserVo.getUsername());
+                }
             }
         }
         return ObjectRestResponse.succ(pageDataVO);

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityTypeBiz.java

+package com.xxfc.platform.activity.biz;
+
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.activity.entity.ActivityType;
+import com.xxfc.platform.activity.mapper.ActivityTypeMapper;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+import java.util.List;
+
+/**
+ * 峰会活动表
+ *
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-10-08 09:48:35
+ */
+@Service
+public class ActivityTypeBiz extends BaseBiz<ActivityTypeMapper, ActivityType> {
+
+
+
+    public List<ActivityType> getList(){
+        Example example=new Example(ActivityType.class);
+        example.createCriteria().andEqualTo("isDel",0);
+        return  selectByExample(example);
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityTypeMapper.java

+package com.xxfc.platform.activity.mapper;
+
+
+import com.xxfc.platform.activity.entity.ActivityType;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 峰会活动表
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-10-08 09:48:35
+ */
+public interface ActivityTypeMapper extends Mapper<ActivityType> {
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.biz.ActivityBiz;
+import com.xxfc.platform.activity.biz.ActivityTypeBiz;
+import com.xxfc.platform.activity.dto.ActivityDTO;
 import com.xxfc.platform.activity.entity.Activity;
+import com.xxfc.platform.activity.vo.ActivityVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("app/activity")
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
+
+    @Autowired
+    ActivityTypeBiz activityTypeBiz;
+
+
+
+    @GetMapping("app/unauth/selectList")
+    @IgnoreUserToken
+    public ObjectRestResponse<PageDataVO<ActivityVo>> selectList( ActivityDTO activityDTO) {
+        return baseBiz.getAllByPage(activityDTO);
+    }
+
+
+
+    @GetMapping("app/unauth/typeList")
+    @IgnoreUserToken
+    public ObjectRestResponse typeList() {
+        return ObjectRestResponse.succ(activityTypeBiz.getList());
+    }
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml

@@ -32,24 +32,26 @@
     </resultMap>
 
     <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="Map">
-        select * from `activity`
-         where 1=1
-        <if test="goodsType != null">
-            and `goods_type`=#{goodsType}
-        </if>
-        <if test="startTime != null and endTime != null">
-            and `crt_time` between #{startTime} and #{endTime}
-        </if>
-        <if test="startTime != null and endTime == null">
-            and <![CDATA[
-            `crt_time` >= #{startTime}
-            ]]>
-        </if>
-        <if test="startTime==null and endTime!=null">
-            and <![CDATA[
-            `crt_time`<=#{endTime}
-            ]]>
-        </if>
-        order by `crt_time` desc
+        select a.*,t.name as typeName from `activity` a
+        LEFT JOIN activity_type t on a.type=t.type
+        <where>
+            <if test="goodsType != null">
+                and a.`goods_type`=#{goodsType}
+            </if>
+            <if test="type != null">
+                and a.`type`=#{type}
+            </if>
+            <if test="startTime != null and  startTime > 0">
+                and <![CDATA[
+                a.`crt_time` >= #{startTime}
+                ]]>
+            </if>
+            <if test="endTime != null  and  endTime > 0">
+                and <![CDATA[
+                a.`crt_time`<=#{endTime}
+                ]]>
+            </if>
+        </where>
+        order by a.`crt_time` desc
     </select>
 </mapper>
\ No newline at end of file