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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -171,9 +171,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
-//            if (!flag) {
-//                return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
-//            }
+            if (!flag) {
+                return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
+            }
             if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -81,6 +81,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             userId=uses.get(0).getId();
             user.setId(userId);
         }else {
+            user.setId(null);
             Long time=System.currentTimeMillis()/1000L;
             user.setWeId(weId);
             user.setRId(rId);
@@ -97,12 +98,12 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
         }
-        String openid = "oXDd91MppH9i5F7xzPwigiMj--5w";
-        /*String access_token = null;
+        String openid= null ;
+        String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);
-            openid = jsonData.getString("openid");
-            access_token = jsonData.getString("access_token");
+             openid = jsonData.getString("openid");
+             access_token = jsonData.getString("access_token");
             String refresh_token = jsonData.getString("refresh_token");
             log.info("-----微信回调userInfo---openid=="+openid+"----access_token==="+access_token);
             //验证access_token是否失效
@@ -116,15 +117,15 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             e.printStackTrace();
             log.info("网络异常===" + e.getMessage());
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("网络异常"));
-        }*/
+        }
         try {
             // 获取微信用户基本信息
-          /*  JSONObject userinfo_json = weixinService.getUserInfo(access_token,openid);
+             JSONObject userinfo_json = weixinService.getUserInfo(access_token,openid);
             if (userinfo_json == null || StringUtils.isNotBlank(userinfo_json.getString("errcode"))) {
                 log.info("调用微信用户基本信息接口失败");
                 throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("调用微信用户基本信息接口失败"));
             }
-            log.info("微信用户基本信息---user===" +userinfo_json.toJSONString());*/
+            log.info("微信用户基本信息---user===" +userinfo_json.toJSONString());
           if (activityId==null||activityId==0){
               ActivityBm activityBm=activityBmBiz.userInfo(key);
               if (activityBm==null){
@@ -138,9 +139,9 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
                 throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("redis的报名信息activityId---为空"));
             }
             User userInfo=new User();
-            String nickName = "苹果呀";//userinfo_json.getString("nickname");
-            String headimgurl = "http://thirdwx.qlogo.cn/mmopen/4eFHvhmOX6XuiaG6ib7wxkLa8AwMLFIbW9BSJ7EmwC3kRMUdgCrobdRUbhjMXbkY7aBc2CazjXFJiap5ianMH6yQnH2UQ4TfkXJw/132";//userinfo_json.getString("headimgurl");
-            String sex ="2"; //userinfo_json.getString("sex");
+            String nickName = userinfo_json.getString("nickname");
+            String headimgurl =userinfo_json.getString("headimgurl");
+            String sex =userinfo_json.getString("sex");
             if (StringUtils.isBlank(sex)){
                 sex="0";
             }

xx-vehicle/xx-vehicle-api/pom.xml

@@ -17,7 +17,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
     <build>
         <plugins>

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

@@ -151,6 +151,24 @@ public class  Vehicle {
     @Column(name = "travel_status")
     private Integer travelStatus;
 
+    /**
+     * 终端号
+     */
+    @Column(name = "terminal_number")
+    private String terminalNumber;
+
+    /**
+     * SIM卡号
+     */
+    @Column(name = "sim_number")
+    private String simNumber;
+
+    /**
+     * 通讯类型
+     */
+    @Column(name = "communication_type")
+    private String communicationType;
+
     /**
      * 是否删除；0-正常；1-删除
      */

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class ResultVehicleVo {
+public class ResultVehicleVo   {
     /**
      * 主键(uuid)
      */
@@ -26,6 +26,12 @@ public class ResultVehicleVo {
      */
     private String numberPlate;
 
+
+    /**
+     * 车型
+     */
+    private String vehicleType;
+
     /**
      * 品牌（编码，对应关系见相关常量），0-未填写
      */

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

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VehicleExcelVo {
+
+
+    /**
+     * 车牌号，空字符串-没有
+     */
+    private String numberPlate;
+
+
+    /**
+     * 车辆编号，0-没有
+     */
+    private Integer code;
+
+    /**
+     * 车型
+     */
+    private String vehicleType;
+
+
+    /**
+     *
+     */
+    private String useType;
+
+
+    /**
+     * 停靠分支机构（名）
+     */
+    private String parkBranchCompanyName;
+
+
+}

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

@@ -317,6 +317,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                                     return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
                                 }
 
+                            } else {
+                                continue;
                             }
                         }
 

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageHelper;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.mapper.VehicleMapper;
+import com.xxfc.platform.vehicle.pojo.ResultVehicleVo;
+import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
+import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicle> {
+
+    @Autowired
+    private VehicleBiz vehicleBiz;
+
+
+
+
+    public List<VehicleExcelVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception {
+        Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
+        //处理预定日期相关参数
+        vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
+        if (companyList != null && companyList.size() > 0) {
+            params.put("companyList", companyList);
+        } else {
+            params.put("companyList", Arrays.asList(-1));
+        }
+
+        return  mapper.getVehicleExcelVoNotAllData(params);
+    }
+
+    public List<VehicleExcelVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {
+
+        Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
+        //处理预定日期相关参数
+        vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
+        params.get("yearMonthAndParam");
+        if (vehiclePageQueryVo.getModelId() == null) {
+            params.remove("modelId");
+        }
+        return  mapper.getVehicleExcelVo(params);
+    }
+
+    public List<VehicleExcelVo> getList(String vehiclePageQueryVoJson, UserDTO userDTO) {
+        VehiclePageQueryVo vehiclePageQueryVo = new VehiclePageQueryVo();
+        try {
+            if (StringUtils.isNotBlank(vehiclePageQueryVoJson)){
+                vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
+            }
+
+                if (userDTO.getDataAll() == 2) {
+                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                 return  getByPageNotAllData(vehiclePageQueryVo, companyList);
+                }
+
+          return   getByPage(vehiclePageQueryVo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ArrayList();
+    }
+}

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

@@ -12,9 +12,13 @@ import java.util.Map;
 
 public interface VehicleMapper extends Mapper<Vehicle> {
 
-    public List<ResultVehicleVo> getByPage(Map<String, Object> params);
+    public   List<ResultVehicleVo> getByPage(Map<String, Object> params);
 
-    public List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
+    public   List<ResultVehicleVo> getByPageNotAllData(Map<String, Object> params);
+
+    List<VehicleExcelVo> getVehicleExcelVo(Map<String, Object> params);
+
+    List<VehicleExcelVo> getVehicleExcelVoNotAllData(Map<String, Object> params);
 
     public int updateStatusById(Map<String, Object> params);
 

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

+package com.xxfc.platform.vehicle.rest.admin;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+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.xxfc.platform.vehicle.biz.VehicleBiz;
+import com.xxfc.platform.vehicle.biz.VehicleInformationDownloadBiz;
+import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+@RestController
+@RequestMapping("VehicleInformationDownload")
+@Slf4j
+public class VehicleInformationDownloadController extends BaseController<VehicleInformationDownloadBiz> {
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    private VehicleBiz vehicleBiz;
+
+    @Autowired
+    HttpServletResponse response;
+
+    @GetMapping("/excel")
+    public void downloadExcel(@RequestParam(value = "vehiclePageQueryVoJson",required = false) String vehiclePageQueryVoJson) throws Exception {
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        if (userDTO==null) {
+            throw  new BaseException("token已失效");
+        }
+        List<VehicleExcelVo> rows = baseBiz.getList(vehiclePageQueryVoJson, userDTO);
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        writer.addHeaderAlias("numberPlate", "车牌号");
+        writer.addHeaderAlias("code", "车辆编码");
+        writer.addHeaderAlias("vehicleType", "车型");
+        writer.addHeaderAlias("useType", "用途");
+        writer.addHeaderAlias("parkBranchCompanyName", "停靠分公司");
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(rows, true);
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=clxx.xlsx");
+        //out为OutputStream，需要写出到的目标流
+        ServletOutputStream out = response.getOutputStream();
+        writer.flush(out, true);
+        // 关闭writer，释放内存
+        writer.close();
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+    }
+}