Merge remote-tracking branch 'origin/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/ArticleBiz.java

@@ -3,10 +3,10 @@ package com.xxfc.platform.uccn.biz;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.uccn.entity.Article;
 import com.xxfc.platform.uccn.mapper.ArticleMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
@@ -104,4 +104,21 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void add(Article article) {
+        if (article==null) {
+            return;
+        }
+
+        article.setIsDel(0);
+        if (article.getStatus()==null){
+            article.setStatus(0);
+        }
+        if (article.getType()==null){
+            article.setType(0);
+        }
+        article.setCreTime(new Date());
+        mapper.insertSelective(article);
+
+    }
 }

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,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * 峰会活动
@@ -33,26 +33,28 @@ import java.util.List;
 public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActivity> {
 
 
-    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit) {
+    public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit,Integer location) {
         Example example = new Example(SummitActivity.class);
         example.setOrderByClause("rank");
         Example.Criteria criteria = example.createCriteria();
         //未删除
-        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("isDel", 0);
         //是首页展示
-        criteria.andEqualTo("isHomePage",1);
+        criteria.andEqualTo("isHomePage", 1);
         //已发布
-        criteria.andEqualTo("isPublish",1);
+        criteria.andEqualTo("isPublish", 1);
         //活动未下架
-        criteria.andEqualTo("isShow",0);
-        //结束时间大于当前时间
-        //criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
+        criteria.andEqualTo("isShow", 1);
+        //位置
+        criteria.andIn("location", Arrays.asList(location,0));
+
         PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
         List<SummitActivity> summitActivities = dataVO.getData();
-        if (CollectionUtils.isEmpty(summitActivities)){
+        if (CollectionUtils.isEmpty(summitActivities)) {
             return Collections.EMPTY_LIST;
         }
-        return JSON.parseObject(JSON.toJSONString(summitActivities),new TypeReference<List<SummitActivityVo>>(){});
+        return JSON.parseObject(JSON.toJSONString(summitActivities), new TypeReference<List<SummitActivityVo>>() {
+        });
     }
 
     public SummitActivityDetailVo findSummitActivityDetailById(Integer id) {
@@ -63,10 +65,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 +145,24 @@ 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;
+    }
+
+    /**
+     * 更改排序
+     *
+     * @param id
+     * @param rank
+     */
+    public void updateSummitActivityRankById(Integer id, Integer rank) {
+        SummitActivity summitActivity = new SummitActivity();
+        summitActivity.setId(id);
+        summitActivity.setRank(rank);
+        mapper.updateByPrimaryKeySelective(summitActivity);
+    }
 }
\ No newline at end of file

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

@@ -48,4 +48,14 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
     public ObjectRestResponse getHomePageArticle(@PathVariable Integer type){
         return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type));
     }
+
+    @Override
+    @PostMapping("/add")
+    @ApiOperation(value = "获取首页文章列表")
+    public ObjectRestResponse add(@RequestBody Article article){
+        baseBiz.add(article);
+        return ObjectRestResponse.succ();
+    }
+
+
 }

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

@@ -28,9 +28,9 @@ public class SummitActivityController{
 
      @ApiOperation("官网首页展示")
      @GetMapping("/home")
-     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit){
+     public ObjectRestResponse<List<SummitActivityVo>>  findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit,@RequestParam("location") Integer location){
 
-          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit);
+          List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit,location);
           return ObjectRestResponse.succ(summitActivityVos);
      }
 
@@ -40,4 +40,6 @@ public class SummitActivityController{
            SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
           return ObjectRestResponse.succ(summitActivityDetailVo);
      }
+
+
 }
\ No newline at end of file

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

@@ -7,6 +7,7 @@ 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.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/admin/summitActivity")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Api("峰会活动*后台")
 public class SummitActivityAdminController {
 
      private final  SummitActivityBiz summitActivityBiz;
@@ -33,6 +35,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){
@@ -68,6 +77,13 @@ public class SummitActivityAdminController {
           return ObjectRestResponse.succ();
      }
 
+     @ApiOperation("更改排序")
+     @PutMapping("/rank/{id}/{rank}")
+     public ObjectRestResponse<Void> setSummitActivityRank(@PathVariable(value = "id") Integer id,@PathVariable("rank") Integer rank){
+          summitActivityBiz.updateSummitActivityRankById(id,rank);
+          return ObjectRestResponse.succ();
+     }
+
      @ApiOperation("删除活动")
      @DeleteMapping("/{id}")
      public ObjectRestResponse<Void> deleteSummitActivity(@PathVariable(value = "id") Integer id){

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -261,9 +261,11 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                 // 删除车型对应的标签
                 vehicleCataBiz.delete(vcDelete);
 
-                ArrayList<VehicleCata> vcs = new ArrayList<>();
+
                 //从新插入车型对应的标签
 //            获取cataid
+                if (vm.getConfig()!=null) {
+                    ArrayList<VehicleCata> vcs = new ArrayList<>();
                     String[] config = vm.getConfig().split(",");
                     for (String con : config) {
                         VehicleCata vc = new VehicleCata();
@@ -274,6 +276,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                     }
                     vehicleCataBiz.inserts(vcs);
                 }
+
+            }
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
             e.printStackTrace();
@@ -293,7 +297,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (id == 1 || id == 14) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "The label cannot be deleted");
         }
-
         //2.进行逻辑删除
         VehicleModel vm = new VehicleModel();
         vm.setId(id);
@@ -310,17 +313,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
 
-    @ApiOperation("查询所有")
-    @RequestMapping(value = "/findAll", method = RequestMethod.GET)
-    @ResponseBody
-    public ObjectRestResponse findAll() {
-        VehicleModel vehicleModel = new VehicleModel();
-        vehicleModel.setIsdel(0);
-        return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
-    }
+//    @ApiOperation("查询所有")
+//    @RequestMapping(value = "/findAll", method = RequestMethod.GET)
+//    @ResponseBody
+//    public ObjectRestResponse findAll() {
+//        VehicleModel vehicleModel = new VehicleModel();
+//        vehicleModel.setIsdel(0);
+//        return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
+//    }
 
     @ApiOperation("查询所有")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/findAll", method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse getList() {
         Example exa = Example.builder(VehicleModel.class).where(
@@ -377,7 +380,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
-
         }
     }
 }
\ No newline at end of file