Merge branch 'master-bug'

# Conflicts:
#	xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

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

@@ -208,15 +208,16 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
                 List<String> tagNames = shopIdOfTagsMap.get(campsiteShopAdminPageDTO.getId());
                 campsiteShopAdminPageDTO.setStoreTypeName(tagNames == null ? new ArrayList<String>() : tagNames);
             }
-        }).sorted(Comparator.comparing(CampsiteShopAdminPageDTO::getHot).reversed().thenComparing(CampsiteShopAdminPageDTO::getCrtTime).reversed()).collect(Collectors.toList());
-
+        }).collect(Collectors.toList());
+        List<CampsiteShopAdminPageVo> campsiteShopAdminPageVos = JSONObject.parseObject(JSONObject.toJSONString(campsiteShopAdminPageDTOS), new TypeReference<List<CampsiteShopAdminPageVo>>() {
+        });
+        campsiteShopAdminPageVos.sort(Comparator.comparing(CampsiteShopAdminPageVo::getHot).reversed().thenComparing(Comparator.comparing(CampsiteShopAdminPageVo::getCrtTime).reversed()));
         //组装数据
         campsiteShopAdminPageDataVos.setTotalPage(campsiteShopAdminpageDTOPageDataVO.getTotalPage());
         campsiteShopAdminPageDataVos.setTotalCount(campsiteShopAdminpageDTOPageDataVO.getTotalCount());
         campsiteShopAdminPageDataVos.setPageSize(campsiteShopAdminpageDTOPageDataVO.getPageSize());
         campsiteShopAdminPageDataVos.setPageNum(campsiteShopAdminpageDTOPageDataVO.getPageNum());
-        campsiteShopAdminPageDataVos.setData(JSONObject.parseObject(JSONObject.toJSONString(campsiteShopAdminPageDTOS), new TypeReference<List<CampsiteShopAdminPageVo>>() {
-        }));
+        campsiteShopAdminPageDataVos.setData(campsiteShopAdminPageVos);
         return campsiteShopAdminPageDataVos;
     }
 

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -69,7 +69,7 @@
             and `city`=#{cityCode}
         </if>
         GROUP BY cs.id
-         order by `crtTime`  DESC
+        order by `hot`DESC,`crt_time` DESC
     </select>
 
     <!--首页查询全部-->
@@ -111,7 +111,7 @@
             <if test="name != null and name != ''">
                and `name` like concat('%',#{name},'%')
             </if>
-
+        ORDER BY `hot` DESC
     </select>
 
     <!--根据id更新营地状态-->

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

@@ -11,7 +11,7 @@ public class VehicleBookRecordQueryVo extends PageParam {
     /**
      * 车辆编号，0-没有
      */
-    private Integer vehicleCode;
+    private Integer code;
 
     /**
      * 车牌号，空字符串-没有

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

@@ -9,6 +9,11 @@ import java.util.List;
 @Data
 public class VehiclePlanDto extends PageParam {
 
+    /**
+     * 车辆编号
+     */
+    private Integer code;
+
     @ApiModelProperty(value = "车辆Id")
     private String vehicleId;
 

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

@@ -258,6 +258,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
         if (addOrUpdateVehicleVo.getNumberPlate() == null) {
             throw new BaseException(ResultCode.NUMBER_PLAT_CAN_NOT_BE_NULL);
+        }
+         boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(),addOrUpdateVehicleVo.getId());
+        if (exist){
+            throw new BaseException("车辆编码已经被占用",400);
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;
@@ -445,7 +449,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate, DateTime.parse(startDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER), DateTime.parse(endDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER));
-               if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
+        if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
 
@@ -639,7 +643,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicleBookRecord == null) {
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-//        //已通过审核的可以取消预定
+        //已通过审核的可以取消预定
 //        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
 //            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
 //        }
@@ -1448,14 +1452,25 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public List<String> findVehicleIdsByPlateNumber(String plateNumber) {
-         List<String> vehicleIds = Lists.newArrayList();
+        List<String> vehicleIds = Lists.newArrayList();
         Example example = new Example(Vehicle.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andLike("numberPlate",String.format("%%%s%%",plateNumber.trim()));
+        criteria.andLike("numberPlate", String.format("%%%s%%", plateNumber.trim()));
         List<Vehicle> vehicles = mapper.selectByExample(example);
-        if (CollectionUtils.isEmpty(vehicles)){
+        if (CollectionUtils.isEmpty(vehicles)) {
             return vehicleIds;
         }
         return vehicles.stream().map(Vehicle::getId).collect(Collectors.toList());
     }
+
+    public Boolean checkCodeExist(Integer code, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("code", code);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
 }

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

@@ -32,9 +32,9 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, String time, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,Integer code, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(mapper.selectVoAll(numberPlate, time));
+        return new PageInfo<>(mapper.selectVoAll(numberPlate,code, time));
     }
 
     public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {

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

@@ -51,9 +51,9 @@ public class VehicleUpkeepService {
         vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
     }
 
-    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer code,Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, companyList));
+        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, code, companyList));
     }
 
     public List<VehicleUpkeepItem> getUpkeepsByIds(List<Integer> ids) {

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

@@ -14,7 +14,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
     List<VehicleDepartureLog> selectByVehicle(String vehicleId);
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("time") String time);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,@Param("code") Integer code, @Param("time") String time);
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);
 

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

@@ -9,7 +9,7 @@ import tk.mybatis.mapper.common.Mapper;
 import java.util.List;
 
 public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
-    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("companyList")List<Integer> companyList);
+    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("code") Integer code, @Param("companyList")List<Integer> companyList);
 
     VehicleUpkeepLogVo selectVoById(Integer id);
 

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

@@ -519,7 +519,14 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     }
 
     @GetMapping("/findwith_plate_number")
-    List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber){
+    public List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber){
      return  vehicleBiz.findVehicleIdsByPlateNumber(plateNumber);
     }
+
+    @GetMapping("/exist_code/{code}")
+    public ObjectRestResponse<Boolean> checkCodeExist(@PathVariable(value = "code") Integer code,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkCodeExist(code,id);
+        return ObjectRestResponse.succ(exist);
+    }
+
 }

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

@@ -34,7 +34,7 @@ public class VehicleDepartureController {
     private UserAuthConfig userAuthConfig;
 
     @GetMapping("page")
-    public RestResponse page(String numberPlate, String time, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate,@RequestParam(value = "code",required = false) Integer code,String time, Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -46,12 +46,12 @@ public class VehicleDepartureController {
                 return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, time, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code, time, page, limit));
     }
 
     @GetMapping("small/page")
     @IgnoreUserToken
-    public RestResponse pageBySmall(String numberPlate, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
+    public RestResponse pageBySmall(String numberPlate,@RequestParam(value = "code",required = false) Integer code, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -63,7 +63,7 @@ public class VehicleDepartureController {
                 return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate,time,page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,code,time,page, limit));
     }
 
     /**

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

@@ -32,6 +32,8 @@ 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 tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -332,7 +334,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         Example exa = Example.builder(VehicleModel.class).where(
                 WeekendSqls.<VehicleModel>custom()
                         .andEqualTo(VehicleModel::getIsdel, 0)
-        ).orderByAsc("sort").build();
+        ).orderByDesc("sort").build();
 
         return ObjectRestResponse.succ(baseBiz.selectByExample(exa));
     }

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

@@ -112,7 +112,7 @@ public class VehicleUpkeepController {
      * @return
      */
     @GetMapping("log/page")
-    public RestResponse pageLog(String numberPlate, Integer page, Integer limit) {
+    public RestResponse pageLog(String numberPlate, @RequestParam(value = "code",required = false) Integer code, Integer page, Integer limit) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -124,7 +124,7 @@ public class VehicleUpkeepController {
                 companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
             }
         }
-        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit, companyList));
+        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, code, page, limit, companyList));
     }
 
     /**

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

@@ -61,6 +61,9 @@
                 )
 
             </if>
+            <if test="code!=null">
+               and  vehicle.code=#{code}
+            </if>
         </trim>
         order by create_time desc
     </select>

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

@@ -154,19 +154,15 @@
             v.expect_destination_branch_company_id=#{subordinateBranch} )
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
-            and (
-            <trim suffixOverrides="OR">
                 <if test="addrProvince !=null">
-                    (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
+                    and bc.addr_province=#{addrProvince}
                 </if>
                 <if test="addrCity !=null">
-                    (bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR
+                   and  bc.addr_city=#{addrCity}
                 </if>
                 <if test="zoneId !=null">
-                    (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
+                   and  bc.zone_id=#{zoneId}
                 </if>
-            </trim>
-            )
         </if>
         order by v.code
         ) r ORDER BY r.parkBranchCompanyName
@@ -310,19 +306,15 @@
             v.expect_destination_branch_company_id=#{subordinateBranch} )
         </if>
         <if test=" addrProvince !=null or  addrCity !=null or zoneId !=null ">
-            and (
-            <trim suffixOverrides="OR">
-                <if test="addrProvince !=null">
-                    (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
-                </if>
-                <if test="addrCity !=null">
-                    (bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR
-                </if>
-                <if test="zoneId !=null">
-                    (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
-                </if>
-            </trim>
-            )
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
         </if>
         order by v.code
         ) r ORDER BY r.parkBranchCompanyName
@@ -409,6 +401,9 @@
             <if test="modelId != null and modelId != ''">
                 and v1.model_id = #{modelId}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             and v1.is_del != 1
         </where>
     </select>
@@ -420,6 +415,9 @@
            <if test="numberPlate != null and numberPlate != ''">
                and v1.number_plate = #{numberPlate}
            </if>
+           <if test="code != null and code != ''">
+               and v1.code = #{code}
+           </if>
            <if test="companyIds != null and companyIds.size > 0">
                and v1.park_branch_company_id in
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -484,6 +482,9 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
+            <if test="code !=null">
+                and v1.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -507,6 +508,9 @@
             <if test="status != null">
                 and v2.status = #{status}
             </if>
+            <if test="code !=null">
+                and v2.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v2.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">

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

@@ -48,6 +48,9 @@
                     )
                 )
             </if>
+            <if test="code !=null">
+               and b.code=#{code}
+            </if>
         </trim>
         order by a.create_time desc
     </select>

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

@@ -61,6 +61,9 @@
             <if test="modelId != null and modelId != ''">
                 and v.model_id = #{modelId}
             </if>
+            <if test="code !=null">
+                and v.code=#{code}
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">