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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 会员等级表
@@ -75,6 +78,9 @@ public class BaseUserMemberLevel implements Serializable {
 	@Column(name = "number")
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
-	
+
+	@Column(name = "big_icon")
+	@ApiModelProperty(value = "大图标")
+	private String bigIcon;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -83,6 +83,7 @@ public class AppUserDTO {
 	private String memberName;
 	//图标
 	private String icon;
+	private String bigIcon;
 	private Integer memberNo;
 	private Long cardLeave;
 	private Integer isBind;

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

@@ -4,10 +4,8 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDataFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.admin.vo.BaseUserMemberExportVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;

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

@@ -2,9 +2,9 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -51,4 +51,11 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        }
        return levelAndDiscountMap;
     }
+
+    public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
+        int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
+        if (affectRows==0){
+            throw new BaseException("更新会员等级失败");
+        }
+    }
 }

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

@@ -153,6 +153,7 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
+                    userDTO.setBigIcon(memberLevel.getBigIcon());
                 }
             }
         }

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

@@ -74,4 +74,9 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
         return ObjectRestResponse.succ();
     }
 
+    @PutMapping("/update")
+    public ObjectRestResponse<Void> updateMemberBaseInfo(@RequestBody BaseUserMemberLevel baseUserMemberLevel){
+        getBaseBiz().updateMemberBaseInfo(baseUserMemberLevel);
+        return ObjectRestResponse.succ();
+    }
 }

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

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;

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

@@ -254,5 +254,19 @@ public class AppUserRest {
         return ObjectRestResponse.succ();
 }
 
+    @ApiModelProperty("检查手机号验证码")
+    @GetMapping("/unauth/checkMobilecode")
+    public ObjectRestResponse checkMobilecode(@RequestParam(value = "phone") String phone,
+                                    @RequestParam(value = "mobilecode") String mobilecode){
+        if (StringUtils.isBlank(phone)||StringUtils.isBlank(mobilecode)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        String redisKey=appPermissionService.checkCodeByUsername(phone,mobilecode);
+        if (StringUtils.isBlank(redisKey)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
+        }
+        return ObjectRestResponse.succ();
+    }
+
 
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -21,4 +22,7 @@ import java.util.Set;
 public interface OrderFeign {
     @GetMapping("/baseOrder/count")
     public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight, @RequestParam("multiStatus") String multiStatus, @RequestParam("multiTypes") String multiTypes, @RequestParam("userId") Integer userId);
+
+    @GetMapping("/count/list")
+    public ObjectRestResponse<List<OrderPageVO>> getOrderList(@RequestParam("dateTime")Long dateTime, @RequestParam("type")Integer type, @RequestParam("status")Integer status);
 }

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

@@ -62,13 +62,16 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
                     orderStatistics.setBranchCompanyId(OMPANY_ID);
                     orderStatistics.setOneDay(accountList.get(0).getOneDay());
                 }
+                log.info("Members:统计完成");
                 insertSelectiveRe(orderStatistics);
+                log.info("Members:保存成功");
             }
 
             return true;
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            e.printStackTrace();
+            log.error("Members:"+ e.getMessage());
+
             return false;
         }
     }

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

@@ -31,10 +31,11 @@ public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper,
         boolean travelFlag = travelStatisticsBiz.saveDailyTravelOrderRecord();
         boolean membersFlag= membersStatisticsBiz.saveDailyMembersOrderRecord();
         if (vehicleFlag&&travelFlag&&membersFlag){
+
             log.info("----statisticalOrder:成功-----");
             return true;
         }
-        log.info("----statisticalOrder:失败-----");
+        log.info("statisticalOrder:失败!(vehicleFlag="+vehicleFlag+"/travelFlag="+travelFlag+"membersFlag="+membersFlag+")");
         return false;
     }
 

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

@@ -113,15 +113,18 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
         try {
             //获取每日订单统计
             List<DailyTravelOrderStatistics> orderStatistics = getDailyTravelOrderStatistics();
+            log.info("Travel:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyTravelOrderStatistics orderStatistic : orderStatistics) {
                     //保存统计
                     insertSelectiveRe(orderStatistic);
                 }
             }
+            log.info("Travel:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Travel:"+e.getMessage());
             return false;
         }
     }
@@ -154,7 +157,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
                     }
                     list.add(orderAccountDTO);
                 }

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

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -245,16 +246,18 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
         try {
             //获取每日订单统计
             List<DailyVehicleOrderStatistics> orderStatistics = getDailyVehicleOrderRecord();
+            log.info("Vehicle:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyVehicleOrderStatistics orderStatistic : orderStatistics) {
                     //保存统计
                     insertSelectiveRe(orderStatistic);
                 }
             }
-
+            log.info("Vehicle:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Vehicle:"+e.getMessage());
             return false;
         }
     }
@@ -292,7 +295,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
 
                     }
                     list.add(orderAccountDTO);

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

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.db.PageResult;
-import com.github.pagehelper.Page;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 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.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
 import com.xxfc.platform.order.Utils.OrderDateUtils;
 import com.xxfc.platform.order.contant.enumerate.OrderInquiryType;
 import com.xxfc.platform.order.entity.MembersOrder;
@@ -19,15 +15,14 @@ import com.xxfc.platform.order.pojo.HomePageOrderData;
 import com.xxfc.platform.order.pojo.Member;
 import com.xxfc.platform.order.pojo.MembersOrderDto;
 import com.xxfc.platform.order.pojo.OrderQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -91,7 +86,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         return result;
     }
 
-    public Object getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
+    public List<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
 
         List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
 
@@ -136,7 +131,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                     //获取今天是今年的第几周
                     time = OrderDateUtils.getTodayOfWeek();
                 }
-               Integer  thisYear =OrderDateUtils.getThisYear();
+                Integer thisYear = OrderDateUtils.getThisYear();
                 if (OrderInquiryType.MONTH.getCode().equals(query.getType())) {
                     startDay = OrderDateUtils.getFirstDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
                     endDay = OrderDateUtils.getLastDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
@@ -148,7 +143,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                     startDay = OrderDateUtils.timeStampConversionToString(query.getStartTime());
                 }
                 //获取当前的年.周(年.月)小数
-                double today=Double.parseDouble(thisYear+"."+time);
+                double today = Double.parseDouble(thisYear + "." + time);
 
                 if (i == (membersOrderList.size() - 1)) {
                     //查询到的最后一条数据年.周(年.月)小数
@@ -177,7 +172,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
         //进行分页处理
 
-           return    arrayList;
+        return arrayList;
 
 //        return pagingProcessing(query, arrayList);
 
@@ -193,16 +188,54 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
     private void TotalPaymentAndMemberName(HashMap<Integer, String> map, MembersOrder mb, MembersOrderDto mbdto) {
 
-        BigDecimal totalPayment =BigDecimal.ZERO;
+        BigDecimal totalPayment = BigDecimal.ZERO;
         List<Member> members = mb.getMembers();
         //设置时间段购买会员总金额和不同的会员名称
         if (CollectionUtil.isNotEmpty(members)) {
             mbdto.setMembers(members);
             for (Member member : members) {
                 member.setMemberName(map.get(member.getLevel()));
-                totalPayment = totalPayment.add(member.getAmount()==null?BigDecimal.ZERO:member.getAmount());
+                totalPayment = totalPayment.add(member.getAmount() == null ? BigDecimal.ZERO : member.getAmount());
             }
         }
         mbdto.setTotalPayment(totalPayment);
     }
+
+    public Object downloadExcel() {
+
+
+        return null;
+    }
+
+    public List<HashMap<Object, Object>> getRows(List<MembersOrderDto> list, List<BaseUserMemberLevel> memberLevels) {
+        ArrayList<HashMap<Object, Object>> rows = Lists.newArrayList();
+        for (MembersOrderDto membersOrderDto : list) {
+            if (CollectionUtils.isEmpty(membersOrderDto.getMembers())) {
+                continue;
+            }
+            HashMap<Object, Object> map = Maps.newLinkedHashMap();
+            map.put("时间", membersOrderDto.getTimeSlot());
+            for (BaseUserMemberLevel memberLevel : memberLevels) {
+                setMap(membersOrderDto, map, memberLevel);
+            }
+            map.put("总支付金额", membersOrderDto.getTotalPayment());
+            rows.add(map);
+        }
+
+
+        return rows;
+    }
+
+    private void setMap(MembersOrderDto membersOrderDto, HashMap<Object, Object> map, BaseUserMemberLevel memberLevel) {
+
+        List<Member> collect = membersOrderDto.getMembers().parallelStream().filter(el -> el.getLevel().equals(memberLevel.getLevel())).collect(Collectors.toList());
+        int number = 0;
+        BigDecimal amount = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(collect)) {
+            number = collect.get(0).getNumber();
+            amount = collect.get(0).getAmount();
+        }
+        map.put(memberLevel.getName() + "购买量", number);
+        map.put("支付金额(" + memberLevel.getName() + ")",amount);
+    }
 }

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

+package com.xxfc.platform.order.biz.rpc;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+@Service
+public class OrderListBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
+
+    /**
+     *
+     * @param dateTime 筛选的时间
+     * @param type 筛选的类型， 1，租车，2，旅游
+     * @return
+     */
+    public ObjectRestResponse<List<OrderPageVO>> getOrderList(Long dateTime, Integer type, Integer status) {
+           Map<String, Object> map = new HashMap<>();
+            if (dateTime != null) {
+                map.put("startTime", getDayStart(dateTime));
+                map.put("endTime", getDayStart(dateTime) + 3600 * 24 * 1000);
+            }
+            map.put("status", status);
+            if (type == OrderTypeEnum.RENT_VEHICLE.getCode()) { //租车
+                List<OrderPageVO> list = mapper.selectAllRentVehicleOrder(map);
+                return ObjectRestResponse.succ(list);
+            } else if (type == OrderTypeEnum.TOUR.getCode()) {
+                List<OrderPageVO> list = mapper.selectAllTourOrder(map);
+                return ObjectRestResponse.succ(list);
+            } else {
+                return ObjectRestResponse.succ();
+            }
+
+        }
+
+    public static Long getDayStart(Long datetime) {
+        long current = datetime;
+        long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        return zero;
+    }
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

@@ -28,4 +28,8 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	public OrderPageVO getOrderDetail(String no);
 
+	public List<OrderPageVO> selectAllRentVehicleOrder(Map<String, Object> paramMap);
+
+	public List<OrderPageVO> selectAllTourOrder(Map<String, Object> paramMap);
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderListController.java

+package com.xxfc.platform.order.rest.background;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.order.biz.rpc.OrderListBiz;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+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 java.util.List;
+
+@RestController
+@RequestMapping(value = "/count")
+public class OrderListController {
+
+    @Autowired
+    OrderListBiz orderListBiz;
+
+    @GetMapping("/list")
+    public ObjectRestResponse<List<OrderPageVO>> getOrderList(@RequestParam("dateTime")Long dateTime, @RequestParam("type")Integer type, @RequestParam("status")Integer status) {
+        return orderListBiz.getOrderList(dateTime, type, status);
+    }
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

 package com.xxfc.platform.order.rest.background;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -9,22 +13,30 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.order.pojo.MembersOrderDto;
 import com.xxfc.platform.order.pojo.OrderQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Array;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,6 +52,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     @Autowired
     private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    private HttpServletResponse response;
     /**
      * 租车订单
      */
@@ -135,14 +150,41 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     @PostMapping("/order")
     @ApiOperation(value = "会员统计")
-    public ObjectRestResponse getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
+    public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
 
         //获取会员等级信息
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();
         //获取会员订单统计信息
-        return ObjectRestResponse.succ( baseBiz.getMemberOrderStatistics(memberLevels,query));
-
+        return ObjectRestResponse.succ(baseBiz.getMemberOrderStatistics(memberLevels, query));
     }
 
 
+    @PostMapping("/excel")
+    @ApiOperation(value = "下载excel表")
+    public void downloadExcel(@RequestBody OrderQuery query) throws Exception {
+
+        // 通过工具类创建writer，默认创建xls格式
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        List<BaseUserMemberLevel> memberLevels = userFeign.levels();
+        List<MembersOrderDto> list = baseBiz.getMemberOrderStatistics(memberLevels, query);
+        List<HashMap<Object, Object>> rows =baseBiz.getRows(list,memberLevels);
+
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(rows, true);
+        //out为OutputStream，需要写出到的目标流
+
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=hwddtj.xls");
+        ServletOutputStream out = response.getOutputStream();
+
+        writer.flush(out, true);
+        // 关闭writer，释放内存
+        writer.close();
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+
+
+    }
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -130,9 +130,6 @@
                 </foreach>
 
             </if>
-            <if test="userId != null">
-                and b.user_id = #{userId}
-            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>
@@ -260,5 +257,26 @@
         where no = #{no}
     </select>
 
+    <select id="selectAllRentVehicleOrder" parameterType="Map" resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
+        where b.type = 2 and b.status &gt;= 4
+        <if test="startTime != null and status == 1">
+            and r.start_time between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and status == 2">
+            and r.start_time between #{startTime} and #{endTime}
+        </if>
+    </select>
 
+    <select id="selectAllTourOrder" parameterType="Map"  resultMap="orderPageMap">
+        select b.*
+        from base_order b
+        LEFT JOIN order_tour_detail r on r.order_id = b.id
+        where b.type = 2 and b.status &gt;= 4
+        <if test="startTime != null">
+            and r.start_time between #{startTime} and #{endTime}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -41,48 +41,52 @@
 
     <select id="getMemberOrderStatistics" parameterType="com.xxfc.platform.order.pojo.OrderQuery"
             resultMap="order">
-    SELECT
-    <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
-    </if>
-    <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
-    </if>
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ) AS period,
-	count( a.id ) AS number,
-	SUM( a.account_amount ) AS amount,
-	d.member_level AS level
-    FROM
-	order_account a
-	LEFT JOIN base_order b ON a.order_id = b.id
-	LEFT JOIN order_member_detail d ON d.order_id = b.id
-    WHERE
-	a.account_status = 1
-	AND a.account_type = 101
-	AND b.type = 3
-	<if test="startTime != null">
-        AND a.crt_time &gt;= #{startTime}
-    </if>
-    <if test="endTime != null">
-        AND  a.crt_time &lt;= #{endTime}
-    </if>
-    GROUP BY
-    <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
-    </if>
-    <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
-    </if>
+        SELECT
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v') AS period,
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m') AS period,
+        </if>
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ) AS period,
+        </if>
+        count( a.id ) AS number,
+        SUM( a.account_amount ) AS amount,
+        d.member_level AS level
+        FROM
+        order_account a
+        LEFT JOIN base_order b ON a.order_id = b.id
+        LEFT JOIN order_member_detail d ON d.order_id = b.id
+        WHERE
+        a.account_status = 1
+        AND a.account_type = 101
+        AND b.type = 3
+        <if test="startTime != null">
+            AND a.crt_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND a.crt_time &lt;= #{endTime}
+        </if>
+        GROUP BY
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v'),
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m'),
+        </if>
 
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ),
-	d.member_level
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ),
+        </if>
+        d.member_level
     </select>
     <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">
-        <result column="period"  property="period"></result>
-         <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
-             <result column="number"  property="number"></result>
-             <result column="amount"  property="amount"></result>
-             <result column="level"  property="level"></result>
-         </collection>
+        <result column="period" property="period"></result>
+        <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
+            <result column="number" property="number"></result>
+            <result column="amount" property="amount"></result>
+            <result column="level" property="level"></result>
+        </collection>
     </resultMap>
 </mapper>
\ No newline at end of file

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

@@ -80,6 +80,11 @@ public class Activity {
     @ApiModelProperty("活动场地（地址格式）")
     private String address;
 
+    @Column(name = "address_img")
+    @ApiModelProperty("地址图片")
+    private String addressImg;
+
+
     @Column(name = "latitude")
     @ApiModelProperty("纬度（不展示")
     private BigDecimal latitude;
@@ -88,9 +93,6 @@ public class Activity {
     @ApiModelProperty("经度 （不展示）")
     private BigDecimal longitude;
 
-    @Column(name = "content")
-    @ApiModelProperty("活动图文内容")
-    private String content;
 
     @Column(name = "is_show")
     @ApiModelProperty("活动开关（1开，0关）")
@@ -108,10 +110,22 @@ public class Activity {
     @ApiModelProperty("0-默认；1-报名中，2-进行中；3-已结束")
     private Integer status;
 
+    @Column(name = "content")
+    @ApiModelProperty("活动图文内容（峰会主题）")
+    private String content;
+
     @Column(name = "act_desc")
-    @ApiModelProperty("活动对象说明（不展示）")
+    @ApiModelProperty("活动对象说明（诚邀莅临）")
     private String actDesc;
 
+    @Column(name = "company_desc")
+    @ApiModelProperty("公司简章")
+    private String companyDesc;
+
+    @Column(name = "vehicle_imgs")
+    @ApiModelProperty("房车介绍")
+    private String vehicleImgs;
+
     @Column(name = "process_json")
     @ApiModelProperty("活动流程")
     private String processJson;

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

@@ -24,13 +24,14 @@ public class ActivityShow {
     @ApiModelProperty("活动id")
     private Integer activityId;
 
-    @Column(name = "type")
-    @ApiModelProperty("1-图片；2-视频")
-    private Integer type;
 
-    @Column(name = "path")
-    @ApiModelProperty("图片或视频路径")
-    private String path;
+    @Column(name = "video_path")
+    @ApiModelProperty("视频路径(逗号分割)")
+    private String videoPath;
+
+    @Column(name = "picture_path")
+    @ApiModelProperty("图片路径(逗号分割)")
+    private String picturePath;
 
     @Column(name = "crt_time")
     @ApiModelProperty("创建时间")
@@ -41,4 +42,6 @@ public class ActivityShow {
     private Integer isDel;
 
 
+
+
 }

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

@@ -13,6 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,21 +42,20 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
             criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
         }
         if (query.getStartTime() != null) {
-            criteria.andLike("startTime", query.getStartTime() / 1000 + "%");
+            criteria.andLike("startTime", query.getStartTime()/(1000*60*60)+"%");
         }
         if (query.getStatus() != null) {
             criteria.andEqualTo("status", query.getStatus());
         }
 
-
         if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
             criteria.andEqualTo("isPublish", PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
 
-        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
-            return mapper.selectByExample(exa);
-        }
+//        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
+////            return mapper.selectByExample(exa);
+////        }
 
 
         PageHelper.startPage(query.getPage(), query.getLimit());

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

@@ -24,7 +24,9 @@ public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
     private ActivityBiz activityBiz;
 
     public ActivityShowDto getOne(Integer activityId) {
-       return mapper.getOne(activityId);
+        ActivityShow activityShow = new ActivityShow();
+        activityShow.setActivityId(activityId);
+        return mapper.getOne(activityId);
     }
 
     @Transactional(rollbackFor = Exception.class)

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/WebConfiguration.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.summit.config;
 
 
 import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
-import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceoptor;
+import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,8 +27,8 @@ public class WebConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    WeChatH5LoginInterceoptor  getWeChatH5LoginRestInterceptor() {
-        return new WeChatH5LoginInterceoptor();
+    WeChatH5LoginInterceptor getWeChatH5LoginRestInterceptor() {
+        return new WeChatH5LoginInterceptor();
     }
 
     /**
@@ -38,7 +38,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
-                "/activity/**"
+                "/auth/activity/**"
         };
         Collections.addAll(list, urls);
         return list;

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

@@ -5,6 +5,8 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.pojo.ActivityQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -12,16 +14,19 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/activity")
+@Api(tags = "峰会")
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
 
     @PostMapping("/app/unauth/list")
+    @ApiOperation(value = "峰会列表",notes = "峰会列表")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
         return ObjectRestResponse.succ(baseBiz.getList(query));
     }
 
     @Override
     @PutMapping ("/update")
+    @ApiOperation(value = "修改",notes = "修改")
     public ObjectRestResponse update(@RequestBody Activity activity ){
         if (baseBiz.update(activity)) {
             return ObjectRestResponse.succ();
@@ -31,6 +36,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
     @Override
     @PostMapping("/add")
+    @ApiOperation(value = "添加",notes = "添加")
     public ObjectRestResponse add(@RequestBody Activity activity ){
         if (baseBiz.add(activity)) {
             return ObjectRestResponse.succ();

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

@@ -17,8 +17,7 @@ import org.springframework.web.bind.annotation.*;
 public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> {
     @GetMapping("/one/{activityId}")
     public ObjectRestResponse getOne(@PathVariable Integer activityId){
-
-      return ObjectRestResponse.succ( baseBiz.getOne(activityId));
+      return ObjectRestResponse.succ(baseBiz.getOne(activityId));
     }
 
 
@@ -29,4 +28,6 @@ public class ActivityShowController extends BaseController<ActivityShowBiz, Acti
          }
          return ObjectRestResponse.createDefaultFail();
     }
+
+
 }

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

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Slf4j
-public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
+public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 
 
 	@Autowired

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityShowMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.xxfc.platform.summit.mapper.ActivityShowMapper">
-    <select id="getOne" parameterType="Integer" resultType="com.xxfc.platform.summit.entity.ActivityShow">
+    <select id="getOne" parameterType="Integer" resultType="com.xxfc.platform.summit.dto.ActivityShowDto">
       	 SELECT
 	    	a.banner,
 	    	s.*

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -184,7 +184,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         criteria.andEqualTo("isShow", 1);
         //位置
         criteria.andIn("location", Arrays.asList(location, 0));
-        criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
+    //    criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
 
         List<SummitActivity> summitActivities = mapper.selectByExample(example);
 

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

@@ -55,7 +55,7 @@ public class SummitActivityController {
     @GetMapping("/list")
     public ObjectRestResponse<PageDataVO<SummitActivityVo>> findSummitActivityWithPage(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
                                                                                       @RequestParam(value = "limit", defaultValue = "6", required = false) Integer limit,
-                                                                                      @RequestParam(value = "location", defaultValue = "0", required = false) Integer location,
+                                                                                      @RequestParam(value = "location", defaultValue = "1", required = false) Integer location,
                                                                                        @RequestParam(value = "title",required = false) String title) {
         PageDataVO<SummitActivityVo> pageDataVO = summitActivityBiz.findSummitActivityWithPage(page, limit,location,title);
         return ObjectRestResponse.succ(pageDataVO);

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/enumerate/FileTypeEnum.java

@@ -8,7 +8,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public enum FileTypeEnum {
     FILE_TYPE_ZIP("application/zip", ".zip"),
-    FILE_TYPE_RAR("application/octet-stream", ".rar");
+    FILE_TYPE_RAR("application/octet-stream", ".rar"),
+    FILE_TYPE_X_ZIP("application/x-zip-compressed", ".zip");
+
     public String type;
     public String fileStufix;
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java

@@ -8,6 +8,7 @@ import com.xxfc.platform.universal.dto.ImgDTO;
 import com.xxfc.platform.universal.dto.UploadImgDTO;
 import com.xxfc.platform.universal.service.FileUploadService;
 import com.xxfc.platform.universal.service.UploadService;
+import com.xxfc.platform.universal.service.UploadZipService;
 import com.xxfc.platform.universal.utils.ImgBase64Util;
 import com.xxfc.platform.universal.utils.PublicMsg;
 import com.xxfc.platform.universal.vo.Ueditor;
@@ -38,10 +39,12 @@ import java.util.Map;
 @Slf4j
 public class UploadController{
 
-       @Autowired
-       UploadService uploadService;
-        @Autowired
-        FileUploadService fileUploadService;
+    @Autowired
+    UploadService uploadService;
+    @Autowired
+    FileUploadService fileUploadService;
+    @Autowired
+    UploadZipService uploadZipService;
 
       private static Integer MAX_DRIVING_LICENSE_SIZE = 10 * 1024 * 1024;//10M
 
@@ -177,5 +180,12 @@ public class UploadController{
             @RequestParam(value = "prefix",defaultValue = "renovate")String prefix) throws Exception {
         return fileUploadService.handlerUpload(upfile,null,prefix);
     }
+
+    @PostMapping(value="/app/unauth/pictureZip")
+    public ObjectRestResponse pictureZip(
+            @RequestBody MultipartFile file,
+            @RequestBody String password) throws Exception {
+        return uploadZipService.uploadPictureZip(file,password);
+    }
 }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadZipService.java

+package com.xxfc.platform.universal.service;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import net.lingala.zip4j.exception.ZipException;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public interface UploadZipService {
+    ObjectRestResponse uploadPictureZip(MultipartFile file, String password) throws IOException;
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/FileUploadServiceImpl.java

@@ -29,6 +29,8 @@ public class FileUploadServiceImpl  implements FileUploadService {
 
     private static final String APK_SUFFIX=".apk";
     private static final String APK_NAME="xxfc.apk";
+    private static final String JPG=".jpg";
+    private static final String PNG=".png";
 
     @Override
     public ObjectRestResponse handlerUpload(MultipartFile zipFile,String password,String prefix)throws Exception {
@@ -100,7 +102,4 @@ public class FileUploadServiceImpl  implements FileUploadService {
         zin.closeEntry();
         return path;
     }
-
-
-
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java

+package com.xxfc.platform.universal.service.impl;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.universal.constant.enumerate.FileTypeEnum;
+import com.xxfc.platform.universal.service.UploadZipService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.Enumeration;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+@Slf4j
+@Service
+public class UploadZipServiceImpl implements UploadZipService {
+
+    @Value("${universal.uploadPath}")
+    private String uploadPath ;
+    @Value("${universal.url}")
+    private String xx_url ;
+
+    private static final String APK_SUFFIX=".apk";
+    private static final String APK_NAME="xxfc.apk";
+    private static final String JPG=".jpg";
+    private static final String PNG=".png";
+
+    @Override
+    public ObjectRestResponse uploadPictureZip(MultipartFile file, String password) throws IOException {
+        if (Objects.isNull(file)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"请上传压缩文件!");
+        }
+
+        String fileContentType = file.getContentType();
+        //将压缩包保存在指定路径
+        String packFilePath = uploadPath + File.separator + file.getName();
+        if (FileTypeEnum.FILE_TYPE_ZIP.type.equals(fileContentType)||FileTypeEnum.FILE_TYPE_X_ZIP.type.equals(fileContentType)) {
+            //zip解压缩处理
+            packFilePath += FileTypeEnum.FILE_TYPE_ZIP.fileStufix;
+        } else {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"上传的压缩包格式不正确,仅支持zip压缩文件!");
+        }
+        File fi = new File(packFilePath);
+        try {
+            file.transferTo(fi);
+        } catch (IOException e) {
+            log.error("zip file save to " + uploadPath + " error", e.getMessage(), e);
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"保存压缩文件到:" + uploadPath + " 失败!");
+        }
+            //zip压缩包
+        return   unPackZip(fi, password, uploadPath);
+
+    }
+
+    public ObjectRestResponse unPackZip(File file, String password, String destPath) throws IOException  {
+        ZipFile zipFile = new ZipFile(file);
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements()) {
+            ZipEntry entry = entries.nextElement();
+            if (entry.isDirectory()) {
+                 destPath =destPath+File.separator+ entry.getName();
+                File dir = new File(destPath);
+                dir.mkdir();
+            }else {
+
+            }
+
+
+        }
+
+       return null;
+    }
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/VehicleCountType.java

+package com.xxfc.platform.vehicle.constant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum VehicleCountType {
+        RENT_VEHICLE(1, "租车用车"),
+        TOUR(2, "旅游用车"),
+        INNER(3, "内部用车"),
+        ;
+        /**
+         * 编码
+         */
+        private Integer code;
+        /**
+         * 类型描述
+         */
+        private String desc;
+
+        public static Map<Integer, VehicleCountType> codeAndDesc = new HashMap<Integer, VehicleCountType>();
+        //Maps.newHashMap();
+
+        static{
+            for(VehicleCountType enumE : VehicleCountType.values()){
+                codeAndDesc.put(enumE.getCode(), enumE);
+            }
+        }
+
+    VehicleCountType(Integer code, String desc){
+            this.code=code;
+            this.desc=desc;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public void setCode(Integer code) {
+            this.code = code;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+
+        public static Boolean exists(Integer code){
+            return codeAndDesc.containsKey(code);
+        }
+
+        public static VehicleCountType get(Integer code) {
+            for(VehicleCountType enumE : VehicleCountType.values()) {
+                if (enumE.getCode().equals(code)) {
+                    return enumE;
+                }
+            }
+            return null;
+        }
+}

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

+package com.xxfc.platform.vehicle.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "vehicle_count_record")
+@Data
+public class VehicleCountRecord {
+    @Id
+    private Integer id;
+
+    private Integer type;
+
+    /**
+     * 应出车数量
+     */
+    @Column(name = "departure_num")
+    private Integer departureNum;
+
+    /**
+     * 实际出车数量
+     */
+    @Column(name = "actual_departure_num")
+    private Integer actualDepartureNum;
+
+    /**
+     * 延期交车数量
+     */
+    @Column(name = "after_departure_num")
+    private Integer afterDepartureNum;
+
+    /**
+     * 提前交车数
+     */
+    @Column(name = "before_departure_num")
+    private Integer beforeDepartureNum;
+
+    /**
+     * 应还车数量
+     */
+    @Column(name = "arrival_num")
+    private Integer arrivalNum;
+
+    /**
+     * 未提前还车数量
+     */
+    @Column(name = "actual_arrival_num")
+    private Integer actualArrivalNum;
+
+    /**
+     * 延后还车数量
+     */
+    @Column(name = "after_arrival_num")
+    private Integer afterArrivalNum;
+
+    /**
+     * 提前还车数量
+     */
+    @Column(name = "before_arrival_num")
+    private Integer beforeArrivalNum;
+
+    /**
+     * 统计日期 yyyy-MM-dd
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    private Date countDate;
+
+    @Transient
+    private String startTime;
+
+    @Transient
+    private String endTime;
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExcelParamDto {
+    List<Object[]> data;
+    String[] header;
+    String name;
+    String path;
+}

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

@@ -40,4 +40,7 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
 
     List<VehicleUpkeepItem> vehicleUpkeepItems;
 
+    private String userCompanyName;
+
+
 }

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/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>xx-universal-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-order-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -311,10 +311,24 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     }
                 }
             }
+            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());
+                    }
+                }
+            }
         }
         return vehicleBookRecordVos;
     }
 
+    public ObjectRestResponse<List<VehicleBookRecordVo>> selectByIds(List<Long> ids) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("ids", ids);
+        return ObjectRestResponse.succ(mapper.selectByIds(map));
+    }
 
     public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception {
         Map<String, Object> params = PropertyUtils.describe(liftVehicleVo);
@@ -499,6 +513,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     }
 
+    public ObjectRestResponse<List<VehicleBookRecordVo>> selectAllBookRecord(Date startTime, Date endTime, Integer status) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        map.put("status", status);
+        return ObjectRestResponse.succ(mapper.selectAllBookRecord(map));
+    }
 
     /**
      * 获取上月数据，并复制到历史表

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

@@ -40,4 +40,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
 
     public List<VehicleBookRecordVo> selectZeroHourRecord(Map<String, Object> param);
 
+    public List<VehicleBookRecordVo> selectAllBookRecord(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectByIds(Map<String, Object> param);
 }
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleCountRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface VehicleCountRecordMapper extends Mapper<VehicleCountRecord> {
+    List<VehicleCountRecord> countDepartureVehicle(VehicleCountRecord vehicleCountRecord);
+
+    List<VehicleCountRecord> selectByTypeAndTime(Map<String, Object> param);
+}
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.rest;
+
+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;
+
+@Controller
+@RequestMapping(value = "/vehicleCount")
+public class VehicleCountRecordController {
+
+    @Autowired
+    VehicleCountRecordBiz vehicleCountRecordBiz;
+
+    @GetMapping("/app/unauth/test")
+    @ResponseBody
+    public ObjectRestResponse add() {
+        vehicleCountRecordBiz.add();
+        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);
+    }
+
+    @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/builder/generatorConfig.xml

@@ -15,7 +15,7 @@
         </plugin>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://10.5.52.3:3306/vehicle?useUnicode=true&amp;characterEncoding=UTF8"
+                        connectionURL="jdbc:mysql://10.5.52.3:3306/xxfc_vehicle?useUnicode=true&amp;characterEncoding=UTF8"
                         userId="root"
                         password="sslcloud123*()">
         </jdbcConnection>
@@ -37,7 +37,7 @@
 <!--        </table>-->
 <!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
 <!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
-        <table tableName="vehicle_book_hour_info" domainObjectName="VehicleBookHourInfo"></table>
+        <table tableName="vehicle_count_record" domainObjectName="VehicleCountRecord"></table>
 <!--        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
     </context>
 </generatorConfiguration>
\ No newline at end of file

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

@@ -516,6 +516,26 @@
         order by create_time DESC
     </select>
 
+    <select id="selectAllBookRecord" resultMap="searchBookRecord" parameterType="Map">
+        select v1.* from vehicle_book_record v1
+        where v1.status not in (4,6,7,3)
+        <if test="startTime != null and status == 1">
+            and v1.book_start_date between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and status == 2">
+            and v1.book_end_date between #{startTime} and #{endTime}
+        </if>
+    </select>
+    <select id="selectByIds" resultMap="searchBookRecord" parameterType="Map">
+        select v1.* from vehicle_book_record v1
+        where v1.status not in (4,6,7,3)
+        <if test="ids != null and ids.size > 0">
+            and v1.id in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 
     <insert id="createTbIfNotExists" parameterType="java.lang.String">
     CREATE TABLE IF NOT EXISTS ${_parameter} (

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleCountRecordMapper" >
+  <resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.VehicleCountRecord" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="INTEGER" />
+    <result column="departure_num" property="departureNum" jdbcType="INTEGER" />
+    <result column="actual_departure_num" property="actualDepartureNum" jdbcType="INTEGER" />
+    <result column="after_departure_num" property="afterDepartureNum" jdbcType="INTEGER" />
+    <result column="before_departure_num" property="beforeDepartureNum" jdbcType="INTEGER" />
+    <result column="arrival_num" property="arrivalNum" jdbcType="INTEGER" />
+    <result column="actual_arrival_num" property="actualArrivalNum" jdbcType="INTEGER" />
+    <result column="after_arrival_num" property="afterArrivalNum" jdbcType="INTEGER" />
+    <result column="before_arrival_num" property="beforeArrivalNum" jdbcType="INTEGER" />
+    <result column="count_date" property="countDate" jdbcType="DATE"/>
+  </resultMap>
+
+  <select id = "countDepartureVehicle" parameterType = "com.xxfc.platform.vehicle.entity.VehicleCountRecord" resultMap = "BaseResultMap">
+    select * from vehicle_count_record where count_date = #{time}
+  </select>
+
+  <select id="selectByTypeAndTime" parameterType = "Map" resultType="com.xxfc.platform.vehicle.entity.VehicleCountRecord">
+    select * from vehicle_count_record
+    <where>
+      <if test="type != null">
+          and type = #{type}
+      </if>
+      <if test="startTime != null">
+          and count_date &gt;= #{startTime} and count_date &lt;= #{endTime}
+      </if>
+    </where>
+    order by id DESC
+  </select>
+
+</mapper>
\ No newline at end of file