Merge branch 'dev' into base-modify

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -129,7 +129,8 @@ public class AppAuthServiceImpl implements AuthService {
             if (ijwtInfo==null){
                 return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
-            return ObjectRestResponse.succ();
+            token=jwtTokenUtil.generateToken(ijwtInfo);
+            return ObjectRestResponse.succ(token);
         }catch (Exception e){
             e.printStackTrace();
             return ObjectRestResponse.createFailedResult(10009,"token失效");

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -126,7 +126,8 @@ public class AuthServiceImpl implements AuthService {
             if (ijwtInfo==null){
                 return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
-            return ObjectRestResponse.succ();
+            token=jwtTokenUtil.generateToken(ijwtInfo);
+            return ObjectRestResponse.succ(token);
         }catch (Exception e){
             e.printStackTrace();
             return ObjectRestResponse.createFailedResult(10009,"token失效");

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

 package com.github.wxiaoqi.security.common.constant;
 
+import cn.hutool.core.date.format.FastDateFormat;
+
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -41,8 +43,10 @@ public class CommonConstants {
     public static final String LONG_TIME = "HHmmss";
     public static final String SHORT_TIME = "HHmm";
     public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
+    public static final String HOUR_MINUTE = "mm:ss";
 
     public static final DateTimeFormatter DATE_TIME_LINE_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_LINE);
     public static final DateTimeFormatter YMR_SLASH_FORMATTER = DateTimeFormatter.ofPattern(YMR_SLASH);
+    public static final FastDateFormat HOUR_MINUTE_FORMATTE_HUTOOL = FastDateFormat.getInstance(HOUR_MINUTE);
 
 }

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

@@ -31,10 +31,7 @@ public class WalletJobHandler extends IJobHandler {
              XxlJobLogger.log("-----定时器进入---walletHandler---");
             log.info("-----定时器进入---walletHandler---");
             myWaterBiz.updTodayAmount();
-            ReturnT returnT = new ReturnT();
-            returnT.setCode(100);
-            returnT.setMsg("成功");
-            return returnT;
+            return ReturnT.SUCCESS;
         } catch (Exception e) {
             XxlJobLogger.log(e);
             return FAIL;

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

@@ -11,14 +11,10 @@ import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderMemberDetail;
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
-import com.xxfc.platform.order.entity.OrderRefund;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -33,6 +29,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -244,7 +241,14 @@ public class OrderMsgBiz {
                     break;
                 case TOUR:
                     CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(otd.getStartCompanyId()).getData();
+                    //发送短信给app用户
                     sms2AppUser(startCompanyDetailTour, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
+
+                    //后台发送消息(客服)
+                    Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
+                    smsParams.clear();
+                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_H, smsParams);
+
                     break;
                 case MEMBER:
                     sms2AppUser(null, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_G, smsParams);
@@ -312,6 +316,46 @@ public class OrderMsgBiz {
                     }
                     break;
                 case TOUR:
+                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(otd.getStartCompanyId()).getData();
+
+                    //后台发送消息(客服)
+                    Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
+                    smsParams.clear();
+                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
+                    break;
+                case MEMBER:
+                    break;
+                default:
+                    break;
+            }
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 取消订单处理提醒短信的发送
+     * @param orvd
+     * @param baseOrder
+     * @param appUserDTO
+     */
+    public void handelMsgStart(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO) {
+        try {
+            OrderTypeEnum orderTypeEnum = OrderTypeEnum.codeAndDesc.get(baseOrder.getType());
+            List<String> smsParams = new ArrayList<String>();
+            switch (orderTypeEnum) {
+                case RENT_VEHICLE:
+                    CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
+                    if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
+                        sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_I, smsParams);
+                    }else {
+                        log.error("通知后台客户短信异常，结束公司id 不存在或者为0 订单号：{}", baseOrder.getId());
+                    }
+                    break;
+                case TOUR:
+                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(otd.getStartCompanyId()).getData();
+                    sms2AppUser(startCompanyDetailTour, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_J, smsParams);
                     break;
                 case MEMBER:
                     break;
@@ -424,7 +468,7 @@ public class OrderMsgBiz {
     private void handelSmsParamApp(CompanyDetail startCompanyDetail, CompanyDetail endCompanyDetail, OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.PAY_A :
-                if(0 < baseOrder.getMemberLevel() ) {
+                if(0 < appUserDTO.getMemberLevel() ) {
                     smsParams.add(USER_M);
                 }else {
                     smsParams.add(USER_N);
@@ -453,12 +497,30 @@ public class OrderMsgBiz {
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 break;
             case SmsTemplateDTO.CANCEL_A :
-                if(0 < baseOrder.getMemberLevel() ) {
+                if(0 < appUserDTO.getMemberLevel() ) {
                     smsParams.add(USER_M);
                 }else {
                     smsParams.add(USER_N);
                 }
                 break;
+            case SmsTemplateDTO.PAY_I :
+                if(0 < appUserDTO.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(startCompanyDetail.getAddrDetail());
+                break;
+            case SmsTemplateDTO.PAY_J :
+                if(0 < appUserDTO.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(baseOrder.getName());
+                smsParams.add(HOUR_MINUTE_FORMATTE_HUTOOL.format(DateUtil.date(otd.getStartTime())));
+                smsParams.add(startCompanyDetail.getAddrDetail());
+                break;
             default:
                 break;
         }
@@ -467,7 +529,7 @@ public class OrderMsgBiz {
     private void handelDepositSmsParamApp(BigDecimal originalAmount, BigDecimal violateAmount, BigDecimal refundAmount, BigDecimal residueAmount,BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.CANCEL_C :
-                if(0 < baseOrder.getMemberLevel() ) {
+                if(0 < appUserDTO.getMemberLevel() ) {
                     smsParams.add(USER_M);
                 }else {
                     smsParams.add(USER_N);
@@ -482,7 +544,7 @@ public class OrderMsgBiz {
             case SmsTemplateDTO.REFUND_A:
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-                if(0 < baseOrder.getMemberLevel() ) {
+                if(0 < appUserDTO.getMemberLevel() ) {
                     smsParams.add(USER_M);
                 }else {
                     smsParams.add(USER_N);
@@ -495,7 +557,7 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + Long.valueOf(rentDepositAutoRefundTime * 60 * 60 * 1000))));
                 break;
             case SmsTemplateDTO.REFUND_B:
-                if(0 < baseOrder.getMemberLevel() ) {
+                if(0 < appUserDTO.getMemberLevel() ) {
                     smsParams.add(USER_M);
                 }else {
                     smsParams.add(USER_N);
@@ -556,6 +618,22 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
                 smsParams.add(orvd.getDayNum().toString());
                 break;
+            case SmsTemplateDTO.PAY_H :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(baseOrder.getName());
+                smsParams.add(sCompany.getName());
+                smsParams.add(sCompany.getTourServicePhone());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                break;
+            case SmsTemplateDTO.CANCEL_F :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(baseOrder.getName());
+                smsParams.add(sCompany.getName());
+                smsParams.add(sCompany.getTourServicePhone());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                break;
             default:
                 break;
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/BaseOrderStatisticsJobHandler.java

@@ -29,11 +29,8 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
             XxlJobLogger.log("-----定时器进入---baseOrderStatisticsHandler---");
             log.info("-----定时器进入---baseOrderStatisticsHandler---");
 //            boolean flag = statisticsBiz.statisticalOrder();
-            ReturnT returnT = new ReturnT();
 //            if (flag) {
-                returnT.setCode(100);
-                returnT.setMsg("成功");
-                return returnT;
+                return ReturnT.SUCCESS;
 //            }
 
 //            else {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RemindMsgJobHandler.java

+package com.xxfc.platform.order.jobhandler;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
+import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
+/**
+ * 跨平台Http任务
+ *
+ * @author xuxueli 2018-09-16 03:48:34
+ */
+@JobHandler(value = "remindMsgJobHandler")
+@Component
+@Slf4j
+public class RemindMsgJobHandler extends IJobHandler {
+
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
+    @Autowired
+    OrderTourDetailBiz orderTourDetailBiz;
+
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
+
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Override
+    public ReturnT<String> execute(String idLastNumInterval) {
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
+
+        try {
+            Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1);
+            //检索明天需要出车的订单
+            List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+                    //订单已完成的租车订单
+                    .where(WeekendSqls.<BaseOrder>custom()
+                                    .andIn(BaseOrder::getType, CollectionUtil.newArrayList(OrderTypeEnum.RENT_VEHICLE.getCode(), OrderTypeEnum.TOUR.getCode()))
+                                    .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_TOSTART.getCode()) //待出发的订单
+                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
+                                    .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
+                    ).build());
+
+            for(BaseOrder baseOrder : lists) {
+                AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+                if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
+                    OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+                    orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
+                }else {
+                    OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId());
+                    orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
+                }
+            }
+
+            return ReturnT.SUCCESS;
+        } catch (Exception e) {
+            XxlJobLogger.log(e);
+            return FAIL;
+        } finally {
+            ;
+        }
+    }
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -126,11 +126,8 @@ public class RentDepositJobHandler extends IJobHandler {
                 }
 
             }
-            ReturnT returnT = new ReturnT();
-            returnT.setCode(100);
-            returnT.setMsg("成功");
-            returnT.setContent(idLastNumInterval);
-            return returnT;
+
+            return ReturnT.SUCCESS;
         } catch (Exception e) {
             XxlJobLogger.log(e);
             return FAIL;

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

@@ -149,10 +149,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     }
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
                        try {
-                           QueryMultiDTO queryMultiDTO = new QueryMultiDTO();
-                           queryMultiDTO.setIds(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
-                           List<VehicleUserLicense> orderUserLicenses = vehicleFeign.multi(queryMultiDTO).getData();
-
+                           List<VehicleUserLicense> orderUserLicenses = vehicleFeign.getVehicleLicenseList(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds()).getData();
                            if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
                                OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
                                orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getIdCard());
@@ -163,6 +160,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                            }
                        } catch (Exception e) {
                            log.info("获取驾驶人信息失败！");
+                           e.printStackTrace();
                        }
 
                     }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/RandomListDto.java

@@ -20,4 +20,14 @@ public class RandomListDto {
      */
     private Integer location;
 
+    /**
+     * 新闻类型
+     */
+    private Integer newsType;
+
+    /**
+     * 新闻id
+     */
+    private  Integer newsId;
+
 }

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

 package com.xxfc.platform.uccn;
 
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,12 +13,12 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @author Administrator
  */
 @SpringBootApplication(scanBasePackages ={
-        "com.github.wxiaoqi",
+        "com.github.wxiaoqi.security.common.handler",
         "com.xxfc.platform"
 })
 @EnableDiscoveryClient
 @EnableAceAuthClient
-@EnableFeignClients(value = {"com.xxfc.platform","com.github.wxiaoqi.security"})
+@EnableFeignClients(value = {"com.xxfc.platform","com.github.wxiaoqi.security"}, defaultConfiguration = HeaderConfig.class)
 @MapperScan(basePackages = "com.xxfc.platform.uccn.mapper")
 public class UccnApplication {
     public static void main(String[] args) {

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

@@ -24,7 +24,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     /**
      * 随机文章条数
      */
-    private final Integer RANDOM_NUMBER = 3;
+    private final Integer RANDOM_NUMBER = 2;
 
     /**
      * 首页文章条数
@@ -44,7 +44,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      */
     public PageInfo getArticleList(Integer page, Integer limit, Integer type) {
         PageHelper.startPage(page, limit);
-        List articleList = mapper.getArticleList(type,null);
+        List articleList = mapper.getArticleList(type,null,null);
         return PageInfo.of(articleList);
     }
 
@@ -71,21 +71,24 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     /**
      * 随机获取三条连续的文章
      *
+     *
+     *
      * @param type
+     * @param id
      * @return
      */
-    public List getThree(Integer type) {
-
-        List<Article> articleList = mapper.getArticleList(type,null);
+    public List getThree( Integer type, Integer number, Integer id) {
+        number = number == null ? RANDOM_NUMBER : number;
+        List<Article> articleList = mapper.getArticleList(type,null,id);
         if (!Objects.isNull(articleList)) {
             int size = articleList.size();
-            if (RANDOM_NUMBER >= size) {
+            if (number >= size) {
                 return articleList;
             } else {
                 Random random = new Random();
-                int r = random.nextInt(size - RANDOM_NUMBER + 1);
+                int r = random.nextInt(size - number + 1);
                 List<Article> result = new ArrayList<>();
-                for (int i = 0; i < RANDOM_NUMBER.intValue(); i++) {
+                for (int i = 0; i < number.intValue(); i++) {
                     int index = i + r;
                     result.add(articleList.get(index));
                 }
@@ -103,7 +106,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      * @return
      */
     public List getHomePageArticle(Integer type) {
-        List<Article> articleList = mapper.getArticleList(type,HOME_PAGE_NUMBER);
+        List<Article> articleList = mapper.getArticleList(type,HOME_PAGE_NUMBER,null);
 //        if (Objects.isNull(articleList)) {
 //            return new ArrayList();
 //        } else {

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

@@ -37,7 +37,7 @@ public class RandomListBiz {
      * @param number 随机数，默认是2
      * @return
      */
-    public ObjectRestResponse getRandomList(Integer type, Integer number, Integer location) {
+    public ObjectRestResponse getRandomList(Integer type, Integer number, Integer location, Integer id, Integer newsType) {
         if(type != null) {
             number = number == null ? 2 : number;
             switch (TypeEnum.getByValue(type)) {
@@ -50,7 +50,7 @@ public class RandomListBiz {
                 case ACTIVITY:
                     return ObjectRestResponse.succ(summitActivityBiz.getHostWithSummitActivity(number, location));
                 case NEWS:
-
+                    return ObjectRestResponse.succ(articleBiz.getThree(type, number, id));
             }
         }
         return ObjectRestResponse.succ();

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/ArticleMapper.java

@@ -11,9 +11,11 @@ import java.util.List;
  */
 public interface ArticleMapper extends Mapper<Article> {
     /**
-     * 根据网站类型查询文章
+     *  获取获取文章信息
      * @param type
+     * @param limit 已使用分业插件传null值即可,不要重复传
+     * @param id  当前文章id ,无就传null
      * @return
      */
-    List<Article> getArticleList(@Param("type") Integer type,@Param( "limit") Integer limit);
+    List<Article> getArticleList(@Param("type") Integer type,@Param( "limit") Integer limit,@Param("id") Integer id);
 }

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

@@ -36,11 +36,20 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
        return ObjectRestResponse.succ(baseBiz.getOne(id,urlType));
     }
 
-
-    @GetMapping("/app/unauth/three/{type}")
+    /**
+     * 随机获取三条数据
+     * @param type
+     * @param number
+     * @param id
+     * @return
+     */
+    @GetMapping("/app/unauth/three")
     @ApiOperation(value = "随机获取三条数据")
-    public ObjectRestResponse randomAccessToThreeData(@PathVariable Integer type){
-        return ObjectRestResponse.succ(baseBiz.getThree(type));
+    public ObjectRestResponse randomAccessToThreeData(@RequestParam("type") Integer type,
+                                                      @RequestParam("number") Integer number,
+                                                      @RequestParam("id") Integer id
+                                                      ){
+        return ObjectRestResponse.succ(baseBiz.getThree(type,number,id));
     }
 
     @GetMapping("/app/unauth/homePage/{type}")

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

@@ -19,7 +19,7 @@ public class RandomListController {
         if(randomListDto == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return randomListBiz.getRandomList(randomListDto.getType(), randomListDto.getNumber(), randomListDto.getLocation());
+        return randomListBiz.getRandomList(randomListDto.getType(), randomListDto.getNumber(), randomListDto.getLocation(), randomListDto.getNewsId(), randomListDto.getNewsType());
     }
 
 }

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

@@ -47,9 +47,11 @@ public class VehicleModelController extends CommonBaseController {
     @RequestMapping(value = "/detail/{name}", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("name") @ApiParam("车型名称") String name) {
-        return vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
+        ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
             setName(name);
         }}, false, true));
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        return objectRestResponse;
     }
 
     /**
@@ -65,21 +67,26 @@ public class VehicleModelController extends CommonBaseController {
         ObjectRestResponse<PageDataVO<VehicleModelVo>> objectRestResponse = vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
         PageDataVO<VehicleModelVo> pageDataVOs = objectRestResponse.getData();
         pageDataVOs.getData().forEach( v -> {
-            List<VehiclePlatCata> vehiclePlatCataList = vehicleFeign.getCatasByIds(v.getConfig()).getData();
-            StrUtil.splitToInt("14,7,11", ",");
-            v.setUccnCataList(vehiclePlatCataList.parallelStream().filter(v1 -> {return ArrayUtil.contains(StrUtil.splitToInt("14,7,11", ","), v1.getParentId());}).sorted(Comparator.comparing(VehiclePlatCata::getParentId, (x, y) -> {
-                int xx = 0,yy = 0;
-                int[] array = StrUtil.splitToInt("14,7,11", ",");
-                for(int i = 0; i < array.length; i++) {
-                    if(x == array[i]) {
-                        xx = i;
-                    }else if(y == array[i]) {
-                        yy = i;
-                    }
-                }
-                return (xx - yy);
-            })).collect(Collectors.toList()));
+            v.setUccnCataList(initUccnCataCollect(v.getConfig()));
         });
         return objectRestResponse;
     }
+
+    private List<VehiclePlatCata> initUccnCataCollect(String modelConfig) {
+        List<VehiclePlatCata> vehiclePlatCataList = vehicleFeign.getCatasByIds(modelConfig).getData();
+        int[] array = StrUtil.splitToInt("14,7,11", ",");
+        return vehiclePlatCataList.parallelStream()
+                .filter(v1 -> {return ArrayUtil.contains(array, v1.getParentId());})
+                .sorted(Comparator.comparing(VehiclePlatCata::getParentId, (x, y) -> {
+            int xx = 0,yy = 0;
+            for(int i = 0; i < array.length; i++) {
+                if(x == array[i]) {
+                    xx = i;
+                }else if(y == array[i]) {
+                    yy = i;
+                }
+            }
+            return (xx - yy);
+        })).collect(Collectors.toList());
+    }
 }

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml

@@ -8,12 +8,18 @@
         where
         is_del=0
         and status=1
+        <if test="id != null">
+        and   id != #{id}
+        </if>
         and (type=#{type} or type=0)
         order by
+
         weight   ASC ,add_time DESC
         <if test="limit != null">
             limit #{limit}
         </if>
     </select>
 
+
+
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -62,6 +62,7 @@ public class SmsTemplateDTO {
     public static final int REFUND_A = 22;
     //违章押金退还
     public static final int REFUND_B = 23;
+
     //旅游内部通知（客服）
     public static final int PAY_H = 24;
     //取消旅游订单（客服）

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

@@ -195,21 +195,26 @@ public class SmsService {
        try {
            JSONObject jsonParams=new JSONObject();
            for (int i=0;i<params.length;i++){
-               jsonParams.put(param+(i+1),params[i]);
+               String para=params[i];
+               if (para.contains("【")){
+                   para=para.replaceAll("【","");
+               }
+               if (para.contains("】")){
+                   para=para.replaceAll("】","");
+               }
+               jsonParams.put(param+(i+1),para);
            }
-
            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
        }catch (Exception e){
            e.printStackTrace();
        }
 
-
     }
 
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService smsService=new SmsService();
         //发短信
-        String[] params={"1","2","3","2019-08-29","松山湖"};
+        String[] params={"1","2","3","2019-08-29","【松山湖】"};
         SmsService.sendTemplateToJson("13612688539,13265487972",params,"SMS_169904346");
         /*System.out.println("短信接口返回的数据----------------");
         System.out.println("Code=" + response.getCode());

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

@@ -27,6 +27,9 @@ public class FileUploadServiceImpl  implements FileUploadService {
     @Value("${universal.url}")
     private String xx_url ;
 
+    private static final String APK_SUFFIX=".apk";
+    private static final String APK_NAME="xxfc.apk";
+
     @Override
     public ObjectRestResponse handlerUpload(MultipartFile zipFile,String password,String prefix)throws Exception {
         if (null == zipFile) {
@@ -63,7 +66,18 @@ public class FileUploadServiceImpl  implements FileUploadService {
 
         String path=readZipFile(packFilePath);
         if (StringUtils.isNotBlank(path)){
+            String filename = path;
             path=xx_url+"/"+prefix+"/"+path;
+               log.info("文件名：{}",path);
+                if (filename.contains(APK_SUFFIX)){
+                    Runtime runtime = Runtime.getRuntime();
+                    log.info("执行删除xxfc.apk");
+                    //删除包
+                    runtime.exec("rm -rf  "+uploadPath+"/"+APK_NAME);
+                    log.info("执行复制上传包为xxfc.apk");
+                    //复制包
+                    runtime.exec("cp -f  "+uploadPath+"/"+filename+"  "+uploadPath+"/"+APK_NAME);
+            }
             return ObjectRestResponse.succ(path);
         }else {
             return ObjectRestResponse.createDefaultFail();

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -83,8 +83,12 @@ public interface VehicleFeign {
     @RequestMapping(value = "/user/license/company/getOne", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> getOne(
             @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception ;
+
     @RequestMapping(value = "/user/license/multi", method = RequestMethod.GET)
-    public ObjectRestResponse<List<VehicleUserLicense>> multi(QueryMultiDTO dto) throws Exception;
+    public ObjectRestResponse<List<VehicleUserLicense>> multi(@RequestBody QueryMultiDTO dto) throws Exception;
+
+    @GetMapping("/user/license/getVehicleLicenseList")
+    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(@RequestParam(value="ids") String ids);
 
     /**
      * 获取优质车型接口

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

@@ -19,4 +19,9 @@ public class VModelDetailVO extends VehicleModel {
 
     @ApiModelProperty("会员列表")
     List<BaseUserMemberLevel> userMemberLevel;
+
+    /**
+     * 官网需要显示的配置列表
+     */
+    List<VehiclePlatCata> UccnCataList;
 }
\ No newline at end of file

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

@@ -48,6 +48,9 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+	/**
+	 * 官网需要显示的配置列表
+	 */
 	List<VehiclePlatCata> UccnCataList;
 
 }

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

@@ -445,7 +445,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate, DateTime.parse(startDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER), DateTime.parse(endDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER));
-        if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
+               if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/jobhandler/VehicleJobHandler.java

@@ -60,10 +60,7 @@ public class VehicleJobHandler extends IJobHandler {
                 vehicleBookInfoBiz.InsertBatch(bookInfos);
                 XxlJobLogger.log("----插入车型对象:【{}】",bookInfos);
             }
-            ReturnT returnT = new ReturnT();
-            returnT.setCode(100);
-            returnT.setMsg("成功");
-            return returnT;
+            return ReturnT.SUCCESS;
         } catch (Exception ex) {
             XxlJobLogger.log(ex);
             return FAIL;

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

@@ -15,10 +15,12 @@ import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -70,12 +72,32 @@ public class VehicleLicenseController extends VehicleBaseController<VehicleLicen
     @RequestMapping(value = "/license/multi", method = RequestMethod.GET)
     public ObjectRestResponse<List<VehicleUserLicense>> multi(QueryMultiDTO dto) throws Exception {
 //        BaseContextHandler.getUserID()
+        log.info("获取驾驶人信息：", dto.toString());
         List<VehicleUserLicense> list = baseBiz.selectByExample(new Example.Builder(VehicleUserLicense.class)
                 .where(WeekendSqls.<VehicleUserLicense>custom()
                         .andIn(VehicleUserLicense::getId, Arrays.asList(dto.getIds().split(",")))).build());
         return ObjectRestResponse.succ().data(list);
     }
 
+
+    @GetMapping("/license/getVehicleLicenseList")
+    public ObjectRestResponse<List<VehicleUserLicense>> getVehicleLicenseList(String ids){
+//        BaseContextHandler.getUserID()
+        log.info("获取驾驶人信息：", ids);
+        List<VehicleUserLicense> list = new ArrayList<>();
+        if(StringUtils.isNotBlank(ids)) {
+           List<String> idList = Arrays.asList(ids.split(","));
+           for(String id : idList) {
+               VehicleUserLicense vehicleUserLicense = baseBiz.selectById(id);
+               if(vehicleUserLicense != null) {
+                   list.add(vehicleUserLicense);
+               }
+           }
+        }
+        return ObjectRestResponse.succ().data(list);
+    }
+
+
     @RequestMapping(value = "/license/del", method = RequestMethod.GET)
     public RestResponse del(
             @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception {

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -44,6 +45,7 @@ import java.util.List;
 @RestController
 @RequestMapping("vehicleModel")
 @Api(value = "车型controller", tags = {"车型操作接口"})
+@IgnoreClientToken
 public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> implements UserRestInterface {
 
     @Autowired

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

@@ -677,6 +677,8 @@
             and v.is_del = 0
             and v.status != 3
             and v.use_type = 1
+            and bc.is_del = 0
+            and bc.is_show = 1
         </where>
     </sql>