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

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

ace-common/pom.xml

@@ -209,7 +209,7 @@
             <artifactId>spring-boot</artifactId>
             <version>2.1.3.RELEASE</version>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
             <version>2.1.0.RELEASE</version>
@@ -226,12 +226,12 @@
             <artifactId>feign-core</artifactId>
             <version>10.1.0</version>
             <scope>compile</scope>
-        </dependency>
-<!--        <dependency>
+        </dependency>-->
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <scope>compile</scope>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/RandomUtil.java

@@ -40,8 +40,8 @@ public class RandomUtil
 	 * @param n
 	 * @param set
 	 */
-	public static void randomSet(int max, int n, Set<Integer> set) {
-		if (n > (max + 1) || max < 0) {
+	public static void randomSet(int max, int n, Set<Integer> set, int total) {
+		if (n > (max) || max < 0) {
 			return;
 		}
 		for (int i = 0; i < n; i++) {
@@ -50,8 +50,8 @@ public class RandomUtil
 		}
 		int setSize = set.size();
 		// 如果存入的数小于指定生成的个数，则调用递归再生成剩余个数的随机数，如此循环，直到达到指定大小
-		if (setSize < n) {
-			randomSet( max, n-setSize, set);// 递归
+		if (setSize < total) {
+			randomSet(max, total - setSize, set, total);// 递归
 		}
 	}
 
@@ -63,9 +63,9 @@ public class RandomUtil
 
 	public static void main(String[] args) {
 		int max = 20;
-		int n = 5;
+		int n = 20;
 		Set<Integer> set = new HashSet<>();
-		randomSet(max, n, set);
+		randomSet(max, n, set, n);
 		for(Integer a : set) {
 			System.out.println(a);
 		}

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -347,7 +347,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();
-            RandomUtil.randomSet(list.size(), number, set);
+            RandomUtil.randomSet(list.size(), number, set, number);
             for(Integer i : set) {
                 resultList.add(list.get(i));
             }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -338,7 +338,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();
-            RandomUtil.randomSet(list.size(), number, set);
+            RandomUtil.randomSet(list.size(), number, set, number);
             for(Integer i : set) {
                 resultList.add(list.get(i));
             }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/comstnt/UrlType.java

+package com.xxfc.platform.uccn.comstnt;
+
+
+/**
+ * 访问路径
+ * @author Administrator
+ */
+
+public enum UrlType {
+     OFFICIAL_WEBSITE("官网访问",1),BACKGROUND_MANAGEMENT("后台访问",2);
+     private String name;
+     private Integer code;
+
+    UrlType(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

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

@@ -10,6 +10,7 @@ import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.IdentityDialect;
 
 import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
@@ -26,6 +27,7 @@ public class Article {
 
     @Id
     @KeySql(dialect = IdentityDialect.MYSQL)
+//    @GeneratedValue(generator = "JDBC")
     private Integer id;
     /**
      * 标题

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

+package com.xxfc.platform.uccn.vo;
+
+import lombok.Data;
+
+/**
+ * 新闻文章查询条件
+ * @author Administrator
+ */
+@Data
+public class ArticleQuery {
+    private Integer page;
+    private Integer limit;
+//    private String newsContent;
+}

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

@@ -3,8 +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.xxfc.platform.uccn.comstnt.UrlType;
 import com.xxfc.platform.uccn.entity.Article;
 import com.xxfc.platform.uccn.mapper.ArticleMapper;
+import com.xxfc.platform.uccn.vo.ArticleQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -21,16 +23,17 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     /**
      * 随机文章条数
      */
-    private final Integer RANDOM_NUMBER=3;
+    private final Integer RANDOM_NUMBER = 3;
 
     /**
      * 首页文章条数
      */
-    private final Integer HOME_PAGE_NUMBER=4;
+    private final Integer HOME_PAGE_NUMBER = 4;
 
 
     /**
      * 文章列表
+     *
      * @param page
      * @param limit
      * @param type
@@ -44,23 +47,27 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
 
     /**
      * 获取一条数据
+     *
      * @param id
+     * @param urlType
      * @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;
+    public Article getOne(Integer id, Integer urlType) {
+
+        Example example = new Example(Article.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", id);
+        criteria.andEqualTo("isDel", 0);
+        if (UrlType.OFFICIAL_WEBSITE.getCode().equals(urlType)) {
+            criteria.andEqualTo("status", 1);
+        }
+        return mapper.selectOneByExample(example);
     }
 
 
     /**
      * 随机获取三条连续的文章
+     *
      * @param type
      * @return
      */
@@ -69,14 +76,14 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
         List<Article> articleList = mapper.getArticleList(type);
         if (!Objects.isNull(articleList)) {
             int size = articleList.size();
-            if (RANDOM_NUMBER>=size) {
+            if (RANDOM_NUMBER >= size) {
                 return articleList;
-            }else {
+            } else {
                 Random random = new Random();
-                int r = random.nextInt(size -RANDOM_NUMBER+1);
+                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;
+                for (int i = 0; i < RANDOM_NUMBER.intValue(); i++) {
+                    int index = i + r;
                     result.add(articleList.get(index));
                 }
                 return result;
@@ -88,17 +95,18 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
 
     /**
      * 首页文章列表
+     *
      * @param type
      * @return
      */
-    public List getHomePageArticle(Integer type){
+    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 {
+        } else {
+            if (articleList.size() > HOME_PAGE_NUMBER) {
+                return articleList.subList(0, HOME_PAGE_NUMBER);
+            } else {
                 return articleList;
             }
         }
@@ -106,19 +114,64 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
 
     @Transactional(rollbackFor = Exception.class)
     public void add(Article article) {
-        if (article==null) {
+        if (article == null) {
             return;
         }
 
         article.setIsDel(0);
-        if (article.getStatus()==null){
+        if (article.getStatus() == null) {
             article.setStatus(0);
         }
-        if (article.getType()==null){
+        if (article.getType() == null) {
             article.setType(0);
         }
         article.setCreTime(new Date());
         mapper.insertSelective(article);
 
     }
+
+    public PageInfo findAll(ArticleQuery query) {
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        Example exa = Example.builder(Article.class).where(
+                WeekendSqls.<Article>custom()
+                        .andEqualTo(Article::getIsDel,0)
+        ).orderByAsc("weight").orderByDesc("addTime").build();
+        List<Article> articles = mapper.selectByExample(exa);
+
+        return PageInfo.of(articles);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateSelectiveByIdRe(Article article){
+         article.setUpdTime(new Date());
+        return mapper.updateByPrimaryKeySelective(article);
+    }
+
+    public int putaway(Integer id) {
+        Article article = new Article();
+        article.setId(id);
+        article.setUpdTime(new Date());
+        article.setAddTime(new Date());
+        article.setStatus(1);
+      return mapper.updateByPrimaryKeySelective(article);
+    }
+
+    public int soldOut(Integer id) {
+        Article article = new Article();
+        article.setId(id);
+        article.setUpdTime(new Date());
+        article.setStatus(0);
+        return mapper.updateByPrimaryKeySelective(article);
+    }
+
+    public int remove(Integer id) {
+        Article article = new Article();
+        article.setId(id);
+        article.setUpdTime(new Date());
+        article.setIsDel(1);
+        return mapper.updateByPrimaryKeySelective(article);
+
+
+    }
 }

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

@@ -194,7 +194,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
                 }
             } else {
                 Set<Integer> resultSet = new HashSet<>();
-                RandomUtil.randomSet(summitActivities.size(), num, resultSet);
+                RandomUtil.randomSet(summitActivities.size(), num, resultSet, num);
                 for (Integer i : resultSet) {
                     summitActivityVo = new SummitActivityVo();
                     SummitActivity summitActivity = summitActivities.get(i);

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

@@ -4,12 +4,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.uccn.biz.ArticleBiz;
 import com.xxfc.platform.uccn.entity.Article;
+import com.xxfc.platform.uccn.vo.ArticleQuery;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
 
 /**
  * 文章
@@ -21,29 +20,30 @@ import java.util.Map;
 @Api(tags = {"文章"})
 public class ArticleController extends BaseController<ArticleBiz, Article> {
 
-    @GetMapping("/list")
+    @GetMapping("/app/unauth/list")
     @ApiOperation(value = "获取文章列表")
     public ObjectRestResponse getArticleList(
             @RequestParam(name = "page", defaultValue = "1") Integer page,
             @RequestParam(name = "limit", defaultValue = "10") Integer limit,
-            @RequestParam(name = "type", defaultValue = "0") Integer type) {
+            @RequestParam(name = "type", defaultValue = "1") Integer type) {
         return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type));
     }
 
-    @GetMapping("/one/{id}")
+    @GetMapping("/app/unauth/one")
     @ApiOperation(value = "获取一条数据")
-    public ObjectRestResponse getOne(@PathVariable Integer id) {
-       return ObjectRestResponse.succ(baseBiz.getOne(id));
+    public ObjectRestResponse getOne(@RequestParam Integer id,
+                                     @RequestParam(required = false) Integer urlType) {
+       return ObjectRestResponse.succ(baseBiz.getOne(id,urlType));
     }
 
 
-    @GetMapping("/three/{type}")
+    @GetMapping("/app/unauth/three/{type}")
     @ApiOperation(value = "随机获取三条数据")
     public ObjectRestResponse randomAccessToThreeData(@PathVariable Integer type){
         return ObjectRestResponse.succ(baseBiz.getThree(type));
     }
 
-    @GetMapping("/homePage/{type}")
+    @GetMapping("/app/unauth/homePage/{type}")
     @ApiOperation(value = "获取首页文章列表")
     public ObjectRestResponse getHomePageArticle(@PathVariable Integer type){
         return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type));
@@ -51,11 +51,58 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
 
     @Override
     @PostMapping("/add")
-    @ApiOperation(value = "获取首页文章列表")
+    @ApiOperation(value = "添加")
     public ObjectRestResponse add(@RequestBody Article article){
         baseBiz.add(article);
         return ObjectRestResponse.succ();
     }
 
 
+    @PostMapping("/all")
+    @ApiOperation(value = "获取新闻列表")
+    public ObjectRestResponse<Article> findAll(@RequestBody ArticleQuery query){
+        return ObjectRestResponse.succ(baseBiz.findAll(query));
+    }
+
+    @Override
+    @PutMapping("/update")
+    @ApiOperation(value = "修改")
+    public ObjectRestResponse update(@RequestBody Article article){
+        int flag = baseBiz.updateSelectiveByIdRe(article);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+       return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/putaway/{id}")
+    @ApiOperation(value = "上架")
+    public ObjectRestResponse  putaway(@PathVariable Integer id){
+        int flag = baseBiz.putaway(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/soldOut/{id}")
+    @ApiOperation(value = "下架")
+    public ObjectRestResponse soldOut(@PathVariable Integer id){
+        int flag = baseBiz.soldOut(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/remove/{id}")
+    @ApiOperation(value = "删除")
+    public ObjectRestResponse remove(@PathVariable Integer id){
+        int flag = baseBiz.remove(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
 }

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

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/tour")
+@RequestMapping("app/unauth/tour")
 @Slf4j
 @IgnoreClientToken
 public class GwTourController extends CommonBaseController {

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

@@ -5,6 +5,7 @@ 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.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
@@ -52,9 +53,10 @@ public class VehicleModelController extends CommonBaseController {
      * @return
      */
     @ApiOperation("车型列表")
-    @PostMapping(value = "/findVehicleModelPage")
+    @GetMapping(value = "/findVehicleModelPage")
     @IgnoreUserToken
-    public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc) {
-        return vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
+    public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(VehicleModelQueryCondition vmqc) {
+        ObjectRestResponse<PageDataVO<VehicleModelVo>> objectRestResponse = vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
+        return objectRestResponse;
     }
 }

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

@@ -5,7 +5,7 @@
 
     <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  and (type=#{type} or type=0) order by weight   DESC,add_time DESC
+        where is_del=0 and status=1  and (type=#{type} or type=0) order by weight   ASC ,add_time DESC
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.feign;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -133,5 +134,5 @@ public interface VehicleFeign {
     ObjectRestResponse<VModelDetailVO> detailByParam(@RequestParam("vehicleModel") Map<String, Object> vehicleModel);
 
     @PostMapping("/vehicleModel/app/unauth/findVehicleModelPage")
-    public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc);
+    public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc);
 }

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

@@ -85,7 +85,6 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     private VehicleBiz vehicleBiz;
 
 
-
     /**
      * 按主键获取公司
      *
@@ -120,7 +119,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      * @param id
      * @return
      */
-    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE+ "{1}")
+    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE + "{1}")
     public CompanyDetail getDetailById(Integer id) {
         BranchCompany branchCompany = this.getById(id);
         CompanyDetail detail = null;
@@ -161,35 +160,35 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public PageDataVO<BranchCompany> getAll(Integer page, Integer limit, Integer addrProvince, Integer addrCity,
-                                            Integer addrTown,Integer zoneId, UserDTO userDTO) {
+                                            Integer addrTown, Integer zoneId, UserDTO userDTO) {
         Example example = new Example(BranchCompany.class);
         Example.Criteria criteria = example.createCriteria();
-        String provinceIds="";
-        if (Objects.nonNull(zoneId)){
+        String provinceIds = "";
+        if (Objects.nonNull(zoneId)) {
             Area area = areaBiz.selectById(zoneId);
             provinceIds = area.getProvinceIds();
         }
-        if (StringUtils.isNotEmpty(provinceIds)){
+        if (StringUtils.isNotEmpty(provinceIds)) {
             List<String> provinceIdList = Arrays.asList(provinceIds.split(","));
-            if (Objects.nonNull(addrProvince)){
-                if (provinceIdList.contains(String.valueOf(addrProvince))){
-                    criteria.andEqualTo("addrProvince",addrProvince);
-                }else {
+            if (Objects.nonNull(addrProvince)) {
+                if (provinceIdList.contains(String.valueOf(addrProvince))) {
+                    criteria.andEqualTo("addrProvince", addrProvince);
+                } else {
                     return new PageDataVO<BranchCompany>();
                 }
-            }else {
-                criteria.andIn("addrProvince",provinceIdList);
+            } else {
+                criteria.andIn("addrProvince", provinceIdList);
             }
-        }else {
+        } else {
             if (addrProvince != null) {
-                criteria.andEqualTo("addrProvince",addrProvince);
+                criteria.andEqualTo("addrProvince", addrProvince);
             }
         }
         if (addrCity != null) {
-            criteria.andEqualTo("addrCity",addrCity);
+            criteria.andEqualTo("addrCity", addrCity);
         }
         if (addrTown != null) {
-            criteria.andEqualTo("addrTown",addrTown);
+            criteria.andEqualTo("addrTown", addrTown);
         }
         if (userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
             if (StringUtils.isNotBlank(userDTO.getDataZone())) {
@@ -361,14 +360,14 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(List<Integer> companyIds) {
-         Map<Integer,BranComanyLeaderVo> companyIdAndLeaderMap = new HashMap<>(companyIds.size());
+        Map<Integer, BranComanyLeaderVo> companyIdAndLeaderMap = new HashMap<>(companyIds.size());
         List<BranchCompany> branchCompanies = mapper.selectByIdList(companyIds);
-        if (CollectionUtils.isEmpty(branchCompanies)){
+        if (CollectionUtils.isEmpty(branchCompanies)) {
             return companyIdAndLeaderMap;
         }
-        return branchCompanies.stream().collect(Collectors.toMap(BranchCompany::getId,branchCompany -> {
+        return branchCompanies.stream().collect(Collectors.toMap(BranchCompany::getId, branchCompany -> {
             BranComanyLeaderVo branComanyLeaderVo = new BranComanyLeaderVo();
-            BeanUtils.copyProperties(branchCompany,branComanyLeaderVo);
+            BeanUtils.copyProperties(branchCompany, branComanyLeaderVo);
             return branComanyLeaderVo;
         }));
     }
@@ -377,14 +376,14 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         PageDataVO<BranchCompanyListVO> pageDataVO = new PageDataVO<>();
         PageDataVO<BranchCompanyListDTO> dataVO = PageDataVO.pageInfo(branchCompanyFindDTO.getPage(), branchCompanyFindDTO.getLimit(), () -> mapper.findBranchCompanys(branchCompanyFindDTO.getAddrProvince(), branchCompanyFindDTO.getAddrCity()));
         List<BranchCompanyListDTO> data = dataVO.getData();
-        if (CollectionUtils.isEmpty(data)){
+        if (CollectionUtils.isEmpty(data)) {
             return pageDataVO;
         }
         List<BranchCompanyListVO> branchCompanyListVOS = new ArrayList<>();
         BranchCompanyListVO branchCompanyListVO;
         for (BranchCompanyListDTO companyListDTO : data) {
             branchCompanyListVO = new BranchCompanyListVO();
-            BeanUtils.copyProperties(companyListDTO,branchCompanyListVO);
+            BeanUtils.copyProperties(companyListDTO, branchCompanyListVO);
             branchCompanyListVOS.add(branchCompanyListVO);
         }
         pageDataVO.setData(branchCompanyListVOS);

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

@@ -45,15 +45,15 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         Date endDate = null;
-        try{
+        try {
             startDate = simpleDateFormat.parse(bookStartDate);
             endDate = simpleDateFormat.parse(bookEndDate);
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
         //判定时间是否合法
-        if(!Boolean.TRUE.equals(notCheckTimeLegal)) {
+        if (!Boolean.TRUE.equals(notCheckTimeLegal)) {
             if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
                 throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
             }
@@ -78,17 +78,17 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         }
         DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-        if(startPredictableHour == 0) { //如果是0点就直接预订全天
+        if (startPredictableHour == 0) { //如果是0点就直接预订全天
             startPredictableHour = 16777215;
         }
-        if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
+        if (DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
             //如果开始时间是0点开始
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
         } else { //非同一天开始
             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.getMillis() - startDay.getMillis() > 24 * 3600 * 1000 ){ //
+        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);
                 //全天预定
@@ -115,14 +115,14 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @Transactional
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse save(VehicleBookHourInfoDto vehicleBookHourInfoDto) {
-        if(vehicleBookHourInfoDto == null) {
+        if (vehicleBookHourInfoDto == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
         List<VehicleBookHourInfo> vehicleBookHourInfos = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
         //有数据直接更新
-        if(vehicleBookHourInfos.size() >=1) {
-            for(VehicleBookHourInfo vehicleBookHourInfo : vehicleBookHourInfos) {
-                if(vehicleBookHourInfo.getBookedHour().equals(vehicleBookHourInfoDto.getBookedHour())) {
+        if (vehicleBookHourInfos.size() >= 1) {
+            for (VehicleBookHourInfo vehicleBookHourInfo : vehicleBookHourInfos) {
+                if (vehicleBookHourInfo.getBookedHour().equals(vehicleBookHourInfoDto.getBookedHour())) {
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_IS_BOOKED_TODAY.getCode(), ResCode.VEHICLE_IS_BOOKED_TODAY.getDesc());
                 } else {
                     vehicleBookHourInfo.setBookedHour(vehicleBookHourInfo.getBookedHour() | vehicleBookHourInfoDto.getBookedHour());
@@ -138,6 +138,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     /**
      * 删除预定车辆小时记录信息
+     *
      * @param vehicleId 车辆Id
      * @param dateList  日期列表
      * @return
@@ -145,7 +146,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @Transactional
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse delete(String vehicleId, List<String> dateList) {
-        if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
+        if (StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
             return ObjectRestResponse.paramIsEmpty();
         }
         Map<String, Object> param = Maps.newHashMap();
@@ -159,12 +160,12 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     public ObjectRestResponse checkBookHourInfo() {
         List<VehicleBookHourInfoDto> vehicleBookHourInfos = new ArrayList<>();
         List<VehicleBookRecord> list = vehicleBookRecordBiz.selectListAll();
-        if(CollectionUtils.isNotEmpty(list)) {
-            for(VehicleBookRecord vehicleBookRecord : list) {
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (VehicleBookRecord vehicleBookRecord : list) {
                 VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
-                if((vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) && (vehicleBookRecord.getStatus() == 2 || vehicleBookRecord.getStatus() == 1)) { //未出车或未还车
+                if ((vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) && (vehicleBookRecord.getStatus() == 2 || vehicleBookRecord.getStatus() == 1)) { //未出车或未还车
                     Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER), Boolean.TRUE);
-                    for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                    for (Map.Entry<String, Integer> entry : map.entrySet()) {
                         VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
                         vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
                         vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
@@ -204,10 +205,10 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
 
-    public static void main(String[] args) throws Exception{
+    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()) {
+        for (Map.Entry<String, Integer> entry : map.entrySet()) {
             System.out.println(entry.getKey());
             System.out.println(entry.getValue());
         }

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

@@ -29,7 +29,7 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
     public static final DateTimeFormatter YEARMONTH_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM");
     public static final Integer DEL_BATCH_SIZE = 1000;
     public static final Integer COPY_BATCH_SIZE = 100;
-    public static final  int  MONTH_INTERVAL=2;
+    public static final int MONTH_INTERVAL = 2;
 
     @Autowired
     private RedisTemplate customRedisTemplate;
@@ -40,14 +40,14 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
      */
     @Scheduled(cron = "0 0 0 1 * ?")//每月1号0点触发
     @Transactional
-    public void transfer2HistoryTb(){
+    public void transfer2HistoryTb() {
         //获取表格名称
         String tbName = getTbNameNow();
         DateTime now = DateTime.now();//当前获取的时间为标准
         log.info("开始预定信息迁移至历史表的定时任务。");
         //每月初将上月数据复制到历史表
-        Boolean needRun= copyDataLastMoth(now,tbName);
-        if(needRun) {
+        Boolean needRun = copyDataLastMoth(now, tbName);
+        if (needRun) {
             //每月初将上上月数据从当前信息表中删除
             delDataTheMonthBeforeLast(now, tbName);
         }
@@ -57,14 +57,14 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
      * 获取上月数据，并复制到历史表
      */
     @Transactional
-    public Boolean copyDataLastMoth(DateTime now,String tbName){
+    public Boolean copyDataLastMoth(DateTime now, String tbName) {
         String lastMonthStr = now.plusMonths(-1).toString(YEARMONTH_DATE_TIME_FORMATTER);
-        String redisKey = RedisKey.DEL_BOOK_INFO_LOCK_PREFIX +lastMonthStr;
+        String redisKey = RedisKey.DEL_BOOK_INFO_LOCK_PREFIX + lastMonthStr;
 
-        Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey,String.valueOf(DateTime.now().getMillis()));
-        if(hasSuc){//设置1天后过期
-            customRedisTemplate.expire(redisKey,1, TimeUnit.DAYS);
-        }else{
+        Boolean hasSuc = customRedisTemplate.opsForValue().setIfAbsent(redisKey, String.valueOf(DateTime.now().getMillis()));
+        if (hasSuc) {//设置1天后过期
+            customRedisTemplate.expire(redisKey, 1, TimeUnit.DAYS);
+        } else {
             log.info("[预定信息迁移]乐观锁获取失败，该线程不执行任务。");
             return Boolean.FALSE;
         }
@@ -78,9 +78,9 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
             params.put("pageStart", (curPageNo - 1) * COPY_BATCH_SIZE);
             params.put("pageSize", COPY_BATCH_SIZE);
             vehicleBookInfoList = mapper.getByPage4YearMonth(params);
-            if(CollectionUtils.isNotEmpty(vehicleBookInfoList)){
+            if (CollectionUtils.isNotEmpty(vehicleBookInfoList)) {
                 //插入数据到历史表
-                for(VehicleBookInfo vehicleBookInfo : vehicleBookInfoList){
+                for (VehicleBookInfo vehicleBookInfo : vehicleBookInfoList) {
                     Map<String, Object> insertHisParams = Maps.newHashMap();
                     insertHisParams.put("tbName", tbName);
                     insertHisParams.put("id", vehicleBookInfo.getId());
@@ -91,17 +91,18 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
                 }
             }
             curPageNo++;
-            log.info("【复制上月预定信息至历史表中】，当前复制页【"+curPageNo+"】，页大小【"+COPY_BATCH_SIZE+"】");
-        }while(CollectionUtils.isNotEmpty(vehicleBookInfoList));
-        log.info("复制上月预定信息至历史表中完成，总页数【"+(curPageNo-1)+"】");
-;       return Boolean.TRUE;
+            log.info("【复制上月预定信息至历史表中】，当前复制页【" + curPageNo + "】，页大小【" + COPY_BATCH_SIZE + "】");
+        } while (CollectionUtils.isNotEmpty(vehicleBookInfoList));
+        log.info("复制上月预定信息至历史表中完成，总页数【" + (curPageNo - 1) + "】");
+        ;
+        return Boolean.TRUE;
     }
 
     /**
      * 删除上上月数据
      */
     @Transactional
-    public void delDataTheMonthBeforeLast(DateTime now,String tbName){
+    public void delDataTheMonthBeforeLast(DateTime now, String tbName) {
         String theMonthBeforeLastStr = now.plusMonths(-2).toString(YEARMONTH_DATE_TIME_FORMATTER);
         Integer effected = 0;
         Integer total = 0;
@@ -110,21 +111,21 @@ public class VehicleBookInfoBiz extends BaseBiz<VehicleBookInfoMapper, VehicleBo
         params.put("batchSize", DEL_BATCH_SIZE);
         do {
             effected = mapper.del4YearMoth(params);
-            total+=effected;
-            log.info("开始删除预定信息数据，删除总数【"+total+"】");
-        }while(effected!=0);
+            total += effected;
+            log.info("开始删除预定信息数据，删除总数【" + total + "】");
+        } while (effected != 0);
         log.info("删除预定信息数据完成");
     }
 
 
-    private String getTbNameNow(){
-        return TB_NAME_PREFIX+ DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
+    private String getTbNameNow() {
+        return TB_NAME_PREFIX + DateTime.now().toString(YEAR_DATE_TIME_FORMATTER);
     }
 
     /**
      * 创建当年相关表格
      */
-    private void createTbIfNotExists(String tbName){
+    private void createTbIfNotExists(String tbName) {
         mapper.createTbIfNotExists(tbName);
     }
 

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

@@ -201,7 +201,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long)vehicleBookRecordVoPageInfo.getList().size());
+            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
             vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
             vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
             return RestResponse.suc(vehicleBookRecordVoPageDataVO);
@@ -212,7 +212,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     }
 
     public void removeStatus2(List<VehicleBookRecordVo> list) {
-        if(list != null && list.size() > 0) {
+        if (list != null && list.size() > 0) {
             Iterator<VehicleBookRecordVo> iterator = list.iterator();
             while (iterator.hasNext()) {
                 if (iterator.next().getVehicleDepartureLogVo() != null) {
@@ -360,29 +360,30 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     /**
      * 检验数据库预定记录日期是否和时间，日期表中的二进制数据一致
+     *
      * @return
      */
-    public ObjectRestResponse checkDateInvalide(){
+    public ObjectRestResponse checkDateInvalide() {
         List<VehicleBookRecord> list = mapper.selectAll();
         List<VehicleBookRecord> unRightList = new ArrayList<>();
-        if(list != null && list.size() > 0) {
-            for(VehicleBookRecord vehicleBookRecord : list) {
+        if (list != null && list.size() > 0) {
+            for (VehicleBookRecord vehicleBookRecord : list) {
                 log.info("vehicleBookRecord = {}", vehicleBookRecord);
                 Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), Boolean.TRUE);
                 log.info("转换为时间二进制：map = {}", map);
                 //检验数据有效性
-                if(vehicleBookRecord.getStatus() == 2) {
+                if (vehicleBookRecord.getStatus() == 2) {
                     VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
-                    if(vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) { //未出车或未还车
-                        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                    if (vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) { //未出车或未还车
+                        for (Map.Entry<String, Integer> entry : map.entrySet()) {
                             VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
                             vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
                             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
                             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
                             log.info("预定时间信息：vehicleBookHourInfos = {}", vehicleBookHourInfos);
-                            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+                            if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
                                 //检验数据是否存在
-                                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+                                if ((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
                                     log.info("时间正确，已经存在");
                                 } else {
                                     log.info("时间不正确");

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

@@ -86,7 +86,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         } else {
             vehicleDepartureLog.setUpdateTime(new Date());
             VehicleDepartureLog oldValue = mapper.selectByPrimaryKey(vehicleDepartureLog);
-            if(oldValue != null) {
+            if (oldValue != null) {
                 log.info("更新出行记录： vehicleDepartureLog = {}", oldValue);
                 BeanUtil.copyProperties(vehicleDepartureLog, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 oldValue.setUpdateTime(new Date());
@@ -104,7 +104,6 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     }
 
 
-
     public ObjectRestResponse findOne(Integer vid) throws Exception {
         Example exm = Example.builder(VehicleDepartureLog.class)
                 .where(WeekendSqls.<VehicleDepartureLog>custom()
@@ -116,7 +115,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
         List<VehicleDepartureLog> vehicleDepartureLogs = mapper.selectByExample(exm);
         if (vehicleDepartureLogs.size() == 1) {
             VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(0);
-            if (vehicleDepartureLog!=null) {
+            if (vehicleDepartureLog != null) {
                 return ObjectRestResponse.succ(vehicleDepartureLog);
             }
         }
@@ -124,7 +123,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     }
 
     @Transactional
-    public ObjectRestResponse collect(VehicleDepartureLog vdl){
+    public ObjectRestResponse collect(VehicleDepartureLog vdl) {
         vdl.setArrivalTime(new Date());
         vdl.setState(1);
         updateSelectiveById(vdl);

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

@@ -87,7 +87,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();
-            RandomUtil.randomSet(list.size(), number, set);
+            RandomUtil.randomSet(list.size(), number, set, number);
             for(Integer i : set) {
                resultList.add(list.get(i));
             }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/jobhandler/VehicleJobHandler.java

@@ -46,12 +46,10 @@ public class VehicleJobHandler extends IJobHandler {
             List<String> existVehicleIds = vehicleBiz.findExistVehicleIds();
             Dictionary dictionary = thirdFeign.findDictionaryByTypeAndCode(DIC_VEHICLE_TYPE, DIC_VEHICLE_CODE);
             LocalDate date = LocalDate.now();
+            date = date.plusMonths(Integer.valueOf(dictionary.getDetail()));
             int year = date.getYear();
-            int nowMonth = date.getMonthValue();
-            int betweenMonth = Integer.valueOf(dictionary.getDetail()).intValue();
-            int month = nowMonth +  betweenMonth> 12 ? (betweenMonth + nowMonth) - 12 : nowMonth + betweenMonth;
-            year = month > nowMonth ? year : year + 1;
-            String yearAndMonth = String.format("%d-%s", year, month>=10?month:"0"+month);
+            int month = date.getMonthValue();
+            String yearAndMonth = String.format("%d-%02d", year,month);
             XxlJobLogger.log("----查询到的车型ids:【{}】",existVehicleIds);
             if (CollectionUtils.isNotEmpty(existVehicleIds)) {
                 List<VehicleBookInfo> bookInfos = existVehicleIds.stream().map(vehicleId -> {

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

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
@@ -133,7 +134,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/unauth/findVehicleModelPage")
     @IgnoreUserToken
-    public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(
+    public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(
             @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc, HttpServletRequest request) {
         if (vmqc.getIsDel() == null) {
             vmqc.setIsDel(0);

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

@@ -380,7 +380,7 @@
 
     </select>
     <select id="selectByVehicleId" parameterType="java.lang.String"
-            resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+            resultMap="searchBookRecord">
        SELECT v1.*,bc2.name retCompanyName from vehicle_book_record v1
                LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2