Merge branch 'master' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/XxLogInterceptor.java

@@ -3,9 +3,7 @@ package com.github.wxiaoqi.security.common.log;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.log.CommonLogService;
 import com.github.wxiaoqi.security.common.log.entity.XxLogEntity;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -16,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -36,7 +33,7 @@ public class XxLogInterceptor{
     CommonLogService commonLogService;
 
     //触发条件为：com.xxfc.platform包下面所有controller
-    @Around("within(com.xxfc.platform.*.rest..* || com.xxfc.platform.*.controller..*)")
+    @Around("within(com.xxfc.platform.*.rest..* || com.xxfc.platform.*.controller..* || com.github.wxiaoqi.security.admin.rest..* || com.github.wxiaoqi.security.admin.rest..*)")
     public Object doAroundXxControllerLog(ProceedingJoinPoint pjp) throws Throwable {
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = servletRequestAttributes.getRequest();//获取request
@@ -60,6 +57,7 @@ public class XxLogInterceptor{
         try{
             //###################上面代码为方法执行前#####################
             result  = pjp.proceed();//执行方法，获取返回参数
+            log.info("接口调用返回：{}", xxLogEntity.toString());
             //###################下面代码为方法执行后#####################
             if(result instanceof JSONObject) {
                 commonLogService.initCommonLogLastPart(xxLogEntity, ((JSONObject) result).toJSONString());

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

@@ -95,4 +95,11 @@ public class AppUserDTO {
 	private Boolean isBindQQ;
     //用户上线
     private Integer  parentId;
+
+     //用户上线身份id
+	private Integer  parentPositionId;
+	//用户上线记录id
+	private Integer  parentPositionTempId;
+	//用户分公司id
+	private Integer  parentCompanyId;
 }

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

@@ -23,7 +23,10 @@ import tk.mybatis.spring.annotation.MapperScan;
  */
 @EnableDiscoveryClient
 @EnableCircuitBreaker
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.github.wxiaoqi.security.common.log",
+        "com.github.wxiaoqi.security.admin"
+})
 @EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableScheduling
 @EnableAceAuthClient

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

@@ -334,5 +334,15 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         }
     }
 
+    public  AppUserPositionTemp getOne(Integer userId){
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
+        List<AppUserPositionTemp> list=selectByExample(example);
+        if (list.size()>0){
+            return  list.get(0);
+        }
+        return null;
+    }
+
 
 }

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

@@ -3,9 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
@@ -20,7 +18,6 @@ import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
@@ -57,6 +54,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     @Value("${admin.validTime}")
     private  Long  validTime;
 
+    @Autowired
+    private  AppUserPositionTempBiz positionTempBiz;
+
     /**
      * 关系绑定
      * 规则A->B (B无有效上线+无有效下线)
@@ -369,6 +369,15 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             parentId=relation.getParentId();
         }
         userDTO.setParentId(parentId);
+        if (parentId!=null&&parentId>0){
+           AppUserPositionTemp positionTemp= positionTempBiz.getOne(parentId);
+           if (positionTemp!=null){
+               userDTO.setParentPositionId(positionTemp.getPositionId());
+               userDTO.setParentPositionTempId(positionTemp.getId());
+               userDTO.setParentCompanyId(positionTemp.getCompanyId());
+           }
+        }
+
     }
 }
 

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

@@ -342,7 +342,7 @@ public class AppUserController extends CommonBaseController{
     }
 
     @PostMapping("/bind")
-    private ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO, HttpServletRequest request){
+    public ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO, HttpServletRequest request){
          try {
              IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/CrosstownTypeEnum.java

@@ -7,7 +7,7 @@ public enum CrosstownTypeEnum {
     DEPARTURE(1, "交车"),
     ARRIVE(2, "还车"),
     FIXED_LOSS(3, "定损"),
-    FIXED_LOSS_NOW(4, "定损"),
+    FIXED_LOSS_NOW(4, "立即定损"),
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -309,16 +309,23 @@ public class BaseOrder implements Serializable {
 	private Integer remark;
 
 	/**
-	 * 备注
+	 * 上级id
 	 */
 	@ApiModelProperty(value = "上级id")
 	@Column(name = "parent_user_id")
 	private Integer parentUserId;
 
 	/**
-	 * 备注
+	 * 上级公司id
 	 */
-	@ApiModelProperty(value = "备注")
+	@ApiModelProperty(value = "上级公司id")
 	@Column(name = "parent_user_company_id")
 	private Integer parentUserCompanyId;
+
+	/**
+	 * 上级公司员工id
+	 */
+	@ApiModelProperty(value = "上级公司员工id")
+	@Column(name = "parent_position_id")
+	private Integer parentPositionId;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

@@ -41,4 +41,7 @@ public class BgOrderListVo {
 	private Integer vehicleCode;
 
 	private Integer userId;
+
+	//员工身份
+	private String positionName;
 }

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

@@ -298,7 +298,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             } catch (Exception e) {
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
-        } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
+        } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //还车
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -101,6 +101,8 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
 
         //设置上级
         baseOrder.setParentUserId(appUserDTO.getParentId());
+        baseOrder.setParentUserCompanyId(appUserDTO.getParentCompanyId());
+        baseOrder.setParentPositionId(appUserDTO.getParentPositionTempId());
 
         return baseOrder;
     }

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

@@ -241,85 +241,58 @@
 
     </select>
     <select id="getAllOrderList" parameterType="Map" resultType="com.xxfc.platform.order.pojo.bg.BgOrderListVo">
-        SELECT
-        DISTINCT(b1.id),
-        bc1.`name` AS startCompanyName,
-        bc2. NAME AS endCompanyName,
-        v1.number_plate AS numberPlate,
-        v1.code AS vehicleCode,
-        a1. NAME AS username,
-        a2.username AS telephone,
-        a2.id As userId,
-        b1.id AS orderId,
-        b1.`no` AS orderNo,
-        b1.`status` as status,
-        b1.`name` as vehicleName,
-        b1.crt_time as crtTime,
-        o1.start_time as startTime,
-        o1.end_time as endTime,
-        b1.real_amount as realAmount,
-        b1.pay_way as payWay,
-        o1.id as detailId,
-        b1.pay_time as payTime
-        FROM
-        base_order b1
-        LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id
-        LEFT JOIN vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
-        LEFT JOIN vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
-        LEFT JOIN vehicle.vehicle v1 ON v1.id = o1.vehicle_id
-        LEFT JOIN xxfc_third_platform.id_information a1 ON b1.user_id = a1.user_login_id
-        LEFT JOIN ag_admin_v1.app_user_login a2 ON a2.id = b1.user_id
+        SELECT * from order_list_info
         <where>
             <if test="userIds != null and userIds.size() > 0">
-                and b1.user_id in
+                and userId in
                 <foreach collection="userIds" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="phone != null and phone != ''">
-                and a2.username like CONCAT ("%", #{phone}, "%")
+                and telephone like CONCAT ("%", #{phone}, "%")
             </if>
             <if test="realName != null and realName != ''">
-                and a1.name like CONCAT ("%", #{realName}, "%")
+                and username like CONCAT ("%", #{realName}, "%")
             </if>
             <if test="userId != null">
-                and b1.user_id = #{userId}
+                and userId = #{userId}
             </if>
             <if test="status != null">
-                and b1.status = #{status}
+                and status = #{status}
             </if>
             <if test="type != null">
-                and b1.type = #{type}
+                and type = #{type}
             </if>
             <if test="no != null and no != '' ">
-                and b1.no like CONCAT ("%", #{no}, "%")
+                and orderNo like CONCAT ("%", #{no}, "%")
             </if>
             <if test="plateNumber != null and plateNumber != '' ">
-                and v1.number_plate like CONCAT ("%", #{plateNumber}, "%")
+                and numberPlate like CONCAT ("%", #{plateNumber}, "%")
             </if>
             <if test="vehicleCode != null">
-                and v1.code = #{vehicleCode}
+                and vehicleCode = #{vehicleCode}
             </if>
             <if test="startTime != null">
-                and o1.start_time between #{startTime} and #{endTime}
+                and startTime between #{startTime} and #{endTime}
             </if>
             <if test="companyIds != null and companyIds.size > 0">
-                and (o1.start_company_id in
+                and (startCompanyId in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
                 or
-                o1.end_company_id in
+                endCompanyId in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
                 )
             </if>
             <if test="zoneId != null">
-                and (bc1.zone_id = #{zoneId} or bc2.zone_id = #{zoneId})
+                and (startZoneId = #{zoneId} or endZoneId = #{zoneId})
             </if>
         </where>
-        order by b1.crt_time desc
+        order by crtTime desc
     </select>
 
 

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

@@ -21,8 +21,8 @@ public class BranchCompanyVehicleCount {
     /**
      * 公司名称
      */
-    @Column(name = "company_name")
-    private String companyName;
+    @Column(name = "company_id")
+    private String companyId;
 
     /**
      * 当前停靠车辆数量
@@ -40,5 +40,21 @@ public class BranchCompanyVehicleCount {
     )
     private Date countDate;
 
+    /**
+     * 统计年
+     */
+    @Column(name = "count_year")
+    private Integer countYear;
+
+    /**
+     * 统计月
+     */
+    @Column(name = "count_month")
+    private Integer countMonth;
+    /**
+     * 统计周
+     */
+    @Column(name = "count_week")
+    private Integer countWeek;
 
 }
\ No newline at end of file

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

 package com.xxfc.platform.vehicle.pojo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class BranchCompanyVehicleCountVo {
-	private String parkBranchCompanyName;
-	private Integer count;
+	//分公司ID
 	private Integer companyId;
+	//统计年
+	private Integer countYear;
+	//统计月
+	private Integer countMonth;
+	//统计周
+	private Integer countWeek;
+	//统计日期
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(
+			pattern = "yyyy-MM-dd"
+	)
+	private Date countDate;
+	//统计数量
+	private Integer vehicleNum;
+	//公司名称
+	private String companyName;
+	//周开始时间
+	private String weekStartDate;
+	//周结束时间
+	private String weekEndDate;
 }

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

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class VehicleWeekCountVo {
+	private Integer week;
+	private Date dateTime;
+	private Integer count;
+}

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

@@ -11,9 +11,8 @@ public class BranchCompanyVehicleCountDTO extends PageParam {
 	//结束时间
 	private String endTime;
 
-	private String companyName;
+	private Integer companyId;
 	//统计类型，日月年， 1、日，2、月，3、年
 	private Integer type;
-	//需要除去的天数
-	private Integer dayNum;
+
 }

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

 package com.xxfc.platform.vehicle.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.Utils.OrderDateUtils;
 import com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyVehicleCountMapper;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyVehicleCountDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
+import java.util.List;
 
 @Service
 @Slf4j
 public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCountMapper, BranchCompanyVehicleCount> {
+
 	@Autowired
-	VehicleInformationDownloadBiz vehicleInformationDownloadBiz;
+	VehicleBiz vehicleBiz;
 
 	public ObjectRestResponse add(BranchCompanyVehicleCount branchCompanyVehicleCount) {
 		if (branchCompanyVehicleCount == null) {
@@ -30,32 +36,78 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 		return ObjectRestResponse.succ();
 	}
 
-	public ObjectRestResponse<PageDataVO<BranchCompanyVehicleCount>> findAll(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
-		vehicleInformationDownloadBiz.addAll();
-		Integer pageNo = branchCompanyVehicleCountDTO.getPage() == null ? 1 : branchCompanyVehicleCountDTO.getPage();
-		Integer pageSize = branchCompanyVehicleCountDTO.getLimit() == null ? 10 : branchCompanyVehicleCountDTO.getLimit();
-		Integer type = branchCompanyVehicleCountDTO.getType() == null ? 1 : branchCompanyVehicleCountDTO.getType();
-		branchCompanyVehicleCountDTO.setPage(pageNo);
-		branchCompanyVehicleCountDTO.setLimit(pageSize);
-		branchCompanyVehicleCountDTO.setType(type);
-		if (type == 1) {
-			branchCompanyVehicleCountDTO.setDayNum(1);
-		} else if (type == 2) {
-			branchCompanyVehicleCountDTO.setDayNum(7);
-		} else if (type == 3) {
-			branchCompanyVehicleCountDTO.setDayNum(getCurrentMonthLastDay());
-		}
-		Query query = new Query(branchCompanyVehicleCountDTO);
-		PageDataVO<BranchCompanyVehicleCount> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByParam(query.getSuper()));
+	public ObjectRestResponse addAll(List<BranchCompanyVehicleCountVo> list) {
+		if (list != null && list.size() > 0) {
+			list.parallelStream().forEach(result -> {
+				BranchCompanyVehicleCount branchCompanyVehicleCount = new BranchCompanyVehicleCount();
+				BeanUtil.copyProperties(result, branchCompanyVehicleCount, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+				add(branchCompanyVehicleCount);
+			});
 			return ObjectRestResponse.succ();
+		} else {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+	}
+	@Scheduled(cron = "0 0 2 * * *")
+	public void addAll() {
+		addAll(vehicleBiz.getAllVehicleInfo());
+	}
+
+
+	/**
+	 * 按天统计
+	 * @param query
+	 * @return
+	 */
+	public PageDataVO<BranchCompanyVehicleCountVo> countByDay(Query query) {
+		return PageDataVO.pageInfo(query, () -> mapper.getAllCountInfo(query.getSuper()));
+	}
+	/**
+	 * 按月统计
+	 * @param query
+	 * @return
+	 */
+	public PageDataVO<BranchCompanyVehicleCountVo> countByMonth(Query query) {
+		return PageDataVO.pageInfo(query, () -> mapper.countByMonth(query.getSuper()));
+	}
+	/**
+	 * 按周统计
+	 * @param query
+	 * @return
+	 */
+	public PageDataVO<BranchCompanyVehicleCountVo> countByWeek(Query query) {
+		return PageDataVO.pageInfo(query, () -> mapper.countByWeek(query.getSuper()));
 	}
 
-	public int getCurrentMonthLastDay() {
-		Calendar a = Calendar.getInstance();
-		a.set(Calendar.DATE, 1);//把日期设置为当月第一天
-		a.roll(Calendar.DATE, -1);//日期回滚一天，也就是最后一天
-		int maxDate = a.get(Calendar.DATE);
-		return maxDate;
+	public ObjectRestResponse<PageDataVO<BranchCompanyVehicleCountVo>> getAllCountInfo(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
+		if (branchCompanyVehicleCountDTO == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		Integer page = branchCompanyVehicleCountDTO.getPage() == null ? 1 : branchCompanyVehicleCountDTO.getPage();
+		Integer limit = branchCompanyVehicleCountDTO.getLimit() == null ? 10 : branchCompanyVehicleCountDTO.getLimit();
+		Integer type = branchCompanyVehicleCountDTO.getType() == null ? 1 : branchCompanyVehicleCountDTO.getType();
+		branchCompanyVehicleCountDTO.setPage(page);
+		branchCompanyVehicleCountDTO.setLimit(limit);
+		Query query = new Query(branchCompanyVehicleCountDTO);
+		if (type == 1) {//按天
+			return ObjectRestResponse.succ(countByDay(query));
+		}
+		if (type == 2) {//按周
+			PageDataVO<BranchCompanyVehicleCountVo> pageDataVO = countByWeek(query);
+			if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
+				pageDataVO.getData().parallelStream().forEach(result -> {
+					String weekStartDate = OrderDateUtils.getStartDayOfWeekNo(result.getCountYear(), result.getCountWeek());
+					String weekEndDate = OrderDateUtils.getEndDayOfWeekNo(result.getCountYear(), result.getCountWeek());
+					result.setWeekStartDate(weekStartDate);
+					result.setWeekEndDate(weekEndDate);
+				});
+			}
+			return ObjectRestResponse.succ(pageDataVO);
+		}
+		if (type == 3) {//按月
+			return ObjectRestResponse.succ(countByMonth(query));
+		}
+		return ObjectRestResponse.succ(new PageDataVO<>());
 	}
 
 }

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

@@ -236,6 +236,8 @@ public class VehicleActiveService {
             if (flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                 vehicle.setStatus(VehicleStatus.NORMAL.getCode());
             }
+            //2019-11-22 16:30 还原还车时修改车辆停靠分公司需求
+            vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());

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

@@ -1516,8 +1516,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return vehicles.stream().map(Vehicle::getId).collect(Collectors.toList());
     }
 
-    public List<BranchCompanyVehicleCountVo> getAllVehicleInfo(Map<String, Object> param) {
-        return mapper.getAllVehicleInfo(param);
+    public List<BranchCompanyVehicleCountVo> getAllVehicleInfo() {
+        return mapper.getAllVehicleInfo();
     }
 
 }

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

@@ -256,14 +256,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 return ObjectRestResponse.createDefaultFail();
             }
             //出行中才修改车辆停靠分公司
-            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
-            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
-                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
-                if (vehicle != null) {
-                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
-                    vehicleBiz.updateSelectiveByIdRe(vehicle);
-                }
-            }
+            //2019-11-22 16:30 取消修改还车地点同时修改停靠分公司需求
+//            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+//            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+//                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
+//                if (vehicle != null) {
+//                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+//                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+//                }
+//            }
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {
             return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());

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

@@ -4,25 +4,24 @@ import com.alibaba.fastjson.JSON;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.google.common.collect.Lists;
-import com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo;
 import com.xxfc.platform.vehicle.pojo.ResultVehicleVo;
 import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
 import com.xxfc.platform.vehicle.pojo.VehiclePageQueryVo;
-import com.xxfc.platform.vehicle.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -100,41 +99,4 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
 
     }
 
-    public void getAllVehicleInfo() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("startTime", DateTime.now().withMillis(DateUtils.getStartOfDay()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        map.put("endTime", DateTime.now().withMillis(DateUtils.getEndOfDay()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        add(map);
-    }
-
-    public   void addAll() {
-        DateTime dateTime = DateTime.parse("2019-10-01 00:00:00", DEFAULT_DATE_TIME_FORMATTER);
-        DateTime dateTime1 = DateTime.parse("2019-10-01 23:59:59", DEFAULT_DATE_TIME_FORMATTER);
-        for (int i = 0; i < 52; i++) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("startTime", dateTime.plusDays(i).toString(DEFAULT_DATE_TIME_FORMATTER));
-            map.put("endTime", dateTime1.plusDays(i).toString(DEFAULT_DATE_TIME_FORMATTER));
-            add(map);
-        }
-
-    }
-    public void add(Map<String, Object> param) {
-        List<BranchCompanyVehicleCountVo> branchCompanyVehicleCountVos = vehicleBiz.getAllVehicleInfo(param);
-        branchCompanyVehicleCountVos.forEach(result->{
-            try {
-                if (result != null) {
-                    BranchCompanyVehicleCount branchCompanyVehicleCount = new BranchCompanyVehicleCount();
-                    branchCompanyVehicleCount.setCompanyName(result.getParkBranchCompanyName());
-                    branchCompanyVehicleCount.setVehicleNum(result.getCount());
-                    branchCompanyVehicleCount.setCountDate(DateTime.parse(param.get("startTime").toString().split(" ")[0]).toDate());
-                    branchCompanyVehicleCountBiz.add(branchCompanyVehicleCount);
-                }
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
-        });
-    }
-
-
-
 }

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -8,5 +9,10 @@ import java.util.Map;
 
 public interface BranchCompanyVehicleCountMapper extends Mapper<BranchCompanyVehicleCount> {
 
-	List<BranchCompanyVehicleCount> getAllByParam(Map<String, Object> param);
+	List<BranchCompanyVehicleCountVo> getAllCountInfo(Map<String, Object> param);
+
+	List<BranchCompanyVehicleCountVo> countByMonth(Map<String, Object> param);
+
+	List<BranchCompanyVehicleCountVo> countByWeek(Map<String, Object> param);
+
 }
\ No newline at end of file

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

@@ -54,5 +54,5 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     @Select("select `id` from `vehicle` where `is_del`=0")
     List<String> findExistVehicleIds();
 
-    List<BranchCompanyVehicleCountVo> getAllVehicleInfo(Map<String, Object> params);
+    List<BranchCompanyVehicleCountVo> getAllVehicleInfo();
 }
\ No newline at end of file

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

@@ -338,14 +338,15 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());
             bookRecordUpdateLog.setCreateTime(new Date());
-            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
-            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
-                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
-                if (vehicle != null) {
-                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
-                    vehicleBiz.updateSelectiveByIdRe(vehicle);
-                }
-            }
+            //2019-11-22 16:30 取消修改还车地点同时修改停靠分公司需求
+//            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
+//            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+//                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
+//                if (vehicle != null) {
+//                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
+//                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+//                }
+//            }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {

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

 package com.xxfc.platform.vehicle.rest.admin;
 
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.BranchCompanyVehicleCountBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyVehicleCountDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
 @Controller
 @RequestMapping(value = "/bg-vehicle/count")
 public class BranchCompanyVehicleCountController extends BaseController<BranchCompanyVehicleCountBiz> {
 
+	@Autowired
+	private HttpServletResponse response;
+
+
 	@GetMapping(value = "/getAll")
 	@ResponseBody
 	public ObjectRestResponse getAll(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
-		return baseBiz.findAll(branchCompanyVehicleCountDTO);
+		return baseBiz.getAllCountInfo(branchCompanyVehicleCountDTO);
+	}
+	@GetMapping("/app/unauth/export")
+	public void exportVehicleInfo(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) throws Exception {
+		PageDataVO<BranchCompanyVehicleCountVo> pageDataVO = baseBiz.getAllCountInfo(branchCompanyVehicleCountDTO).getData();
+		if (pageDataVO != null && pageDataVO.getData() != null) {
+			ExcelWriter writer = ExcelUtil.getWriter(true);
+			writer.addHeaderAlias("companyId", "公司ID");
+			writer.addHeaderAlias("companyName", "公司名");
+			writer.addHeaderAlias("countYear", "年");
+			writer.addHeaderAlias("countMonth", "月");
+			writer.addHeaderAlias("countWeek", "周");
+			writer.addHeaderAlias("weekStartDate", "开始日期");
+			writer.addHeaderAlias("weekEndDate", "结束日期");
+			writer.addHeaderAlias("countDate", "日期");
+			writer.addHeaderAlias("vehicleNum", "数量");
+			writer.setColumnWidth(7, 17);
+			writer.setColumnWidth(5, 17);
+			writer.setColumnWidth(6, 17);
+			writer.setColumnWidth(1, 17);
+			// 一次性写出内容，使用默认样式，强制输出标题
+			writer.write(pageDataVO.getData(), true);
+			//response为HttpServletResponse对象
+			response.setContentType("application/vnd.ms-excel;charset=utf-8");
+			//test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+			response.setHeader("Content-Disposition", "attachment;filename=vehicleInfo.xlsx");
+			//out为OutputStream，需要写出到的目标流
+			ServletOutputStream out = response.getOutputStream();
+			writer.flush(out, true);
+			// 关闭writer，释放内存
+			writer.close();
+			//此处记得关闭输出Servlet流
+			IoUtil.close(out);
+		}
+
 	}
 }

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

@@ -7,15 +7,11 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.BranchCompanyVehicleCountBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleInformationDownloadBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
-import com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount;
 import com.xxfc.platform.vehicle.pojo.VehicleExcelVo;
-import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyVehicleCountDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -76,31 +72,9 @@ public class VehicleInformationDownloadController extends BaseController<Vehicle
         IoUtil.close(out);
     }
 
-    @GetMapping("/app/unauth/export")
-    public void exportVehicleInfo(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) throws Exception {
-        PageDataVO<BranchCompanyVehicleCount> pageDataVO = branchCompanyVehicleCountBiz.findAll(branchCompanyVehicleCountDTO).getData();
-        if (pageDataVO == null || pageDataVO.getData() == null) {
-            throw new BaseException(ResultCode.getMsg(ResultCode.NOTEXIST_CODE), ResultCode.NOTEXIST_CODE);
-        }
-        List<BranchCompanyVehicleCount> rows = pageDataVO.getData();
-        ExcelWriter writer = ExcelUtil.getWriter(true);
-        writer.addHeaderAlias("id", "ID");
-        writer.addHeaderAlias("countDate", "日期");
-        writer.addHeaderAlias("companyName", "停靠分公司");
-        writer.addHeaderAlias("vehicleNum", "车辆数量");
-        // 一次性写出内容，使用默认样式，强制输出标题
-        writer.write(rows, true);
-        //response为HttpServletResponse对象
-        response.setContentType("application/vnd.ms-excel;charset=utf-8");
-        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
-        response.setHeader("Content-Disposition", "attachment;filename=vehicleInfo.xlsx");
-        //out为OutputStream，需要写出到的目标流
-        ServletOutputStream out = response.getOutputStream();
-        writer.flush(out, true);
-        // 关闭writer，释放内存
-        writer.close();
-        //此处记得关闭输出Servlet流
-        IoUtil.close(out);
+    @GetMapping("/app/unauth/addAll")
+    public void addAll() {
+        branchCompanyVehicleCountBiz.addAll(vehicleBiz.getAllVehicleInfo());
     }
 
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyVehicleCountMapper.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.BranchCompanyVehicleCountMapper" >
-  <resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount" >
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" property="id" jdbcType="BIGINT" />
-    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
-    <result column="vehicle_num" property="vehicleNum" jdbcType="INTEGER" />
-    <result column="count_date" property="countDate" jdbcType="TIMESTAMP" />
-    <result column="company_id" property="companyId" jdbcType="INTEGER" />
-  </resultMap>
 
-  <select id="getAllByParam" parameterType="Map" resultType="com.xxfc.platform.vehicle.entity.BranchCompanyVehicleCount">
-    SELECT company_name, CEILING((
-          CASE
-          WHEN #{type} = 1 THEN
-          sum(vehicle_num) / #{dayNum}
-          WHEN #{type} = 2 THEN
-          sum(vehicle_num) / #{dayNum}
-          WHEN #{type} = 3 THEN
-          sum(vehicle_num) / #{dayNum}
-          END
-    ))
-    AS vehicleNum from branch_company_vehicle_count
+    <select id="getAllCountInfo" parameterType="Map" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
+        SELECT
+        c.*,
+        b.`name` AS companyName
+        FROM
+        branch_company_vehicle_count c
+        LEFT JOIN branch_company b ON b.id = c.company_id
         <where>
-        <if test="companyName != null and companyName != ''">
-          and company_name like concat('%', #{companyName}, '%')
+            <if test = "companyId != null">
+              and  c.company_id = #{companyId}
             </if>
             <if test="startTime != null and startTime != ''">
-          and count_date &gt; #{startTime} and count_date &lt; #{endTime}
+              and c.count_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+              and  c.count_date &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY c.id
+        ORDER BY c.company_id
+    </select>
+
+    <select id="countByMonth" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo" parameterType="Map">
+        SELECT c.company_id, c.count_year, c.count_month, b.`name` as companyName, sum(c.vehicle_num) as vehicle_num from branch_company_vehicle_count c
+        LEFT JOIN branch_company b on b.id = c.company_id
+        <where>
+            <if test = "companyId != null">
+                and  c.company_id = #{companyId}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and c.count_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  c.count_date &lt;= #{endTime}
             </if>
         </where>
-    GROUP BY company_name
+        GROUP BY c.company_id,c.count_year,c.count_month
     </select>
+
+    <select id="countByWeek" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo" parameterType="Map">
+        SELECT c.company_id, c.count_year, c.count_week, b.`name` as companyName, sum(c.vehicle_num) as vehicle_num from branch_company_vehicle_count c
+        LEFT JOIN branch_company b on b.id = c.company_id
+        <where>
+            <if test = "companyId != null">
+                and  c.company_id = #{companyId}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and c.count_date &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  c.count_date &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY c.company_id,c.count_year,c.count_week
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -591,16 +591,10 @@
     </select>
 
     <!--导出分公司停靠所有车辆-->
-    <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo" parameterType="Map">
-            select tmp.name as parkBranchCompanyName, COUNT(0) as count from (
-            select v1.number_plate, b.name from vehicle_book_record v
-            LEFT JOIN branch_company b on b.id = v.lift_company
-            LEFT JOIN vehicle v1 on v1.id = v.vehicle_id
-            where v.`status` != 4 and v.`status` != 6
-             and v.book_start_date &gt; #{startTime} and v.book_start_date &lt; #{endTime}
-            ORDER BY v.vehicle_id, v.book_start_date DESC
-            ) tmp
-            GROUP BY name
+    <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
+        select b.id as companyId, DATE_FORMAT(now(),'%Y') as countYear, DATE_FORMAT(now(),'%m') as countMonth,DATE_FORMAT(now(),'%u') as countWeek,DATE_FORMAT(now(),'%Y-%m-%d') as countDate,count(*) as vehicleNum from vehicle v
+        LEFT JOIN branch_company b on b.id = v.park_branch_company_id
+        GROUP BY b.id
     </select>
 
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"