Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

 package com.xxfc.platform.vehicle.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -14,23 +15,27 @@ import java.util.Date;
 public class BranchCompany {
     @Id
     @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键id")
     private Integer id;
 
     /**
      * 分公司名称
      */
+    @ApiModelProperty("分公司名称")
     private String name;
 
     /**
      * 分支机构类型
      */
     @Column(name = "branch_type")
+    @ApiModelProperty("分支机构类型")
     private Integer branchType;
 
     /**
      * 分支机构所属机构
      */
     @Column(name = "subordinate_branch")
+    @ApiModelProperty("分支机构所属机构")
     private Integer subordinateBranch;
 
 
@@ -38,24 +43,28 @@ public class BranchCompany {
      * 地址-省/直辖市(编码)
      */
     @Column(name = "addr_province")
+    @ApiModelProperty("地址-省/直辖市(编码)")
     private Integer addrProvince;
 
     /**
      * 地址-市(编码)
      */
     @Column(name = "addr_city")
+    @ApiModelProperty("地址-市(编码)")
     private Integer addrCity;
 
     /**
      * 地址-镇/县（编码）
      */
     @Column(name = "addr_town")
+    @ApiModelProperty("地址-镇/县（编码）")
     private Integer addrTown;
 
     /**
      * 详细地址
      */
     @Column(name = "addr_detail")
+    @ApiModelProperty("详细地址")
     private String addrDetail;
 
     private Date createTime;
@@ -65,25 +74,30 @@ public class BranchCompany {
     /**
      * 负责人
      */
+    @ApiModelProperty("负责人")
     private String leader;
 
     /**
      * 负责人联系方式
      */
+    @ApiModelProperty("负责人联系方式")
     private String leaderContactInfo;
     /**
      * 分公司状态
      */
+    @ApiModelProperty("分公司状态")
     private Integer status;
 
     /**
      *公司地址-纬度
      */
+    @ApiModelProperty("公司地址-纬度")
     private BigDecimal latitude;
 
     /**
      * 公司地址-经度
      */
+    @ApiModelProperty("公司地址-经度")
     private BigDecimal longitude;
 
     private String companyPic;

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

@@ -50,7 +50,7 @@ import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 @RequestMapping("/vehicleInfo")
 @Slf4j
 @IgnoreClientToken
-@Api(value = "车辆管理")
+@Api(value="车辆管理controller",tags={"车辆管理接口"})
 public class VehicleController extends BaseController<VehicleBiz> {
 
     @Autowired

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

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleLicenseBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.common.VehicleBaseController;
@@ -9,14 +11,23 @@ import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.util.Arrays;
+import java.util.List;
 
 @RestController
 @RequestMapping("/user")
 @Slf4j
 @IgnoreClientToken
-
+@Api(value="常用驾驶人管理controller",tags={"常用驾驶人管理接口"})
 public class VehicleLicenseController extends VehicleBaseController<VehicleLicenseBiz> {
 
 
@@ -50,6 +61,16 @@ public class VehicleLicenseController extends VehicleBaseController<VehicleLicen
         return RestResponse.suc(baseBiz.getOneById(id));
     }
 
+    @ApiOperation("多个驾驶员查询")
+    @RequestMapping(value = "/license/multi", method = RequestMethod.GET)
+    public ObjectRestResponse<List<VehicleUserLicense>> multi(QueryMultiDTO dto) throws Exception {
+//        BaseContextHandler.getUserID()
+        List<VehicleUserLicense> list = baseBiz.selectByExample(new Example.Builder(VehicleUserLicense.class)
+                .where(WeekendSqls.<VehicleUserLicense>custom()
+                        .andIn(VehicleUserLicense::getId, Arrays.asList(dto.getIds().split(",")))).build());
+        return ObjectRestResponse.success().data(list);
+    }
+
     @RequestMapping(value = "/license/del", method = RequestMethod.GET)
     public RestResponse del(
             @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception {
@@ -59,8 +80,10 @@ public class VehicleLicenseController extends VehicleBaseController<VehicleLicen
         return baseBiz.del(id);
     }
 
-
-
-
+    @Data
+    public class QueryMultiDTO{
+        @ApiModelProperty(value = "主键逗号分割")
+        public String ids;
+    }
 
 }