Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/User.java

@@ -53,11 +53,11 @@ public class User {
     @ApiModelProperty("性别")
     private String sex;
 
-    @Column(name = "group")
+    @Column(name = "'group'")
     @ApiModelProperty("分组")
     private Integer group;
 
-    @Column(name = "status")
+    @Column(name = "'status'")
     @ApiModelProperty("状态")
     private Integer status;
 
@@ -96,12 +96,12 @@ public class User {
 
     @Column(name = "createtime")
     @ApiModelProperty("创建时间")
-    private Integer createtime;
+    private Long createtime;
 
 
     @Column(name = "lastjointime")
     @ApiModelProperty("待定")
-    private Integer lastjointime;
+    private Long lastjointime;
 
     @Column(name = "had_luru")
     @ApiModelProperty("待定")

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/model/AccessToken.java

@@ -8,16 +8,16 @@ package com.xxfc.platform.summit.model;
 
 import java.io.Serializable;
 import java.util.Map;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
+
+
 
 
 /**
  * 封装 access_token
  */
-
-@Data
 public class AccessToken implements Serializable {
 	
 	private static final long serialVersionUID = -822464425433824314L;
@@ -52,14 +52,11 @@ public class AccessToken implements Serializable {
 		}
 	}
 	
-	public AccessToken(String json,String access_token,Integer expires_in) {
+	public AccessToken(String json,String access_token,Integer expires_in,Long expiredTime) {
 		this.json = json;
 		this.access_token =  access_token;
 		this.expires_in = expires_in;
-
-
-		if (expires_in != null)
-			expiredTime = System.currentTimeMillis() + ((expires_in -5) * 1000);
+		this.expiredTime=expiredTime;
 	}
 
 	public String getJson() {
@@ -72,6 +69,18 @@ public class AccessToken implements Serializable {
 		return access_token != null;
 	}
 
+	public void setAccess_token(String access_token) {
+		this.access_token = access_token;
+	}
+
+	public void setExpires_in(Integer expires_in) {
+		this.expires_in = expires_in;
+	}
+
+	public void setExpiredTime(Long expiredTime) {
+		this.expiredTime = expiredTime;
+	}
+
 
 	public void setJson(String json) {
 		this.json = json;
@@ -82,6 +91,17 @@ public class AccessToken implements Serializable {
 		return number == null ? null : number.intValue();
 	}
 
+	public String getAccessToken() {
+		return access_token;
+	}
+
+	public Integer getExpiresIn() {
+		return expires_in;
+	}
+
+	public Long getExpiredTime() {
+		return expiredTime;
+	}
 	
 	
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/model/JsTicket.java

@@ -89,5 +89,12 @@ public class JsTicket implements Serializable {
 		this.ticket = ticket;
 	}
 
+	@Override
+	public String toString() {
+		return "JsTicket [ticket=" + ticket + ", expires_in=" + expires_in + ", expiredTime=" + expiredTime + "]";
+	}
+
+
+
 
 }

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

 package com.xxfc.platform.summit.biz;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -17,7 +17,6 @@ import com.xxfc.platform.summit.pojo.ActivityBmQuery;
 import com.xxfc.platform.summit.vo.MeepoActivityVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -107,9 +106,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
         if (StringUtils.isBlank(json)){
             return  null;
         }
-        JSONObject jsonObject= JSONObject.parseObject(json);
-        BeanUtils.copyProperties(jsonObject,bm);
-        return  bm;
+        return  JSON.parseObject(json,ActivityBm.class);
     }
 
     public  ActivityBm checkUserBm(Integer meepoUserId,Integer activityId ){
@@ -186,6 +183,7 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
 
     //获取峰会活动详情
     public ObjectRestResponse  getActivityById(Integer activityId,String key,HttpServletRequest request){
+        log.info("--getActivityById---activityId==="+activityId+"----key===="+key);
         if (activityId==0||activityId==null){
             return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"参数为空");
         }
@@ -251,4 +249,5 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
     public ActivityBm userBm(ActivityBm activityBm, Integer id) {
         return null;
     }
+
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.summit.biz;
 
 
 import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -80,8 +81,11 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             userId=uses.get(0).getId();
             user.setId(userId);
         }else {
+            Long time=System.currentTimeMillis()/1000L;
             user.setWeId(weId);
             user.setRId(rId);
+            user.setCreatetime(time);
+            user.setLastjointime(time);
             insertSelective(user);
             userId=user.getId();
         }
@@ -93,8 +97,8 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             log.info("----code为空---");
             throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("code为空"));
         }
-        String openid = null;
-        String access_token = null;
+        String openid = "ohe-C0vTEyivU7MK4BKEiDq0UdW4";
+        /*String access_token = null;
         try {
             JSONObject jsonData = weixinService.getAccessToken(code);
             openid = jsonData.getString("openid");
@@ -112,15 +116,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());*/
             ActivityBm activityBm=activityBmBiz.userInfo(key);
             if (activityBm==null){
                 log.info("redis的报名信息为空");
@@ -132,9 +136,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 = userinfo_json.getString("headimgurl");
-            String sex = userinfo_json.getString("sex");
+            String nickName = "何振";//userinfo_json.getString("nickname");
+            String headimgurl = "http://thirdwx.qlogo.cn/mmopen/vi_32/X2WxAZeZlhME5RtHKA3iadPA1yGq084s59Sl0Dzana0QInaceROnto82zyNBGdQaiaQZCdBaHsjtdM0Zkob4PXMA/132";//userinfo_json.getString("headimgurl");
+            String sex =null; //userinfo_json.getString("sex");
             if (StringUtils.isBlank(sex)){
                 sex="0";
             }
@@ -166,10 +170,8 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             if (StringUtils.isBlank(frontSessionValue1)) {
                 return  null;
             }
-            JSONObject jsonObject=JSONObject.parseObject(frontSessionValue1);
-            User user=new User();
-            BeanUtils.copyProperties(jsonObject,user);
-            return user;
+            frontSessionValue1 =new String(Base64.decode(frontSessionValue1), "utf-8");
+            return JSON.parseObject(frontSessionValue1,User.class);
         }catch (Exception e){
             e.printStackTrace();
             return  null;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.summit.biz.ActivityBmBiz;
 import com.xxfc.platform.summit.biz.UserBiz;
+import com.xxfc.platform.summit.constant.RedisKey;
 import com.xxfc.platform.summit.entity.ActivityBm;
 import com.xxfc.platform.summit.entity.User;
 import com.xxfc.platform.summit.service.WXjsService;
@@ -82,10 +83,12 @@ public class WeixinController {
         log.info("-----微信回调userInfo---code=="+code+"----redirec_url==="+callback);
         try {
             String [] params=callback.split(",");
-            String key=params[1];
+            String key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
             callback=params[0];
+            log.info("-----微信回调userInfo---key=="+key+"----callback==="+callback);
             userBiz.authUser(code,key,request);
-            callback =new String(Base64.decode(callback), "utf-8");
+            //callback =new String(Base64.decode(callback), "utf-8");
+            callback+="&key="+key;
             log.info("callback===" + callback);
             return  String.format("redirect:"+callback);
         }catch (Exception e){

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -4,7 +4,6 @@ package com.xxfc.platform.summit.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import com.github.wxiaoqi.security.common.util.UserAgentUtil;
 import com.xxfc.platform.summit.biz.UserBiz;
 import com.xxfc.platform.summit.constant.RedisKey;
@@ -13,6 +12,7 @@ import com.xxfc.platform.summit.service.WeixinService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import com.alibaba.fastjson.JSONObject;
@@ -41,6 +41,9 @@ public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 	@Autowired
 	private RedisTemplate summbitRedisTemplate;
 
+	@Value("${wx.authUrl}")
+	private String  authUrl;
+
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -64,7 +67,7 @@ public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 			if (StringUtils.isNotBlank(redisKey)){
 				json.put("key",redisKey);
 			}
-			json.put("url","https://dev.dfangche.com/api/summit/auth/app/unauth/wxLogin");
+			json.put("url",authUrl);
 			result.put("data",json);
 			result.put("status",1001);
 			response.setCharacterEncoding("utf-8");

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/AccessTokenService.java

@@ -2,11 +2,7 @@ package com.xxfc.platform.summit.service;
 
 
 
-
-
-
 import com.xxfc.platform.summit.model.AccessToken;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.xxfc.platform.summit.util.HttpRequestUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +53,7 @@ public class AccessTokenService {
 		if (StringUtils.isNotBlank(accessTokenRedis))
 		{
 			JSONObject  obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid);
-			AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"));
+			AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"),obj.getLong("expiredTime"));
 			if(accessToken.isAvailable()){
 				return accessToken;
 			}
@@ -67,7 +63,7 @@ public class AccessTokenService {
 		refreshAccessToken();
 		accessTokenRedis = summbitRedisTemplate.opsForValue().get(wy_appid) == null ? "" : summbitRedisTemplate.opsForValue().get(wy_appid).toString();
 		JSONObject  obj = JSONObject.parseObject(accessTokenRedis).getJSONObject(wy_appid);
-		AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"));
+		AccessToken accessToken = new AccessToken(obj.getString("json"),obj.getString("accessToken"),obj.getInteger("expiresIn"),obj.getLong("expiredTime"));
 		return accessToken;
 		//return (AccessToken) ehcache.get(SystemConfig.WINXIN_AppID).getObjectValue();
 	}
@@ -96,7 +92,6 @@ public class AccessTokenService {
 			String json =  HttpRequestUtil.httpGet(url+"&appid="+wy_appid+"&secret="+wy_secret);
 			log.info("---json===="+json);
 			result = new AccessToken(json);
-			log.info("---result===="+result.toString());
 			if (result.isAvailable())
 				break;
 		}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/JsTicketService.java

@@ -92,7 +92,9 @@ public class JsTicketService {
 				  jsTicket = new JsTicket(json);
 					/*Element element = new Element(SystemConfig.WINXIN_AppID, jsTicket);
 					ehcache.put(element);*/
+					log.info("----jsTicket===="+jsTicket);
 				  JSONObject obj = new JSONObject();
+				  obj.put(key, jsTicket);
 				  summbitRedisTemplate.delete(key);
 				  Boolean suc=summbitRedisTemplate.opsForValue().setIfAbsent(key,  obj.toJSONString());
 				  if (suc) {
@@ -101,7 +103,7 @@ public class JsTicketService {
 			  }
 		}else{
 			  String json =  HttpRequestUtil.httpGet(apiUrl+"access_token="+ tokenService.getAccessTokenStr()+"&type="+jsApiType.name());
-			log.info("---json===="+json);
+			 log.info("---json===="+json);
 			  jsTicket = new JsTicket(json);
 				/*Element element = new Element(SystemConfig.WINXIN_AppID, jsTicket);
 				ehcache.put(element);*/
@@ -117,4 +119,5 @@ public class JsTicketService {
 	}
 
 
+
 }
\ No newline at end of file

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

@@ -9,4 +9,5 @@ public class ExcelParamDto {
     List<Object[]> data;
     String[] header;
     String name;
+    String path;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/util/excel/DownloadUtil.java

+package com.xxfc.platform.vehicle.util.excel;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+
+/***
+ * 将文件内容响应到浏览器
+ */
+public class DownloadUtil {
+
+    // 字符编码格式
+    private static String charsetCode = "utf-8";
+
+
+    /**
+     * 文件的内容类型
+     */
+    private static String getFileContentType(String name){
+        String result = "";
+        String fileType = name.toLowerCase();
+        if (fileType.endsWith(".png")) {
+            result = "image/png";
+        } else if (fileType.endsWith(".gif")) {
+            result = "image/gif";
+        } else if (fileType.endsWith(".jpg") || fileType.endsWith(".jpeg")) {
+            result = "image/jpeg";
+        } else if(fileType.endsWith(".svg")){
+            result = "image/svg+xml";
+        }else if (fileType.endsWith(".doc")) {
+            result = "application/msword";
+        } else if (fileType.endsWith(".xls")) {
+            result = "application/x-excel";
+        } else if (fileType.endsWith(".zip")) {
+            result = "application/zip";
+        } else if (fileType.endsWith(".pdf")) {
+            result = "application/pdf";
+        } else {
+            result = "application/octet-stream";
+        }
+        return result;
+    }
+
+    /**
+     * 下载文件
+     * @param path 文件的位置
+     * @param fileName 自定义下载文件的名称
+     * @param resp http响应
+     * @param req http请求
+     */
+    public static void downloadFile(String path, String fileName, HttpServletResponse resp, HttpServletRequest req){
+        File file = new File(path);
+        try {
+
+            /**
+             * 中文乱码解决
+             */
+            String type = req.getHeader("User-Agent").toLowerCase();
+            if(type.indexOf("firefox")>0 || type.indexOf("chrome")>0){
+                /**
+                 * 谷歌或火狐
+                 */
+                fileName = new String(fileName.getBytes(charsetCode), "iso8859-1");
+            }else{
+                /**
+                 * IE
+                 */
+                fileName = URLEncoder.encode(fileName, charsetCode);
+            }
+            // 设置响应的头部信息
+            resp.setHeader("content-disposition", "attachment;filename=" + fileName);
+            // 设置响应内容的类型
+            resp.setContentType(getFileContentType(fileName)+"; charset=" + charsetCode);
+            // 设置响应内容的长度
+            resp.setContentLength((int) file.length());
+            // 输出
+            outStream(new FileInputStream(file), resp.getOutputStream());
+        } catch (Exception e) {
+            System.out.println("执行downloadFile发生了异常：" + e.getMessage());
+        } finally {
+            if (file.exists()) {
+                file.delete();
+            }
+        }
+    }
+
+    /**
+     * 基础字节数组输出
+     */
+    private static void outStream(InputStream is, OutputStream os) {
+        try {
+            byte[] buffer = new byte[10240];
+            int length = -1;
+            while ((length = is.read(buffer)) != -1) {
+                os.write(buffer, 0, length);
+                os.flush();
+            }
+        } catch (Exception e) {
+            System.out.println("执行 outStream 发生了异常：" + e.getMessage());
+        } finally {
+            try {
+                os.close();
+            } catch (IOException e) {
+            }
+            try {
+                is.close();
+            } catch (IOException e) {
+            }
+        }
+    }
+
+}
\ No newline at end of file

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

@@ -149,7 +149,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
-        getupKeeps(pageDataVO.getData(), userDTO);
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
@@ -198,7 +198,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus3(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -213,7 +213,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus5(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -228,7 +228,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus7(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -239,7 +239,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
-        getupKeeps(pageDataVO.getData(), userDTO);
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
@@ -300,7 +300,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     /**
      * 获取随身物品
      */
-    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos, UserDTO userDTO) {
+    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
         for (VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
             if (vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
                 if (StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {
@@ -311,10 +311,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     }
                 }
             }
-            if (userDTO.getCompanyId() != null) {
-                BranchCompany branchCompany = branchCompanyBiz.getById(userDTO.getCompanyId());
-                if (branchCompany != null) {
-                    vehicleBookRecordVo.setUserCompanyName(branchCompany.getName());
+            if (vehicleBookRecordVo.getBookUser() != null) {
+                UserDTO userDTO = userFeign.userinfoByUid(vehicleBookRecordVo.getBookUser()).getData();
+                if(userDTO != null) {
+                    BranchCompany branchCompany = branchCompanyBiz.getById(userDTO.getCompanyId());
+                    if (branchCompany != null) {
+                        vehicleBookRecordVo.setUserCompanyName(branchCompany.getName());
+                    }
                 }
             }
         }

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

@@ -87,7 +87,6 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "59 59 23 * * ?")
     public void addAll() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -197,7 +196,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
                 tourCountRecord.setActualArrivalNum(tourArrivalList.size());
             }
             //内部用车应还车数量
-            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
             if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
                 innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
                 Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
@@ -226,6 +225,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
+    @Scheduled(cron = "0 0 2 * * ?")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -325,7 +325,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             tourCountRecord.setActualArrivalNum(tourArrivalList.size());
         }
         //内部用车应还车数量
-        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
         if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
             innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
             Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
@@ -366,7 +366,14 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
     public ObjectRestResponse export(ExcelParamDto excelParamDto) {
         ExcelExport ee1 = new ExcelExport();
         ee1.addSheetByArray(excelParamDto.getName(), excelParamDto.getData(), excelParamDto.getHeader());
-        String path = "/data/temp/"+ excelParamDto.getName() + ".xlsx";
+        Properties properties = System.getProperties();
+        String osName = properties.getProperty("os.name");
+        String path = "";
+        if(osName.contains("Windows")) {
+            path = "d://"+ excelParamDto.getName() + ".xlsx";
+        } else {
+            path = "/data/temp/"+ excelParamDto.getName() + ".xlsx";
+        }
         File file = new File(path);
         if (!file.exists()) {
             try {

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

@@ -4,12 +4,16 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleCountRecordBiz;
 import com.xxfc.platform.vehicle.entity.VehicleCountRecord;
 import com.xxfc.platform.vehicle.pojo.ExcelParamDto;
+import com.xxfc.platform.vehicle.util.excel.DownloadUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 
-@RestController
+@Controller
 @RequestMapping(value = "/vehicleCount")
 public class VehicleCountRecordController {
 
@@ -17,24 +21,26 @@ public class VehicleCountRecordController {
     VehicleCountRecordBiz vehicleCountRecordBiz;
 
     @GetMapping("/app/unauth/test")
+    @ResponseBody
     public ObjectRestResponse add() {
-        vehicleCountRecordBiz.add();
+        vehicleCountRecordBiz.addAll();
         return ObjectRestResponse.succ();
     }
 
     @GetMapping("/app/unauth/get")
+    @ResponseBody
     public ObjectRestResponse getByTypeAndDate(VehicleCountRecord vehicleCountRecord) {
         return vehicleCountRecordBiz.countDepartureVehicle(vehicleCountRecord);
     }
 
     @PostMapping("/app/unauth/export")
+    @ResponseBody
     public ObjectRestResponse export(@RequestBody ExcelParamDto excelParamDto) {
         return vehicleCountRecordBiz.export(excelParamDto);
     }
 
-    @PostMapping("/app/unauth/download")
-    public ObjectRestResponse download(@RequestBody String path, HttpServletResponse response) {
-        vehicleCountRecordBiz.download(path, response);
-        return ObjectRestResponse.succ();
+    @GetMapping("/app/unauth/download")
+    public void download(ExcelParamDto excelParamDto, HttpServletRequest request,HttpServletResponse response) {
+        DownloadUtil.downloadFile(excelParamDto.getPath(), "export.xls", response,request);
     }
 }

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

@@ -29,7 +29,7 @@
           and type = #{type}
       </if>
       <if test="startTime != null">
-          and count_date &gt;= #{startTime} and count_date &lt;= #{endTime}
+          and count_date = #{startTime}
       </if>
     </where>
     order by id DESC