Merge branch 'dev' into base-modify

ace-gate/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848,10.1.37.166:8848
+        server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 ---

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 cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 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.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
@@ -20,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/vehicleModel/app/unauth")
@@ -57,6 +63,23 @@ public class VehicleModelController extends CommonBaseController {
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(VehicleModelQueryCondition vmqc) {
         ObjectRestResponse<PageDataVO<VehicleModelVo>> objectRestResponse = vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
+        PageDataVO<VehicleModelVo> pageDataVOs = objectRestResponse.getData();
+        pageDataVOs.getData().forEach( v -> {
+            List<VehiclePlatCata> vehiclePlatCataList = vehicleFeign.getCatasByIds(v.getConfig()).getData();
+            StrUtil.splitToInt("14,7,11", ",");
+            v.setUccnCataList(vehiclePlatCataList.parallelStream().filter(v1 -> {return ArrayUtil.contains(StrUtil.splitToInt("14,7,11", ","), v1.getParentId());}).sorted(Comparator.comparing(VehiclePlatCata::getParentId, (x, y) -> {
+                int xx = 0,yy = 0;
+                int[] array = StrUtil.splitToInt("14,7,11", ",");
+                for(int i = 0; i < array.length; i++) {
+                    if(x == array[i]) {
+                        xx = i;
+                    }else if(y == array[i]) {
+                        yy = i;
+                    }
+                }
+                return (xx - yy);
+            })).collect(Collectors.toList()));
+        });
         return objectRestResponse;
     }
 }

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

@@ -160,4 +160,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "sort")
 	@ApiModelProperty(value = "排序")
 	private Integer sort;
+
+	@Column(name = "intro")
+	@ApiModelProperty(value = "简介")
+	private Integer intro;
 }

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

@@ -135,4 +135,14 @@ public interface VehicleFeign {
 
     @PostMapping("/vehicleModel/app/unauth/findVehicleModelPage")
     public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc);
+
+
+    //cata
+    /**
+     * 查询当前车型拥有的标签
+     * @param ids
+     * @return
+     */
+    @GetMapping("/cata/add/getCatasByIds/{ids}")
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable("ids") String ids);
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -25,128 +27,6 @@ import java.util.Date;
 @Table(name = "vehicle_model")
 public class VehicleModelVo extends VehicleModel implements Serializable {
 	private static final long serialVersionUID = 1L;
-	//主键
-	@Id
-	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("主键")
-	private Integer id;
-
-	//名称
-	@Column(name = "name")
-	@ApiModelProperty(value = "名称")
-	private String name;
-
-	//房车配置，code逗号分割
-	@Column(name = "config")
-	@ApiModelProperty(value = "房车配置，code逗号分割")
-	private String config;
-
-	@Column(name = "number")
-	@ApiModelProperty(value = "乘卧数id")
-	private String number;
-
-	@Column(name = "brand")
-	@ApiModelProperty(value = "品牌id")
-	private String brand;
-
-	//关键标签，code逗号分割
-	@Column(name = "keyword")
-	@ApiModelProperty(value = "关键标签，code逗号分割")
-	private String keyword;
-
-	//车型详情
-	@Column(name = "models_details")
-	@ApiModelProperty(value = "车型详情")
-	private String modelsDetails;
-
-	//参数
-	@Column(name = "model_param")
-	@ApiModelProperty(value = "参数")
-	private String modelParam;
-
-	//图片地址 多张为逗号分割
-	@Column(name = "picture")
-	@ApiModelProperty(value = "图片地址 多张为逗号分割")
-	private String picture;
-
-	//价格
-	@Column(name = "price")
-	@ApiModelProperty(value = "价格")
-	private BigDecimal price;
-
-
-	//总押金
-	@Column(name = "deposit")
-	@ApiModelProperty(value = "总押金")
-	private BigDecimal deposit;
-
-	//违章押金
-	@Column(name = "vio_deposit")
-	@ApiModelProperty(value = "违章押金")
-	private BigDecimal vioDeposit;
-
-	//创建时间
-	@Column(name = "crt_time")
-	@ApiModelProperty(value = "创建时间", hidden = true )
-	private Date crtTime;
-
-	//创建者id
-	@Column(name = "crt_user")
-	@ApiModelProperty(value = "创建者id")
-	private Integer crtUser;
-
-	//创建者名称
-	@Column(name = "crt_name")
-	@ApiModelProperty(value = "创建者名称")
-	private String crtName;
-
-	//创建者host
-	@Column(name = "crt_host")
-	@ApiModelProperty(value = "创建者host")
-	private String crtHost;
-
-	//修改时间
-	@Column(name = "upd_time")
-	@ApiModelProperty(value = "修改时间", hidden = true )
-	private Date updTime;
-
-	//修改者
-	@Column(name = "upd_user")
-	@ApiModelProperty(value = "修改者")
-	private Integer updUser;
-
-	//修改者名称
-	@Column(name = "upd_name")
-	@ApiModelProperty(value = "修改者名称")
-	private String updName;
-
-	//修改者host
-	@Column(name = "upd_host")
-	@ApiModelProperty(value = "修改者host")
-	private String updHost;
-
-	//评分
-	@Column(name = "score")
-	@ApiModelProperty(value = "评分")
-	private Integer score;
-
-	@Column(name = "hot_sign")
-	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
-	private Integer hotSign;
-
-	@ApiModelProperty(value = "是否删除")
-	private  Integer isdel;
-	@Column(name = "rent_discount_status")
-	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")
-	private Integer rentDiscountStatus;
-
-	@Column(name = "rent_discount_price")
-	@ApiModelProperty(value = "租车优惠价格")
-	private  String rentDiscountPrice;
-
-	@Column(name = "buy_price")
-	@ApiModelProperty(value = "购买价格")
-	private  BigDecimal buyPrice;
 
 	@ApiModelProperty(value = "总数量")
 	private Integer sum;
@@ -168,17 +48,6 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
-	@Column(name = "sort")
-	@ApiModelProperty(value = "排序")
-	private Integer sort;
-
-
-//	@Column(name = "status")
-//	@ApiModelProperty(value = "状态 0--下架；1--上架")
-//	private String status;
-
-//	@Column(name = "cover_pic")
-//	@ApiModelProperty(value = "封面图")
-//	private String coverPic;
+	List<VehiclePlatCata> UccnCataList;
 
 }

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

@@ -123,6 +123,11 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
                 || companyVo.getAddrCity()==null||companyVo.getAddrCity()==0){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
+        Area area=areaBiz.selectById(companyVo.getZoneId());
+        Integer provinc=companyVo.getAddrProvince();
+        if (area==null||StringUtils.isBlank(area.getProvinceIds())||!area.getProvinceIds().contains(provinc+"")){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"片区和省份不一致");
+        }
         Integer state=companyVo.getState()==null?2:companyVo.getState();
         BigDecimal latitude=companyVo.getLatitude();
         BigDecimal longitude=companyVo.getLongitude();

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

@@ -410,7 +410,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param ids
      * @return
      */
-    public ObjectRestResponse getCatasByIds(String ids) {
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(String ids) {
         Example exa = Example.builder(VehiclePlatCata.class).where(
                 WeekendSqls.<VehiclePlatCata>custom()
                         .andIn(VehiclePlatCata::getId, Arrays.asList(ids.split(",")))

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

@@ -9,6 +9,7 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;
 import com.xxl.job.core.log.XxlJobLogger;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -25,16 +26,14 @@ import java.util.stream.Collectors;
  */
 @JobHandler(value = "vehicle_job_handler")
 @Component("vehicle_job_handler")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class VehicleJobHandler extends IJobHandler {
 
-       @Autowired
-       private VehicleBiz vehicleBiz;
+       private final  VehicleBiz vehicleBiz;
 
-       @Autowired
-       private VehicleBookInfoBiz  vehicleBookInfoBiz;
+       private final  VehicleBookInfoBiz  vehicleBookInfoBiz;
 
-       @Autowired
-       private ThirdFeign thirdFeign;
+       private final ThirdFeign thirdFeign;
 
 
        private static  final  String DIC_VEHICLE_TYPE="VEHICLE";

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

@@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/cata")
 @Slf4j
@@ -146,7 +148,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @GetMapping("/add/getCatasByIds/{ids}")
-    public ObjectRestResponse getCatasByIds(@PathVariable String ids){
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable String ids){
         return  baseBiz.getCatasByIds(ids);
     }
 
@@ -184,6 +186,8 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
     }
 
 
+
+
    /* @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));