Merge remote-tracking branch 'origin/dev' into jrz_dev

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-server/pom.xml

@@ -27,6 +27,12 @@
             <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/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-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-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;
     }
 
     /**