解决VehicleFeign重复

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java

@@ -97,4 +97,5 @@ public class RedisKey {
 
     public static final String CACHE_DICTIONARY_ALL =CACHE_DICTIONARY_PREFIX + "all:";
     public static final String CACHE_DICTIONARY_ALL_MAP =CACHE_DICTIONARY_ALL + "map:";
+    public static final String ILLEGAL_VEHICLE_ENQUIRIES ="cache:violation";
 }

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

-package com.xxfc.platform.universal.feign;
-
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-
-import com.xxfc.platform.universal.feign.result.Vehicle;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * Created by ace on 2017/9/15.
- */
-@FeignClient(name = "vehicle")
-public interface VehicleFeign {
-
-
-    @GetMapping(value = "/vehicleInfo/{id}")
-    public ObjectRestResponse<Vehicle> get(@PathVariable("id") String id);
-
-
-}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/result/Vehicle.java

-package com.xxfc.platform.universal.feign.result;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import java.util.Date;
-
-@Data
-public class  Vehicle {
-    /**
-     * 主键(uuid)
-     */
-    @Id
-    private String id;
-
-    /**
-     * 车辆编号，0-没有
-     */
-    private Integer code;
-
-    /**
-     * 车辆状态： 1-正常运行 2-维修 3-报废
-     */
-    private Integer status;
-
-    /**
-     * 车牌号，空字符串-没有
-     */
-    @Column(name = "number_plate")
-    private String numberPlate;
-
-    /**
-     * 品牌（编码，对应关系见相关常量），0-未填写
-     */
-    private Integer brand;
-
-    /**
-     * 所属分支机构（id）
-     */
-    @Column(name = "subordinate_branch")
-    private Integer subordinateBranch;
-
-    /**
-     * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
-     */
-    @Column(name = "use_type")
-    private Integer useType;
-
-    /**
-     * 备注信息
-     */
-    private String remark;
-
-    /**
-     * 车架号
-     */
-    private String vin;
-
-    /**
-     * 保险公司，见常量表
-     */
-    private Integer insuranceCompany;
-
-
-    /**
-     * 保险单号
-     */
-    private String insuranceNo;
-
-    /**
-     * 保险开始时间
-     */
-    private Date insuranceStartDate;
-
-    /**
-     * 保险结束时间
-     */
-    private Date insuranceEndDate;
-
-    /**
-     * 年审时间
-     */
-    private Date annualVerificationDate;
-
-    /**
-     * 保养时间
-     */
-    private Date maintenanceDate;
-
-    /**
-     * 保养里程数
-     */
-    private Integer maintenanceMileage;
-
-    /**
-     * 车辆所属人-类型
-     */
-    private Integer belongTo;
-
-    /**
-     * 所属人 名称
-     */
-    private String belongToName;
-
-    /**
-     * 行驶证路径
-     */
-    private String drivingLicensePath;
-
-    /**
-     * 发动机号
-     */
-    private String engineNum;
-
-    /**
-     * 生产商
-     */
-    private String manufacturer;
-
-    /**
-     * 收车时间
-     */
-    private Date receiveTime;
-
-    /**
-     * 最后更新里程数
-     */
-    private Integer mileageLastUpdate;
-
-    /**
-     * 停车分公司（id）
-     */
-    @Column(name = "park_branch_company_id")
-    private Integer parkBranchCompanyId;
-    /**
-     * 预计目的地分公司id
-     */
-    private Integer expectDestinationBranchCompanyId;
-    /**
-     * 车型id
-     */
-    @Column(name = "model_id")
-    private Integer modelId;
-
-    /**
-     * 车辆当前出行状态： 1-出行中 2-预约中 3-空闲中 4-保养中
-     */
-    @Column(name = "travel_status")
-    private Integer travelStatus;
-
-    /**
-     * 是否删除；0-正常；1-删除
-     */
-    private Integer isDel;
-
-
-    /**
-     * 车牌类型
-     */
-    private String numberPlateType;
-//    /**
-//     * 车牌号码
-//     */
-//    private String plateno;
-//    /**
-//     * 发动机号
-//     */
-//    private String engineno;
-//    /**
-//     * 车架号
-//     */
-//    private String frameno;
-}
\ No newline at end of file

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/TrafficViolationsController.java

@@ -3,12 +3,13 @@ package com.xxfc.platform.universal.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.universal.feign.VehicleFeign;
-import com.xxfc.platform.universal.feign.result.Vehicle;
+
 import com.xxfc.platform.universal.service.TrafficViolationsService;
 import com.xxfc.platform.universal.vo.RentViolationDTO;
 import com.xxfc.platform.universal.vo.TrafficViolations;
 import com.xxfc.platform.universal.vo.ViolationVO;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/TrafficViolationsService.java

@@ -5,12 +5,10 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.universal.biz.LicensePlateTypeBiz;
 import com.xxfc.platform.universal.constant.RedisKey;
 import com.xxfc.platform.universal.entity.LicensePlateType;
-import com.xxfc.platform.universal.feign.result.Vehicle;
 import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.vo.RentViolationDTO;
 import com.xxfc.platform.universal.vo.TrafficViolations;
-import com.xxfc.platform.universal.vo.ViolationVO;
-import org.apache.commons.beanutils.BeanUtils;
+import com.xxfc.platform.vehicle.entity.Vehicle;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 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.entity.Vehicle;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,8 @@ import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.Arrays;
 import java.util.List;
@@ -98,12 +101,13 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      */
     public List<GoodDataVO> goodList(Integer page, Integer limit) {
         List<GoodDataVO> goodDataVOS = Arrays.asList();
-        /*设置查询条件*/
-        VehicleModel vehicleModel = new VehicleModel();
-        vehicleModel.setIsdel(0);
         /*设置分页*/
         Page<VehicleModel> pages = PageHelper.startPage(page, limit);
-        selectList(vehicleModel);
+
+        Example example = Example.builder(VehicleModel.class)
+                .where(WeekendSqls.<VehicleModel>custom().andEqualTo(VehicleModel::getIsdel, 0)).orderByDesc("hot_sign").build();
+        selectByExample(example);
+
         PageInfo<VehicleModel> pageInfo= PageInfo.of(pages.getResult());
         List<VehicleModel> vehicleModelList = pageInfo.getList();
         /*遍历车型列表设置List<GoodDataVO>*/