Merge branch 'master-ucc-feature' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/BranchCompanyController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/17 15:24
+ */
+@RestController
+@RequestMapping("/app/unauth/branch_company")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class BranchCompanyController {
+
+    private final VehicleFeign vehicleFeign;
+
+    @PostMapping("/page")
+    public ObjectRestResponse<PageDataVO> listBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO) {
+        PageDataVO<BranchCompanyListVO> branchCompanyWithPage = vehicleFeign.findBranchCompanyWithPage(branchCompanyFindDTO);
+        return ObjectRestResponse.succ(branchCompanyWithPage);
+    }
+}

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

@@ -6,13 +6,13 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
-import io.swagger.annotations.ApiParam;
+import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 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;
@@ -153,6 +153,14 @@ public interface VehicleFeign {
     @GetMapping("/vehicleInfo/findwith_plate_number")
     List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber);
 
+    /**
+     * 根据位置查询
+     * @param branchCompanyFindDTO
+     * @return
+     */
+    @PostMapping("/branchCompany/app/unauth/companys")
+    PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO);
+
     @GetMapping("/vehicleInfo/findVehicleIds")
     List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
 }

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

@@ -15,4 +15,6 @@ public class BranchCompanyFindDTO extends PageParam {
     private Integer addrProvince;
 
     private Integer addrCity;
+
+    private String  name;
 }

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/17 14:48
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class VehiclePlatCataVo {
+
+      private Integer id;
+
+      private String name;
+}

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

@@ -375,7 +375,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     public PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(BranchCompanyFindDTO branchCompanyFindDTO) {
         PageDataVO<BranchCompanyListVO> pageDataVO = new PageDataVO<>();
-        PageDataVO<BranchCompanyListDTO> dataVO = PageDataVO.pageInfo(branchCompanyFindDTO.getPage(), branchCompanyFindDTO.getLimit(), () -> mapper.findBranchCompanys(branchCompanyFindDTO.getAddrProvince(), branchCompanyFindDTO.getAddrCity()));
+        PageDataVO<BranchCompanyListDTO> dataVO = PageDataVO.pageInfo(branchCompanyFindDTO.getPage(), branchCompanyFindDTO.getLimit(), () -> mapper.findBranchCompanys(branchCompanyFindDTO.getAddrProvince(), branchCompanyFindDTO.getAddrCity(),branchCompanyFindDTO.getName()));
         List<BranchCompanyListDTO> data = dataVO.getData();
         if (CollectionUtils.isEmpty(data)) {
             return pageDataVO;

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

@@ -3,7 +3,9 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -16,7 +18,9 @@ import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
 import com.xxfc.platform.vehicle.pojo.Cascade;
 import com.xxfc.platform.vehicle.pojo.CataVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePlatCataVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Arrays;
 import org.springframework.beans.BeanUtils;
@@ -492,4 +496,19 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         }
         return vpcMap;
     }
+
+    public List<VehiclePlatCataVo> findVehicleCategoryByParentId(Integer parentId){
+         List<VehiclePlatCataVo> cataVos = new ArrayList<>();
+        Example example = new Example(VehiclePlatCata.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("parentId",parentId);
+        criteria.andEqualTo("state",0);
+        List<VehiclePlatCata> vehiclePlatCatas = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(vehiclePlatCatas)){
+            return cataVos;
+        }
+        cataVos= JSON.parseObject(JSON.toJSONString(vehiclePlatCatas), new TypeReference<List<VehiclePlatCataVo>>() {
+        });
+        return cataVos;
+    }
 }

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

@@ -3,7 +3,6 @@ package com.xxfc.platform.vehicle.mapper;
 import com.alibaba.fastjson.JSONObject;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO;
-import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
@@ -18,7 +17,7 @@ public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdLi
 
     List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);
 
-    List<BranchCompanyListDTO > findBranchCompanys(@Param("provinceCode") Integer provinceCode,@Param("cityCode") Integer cityCode);
+    List<BranchCompanyListDTO > findBranchCompanys(@Param("provinceCode") Integer provinceCode,@Param("cityCode") Integer cityCode,@Param("name") String name);
 
 
     @Select("SELECT `code`,count(id) cd FROM `vehicle` WHERE is_del=0 and number_plate LIKE '%测试%' GROUP  BY code HAVING cd>=2")

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

@@ -202,8 +202,8 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     }
 
     @PostMapping("/app/unauth/companys")
-    public ObjectRestResponse<PageDataVO<BranchCompanyListVO>> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO){
+    public PageDataVO<BranchCompanyListVO> findBranchCompanyWithPage(@RequestBody BranchCompanyFindDTO branchCompanyFindDTO){
         PageDataVO<BranchCompanyListVO> pageDataVO = baseBiz.findBranchCompanyWithPage(branchCompanyFindDTO);
-        return ObjectRestResponse.succ(pageDataVO);
+        return pageDataVO;
     }
 }

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

@@ -11,6 +11,7 @@ import com.xxfc.platform.vehicle.common.VehicleBaseController;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.pojo.Cascade;
 import com.xxfc.platform.vehicle.pojo.CataVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePlatCataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -185,6 +186,16 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
         return  baseBiz.setIsore(id,isMore);
     }
 
+    /**
+     * 根据类型id查询分类
+     * @param type
+     * @return
+     */
+    @GetMapping("/types")
+    public ObjectRestResponse<List<VehiclePlatCataVo>> findVehiclePlatCate(@RequestParam(value = "type",required = false,defaultValue = "7") Integer type){
+        List<VehiclePlatCataVo> category = baseBiz.findVehicleCategoryByParentId(type);
+        return ObjectRestResponse.succ(category);
+    }
 
 
 

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

@@ -70,7 +70,11 @@
         bc.longitude,
         bc.latitude
         FROM
-        (SELECT * FROM `branch_company` WHERE `is_del`=0 AND `state`=1) AS `bc`
+        (SELECT * FROM `branch_company` WHERE `is_del`=0 AND `state`=1
+         <if test="name !=null and name !='' ">
+             and name like concat('%',#{name},'%')
+         </if>
+        ) AS `bc`
         INNER JOIN (SELECT * FROM `company_base` WHERE `is_del`=0
         <if test="provinceCode != null">
            AND `addr_province`=#{provinceCode}