Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/AccessType.java

@@ -5,16 +5,19 @@ import lombok.Data;
 
 public enum AccessType {
     BACKSTAGE(1, "后台管理页面"),
-    PUBLIC(2,"公众号")
-    ;
+    PUBLIC(2,"公众号");
 
-    AccessType(int code, String mas) {
+
+    AccessType(Integer code, String mas) {
+        this.code = code;
+        this.mas = mas;
     }
 
     private Integer code;
 
     private String mas;
 
+
     public Integer getCode() {
         return code;
     }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityQuery.java

@@ -13,5 +13,7 @@ public class ActivityQuery extends Query {
     /**
      * 1.管理后台,2.h5页面
      */
-    private Integer type;
+    private Integer type=1;
+
+
 }

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

@@ -13,6 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,40 +26,42 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
     /**
      * 未删除
      */
-     private Integer NOT_DELETE=0;
+    private Integer NOT_DELETE = 0;
     private Activity activity;
     /**
      * 已发布
      */
-    private Integer PUBLISHED=1;
+    private Integer PUBLISHED = 1;
 
     public Object getList(ActivityQuery query) {
 
-        Example exa= new Example(Activity.class);
+        Example exa = new Example(Activity.class);
         Example.Criteria criteria = exa.createCriteria();
-        criteria.andEqualTo("isDel",NOT_DELETE );
+        criteria.andEqualTo("isDel", NOT_DELETE);
         if (StringUtils.isNotBlank(query.getTitle())) {
-            criteria.andLike("title",String.format("%%%s%%",query.getTitle().trim()));
+            criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
         }
-        if (query.getStartTime()!=null) {
-            criteria.andLike("startTime",query.getStartTime()/1000+"%");
+        if (query.getStartTime() != null) {
+            criteria.andLike("startTime", query.getStartTime()/(1000*60*60)+"%");
         }
-        if (query.getStatus()!=null) {
-            criteria.andEqualTo("status",query.getStatus());
+        if (query.getStatus() != null) {
+            criteria.andEqualTo("status", query.getStatus());
         }
-        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
-            criteria.andEqualTo("isPublish",PUBLISHED);
+
+        if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
+            criteria.andEqualTo("isPublish", PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
-        if(AccessType.BACKSTAGE.getCode().equals(query.getType())){
-            return mapper.selectByExample(exa);
-        }
 
+//        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
+////            return mapper.selectByExample(exa);
+////        }
 
 
-        PageHelper.startPage(query.getPage(),query.getLimit());
+        PageHelper.startPage(query.getPage(), query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
         return new PageInfo<Activity>(activities);
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -65,7 +69,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         try {
             activity.setUpdTime(System.currentTimeMillis());
             mapper.updateByPrimaryKeySelective(activity);
-           return true;
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -79,13 +83,13 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         try {
             activity.setCrtTime(System.currentTimeMillis());
             activity.setIsDel(0);
-            if (activity.getIsOpenBm()==null) {
+            if (activity.getIsOpenBm() == null) {
                 activity.setIsOpenBm(0);
             }
-            if (activity.getIsPublish()==null) {
+            if (activity.getIsPublish() == null) {
                 activity.setIsPublish(0);
             }
-            if (activity.getIsShow()==null) {
+            if (activity.getIsShow() == null) {
                 activity.setIsShow(0);
             }
             mapper.insertSelective(activity);
@@ -100,6 +104,6 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
     @Override
     public void updateSelectiveById(Activity activity) {
         activity.setUpdTime(System.currentTimeMillis());
-          mapper.updateByPrimaryKeySelective(activity);
+        mapper.updateByPrimaryKeySelective(activity);
     }
 }

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

@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author Administrator
  */
 @RestController
-@RequestMapping("front/activityBm")
+@RequestMapping("/activityBm")
 public class ActivityBmController extends BaseController<ActivityBmBiz,ActivityBm> {
 
 

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

@@ -5,6 +5,8 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.pojo.ActivityQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -12,17 +14,19 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/activity")
+@Api(tags = "峰会")
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
 
     @PostMapping("/app/unauth/list")
+    @ApiOperation(value = "峰会列表",notes = "峰会列表")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
-
         return ObjectRestResponse.succ(baseBiz.getList(query));
     }
 
     @Override
     @PutMapping ("/update")
+    @ApiOperation(value = "修改",notes = "修改")
     public ObjectRestResponse update(@RequestBody Activity activity ){
         if (baseBiz.update(activity)) {
             return ObjectRestResponse.succ();
@@ -32,6 +36,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
     @Override
     @PostMapping("/add")
+    @ApiOperation(value = "添加",notes = "添加")
     public ObjectRestResponse add(@RequestBody Activity activity ){
         if (baseBiz.add(activity)) {
             return ObjectRestResponse.succ();

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

@@ -145,7 +145,7 @@ public class Article {
     private String tagTitle;
 
     @Column(name = "keywords")
-    @ApiModelProperty("title标签内容")
+    @ApiModelProperty("keywords标签内容")
     private String keywords;
 
     @Column(name = "description")