增加运营管理后台

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -33,7 +33,7 @@ import java.util.List;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

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

@@ -7,7 +7,7 @@ import javax.persistence.Id;
 import java.util.Date;
 
 @Data
-public class Vehicle {
+public class  Vehicle {
     /**
      * 主键(uuid)
      */

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
@@ -44,6 +45,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.io.File;
 import java.util.*;
@@ -910,4 +913,45 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         PageInfo<Vehicle> usableVehicleInfo = new PageInfo<>(lists);
         return PageDataVO.pageInfo(usableVehicleInfo);
     }
+
+    /**
+     * 保存
+     * @param vehicle
+     * @return
+     */
+    @Transactional
+    public ObjectRestResponse save(Vehicle vehicle){
+        if (vehicle==null) {
+           ObjectRestResponse.createDefaultFail();
+        }
+
+        String id = vehicle.getId();
+        if (StringUtils.isBlank(id)) {
+            insertSelective(vehicle);
+           insertSelective(vehicle);
+        }else {
+          updateSelectiveById(vehicle);
+        }
+       return ObjectRestResponse.succ();
+    }
+    public ObjectRestResponse findListByVehicle(Vehicle vehicle, Integer page, Integer limit){
+
+        WeekendSqls<Vehicle> sqls = WeekendSqls.<Vehicle>custom();
+         if (vehicle.getStatus()!=null||vehicle.getStatus()!=0){
+             sqls.andEqualTo(Vehicle::getStatus,vehicle.getStatus());
+         }
+
+         if (StringUtils.isBlank(vehicle.getNumberPlate())){
+             sqls.andEqualTo(Vehicle::getNumberPlate,vehicle.getNumberPlate());
+         }
+
+         if (vehicle.getSubordinateBranch()==null||vehicle.getSubordinateBranch()==0){
+             sqls.andEqualTo(Vehicle::getSubordinateBranch,vehicle.getSubordinateBranch());
+         }
+
+
+        Example exa = Example.builder(Vehicle.class).where(sqls).build();
+        selectByExample(exa);
+        return ObjectRestResponse.succ();
+    }
 }

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

@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
@@ -404,4 +405,22 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         return ObjectRestResponse.succ(vehiclePlatCatas);
     }
 
+
+    @Transactional
+    public ObjectRestResponse deleteCascadeById(Integer id){
+        //修改一级标签
+        VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
+        vehiclePlatCata.setId(id);
+        vehiclePlatCata.setState(1);
+         updateSelectiveById(vehiclePlatCata);
+
+         //修改子标签
+        VehiclePlatCata vpc = new VehiclePlatCata();
+        vpc.setState(1);
+        mapper.updateByExampleSelective(vpc,Example.builder(VehiclePlatCata.class)
+                 .andWhere(WeekendSqls.<VehiclePlatCata>custom()
+                         .andEqualTo(VehiclePlatCata::getParentId,id)).build());
+        return ObjectRestResponse.succ();
+    }
+
 }

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

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.common.VehicleBaseController;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.pojo.*;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -62,7 +63,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @GetMapping(value = "/add/fingCatasByParentId/{parentId}")
-    public ObjectRestResponse fingCatasByParentId(@PathVariable Integer parentId ){
+    public ObjectRestResponse fingCatasByParentId(@PathVariable("parentId") Integer parentId ){
         return   baseBiz.fingCatasByParentId(parentId);
 
     }
@@ -73,7 +74,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @GetMapping(value = "/add/findCascade/{id}")
-    public ObjectRestResponse findCascade(@PathVariable Integer id){
+    public ObjectRestResponse findCascade(@PathVariable("id") Integer id){
 
         return baseBiz.findCascade(id);
 
@@ -87,14 +88,16 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @param sort 分类 0-增加车型页面,1-标签管理页面
      * @return
      */
-    @GetMapping(value = "/add/fingCatasByParentId/{page}/{limit}/{sort}")
+    @GetMapping(value = "/add/getCascades/{page}/{limit}/{sort}")
     public ObjectRestResponse getCascades(
-             @PathVariable Integer page
-            ,@PathVariable Integer limit
-            ,@PathVariable Integer sort){
+//             @PathVariable("page") Integer page
+//            ,@PathVariable("limit") Integer limit
+//            ,@PathVariable("sort") Integer sort){
+            @PathVariable Integer page
+          ,@PathVariable Integer limit
+          ,@PathVariable Integer sort){
 
         return   baseBiz.getCascades(page,limit,sort);
-
     }
 
 
@@ -136,7 +139,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @PutMapping("/add/updateParentRank/{id}/{rank}")
-    public ObjectRestResponse updateParentRank(@PathVariable  Integer id,@PathVariable Integer rank){
+    public ObjectRestResponse updateParentRank(@PathVariable("id")  Integer id,@PathVariable("rank") Integer rank){
 
         return  baseBiz.updateParentRank(id,rank);
     }
@@ -152,6 +155,16 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
         return  baseBiz.getCatasByIds(ids);
     }
 
+    /**
+     * 删除一级标签及其子标签
+     * @param id 标签id
+     * @return
+     */
+    @DeleteMapping("/add/deleteCascadeById/{id}")
+    public ObjectRestResponse deleteCascadeById(@PathVariable("id") Integer id){
+        return  baseBiz.deleteCascadeById(id);
+    }
+
    /* @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));

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

@@ -52,7 +52,7 @@ import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 @RequestMapping("/vehicleInfo")
 @Slf4j
 @IgnoreClientToken
-@Api(value="车辆管理controller",tags={"车辆管理接口"})
+@Api(value = "车辆管理controller", tags = {"车辆管理接口"})
 public class VehicleController extends BaseController<VehicleBiz> {
 
     @Autowired
@@ -280,14 +280,14 @@ public class VehicleController extends BaseController<VehicleBiz> {
     public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentUsableVehicle(UsableVeicleDTO dto) throws Exception {
         //根据时间 获得 可用车辆
         //结合车型
-        if(StringUtils.isNotBlank(dto.getCatasStr())) {
-            List<Integer> catasIds = Pattern.compile(",").splitAsStream(dto.getCatasStr()).map((s)-> Integer.parseInt(s)).collect(Collectors.toList());
+        if (StringUtils.isNotBlank(dto.getCatasStr())) {
+            List<Integer> catasIds = Pattern.compile(",").splitAsStream(dto.getCatasStr()).map((s) -> Integer.parseInt(s)).collect(Collectors.toList());
             List<VehiclePlatCata> catas = vehiclePlatCataBiz.selectByExample(new Example.Builder(VehiclePlatCata.class)
                     .where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId, catasIds)).build());
             Map<Integer, List<VehiclePlatCata>> vpcMap = new HashMap<Integer, List<VehiclePlatCata>>();
-            for(VehiclePlatCata vpc : catas) {
+            for (VehiclePlatCata vpc : catas) {
                 List<VehiclePlatCata> vpcs = vpcMap.get(vpc.getParentId());
-                if(null == vpcs) {
+                if (null == vpcs) {
                     vpcs = new ArrayList<VehiclePlatCata>();
                 }
                 vpcs.add(vpc);
@@ -326,14 +326,14 @@ public class VehicleController extends BaseController<VehicleBiz> {
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = dto.getUserName();
-                //BaseContextHandler.getName();
+        //BaseContextHandler.getName();
         BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);
         dto.setLimit(1);
         dto.setPage(1);
 
         //查询可车辆信息
         PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
-        if(pageDataVO.getData().size() <= 0) {
+        if (pageDataVO.getData().size() <= 0) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
         bookVehicleVo.setVehicle(pageDataVO.getData().get(0).getId());
@@ -342,5 +342,24 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
         return ObjectRestResponse.succ(bookVehicleVo.getVehicle());
     }
-    
+
+    /**
+     * 保存
+     *
+     * @param vehicle
+     * @return
+     */
+    @PostMapping("/add/seva")
+    public ObjectRestResponse seva(Vehicle vehicle) {
+        return baseBiz.save(vehicle);
+    }
+
+    @PostMapping("/add/findListByVehicle/{page}/{limit}")
+    public ObjectRestResponse findListByVehicle(
+            @RequestBody Vehicle vehicle
+            , @PathVariable("page") Integer page
+            , @PathVariable("limit") Integer limit) {
+        return  baseBiz.findListByVehicle(vehicle,page,limit);
+    }
+
 }