Merge branch 'lb_dev' into dev

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

@@ -10,4 +10,6 @@ import lombok.Data;
  */
 @Data
 public class SummitActivityDTO {
+
+
 }

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

@@ -17,4 +17,6 @@ public class SummitActivityFindDTO extends PageParam {
      private Long endTime;
 
      private String title;
+
+    private Integer location;
 }

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

 package com.xxfc.platform.uccn.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * @author libin
  * @version 1.0
@@ -9,5 +13,94 @@ import lombok.Data;
  * @data 2019/8/26 18:54
  */
 @Data
-public class SummitActivitySaveDTO {
+public class SummitActivitySaveDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    @ApiModelProperty(value = "活动主标题")
+    private String title;
+
+    @ApiModelProperty(value = "副标题（不展示）")
+    private String subtitle;
+
+
+    @ApiModelProperty(value = "活动主图")
+    private String banner;
+
+
+    @ApiModelProperty(value = "开始时间")
+    private Long startTime;
+
+
+    @ApiModelProperty(value = "结束时间")
+    private Long endTime;
+
+
+    @ApiModelProperty(value = "报名截止时间（不展示）")
+    private Long regCloseTime;
+
+
+    @ApiModelProperty(value = "省编码")
+    private Integer provinceCode;
+
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+
+    @ApiModelProperty(value = "市编码")
+    private Integer cityCode;
+
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+
+    @ApiModelProperty(value = "县/镇 编码")
+    private Integer townCode;
+
+
+    @ApiModelProperty(value = "县/镇")
+    private String town;
+
+
+    @ApiModelProperty(value = "活动场地（地址格式）")
+    private String address;
+
+
+    @ApiModelProperty(value = "纬度（不展示）")
+    private BigDecimal latitude;
+
+
+    @ApiModelProperty(value = "经度 （不展示）")
+    private BigDecimal longitude;
+
+
+    @ApiModelProperty(value = "总人数")
+    private Integer limitNum;
+
+
+    @ApiModelProperty(value = "活动图文内容")
+    private String content;
+
+
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private Long crtTime;
+
+
+    @ApiModelProperty(value = "活动对象说明（不展示）")
+    private String actDesc;
+
+
+    @ApiModelProperty(value = "活动类型(保留，不展示)")
+    private Integer type;
+
+
+    @ApiModelProperty(value = "1:欣欣官网 2：滴房车官网 0：无限制")
+    private Integer location;
+
+
+    @ApiModelProperty(value = "排序")
+    private Integer rank;
 }

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

@@ -53,14 +53,14 @@ public class SummitActivity implements Serializable {
      */
     @Column(name = "start_time")
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
     /**
      * 结束时间
      */
     @Column(name = "end_time")
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
     /**
      * 报名截止时间（不展示）

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

 package com.xxfc.platform.uccn.vo;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
 /**
  * @author libin
  * @version 1.0
  * @description
  * @data 2019/8/26 19:00
  */
-public class SummitActivityAdminVo {
+@Data
+public class SummitActivityAdminVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    @ApiModelProperty(value = "活动主标题")
+    private String title;
+
+    @ApiModelProperty(value = "活动主图")
+    private String banner;
+
+    @ApiModelProperty(value = "开始时间")
+    private Long startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private Long endTime;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县/镇")
+    private String town;
+
+    @ApiModelProperty(value = "活动场地（地址格式）")
+    private String address;
+
+    @ApiModelProperty(value = "总人数")
+    private Integer limitNum;
+
+    @ApiModelProperty(value = "活动开关（0关，1开）")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "报名开关（0开，1关）")
+    private Integer isOpenReg;
+
+    @ApiModelProperty(value = "0是未发布，1是已发布")
+    private Integer isPublish;
+
+    @ApiModelProperty(value = "0是普通，1是置顶（首页展示）")
+    private Integer isHomePage;
+
+    @ApiModelProperty(value = "创建时间", hidden = true)
+    private Long crtTime;
+
+    @ApiModelProperty(value = "活动对象说明（不展示）")
+    private String actDesc;
+
+    @ApiModelProperty(value = "活动类型(保留，不展示)")
+    private Integer type;
+
+    @ApiModelProperty(value = "排序")
+    private Integer rank;
 }

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-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

@@ -31,11 +31,11 @@ public class SummitActivityDetailVo implements Serializable {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
 
     @ApiModelProperty(value = "报名截止时间（不展示）")

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

@@ -32,11 +32,11 @@ public class SummitActivityVo implements Serializable {
 
 
     @ApiModelProperty(value = "开始时间")
-    private Integer startTime;
+    private Long startTime;
 
 
     @ApiModelProperty(value = "结束时间")
-    private Integer endTime;
+    private Long endTime;
 
 
     @ApiModelProperty(value = "省")

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

@@ -10,6 +10,7 @@ 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;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -19,8 +20,10 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 峰会活动
@@ -63,10 +66,50 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
     }
 
     public PageDataVO<SummitActivityAdminVo> listSummitActivityWithPage(SummitActivityFindDTO summitActivityFindDTO) {
-        return null;
+         PageDataVO<SummitActivityAdminVo> activityAdminVoPageDataVO = new PageDataVO<>();
+         Example example = new Example(SummitActivity.class);
+         example.setOrderByClause("crt_time");
+        Example.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotEmpty(summitActivityFindDTO.getTitle())){
+            criteria.andLike("title",String.format("%%%s%%",summitActivityFindDTO.getTitle()));
+        }
+        criteria.andEqualTo("isDel",0);
+       /* if (Objects.nonNull(summitActivityFindDTO.getStartTime()) && Objects.nonNull(summitActivityFindDTO.getEndTime())){
+            criteria.andBetween("")
+        }*/
+       PageDataVO<SummitActivity> pageDataVO = PageDataVO.pageInfo(summitActivityFindDTO.getPage(),summitActivityFindDTO.getLimit(),()->mapper.selectByExample(example));
+        List<SummitActivity> data = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return activityAdminVoPageDataVO;
+        }
+
+        List<SummitActivityAdminVo> summitActivityAdminVos = new ArrayList<>();
+        SummitActivityAdminVo summitActivityAdminVo;
+        for (SummitActivity summitActivity : data) {
+            summitActivityAdminVo = new SummitActivityAdminVo();
+            BeanUtils.copyProperties(summitActivity,summitActivityAdminVo);
+            summitActivityAdminVos.add(summitActivityAdminVo);
+        }
+        activityAdminVoPageDataVO.setTotalCount(pageDataVO.getTotalCount());
+        activityAdminVoPageDataVO.setTotalPage(pageDataVO.getTotalPage());
+        activityAdminVoPageDataVO.setPageNum(pageDataVO.getPageNum());
+        activityAdminVoPageDataVO.setPageSize(pageDataVO.getPageSize());
+        activityAdminVoPageDataVO.setData(summitActivityAdminVos);
+        return activityAdminVoPageDataVO;
     }
 
     public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
+        SummitActivity summitActivity = new SummitActivity();
+        if (Objects.isNull(summitActivitySaveDTO.getId())){
+            BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
+            summitActivity.setCrtName(userDTO.getUsername());
+            summitActivity.setCrtUser(userDTO.getId());
+            summitActivity.setCrtTime(Instant.now().toEpochMilli());
+            mapper.insertSelective(summitActivity);
+        }else {
+            BeanUtils.copyProperties(summitActivitySaveDTO,summitActivity);
+            mapper.updateByPrimaryKeySelective(summitActivity);
+        }
     }
 
     public void publishSummitActivityById(Integer id, Integer state) {
@@ -103,4 +146,11 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         summitActivity.setId(id);
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
+
+    public SummitActivitySaveDTO selectSummitActivityById(Integer id) {
+        SummitActivitySaveDTO summitActivitySaveDTO = new SummitActivitySaveDTO();
+        SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(summitActivity,summitActivitySaveDTO);
+        return summitActivitySaveDTO;
+    }
 }
\ No newline at end of file

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

@@ -33,6 +33,13 @@ public class SummitActivityAdminController {
           return ObjectRestResponse.succ(pageDataVO);
      }
 
+     @ApiOperation("编辑查询")
+     @GetMapping("/{id}")
+     public ObjectRestResponse<SummitActivitySaveDTO>  selectToEdit(@PathVariable(value = "id") Integer id){
+           SummitActivitySaveDTO summitActivitySaveDTO = summitActivityBiz.selectSummitActivityById(id);
+           return ObjectRestResponse.succ(summitActivitySaveDTO);
+     }
+
      @ApiOperation("保存或编辑")
      @PostMapping("/save")
      public ObjectRestResponse<Void>  saveSummitActivity(@RequestBody SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO){