Merge branch 'master' into dev

# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java

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

+package com.xxfc.platform.summit.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+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 = "fc_activity_temporary")
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel()
+public class ActivityTemporary {
+    @Id
+    @KeySql(dialect = IdentityDialect.MYSQL)
+    private Integer id;
+    @Column(name = "activity_id")
+    private Integer activityId;
+    private String name;
+    private String phone;
+    private Integer inviter;
+    @Column(name = "crt_time")
+    private Date crtTime;
+    @Column(name = "upd_time")
+    private Date updTime;
+
+}

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

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityBm;
+import com.xxfc.platform.summit.entity.ActivityTemporary;
 import com.xxfc.platform.summit.entity.User;
 import com.xxfc.platform.summit.mapper.ActivityBmMapper;;
 import com.xxfc.platform.summit.pojo.ActivityBmExcel;
@@ -48,6 +49,8 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
     @Autowired
     private  MeepoUserQdBiz meepoUserQdBiz;
 
+    @Autowired
+    private ActivityTemporaryBiz activityTemporaryBiz;
 
 
 
@@ -261,8 +264,8 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
         return PageInfo.of(activityBms);
     }
 
-    public ActivityBm userBm(ActivityBm activityBm, Integer id) {
-        return null;
+    public void userBm(ActivityTemporary activityTemporary) throws Exception {
+        activityTemporaryBiz.addModifyIfPresent(activityTemporary);
     }
 
     public List<ActivityBmExcel> excel(ActivityBmQuery query) throws Exception {

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

+package com.xxfc.platform.summit.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.summit.entity.ActivityTemporary;
+import com.xxfc.platform.summit.mapper.ActivityTemporaryMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class ActivityTemporaryBiz extends BaseBiz<ActivityTemporaryMapper, ActivityTemporary> {
+    public void addModifyIfPresent(ActivityTemporary activityTemporary)throws Exception {
+        activityTemporary.setCrtTime(new Date());
+        mapper.addModifyIfPresent(activityTemporary);
+    }
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/SwaggerConfig.java

@@ -39,7 +39,7 @@ public class SwaggerConfig {
  
         return new Docket(DocumentationType.SWAGGER_2)
         		.select()
-                .apis(RequestHandlerSelectors.basePackage("com.xxfc.platform.tour"))
+                .apis(RequestHandlerSelectors.basePackage("com.xxfc.platform.summit"))
         		//.apis(RequestHandlerSelectors.any())
                 .build()  
                 .globalOperationParameters(pars)  

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBmBiz;
 import com.xxfc.platform.summit.biz.UserBiz;
 import com.xxfc.platform.summit.entity.ActivityBm;
+import com.xxfc.platform.summit.entity.ActivityTemporary;
 import com.xxfc.platform.summit.entity.User;
 import com.xxfc.platform.summit.pojo.ActivityBmExcel;
 import com.xxfc.platform.summit.pojo.ActivityBmQuery;
@@ -36,11 +37,11 @@ public class ActivityBmController extends BaseController<ActivityBmBiz, Activity
     UserBiz userBiz;
 
 
-    @PostMapping("/add")
-    public ObjectRestResponse bm(@RequestBody ActivityBm activityBm, HttpServletRequest request) {
-        User user = userBiz.getSession(request);
+    @PostMapping("/app/unauth/add")
+    public ObjectRestResponse bm(@RequestBody ActivityTemporary activityTemporary) {
         try {
-            return ObjectRestResponse.succ(baseBiz.userBm(activityBm, user.getId()));
+            baseBiz.userBm(activityTemporary);
+            return ObjectRestResponse.succ();
         } catch (Exception e) {
             e.printStackTrace();
             return ObjectRestResponse.createDefaultFail();

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ActivityTemporaryMapper.java

+package com.xxfc.platform.summit.mapper;
+
+import com.xxfc.platform.summit.entity.ActivityTemporary;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author Administrator
+ */
+public interface ActivityTemporaryMapper extends Mapper<ActivityTemporary> {
+
+    void addModifyIfPresent(ActivityTemporary activityTemporary);
+}

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityTemporaryMapper.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.ActivityTemporaryMapper">
+    <insert id="addModifyIfPresent" parameterType="com.xxfc.platform.summit.entity.ActivityTemporary"
+            useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    INSERT INTO fc_activity_temporary (activity_id,name,phone,inviter,crt_time,upd_time)
+    VALUES (#{activityId},#{name},#{phone},#{inviter},#{crtTime},#{updTime}) ON DUPLICATE KEY UPDATE upd_time = VALUES(crt_time)
+   </insert>
+</mapper>
\ No newline at end of file