Merge remote-tracking branch 'origin/master' into master2

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

@@ -16,6 +16,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Transactional
 @Service("appUserPositionChangeRecordBiz")
@@ -43,26 +44,26 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
+        if (Objects.nonNull(userPositionTemp.getIsQuit()) && !(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 
         //状态1：职位变动
-        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+        if (Objects.nonNull(userPositionTemp.getJobId()) && !(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
             appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
             appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
             appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
             findUserJobName(appUserPositionChangeRecord);
         }
         //状态2：身份变动
-        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+        if (Objects.nonNull(userPositionTemp.getPositionId()) && !(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
             appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
             appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
             appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
             findUserPositionName(appUserPositionChangeRecord);
         }
         //状态3：公司变动调整
-        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+        if (Objects.nonNull(userPositionTemp.getCompanyId()) && !(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
             appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
             appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
             appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
@@ -76,7 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
         appUserPositionChangeRecord.setOperatorId(operatorId);
-        mapper.insert(appUserPositionChangeRecord);
+        mapper.insertSelective(appUserPositionChangeRecord);
     }
 
     /**

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

@@ -258,6 +258,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
+        if (StringUtils.isNotBlank(username)){
+            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+        }
         if (StringUtils.isNotBlank(code)){
             //判断处理活动关键字
             String[] codes = code.split("_");
@@ -1048,6 +1051,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
+        if (StringUtils.isNotBlank(username)){
+            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+        }
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {

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

 package com.xxfc.platform.order.rest;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
-import com.xxfc.platform.order.pojo.order.MemberBO;
 import com.xxfc.platform.order.pojo.vo.MemberOrderPageVo;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
@@ -25,10 +21,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Base64;
 
 @Controller
 @RequestMapping("orderMember")
@@ -46,20 +40,21 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
     @ResponseBody
     @ApiOperation(value = "确认会员订单")
     public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto) {
-        MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
-        bo.setTickerNo(StrUtil.isNotBlank(dto.getTickerNos())?
-                StrUtil.splitTrim(dto.getTickerNos(), ","):null);
-        //查询会员等级实体
-//        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
-//            setId(dto.getMemberLevelId());
-//        }})).getData().get(0));
-
-//        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
-
-        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-        //查询优惠券
-        orderMemberService.createOrder(bo);
-        return ObjectRestResponse.succ(bo.getOrder());
+//        MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
+//        bo.setTickerNo(StrUtil.isNotBlank(dto.getTickerNos())?
+//                StrUtil.splitTrim(dto.getTickerNos(), ","):null);
+//        //查询会员等级实体
+////        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
+////            setId(dto.getMemberLevelId());
+////        }})).getData().get(0));
+//
+////        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
+//
+//        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+//        //查询优惠券
+//        orderMemberService.createOrder(bo);
+//        return ObjectRestResponse.succ(bo.getOrder());
+        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "为了更好地为您提供会员服务，请联系在线客服（或拨打客服电话：4000-369-369）");
     }
 
     /**

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -15,13 +14,11 @@ import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
+import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.add.BgAddRentDTO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
-import com.xxfc.platform.universal.constant.DictionaryKey;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -37,14 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
-
 @Controller
 @RequestMapping("orderRentVehicle")
 @Api(value="租车订单",tags={"租车订单"})
@@ -81,6 +74,7 @@ public class OrderRentVehicleController extends CommonBaseController {
             bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             orderRentVehicleService.createOrder(bo);
             return ObjectRestResponse.succ(bo.getOrder());
+//                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "系统维护，请联系客服线下租车: 4000-369-369！");
         }
 
         @RequestMapping(value = "back-stage/add",method = RequestMethod.POST)

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

@@ -323,7 +323,7 @@
         (
         (
         orv.start_time > #{startTime}
-        AND orv.start_time < #{startTime}
+        AND orv.start_time < #{endTime}
         AND orv.end_time > #{endTime}
         )
         OR (
@@ -332,7 +332,7 @@
         )
         OR (
         orv.start_time < #{startTime}
-        AND orv.end_time > #{endTime}
+        AND orv.end_time > #{startTime}
         AND orv.end_time < #{endTime}
         )
         OR (

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

@@ -20,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -95,8 +98,8 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 		branchCompanyVehicleCountDTO.setPage(page);
 		branchCompanyVehicleCountDTO.setLimit(limit);
 		if (StringUtils.isBlank(branchCompanyVehicleCountDTO.getStartTime()) || StringUtils.isBlank(branchCompanyVehicleCountDTO.getEndTime())) {
-			branchCompanyVehicleCountDTO.setStartTime(DateTime.now().minusDays(1).toString(DATE_TIME_FORMATTER));
-			branchCompanyVehicleCountDTO.setEndTime(DateTime.now().minusDays(1).toString(DATE_TIME_FORMATTER));
+			branchCompanyVehicleCountDTO.setStartTime(DateTime.now().toString(DATE_TIME_FORMATTER));
+			branchCompanyVehicleCountDTO.setEndTime(DateTime.now().toString(DATE_TIME_FORMATTER));
 		}
 		Query query = new Query(branchCompanyVehicleCountDTO);
 		if (type == 1) {//按天
@@ -120,4 +123,32 @@ public class BranchCompanyVehicleCountBiz extends BaseBiz<BranchCompanyVehicleCo
 		return ObjectRestResponse.succ(new PageDataVO<>());
 	}
 
+
+	public List<BranchCompanyVehicleCountVo> exportAllDate(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) {
+		Integer type = branchCompanyVehicleCountDTO.getType() == null ? 1 : branchCompanyVehicleCountDTO.getType();
+		Map<String, Object> param = new HashMap<>();
+		if (branchCompanyVehicleCountDTO.getCompanyId() != null) {
+			param.put("companyId", branchCompanyVehicleCountDTO.getCompanyId());
+		}
+		if (type == 1) {//按天
+			return mapper.getAllCountInfo(param);
+		}
+		if (type == 2) {//按周
+			List<BranchCompanyVehicleCountVo> pageDataVO = mapper.countByWeek(param);
+			if (pageDataVO != null &&  pageDataVO.size() > 0) {
+				pageDataVO.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 pageDataVO;
+		}
+		if (type == 3) {//按月
+			return mapper.countByMonth(param);
+		}
+		return new ArrayList<>();
+	}
+
 }

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

@@ -123,7 +123,8 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
         DateTime startDay = DateTime.parse(startDate, DEFAULT_DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(endDate, DEFAULT_DATE_TIME_FORMATTER);
         int i = 0;
-        for (DateTime curDate = startDay; i < 30; curDate = curDate.minusDays(1)) {
+        int monthDay = endDay.getDayOfMonth() - startDay.getDayOfMonth() + 1;
+        for (DateTime curDate = startDay; i < monthDay; curDate = curDate.minusDays(1)) {
             i++;
             nowTime = curDate.getMillis();
             lastTime = nowTime + 24 * 3600 * 1000 - 1;

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

@@ -103,6 +103,9 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
      */
     public RestResponse<PageDataVO<VehicleWarningMsg>> getByPage(String queryVehicleWarningMsgVoJson){
         try {
+            if (StringUtils.isBlank(queryVehicleWarningMsgVoJson)) {
+                return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(), ResCode.INVALID_REST_REQ_PARAM.getDesc());
+            }
             QueryVehicleWarningMsgVo queryVehicleWarningMsgVo = JSON.parseObject(queryVehicleWarningMsgVoJson, QueryVehicleWarningMsgVo.class);
             PageHelper.startPage(queryVehicleWarningMsgVo.getPage(),queryVehicleWarningMsgVo.getLimit());
             UserDTO userDTO = getAdminUserInfo();

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

@@ -4,7 +4,6 @@ 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;
@@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @Controller
 @RequestMapping(value = "/bg-vehicle/count")
@@ -33,8 +33,8 @@ public class BranchCompanyVehicleCountController extends BaseController<BranchCo
 	}
 	@GetMapping("/app/unauth/export")
 	public void exportVehicleInfo(BranchCompanyVehicleCountDTO branchCompanyVehicleCountDTO) throws Exception {
-		PageDataVO<BranchCompanyVehicleCountVo> pageDataVO = baseBiz.getAllCountInfo(branchCompanyVehicleCountDTO).getData();
-		if (pageDataVO != null && pageDataVO.getData() != null) {
+		List<BranchCompanyVehicleCountVo> pageDataVO = baseBiz.exportAllDate(branchCompanyVehicleCountDTO);
+		if (pageDataVO != null && pageDataVO.size() > 0) {
 			ExcelWriter writer = ExcelUtil.getWriter(true);
 			writer.addHeaderAlias("companyId", "公司ID");
 			writer.addHeaderAlias("companyName", "公司名");
@@ -50,7 +50,7 @@ public class BranchCompanyVehicleCountController extends BaseController<BranchCo
 			writer.setColumnWidth(6, 17);
 			writer.setColumnWidth(1, 17);
 			// 一次性写出内容，使用默认样式，强制输出标题
-			writer.write(pageDataVO.getData(), true);
+			writer.write(pageDataVO, true);
 			//response为HttpServletResponse对象
 			response.setContentType("application/vnd.ms-excel;charset=utf-8");
 			//test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码

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

@@ -598,16 +598,17 @@
         SELECT
         b.id AS companyId,
         DATE_FORMAT(
-        DATE_SUB(NOW(), INTERVAL 1 DAY),
+        NOW(),
         '%Y'
         ) AS countYear,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%m') AS countMonth,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%u') AS countWeek,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%Y-%m-%d') AS countDate,
+        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
+        where v.is_del = 0
         GROUP BY
         b.id
     </select>