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

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

@@ -109,4 +109,5 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
     }
 
 
+
 }

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

@@ -21,6 +21,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
+
+//@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
 @EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
 @EnableScheduling
 @EnableAceAuthClient

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

@@ -138,6 +138,12 @@ public class  Vehicle {
     /**
      * 车型id
      */
+    @Column(name = "model_id")
     private Integer modelId;
 
+    /**
+     * 车辆当前出行状态： 1-出行中 2-预约中 3-空闲中 4-保养中
+     */
+    @Column(name = "travel_status")
+    private Integer travelStatus;
 }
\ No newline at end of file

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

@@ -122,4 +122,13 @@ public class AddOrUpdateVehicleVo {
      * 生产商
      */
     private Date receiveTime;
+
+    /**
+     * 车型
+     */
+    private Integer modeLId;
+    /**
+     * 车辆状态
+     */
+    private Integer travelStatus;
 }
\ No newline at end of file

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

@@ -115,6 +115,13 @@ public class VehiclePageQueryVo {
      */
     private Integer haveViolation;
 
+
+    /**
+     * 所属大区
+     */
+    private Integer zoneId;
+
+
 //    public Integer getMileageRangeStart() {
 //        return mileageRangeStart;
 //    }

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

@@ -212,6 +212,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         example.createCriteria().andIn("zoneId", zoneIds);
         List<BranchCompany> zoneCompanys = selectByExample(example);
         return zoneCompanys;
+
     }
     public RestResponse<String> importExcel(MultipartFile multipartfile, HttpServletRequest request){
         try {

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

@@ -894,7 +894,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         fillBookedDateSearchParam(params,yearMonthAndDate,yearMonthAndDateNotBooked);
     }
 
-    public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto){
+    public PageDataVO<Vehicle>  searchUsableVehicle(RentVehicleBookDTO dto){
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getBookEndDate())&&
@@ -1013,6 +1013,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
                                .andEqualTo(Vehicle::getId,id)
                                .andEqualTo(Vehicle::getStatus,0))
                        .build()));
+
     }
 
 

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

 package com.xxfc.platform.vehicle.biz;
 
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -97,7 +98,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
 
         List<VehicleDepartureLog> vehicleDepartureLogs = mapper.selectByExample(exm);
         if (vehicleDepartureLogs.size() == 1) {
-            VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(1);
+            VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(0);
             if (vehicleDepartureLog!=null) {
                 return ObjectRestResponse.succ(vehicleDepartureLog);
             }

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

@@ -73,4 +73,9 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
     public int updateScoreByModelIdAndavgScore(Integer modelId, int avgScore) {
       return  mapper.updateScoreByModelIdAndavgScore(modelId,avgScore);
     }
+
+
+    public void updateByPrimaryKeySelective(VehicleModel vm){
+        mapper.updateByPrimaryKeySelective(vm);
+    }
 }
\ No newline at end of file

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

@@ -2,14 +2,20 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
 import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
+import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.Transaction;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 @Service
@@ -21,6 +27,7 @@ public class VehicleUpkeepService {
     @Autowired
     VehicleUpkeepLogMapper vehicleUpkeepLogMapper;
 
+
     public List<VehicleUpkeepItem> getAllItem() {
         return vehicleUpkeepItemMapper.selectAll();
     }
@@ -39,7 +46,7 @@ public class VehicleUpkeepService {
     public void updateItem(VehicleUpkeepItem item) {
         vehicleUpkeepItemMapper.updateByPrimaryKey(item);
     }
-
+    @Transactional
     public void deleteItem(Integer id) {
         vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
     }
@@ -56,8 +63,18 @@ public class VehicleUpkeepService {
         return vehicleUpkeepLogVo;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteLog(Integer id) {
         vehicleUpkeepLogMapper.deleteByPrimaryKey(id);
         vehicleUpkeepLogMapper.deleteItemsByLogId(id);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void addLog(VehicleUpkeepLogVo vulvo) throws InvocationTargetException, IllegalAccessException {
+        VehicleUpkeepLog vul = new VehicleUpkeepLog();
+        BeanUtilsBean.getInstance().copyProperties(vul,vulvo);
+        vehicleUpkeepLogMapper.insertSelective(vul);
+        vehicleUpkeepLogMapper.insertUpkeepLogItmes(vulvo);
+
+    }
 }

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

@@ -20,4 +20,6 @@ public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
     int deleteItemsByLogId(Integer id);
 
     VehicleUpkeepLog selectLastByVehicleId(String vehicleId);
+
+    void insertUpkeepLogItmes(VehicleUpkeepLogVo upkeepItems);
 }
\ No newline at end of file

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

@@ -288,7 +288,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @ApiOperation(value = "提车")
     public RestResponse<Integer> liftVehicle(@RequestBody LiftVehicleVo liftVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
-        String userName = BaseContextHandler.getName();
+        String userName = BaseContextHandler.getName ();
         return vehicleBookRecordBiz.lift(operatorId, userName, liftVehicleVo);
     }
 
@@ -437,4 +437,5 @@ public class VehicleController extends BaseController<VehicleBiz> {
    }
 
 
+
 }

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

@@ -48,6 +48,13 @@ public class VehicleDepartureController {
         return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
     }
 
+    /**
+     * 根据车辆id查询并分页
+     * @param vehicleId
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("findByVehicle")
     public RestResponse findByVehicle(String vehicleId, Integer page, Integer limit) {
         if (vehicleId == null) {
@@ -71,7 +78,7 @@ public class VehicleDepartureController {
     }
 
     /**
-     * 保存(出车)
+     * 保存
      * @param vehicleDepartureLog
      * @return
      */
@@ -80,6 +87,7 @@ public class VehicleDepartureController {
         return vehicleDepartureService.save(vehicleDepartureLog);
     }
 
+
     /**
      * 查询一条
      * @param vid 车辆id
@@ -91,6 +99,7 @@ public class VehicleDepartureController {
        return vehicleDepartureService.findOne(vid);
     }
 
+
     /**
      *
      * 收车
@@ -104,4 +113,5 @@ public class VehicleDepartureController {
     }
 
 
+
 }

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -27,12 +28,15 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.TransactionManagementConfigurationSelector;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -54,6 +58,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Autowired
     private UserFeign userFeign;
 
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
 
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
@@ -87,7 +94,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/findVehicleModelPage")
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPage(
-            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc) {
+            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ,HttpServletRequest request) {
+
+//        UserDTO user = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+//
+//        if (user!=null) {
+//            if (user.getDataAll()==2) {
+//
+//            }
+//        }
+
+
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
@@ -138,6 +155,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setCrtTime(new Date());
         vm.setCrtHost(host);
         vm.setIsdel(0);
+        vm.setVioDeposit(BigDecimal.valueOf(500));
         try {
             //插入数据到车型并返回id
             Integer vmId = vehicleModelBiz.insertAndGetId(vm);
@@ -194,9 +212,10 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setUpdHost(host);
         vm.setUpdTime(new Date());
 
+
         try {
             //修改车型
-            vehicleModelBiz.updateSelectiveById(vm);
+            vehicleModelBiz.updateByPrimaryKeySelective(vm);
             VehicleCata vcDelete = new VehicleCata();
             vcDelete.setVehicleModelId(vm.getId());
             // 删除车型对应的标签
@@ -209,6 +228,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                 VehicleCata vc = new VehicleCata();
                 vc.setCataId(Integer.parseInt(con));
                 vc.setVehicleModelId(vm.getId());
+                vc.setCrtTime(System.currentTimeMillis());
                 vcs.add(vc);
             }
             vehicleCataBiz.inserts(vcs);
@@ -216,6 +236,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new BaseException(ResultCode.FAILED_CODE);
 
         }

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

@@ -4,9 +4,13 @@ import com.xxfc.platform.vehicle.biz.VehicleUpkeepService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.InvocationTargetException;
+
 @RestController
 @RequestMapping("upkeep")
 public class VehicleUpkeepController {
@@ -15,11 +19,21 @@ public class VehicleUpkeepController {
     @Autowired
     private VehicleUpkeepService vehicleUpkeepService;
 
+    /**
+     * 查询所有保养项目
+     * @return
+     */
     @GetMapping("item/all")
     public RestResponse allItem() {
         return RestResponse.suc(vehicleUpkeepService.getAllItem());
     }
 
+    /**
+     * 分页查询所用保养项目
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("item/page")
     public RestResponse pageItem(Integer page, Integer limit) {
         if (page == null || limit == null) {
@@ -29,6 +43,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.pageItem(page, limit));
     }
 
+    /**
+     * 添加保养项目
+     * @param name
+     * @return
+     */
     @PostMapping("item")
     public RestResponse addItem(String name) {
         if (name == null || name.trim().equals("")) {
@@ -39,6 +58,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 修改项目
+     * @param item
+     * @return
+     */
     @PutMapping("item")
     public RestResponse editItem(VehicleUpkeepItem item) {
         if (item == null || item.getId() == null || item.getName() == null || item.getName().trim().equals("")) {
@@ -49,6 +73,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 删除保养项目
+     * @param id
+     * @return
+     */
     @DeleteMapping("item/{id}")
     public RestResponse delItem(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -59,6 +88,13 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 分页查询保养记录
+     * @param numberPlate
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("log/page")
     public RestResponse pageLog(String numberPlate, Integer page, Integer limit) {
         if (page == null || limit == null) {
@@ -68,6 +104,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit));
     }
 
+    /**
+     * 根据id查询一条保养记录(包含车牌、分公司名和保养项目)
+     * @param id
+     * @return
+     */
     @GetMapping("log/{id}")
     public RestResponse getLog(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -77,6 +118,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.getLogVoById(id));
     }
 
+    /**
+     * 根据id删除一条保养记录
+     * @param id
+     * @return
+     */
     @DeleteMapping("log/{id}")
     public RestResponse delLog(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -87,4 +133,23 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 添加一条保养记录
+     * @param vulvo
+     * @return
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     */
+    @PostMapping("log/addLog")
+    public RestResponse addLog(VehicleUpkeepLogVo vulvo) throws InvocationTargetException, IllegalAccessException {
+
+        if (vulvo==null) {
+
+            return  RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.addLog(vulvo);
+        return RestResponse.suc();
+    }
+
 }

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

@@ -7,7 +7,7 @@
       (select vm.*,v.sum,v2.leasableQuantity from  vehicle_model  vm left JOIN
       (select model_id as mid, count(1) as sum FROM vehicle GROUP BY mid)  v
       on vm.id=v.mid left JOIN
-      (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`status`=1 GROUP BY model_id)  v2
+      (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`use_type`=1 GROUP BY model_id)  v2
       on v.mid=v2.mid2 ) vmqc WHERE 1=1
 
       <if test="isDel !=null ">

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

@@ -60,4 +60,14 @@
         order by create_time desc
         limit 1
     </select>
+
+    <insert id="insertUpkeepLogItmes" parameterType="com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo">
+        insert into vehicle_upkeep_log_item(log_id, item_id)
+        values
+        <trim suffixOverrides=",">
+            <foreach collection="upkeepItems" item="item">
+                (#{id}, #{item.itemId}),
+            </foreach>
+        </trim>
+    </insert>
 </mapper>
\ No newline at end of file