Merge branch 'master_activity' of...

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

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

@@ -125,4 +125,5 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
         return new TableResultResponse<T>(result.getTotal(), list);
     }
 
+
 }

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

@@ -23,11 +23,11 @@ public class ActivityShow {
 
     @Column(name = "activity_id")
     @ApiModelProperty("活动id")
-    private String activityId;
+    private Integer activityId;
 
     @Column(name = "type")
     @ApiModelProperty("1-图片；2-视频")
-    private String type;
+    private Integer type;
 
     @Column(name = "path")
     @ApiModelProperty("图片或视频路径")
@@ -35,11 +35,11 @@ public class ActivityShow {
 
     @Column(name = "crt_time")
     @ApiModelProperty("创建时间")
-    private String crtTime;
+    private Long crtTime;
 
     @Column(name = "is_del")
     @ApiModelProperty("是否删除：0-正常；1-删除")
-    private String isDel;
+    private Integer isDel;
 
 
 }

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

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ActivityQuery extends Query {
+    private String title;
+    private Long startTime;
+    private Integer status;
+}

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

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class Query {
+    private Integer page=1;
+    private Integer limit=10;
+}

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

 package com.xxfc.platform.summit.biz;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.mapper.ActivityMapper;
+import com.xxfc.platform.summit.pojo.ActivityQuery;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 /**
  * @author Administrator
  */
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
+
+     private Integer NOT_DELETE=0;
+
+    public PageInfo<Activity> getList(ActivityQuery query) {
+
+        Example exa= new Example(Activity.class);
+        Example.Criteria criteria = exa.createCriteria();
+        criteria.andEqualTo("isDel",NOT_DELETE );
+        if (StringUtils.isNotBlank(query.getTitle())) {
+            criteria.andLike("title",query.getTitle());
+        }
+        if (query.getStartTime()!=null) {
+            criteria.andGreaterThanOrEqualTo("startTime",query.getStartTime());
+        }
+        if (query.getStatus()!=null) {
+            criteria.andGreaterThanOrEqualTo("status",query.getStatus());
+        }
+        exa.orderBy("rank").asc().orderBy("startTime").desc();
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        List<Activity> activities = mapper.selectByExample(exa);
+        return   new PageInfo<Activity>(activities);
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(Activity activity) {
+        try {
+            activity.setUpdTime(System.currentTimeMillis());
+            mapper.updateByPrimaryKeySelective(activity);
+           return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+
+    }
 }

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.msg.ObjectRestResponse;
 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;
+import com.xxfc.platform.summit.pojo.ActivityQuery;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author Administrator
@@ -13,4 +14,22 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/activity")
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
+
+    @PostMapping("/list")
+    public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
+
+        return ObjectRestResponse.succ(baseBiz.getList(query));
+    }
+
+    @Override
+    @PutMapping ("/update")
+    public ObjectRestResponse update(@RequestBody Activity activity ){
+        if (baseBiz.update(activity)) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+
+
 }