Merge branch 'master_activity' into base-modify

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

+package com.xxfc.platform.summit.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+/**
+ * 文章实体
+ *
+ * @author Administrator
+ */
+@Data
+@Table(name = "fc_activity")
+@Entity
+@ApiModel(value = "峰会活动表")
+public class Activity {
+
+    @Id
+    @GeneratedValue(generator="JDBC")
+    private Integer id;
+
+    @Column(name = "rid")
+    @ApiModelProperty("抽奖活动id")
+    private Integer rid;
+
+
+    @Column(name = "title")
+    @ApiModelProperty("活动主标题")
+    private String title;
+
+
+    @Column(name = "subtitle")
+    @ApiModelProperty("副标题（不展示）")
+    private String subtitle;
+
+
+    @Column(name = "banner")
+    @ApiModelProperty("活动主图")
+    private String banner;
+
+    @Column(name = "start_time")
+    @ApiModelProperty("开始时间")
+    private Long startTime;
+
+    @Column(name = "end_time")
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+
+    @Column(name = "bm_close_time")
+    @ApiModelProperty("报名截止时间（不展示）")
+    private String bmCloseTime;
+
+    @Column(name = "province_code")
+    @ApiModelProperty("省编码")
+    private Integer provinceCode;
+
+    @Column(name = "province")
+    @ApiModelProperty("省")
+    private String province;
+
+    @Column(name = "city_code")
+    @ApiModelProperty("市编码")
+    private Integer cityCode;
+
+    @Column(name = "city")
+    @ApiModelProperty("市")
+    private String city;
+
+    @Column(name = "town_code")
+    @ApiModelProperty("县/镇 编码")
+    private Integer townCode;
+
+    @Column(name = "town")
+    @ApiModelProperty("县/镇")
+    private String town;
+
+    @Column(name = "address")
+    @ApiModelProperty("活动场地（地址格式）")
+    private String address;
+
+    @Column(name = "latitude")
+    @ApiModelProperty("纬度（不展示")
+    private BigDecimal latitude;
+
+    @Column(name = "longitude")
+    @ApiModelProperty("经度 （不展示）")
+    private BigDecimal longitude;
+
+    @Column(name = "content")
+    @ApiModelProperty("活动图文内容")
+    private String content;
+
+    @Column(name = "is_show")
+    @ApiModelProperty("活动开关（1开，0关）")
+    private Integer isShow;
+
+    @Column(name = "is_open_bm")
+    @ApiModelProperty("报名开关（1开，0关）")
+    private Integer isOpenBm;
+
+    @Column(name = "is_publish")
+    @ApiModelProperty("0是未发布，1是已发布")
+    private Integer isPublish;
+
+    @Column(name = "status")
+    @ApiModelProperty("0-默认；1-报名中，2-进行中；3-已结束")
+    private Integer status;
+
+    @Column(name = "act_desc")
+    @ApiModelProperty("活动对象说明（不展示）")
+    private String actDesc;
+
+    @Column(name = "process_json")
+    @ApiModelProperty("活动流程")
+    private String processJson;
+
+    @Column(name = "type")
+    @ApiModelProperty("活动类型(保留，不展示)")
+    private Integer type;
+
+    @Column(name = "limit_num")
+    @ApiModelProperty("总人数限制")
+    private Integer limitNum;
+
+    @Column(name = "bm_num")
+    @ApiModelProperty("已报名人数")
+    private Integer bmNum;
+
+    @Column(name = "qd_num")
+    @ApiModelProperty("已签到人数")
+    private Integer qdNum;
+
+    @Column(name = "rank")
+    @ApiModelProperty("排序")
+    private Integer rank;
+
+    @Column(name = "crt_time")
+    @ApiModelProperty("创建时间")
+    private Long crtTime;
+
+    @Column(name = "upd_time")
+    @ApiModelProperty("修改时间")
+    private Long updTime;
+
+    @Column(name = "is_del")
+    @ApiModelProperty("删除（0正常，1删除）")
+    private Integer isDel;
+
+
+}

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityShow.java

+package com.xxfc.platform.summit.entity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.junit.Test;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author Administrator
+ */
+@Data
+@Table(name = "fc_activity_show")
+public class ActivityShow {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+
+
+    @Column(name = "activity_id")
+    @ApiModelProperty("活动id")
+    private String activityId;
+
+    @Column(name = "type")
+    @ApiModelProperty("1-图片；2-视频")
+    private String type;
+
+    @Column(name = "path")
+    @ApiModelProperty("图片或视频路径")
+    private String path;
+
+    @Column(name = "crt_time")
+    @ApiModelProperty("创建时间")
+    private String crtTime;
+
+    @Column(name = "is_del")
+    @ApiModelProperty("是否删除：0-正常；1-删除")
+    private String isDel;
+
+
+}

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/Article.java

-package com.xxfc.platform.summit.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import tk.mybatis.mapper.annotation.KeySql;
-import tk.mybatis.mapper.code.IdentityDialect;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 文章实体
- *
- * @author Administrator
- */
-@Data
-@Table(name = "article")
-@ApiModel(value = "文章实体")
-public class Article {
-
-    @Id
-    @KeySql(dialect = IdentityDialect.MYSQL)
-//    @GeneratedValue(generator = "JDBC")
-    private Integer id;
-    /**
-     * 标题
-     */
-    @Column(name = "title")
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    /**
-     * 副标题
-     */
-    @Column(name = "subtitle")
-    @ApiModelProperty(value = "副标题")
-
-    private String subtitle;
-
-    /**
-     * 文章摘要
-     */
-    @Column(name = "epitome")
-    @ApiModelProperty(value = "文章摘要")
-    private String epitome;
-
-    /**
-     * 正文
-     */
-    @Column(name = "text")
-    @ApiModelProperty(value = "正文")
-    private String text;
-
-    /**
-     * 图片url,以逗号分割
-     */
-    @Column(name = "picture")
-    @ApiModelProperty(value = "图片url,以逗号分割")
-    private String picture;
-
-    /**
-     * 作者
-     */
-    @Column(name = "author")
-    @ApiModelProperty(value = "作者")
-    private String author;
-
-    /**
-     * 发布人
-     */
-    @Column(name = "publisher")
-    @ApiModelProperty(value = "发布人")
-    private String publisher;
-
-    /**
-     * 封面图
-     */
-    @Column(name = "cover_image")
-    @ApiModelProperty(value = "封面图")
-    private String coverImage;
-
-    /**
-     * 权重
-     */
-    @Column(name = "weight")
-    @ApiModelProperty(value = "权重")
-    private Integer weight;
-
-    /**
-     * 是否删除:0-否,1-是
-     */
-    @Column(name = "is_del")
-    @ApiModelProperty(value = "是否删除:0-否,1-是")
-    private Integer isDel;
-
-    /**
-     * 是否上下架:0-否,1-是
-     */
-    @Column(name = "status")
-    @ApiModelProperty(value = "是否上下架:0-否,1-是")
-    private Integer status;
-
-
-    @Column(name = "type")
-    @ApiModelProperty(value = "文章发布网站:0-所有,1-新欣房车官网,2-滴房车官网")
-    private Integer type;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "cre_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date creTime;
-
-    /**
-     * 修改时间
-     */
-    @Column(name = "upd_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private Date updTime;
-
-    /**
-     * 上架时间
-     */
-    @Column(name = "add_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "上架时间")
-    private Date addTime;
-
-    @ApiModelProperty("seo*html标签优化")
-    private String alt;
-
-    @Column(name = "tag_title")
-    @ApiModelProperty("title标签内容")
-    private String tagTitle;
-
-    @Column(name = "keywords")
-    @ApiModelProperty("title标签内容")
-    private String keywords;
-
-    @Column(name = "description")
-    @ApiModelProperty("description")
-    private String description;
-
-}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ArticleMapper.java → xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/mapper/ActivityMapper.java

 package com.xxfc.platform.summit.mapper;
 
 
-import com.xxfc.platform.summit.entity.Article;
-import org.apache.ibatis.annotations.Param;
+import com.xxfc.platform.summit.entity.Activity;
 import tk.mybatis.mapper.common.Mapper;
 
-import java.util.List;
 
 /**
  * @author Administrator
  */
-public interface ArticleMapper extends Mapper<Article> {
+public interface ActivityMapper extends Mapper<Activity> {
 
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/mapper/ActivityShowMapper.java

+package com.xxfc.platform.summit.mapper;
+
+import com.xxfc.platform.summit.entity.ActivityShow;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author Administrator
+ */
+public interface ActivityShowMapper extends Mapper<ActivityShow> {
+}

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

+package com.xxfc.platform.summit.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.summit.entity.Activity;
+import com.xxfc.platform.summit.mapper.ActivityMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityShowBiz.java

+package com.xxfc.platform.summit.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.summit.entity.ActivityShow;
+import com.xxfc.platform.summit.mapper.ActivityShowMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

+package com.xxfc.platform.summit.controller;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.summit.biz.ActivityBiz;
+import com.xxfc.platform.summit.entity.Activity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/activity")
+public class ActivityController extends BaseController<ActivityBiz, Activity> {
+
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityShowController.java

+package com.xxfc.platform.summit.controller;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.summit.biz.ActivityBiz;
+import com.xxfc.platform.summit.biz.ActivityShowBiz;
+import com.xxfc.platform.summit.entity.Activity;
+import com.xxfc.platform.summit.entity.ActivityShow;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/activityShow")
+public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> {
+
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceoptor.java

@@ -65,7 +65,7 @@ public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
 			log.info("curr_url=====" + curr_url + "-----code=" + code);
 			if (StringUtils.isBlank(code)) {
 				String redirec_url=curr_url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
-				String oauth_api=weixinService.getAuthorize(redirec_url);
+				String oauth_api=weixinService.getAuthorize(curr_url);
 				log.info("curr_url=====" + curr_url);
 				response.sendRedirect(oauth_api);
 				return false;

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

+<?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.xxfc.platform.summit.mapper.ActivityMapper">
+</mapper>
\ No newline at end of file