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

pom.xml

@@ -102,7 +102,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>0.2.1.RELEASE</version>
+                <version>0.2.2.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

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/entity/Article.java

@@ -68,21 +68,21 @@ public class Article {
      */
     @Column(name = "author")
     @ApiModelProperty(value = "作者")
-    private Integer author;
+    private String author;
 
     /**
      * 发布人
      */
     @Column(name = "publisher")
     @ApiModelProperty(value = "发布人")
-    private Integer publisher;
+    private String publisher;
 
     /**
      * 封面图
      */
     @Column(name = "cover_image")
     @ApiModelProperty(value = "封面图")
-    private Integer coverImage;
+    private String coverImage;
 
     /**
      * 权重
@@ -105,6 +105,11 @@ public class Article {
     @ApiModelProperty(value = "是否上下架:0-否,1-是")
     private Integer status;
 
+
+    @Column(name ="type")
+    @ApiModelProperty(value = "文章发布网站:0-所有,1-新欣房车官网,2-滴房车官网")
+    private Integer type;
+
     /**
      * 创建时间
      */

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,10 +18,21 @@
             <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>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-vehicle-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -12,8 +12,8 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @author Administrator
  */
 @SpringBootApplication(scanBasePackages ={
-         "com.xxfc.platform.uccn",
-        "com.github.wxiaoqi"
+        "com.github.wxiaoqi",
+        "com.xxfc.platform"
 })
 @EnableDiscoveryClient
 @EnableAceAuthClient

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

@@ -7,18 +7,101 @@ 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 tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.util.*;
 
-import java.util.List;
 
 /**
  * @author Administrator
  */
 @Service
 public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
+    /**
+     * 随机文章条数
+     */
+    private final Integer RANDOM_NUMBER=3;
+
+    /**
+     * 首页文章条数
+     */
+    private final Integer HOME_PAGE_NUMBER=4;
+
 
-    public PageInfo getArticleList(Integer page, Integer limit) {
-        PageHelper.startPage(page,limit);
-        List articleList = mapper.getArticleList();
+    /**
+     * 文章列表
+     * @param page
+     * @param limit
+     * @param type
+     * @return
+     */
+    public PageInfo getArticleList(Integer page, Integer limit, Integer type) {
+        PageHelper.startPage(page, limit);
+        List articleList = mapper.getArticleList(type);
         return PageInfo.of(articleList);
     }
+
+    /**
+     *  获取一条数据
+     * @param id
+     * @return
+     */
+    public Article getOne(Integer id) {
+        Example example = Example.builder(Article.class).where(
+                WeekendSqls.<Article>custom()
+                        .andEqualTo(Article::getId,id)
+                        .andEqualTo(Article::getIsDel, 0)
+                        .andEqualTo(Article::getStatus, 1)
+        ).build();
+        Article article = mapper.selectOneByExample(example);
+        return article;
+    }
+
+
+    /**
+     * 随机获取三条连续的文章
+     * @param type
+     * @return
+     */
+    public List getThree(Integer type) {
+
+        List<Article> articleList = mapper.getArticleList(type);
+        if (!Objects.isNull(articleList)) {
+            int size = articleList.size();
+            if (RANDOM_NUMBER>=size) {
+                return articleList;
+            }else {
+                Random random = new Random();
+                int r = random.nextInt(size -RANDOM_NUMBER+1);
+                List<Article> result = new ArrayList<>();
+                for (int i=0;i<RANDOM_NUMBER.intValue();i++){
+                    int index= i+r;
+                    result.add(articleList.get(index));
+                }
+                return result;
+            }
+        }
+        return new ArrayList();
+    }
+
+
+    /**
+     * 首页文章列表
+     * @param type
+     * @return
+     */
+    public List getHomePageArticle(Integer type){
+        List<Article> articleList = mapper.getArticleList(type);
+        if (Objects.isNull(articleList)) {
+            return new ArrayList();
+        }else {
+            if (articleList.size()>HOME_PAGE_NUMBER) {
+                return articleList.subList(0,HOME_PAGE_NUMBER);
+            }else {
+                return articleList;
+            }
+        }
+    }
+
 }

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/mapper/ArticleMapper.java

 package com.xxfc.platform.uccn.mapper;
 
 import com.xxfc.platform.uccn.entity.Article;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -9,5 +10,10 @@ import java.util.List;
  * @author Administrator
  */
 public interface ArticleMapper extends Mapper<Article> {
-    List getArticleList();
+    /**
+     * 根据网站类型查询文章
+     * @param type
+     * @return
+     */
+    List<Article> getArticleList(@Param("type") Integer type);
 }

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

@@ -5,14 +5,15 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.uccn.biz.ArticleBiz;
 import com.xxfc.platform.uccn.entity.Article;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * 文章
+ *
  * @author Administrator
  */
 @RestController
@@ -23,8 +24,28 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
     @GetMapping("/list")
     @ApiOperation(value = "获取文章列表")
     public ObjectRestResponse getArticleList(
-             @RequestParam(name = "page",defaultValue = "1") Integer page,
-             @RequestParam(name = "limit",defaultValue = "10")Integer limit){
-        return ObjectRestResponse.succ(baseBiz.getArticleList(page,limit));
+            @RequestParam(name = "page", defaultValue = "1") Integer page,
+            @RequestParam(name = "limit", defaultValue = "10") Integer limit,
+            @RequestParam(name = "type", defaultValue = "0") Integer type) {
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type));
+    }
+
+    @GetMapping("/one/{id}")
+    @ApiOperation(value = "获取一条数据")
+    public ObjectRestResponse getOne(@PathVariable Integer id) {
+       return ObjectRestResponse.succ(baseBiz.getOne(id));
+    }
+
+
+    @GetMapping("/three/{type}")
+    @ApiOperation(value = "随机获取三条数据")
+    public ObjectRestResponse randomAccessToThreeData(@PathVariable Integer type){
+        return ObjectRestResponse.succ(baseBiz.getThree(type));
+    }
+
+    @GetMapping("/homePage/{type}")
+    @ApiOperation(value = "获取首页文章列表")
+    public ObjectRestResponse getHomePageArticle(@PathVariable Integer type){
+        return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type));
     }
 }

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

+package com.xxfc.platform.uccn.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/vehicleModel")
+@Slf4j
+@IgnoreClientToken
+public class VehicleModelController extends CommonBaseController {
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    /**
+     * 车型详情
+     *
+     * @param name
+     * @return
+     */
+    @ApiOperation("车型详情")
+    @RequestMapping(value = "/detail/{name}", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("name") @ApiParam("车型名称") String name) {
+        return vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
+            setName(name);
+        }}, false, true));
+    }
+
+    /**
+     * 车型列表查
+     *
+     * @param vmqc 条件
+     * @return
+     */
+    @ApiOperation("车型列表")
+    @PostMapping(value = "/app/unauth/findVehicleModelPage")
+    @IgnoreUserToken
+    public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc) {
+        return vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
+    }
+}

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

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml

@@ -4,7 +4,8 @@
 <mapper namespace="com.xxfc.platform.uccn.mapper.ArticleMapper">
 
     <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
-        select title,epitome,add_time,cover_image from article  where is_del=0 and status=1 order by weight,add_time DESC
+        select title,epitome,add_time,cover_image from article
+        where is_del=0 and status=1  and (type=#{type} or type=0) order by weight   DESC,add_time DESC
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -150,7 +150,11 @@ public class BranchCompany {
      * 上下架:1-上架；2-下架
      */
     private Integer state;
-
+    /**
+     * 是否app展示：1-是；2-否
+     */
+    @Column(name = "is_show")
+    private Integer isShow;
 
     /**
      * 是否删除：0-正常；1-删除

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -7,9 +7,11 @@ import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -126,4 +128,10 @@ public interface VehicleFeign {
 
     @GetMapping("/branchCompany/company")
     Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(@RequestParam(value = "companyIds") List<Integer> companyIds);
+
+    @GetMapping("/vehicleModel/app/unauth/detail-param")
+    ObjectRestResponse<VModelDetailVO> detailByParam(@RequestParam("vehicleModel") Map<String, Object> vehicleModel);
+
+    @PostMapping("/vehicleModel/app/unauth/findVehicleModelPage")
+    public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc);
 }

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

@@ -55,6 +55,8 @@ public class CompanyVo extends PageParam {
     String addrDetail;
     @ApiModelProperty("上下架:1-上架；2-下架")
     Integer state;
+    @ApiModelProperty("是否app展示：1-是；2-否")
+    Integer isShow;
     @ApiModelProperty("负责人")
     private String leader;
     @ApiModelProperty("负责人联系方式")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockApplyInfoBiz.java

@@ -46,6 +46,7 @@ public class BranchCompanyStockApplyInfoBiz extends BaseBiz<BranchCompanyStockAp
         BeanUtils.copyProperties(applyVo, applyInfo);
         applyInfo.setState(BranchCompanyStockApplyState.Apply.getCode());
         applyInfo.setCreateTime(new Date());
+        applyInfo.setCompanyId(applyVo.getStockRightId());
         mapper.insertSelective(applyInfo);
 
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -124,8 +124,10 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
         Integer state=companyVo.getState()==null?2:companyVo.getState();
-        if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())||StringUtils.isBlank(companyVo.getContent())
-                ||StringUtils.isBlank(companyVo.getLeader())||StringUtils.isBlank(companyVo.getLeaderContactInfo())||StringUtils.isBlank(companyVo.getTourServicePhone())||StringUtils.isBlank(companyVo.getVehiceServicePhone()))){
+        BigDecimal latitude=companyVo.getLatitude();
+        BigDecimal longitude=companyVo.getLongitude();
+        if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())
+                ||StringUtils.isBlank(companyVo.getLeaderContactInfo())||latitude==null||longitude==null)){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"上架时参数不能为空");
         }
         CompanyBase companyBase=new CompanyBase();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

@@ -88,7 +88,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
         }
-        if(endDay.getDayOfMonth() - startDay.getDayOfMonth() > 1){ //
+        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定
@@ -204,15 +204,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
 
-//    public static void main(String[] args) throws Exception{
-//        VehicleBookHourInfoBiz vehicleBookHourInfoBiz = new VehicleBookHourInfoBiz();
-//        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours("2019-08-26 10:00:00", "2019-08-27 10:00:00", Boolean.TRUE);
-//        for(Map.Entry<String, Integer> entry : map.entrySet()) {
-//            System.out.println(entry.getKey());
-//            System.out.println(entry.getValue());
-//        }
-//        Integer a = 7936 & 2047;
-//        System.out.println(a);
-//    }
+    public static void main(String[] args) throws Exception{
+        VehicleBookHourInfoBiz vehicleBookHourInfoBiz = new VehicleBookHourInfoBiz();
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours("2019-08-26 10:00:00", "2019-08-27 10:00:00", Boolean.TRUE);
+        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+            System.out.println(entry.getKey());
+            System.out.println(entry.getValue());
+        }
+        Integer a = 215712192 & 33554432;
+        System.out.println(a);
+    }
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookInfoBiz.java

@@ -131,4 +131,8 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
     public void InsertBatch(List<VehicleBookInfo> bookInfos) {
         mapper.insertBatch(bookInfos);
     }
+
+    public int update(VehicleBookInfo vehicleBookInfo) {
+        return mapper.updateById(vehicleBookInfo);
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookInfoMapper.java

@@ -45,4 +45,6 @@ public interface VehicleBookInfoMapper extends Mapper<VehicleBookInfo> {
     public Integer del4YearMoth(Map<String, Object> params);
 
     void insertBatch(@Param("vbfs") List<VehicleBookInfo> bookInfos);
+
+    public Integer updateById(VehicleBookInfo vehicleBookInfo);
 }
\ No newline at end of file

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

@@ -77,7 +77,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
     /**
-     * 订单
+     * 车型详情
      *
      * @param id
      * @return
@@ -91,11 +91,36 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         VehicleModel vm = baseBiz.selectById(id);
         if (null == vm)
             throw new BaseException(ResultCode.NOTEXIST_CODE);
+        VModelDetailVO vModelDetailVO = initVModelDetailVO(vm);
+        return new ObjectRestResponse().data(vModelDetailVO);
+    }
+
+    /**
+     * 车型详情
+     *
+     * @param vehicleModel
+     * @return
+     */
+    @ApiOperation("车型详情")
+    @RequestMapping(value = "/app/unauth/detail-param", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<VModelDetailVO> detailByParam(VehicleModel vehicleModel) {
+        //查询车型信息，车型类型关系
+        //公司信息，系统信息（购车须知，预定须知）
+        ObjectRestResponse<List<VehicleModel>> vms = entityList(vehicleModel);
+        if (null == vms.getData() || null == vms.getData().get(0))
+            throw new BaseException(ResultCode.NOTEXIST_CODE);
+        VehicleModel vm = vms.getData().get(0);
+        VModelDetailVO vModelDetailVO = initVModelDetailVO(vm);
+        return new ObjectRestResponse().data(vModelDetailVO);
+    }
+
+    private VModelDetailVO initVModelDetailVO(VehicleModel vm) {
         VModelDetailVO vModelDetailVO = BeanUtil.toBean(vm, VModelDetailVO.class);
         vModelDetailVO.setVehiclePlatCatas(vehiclePlatCataBiz.getByModelId(vm.getId()));
         vModelDetailVO.setAppUserDTO(getAppUser());
         vModelDetailVO.setUserMemberLevel(userFeign.levels());
-        return new ObjectRestResponse().data(vModelDetailVO);
+        return vModelDetailVO;
     }
 
     /**

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

@@ -69,8 +69,8 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
 
     @ApiOperation("删除")
     @RequestMapping(value = "/del", method = RequestMethod.POST)
-    public ObjectRestResponse del(@RequestParam(value = "id",defaultValue = "0") Integer id){
-        return  baseBiz.delCompany(id);
+    public ObjectRestResponse del(@RequestBody CompanyVo companyVo){
+        return  baseBiz.delCompany(companyVo.getId());
     }
 
     /**

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

@@ -9,6 +9,7 @@
       c.addr_detail as addrDetail,
       c.state,
       c.status,
+      c.is_show as isShow,
       c.leader,
       c.leader_contact_info as leaderContactInfo,
       c.latitude,

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

@@ -26,7 +26,6 @@
         </foreach>
     </select>
 
-
   <insert id="insertIgnore" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
     insert ignore into vehicle_book_info ( vehicle, `year_month`, booked_date)
     values(#{vehicle},#{yearMonth},#{bookedDate})
@@ -47,6 +46,12 @@
           vehicle = #{vehicleId} and `year_month`=#{yearMonth} and
           booked_date &amp; #{andOperationFactor} = #{andOperationRs}
   </update>
+    <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
+         update vehicle_book_info set
+             booked_date = #{bookedDate}
+         where
+        vehicle = #{vehicle} and `year_month`=#{yearMonth}
+    </update>
 
     <select id="getByPage4YearMonth" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
         select id, vehicle, `year_month`, booked_date, create_time, update_time from vehicle_book_info where `year_month` = #{yearMonth} order by id limit #{pageStart},#{pageSize}