Merge remote-tracking branch 'remotes/origin/dev' into base-modify

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,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/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/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){

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -156,4 +156,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
+
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -168,6 +168,10 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
 
 //	@Column(name = "status")
 //	@ApiModelProperty(value = "状态 0--下架；1--上架")

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

@@ -28,11 +28,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -199,6 +200,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setCrtHost(host);
         vm.setIsdel(0);
         vm.setStatus(0);
+        vm.setSort(0);
         vm.setVioDeposit(BigDecimal.valueOf(500));
         try {
             //插入数据到车型并返回id
@@ -259,18 +261,22 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                 // 删除车型对应的标签
                 vehicleCataBiz.delete(vcDelete);
 
-                ArrayList<VehicleCata> vcs = new ArrayList<>();
+
                 //从新插入车型对应的标签
 //            获取cataid
-                String[] config = vm.getConfig().split(",");
-                for (String con : config) {
-                    VehicleCata vc = new VehicleCata();
-                    vc.setCataId(Integer.parseInt(con));
-                    vc.setVehicleModelId(vm.getId());
-                    vc.setCrtTime(System.currentTimeMillis());
-                    vcs.add(vc);
+                if (vm.getConfig()!=null) {
+                    ArrayList<VehicleCata> vcs = new ArrayList<>();
+                    String[] config = vm.getConfig().split(",");
+                    for (String con : config) {
+                        VehicleCata vc = new VehicleCata();
+                        vc.setCataId(Integer.parseInt(con));
+                        vc.setVehicleModelId(vm.getId());
+                        vc.setCrtTime(System.currentTimeMillis());
+                        vcs.add(vc);
+                    }
+                    vehicleCataBiz.inserts(vcs);
                 }
-                vehicleCataBiz.inserts(vcs);
+
             }
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
@@ -291,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);
@@ -308,13 +313,25 @@ 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));
+    public ObjectRestResponse getList() {
+        Example exa = Example.builder(VehicleModel.class).where(
+                WeekendSqls.<VehicleModel>custom()
+                        .andEqualTo(VehicleModel::getIsdel, 0)
+        ).orderByAsc("sort").build();
+
+        return ObjectRestResponse.succ(baseBiz.selectByExample(exa));
     }
 
     /**
@@ -324,12 +341,13 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      * @param limit
      * @return
      */
-     @ApiOperation("优质车型")
+    @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     @IgnoreUserToken
-    public ObjectRestResponse<List<GoodDataVO>>  goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
+    public ObjectRestResponse<List<GoodDataVO>> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
         return ObjectRestResponse.succ(baseBiz.goodList(page, limit));
     }
+
     @ApiOperation("上下架")
     @PutMapping(value = "/setStatus/{id}/{status}")
     @Transactional
@@ -362,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

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.xxfc.platform.vehicle.mapper.CompanyBaseMapper" >
 
   <select id="getList"  parameterType="com.xxfc.platform.vehicle.pojo.vo.CompanyVo"  resultType="com.xxfc.platform.vehicle.pojo.vo.CompanyVo">
+     SELECT
       c.id as companyId,
       c.`name` as companyName,
       c.addr_detail as addrDetail,