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

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityDTO.java

 package com.xxfc.platform.uccn.dto;
 
+import lombok.Data;
+
 /**
  * @author libin
  * @version 1.0
  * @description
  * @data 2019/8/26 15:51
  */
+@Data
 public class SummitActivityDTO {
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityFindDTO.java

+package com.xxfc.platform.uccn.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 18:55
+ */
+@Data
+public class SummitActivityFindDTO extends PageParam {
+
+     private Long startTime;
+
+     private Long endTime;
+
+     private String title;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java

+package com.xxfc.platform.uccn.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 18:54
+ */
+@Data
+public class SummitActivitySaveDTO {
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

+package com.xxfc.platform.uccn.vo;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 19:00
+ */
+public class SummitActivityAdminVo {
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailAdminVo.java

+package com.xxfc.platform.uccn.vo;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/26 19:01
+ */
+public class SummitActivityDetailAdminVo {
+}

xx-uccn/xx-uccn-server/pom.xml

@@ -18,6 +18,11 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-admin-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -2,7 +2,11 @@ package com.xxfc.platform.uccn.biz;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
+import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
+import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
 import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
 import com.xxfc.platform.uccn.vo.SummitActivityVo;
 import org.apache.commons.collections.CollectionUtils;
@@ -57,4 +61,46 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         BeanUtils.copyProperties(summitActivity, summitActivityDetailVo);
         return summitActivityDetailVo;
     }
+
+    public PageDataVO<SummitActivityAdminVo> listSummitActivityWithPage(SummitActivityFindDTO summitActivityFindDTO) {
+        return null;
+    }
+
+    public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
+    }
+
+    public void publishSummitActivityById(Integer id, Integer state) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setIsPublish(state);
+        summitActivity.setId(id);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
+
+    public void soldOutSummitAcitivityById(Integer id, Integer state) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setIsShow(state);
+        summitActivity.setId(id);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
+
+    public void setShowOnHomePageById(Integer id, Integer state) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setIsHomePage(state);
+        summitActivity.setId(id);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
+
+    public void setRegSateWithSummitActivityById(Integer id, Integer state) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setIsOpenReg(state);
+        summitActivity.setId(id);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
+
+    public void deleteSummitActivityById(Integer id) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setIsDel(1);
+        summitActivity.setId(id);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
 }
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java

 package com.xxfc.platform.uccn.rest.admin;
 
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.uccn.biz.SummitActivityBiz;
+import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
+import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
+import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,31 +25,53 @@ public class SummitActivityAdminController {
 
      private final  SummitActivityBiz summitActivityBiz;
 
+
+     @ApiOperation("活动列表")
+     @PostMapping("/list")
+     public ObjectRestResponse<PageDataVO<SummitActivityAdminVo>> listSummitActivityWithPage(@RequestBody SummitActivityFindDTO summitActivityFindDTO){
+         PageDataVO<SummitActivityAdminVo>  pageDataVO =  summitActivityBiz.listSummitActivityWithPage(summitActivityFindDTO);
+          return ObjectRestResponse.succ(pageDataVO);
+     }
+
      @ApiOperation("保存或编辑")
      @PostMapping("/save")
-     public ObjectRestResponse<Void>  saveSummitActivity(){
-
+     public ObjectRestResponse<Void>  saveSummitActivity(@RequestBody SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO){
+             summitActivityBiz.saveSummitActivity(summitActivitySaveDTO,userDTO);
           return ObjectRestResponse.succ();
      }
 
-     @ApiOperation("发布活动")
-     @PutMapping("/publish/{id}")
-     public ObjectRestResponse<Void> publishSumitActivity(@PathVariable(value = "id") Integer id){
+     @ApiOperation("活动发布设置")
+     @PutMapping("/publish/{id}/{state}")
+     public ObjectRestResponse<Void> publishSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
+          summitActivityBiz.publishSummitActivityById(id,state);
+          return ObjectRestResponse.succ();
+     }
 
+     @ApiOperation("上下架活动")
+     @PutMapping("/soldout/{id}/{state}")
+     public ObjectRestResponse<Void> soldOutSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
+          summitActivityBiz.soldOutSummitAcitivityById(id,state);
           return ObjectRestResponse.succ();
      }
 
-     @ApiOperation("下架活动")
-     @PutMapping("/soldout/{id}")
-     public ObjectRestResponse<Void> soldOutSumitActivity(@PathVariable(value = "id") Integer id){
+     @ApiOperation("首页展示设置")
+     @PutMapping("/home_page/{id}/{state}")
+     public ObjectRestResponse<Void> setShowOnHomePage(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
+          summitActivityBiz.setShowOnHomePageById(id,state);
+          return ObjectRestResponse.succ();
+     }
 
+     @ApiOperation("报名开关设置")
+     @PutMapping("/reg_state/{id}/{state}")
+     public ObjectRestResponse<Void> setRegStateWithSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
+          summitActivityBiz.setRegSateWithSummitActivityById(id,state);
           return ObjectRestResponse.succ();
      }
 
      @ApiOperation("删除活动")
      @DeleteMapping("/{id}")
-     public ObjectRestResponse<Void> deleteSummitActivityById(@PathVariable(value = "id") Integer id){
-
+     public ObjectRestResponse<Void> deleteSummitActivity(@PathVariable(value = "id") Integer id){
+          summitActivityBiz.deleteSummitActivityById(id);
           return ObjectRestResponse.succ();
      }
 }
\ No newline at end of file