Skip to content

C
cloud-platform
Commit 855887e3 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'jrz_dev' into base-modify

parents 35ca438c 97889578
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 87 deletions
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java
View file @ 855887e3
......@@ -234,4 +234,14 @@ public class AuthController {
return JsonResultUtil.createSuccessResultWithObj(authService.loginImiWithToken());
}
/**
* 检查token是否失效
* @param token
* @return
*/
@RequestMapping(value = "checkToken", method = RequestMethod.GET)
public ObjectRestResponse checkToken(String token){
return authService.checkToken(token);
}
}
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
View file @ 855887e3
......@@ -37,4 +37,6 @@ public interface AuthService {
JSONObject appletRegistry(String username,String headimgurl,String nickname,Integer userid);
String loginImiWithToken();
ObjectRestResponse checkToken(String token);
}
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java
View file @ 855887e3
......@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
import com.github.wxiaoqi.security.api.vo.user.UserInfo;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
import com.github.wxiaoqi.security.auth.feign.IUserService;
import com.github.wxiaoqi.security.auth.service.AuthService;
......@@ -11,6 +12,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
......@@ -117,4 +119,22 @@ public class AppAuthServiceImpl implements AuthService {
return userService.loginImiWithToken();
}
@Override
public ObjectRestResponse checkToken(String token) {
try {
if (StringUtils.isEmpty(token)){
return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
}
IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
if (ijwtInfo==null){
return ObjectRestResponse.createFailedResult(10009,"token失效");
}
return ObjectRestResponse.succ();
}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
View file @ 855887e3
......@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.api.vo.user.UserInfo;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
import com.github.wxiaoqi.security.auth.feign.IUserService;
import com.github.wxiaoqi.security.auth.service.AuthService;
......@@ -10,6 +11,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
......@@ -113,4 +115,22 @@ public class AuthServiceImpl implements AuthService {
public String loginImiWithToken() {
return userService.loginImiWithToken();
}
@Override
public ObjectRestResponse checkToken(String token) {
try {
if (StringUtils.isEmpty(token)){
return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
}
IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
if (ijwtInfo==null){
return ObjectRestResponse.createFailedResult(10009,"token失效");
}
return ObjectRestResponse.succ();
}catch (Exception e){
e.printStackTrace();
return ObjectRestResponse.createFailedResult(10009,"token失效");
}
}
}
xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java
View file @ 855887e3
......@@ -343,7 +343,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
List<GoodDataVO> list = mapper.findAll();
Set<GoodDataVO> resultList = new HashSet<>();
if(CollectionUtils.isNotEmpty(list)) {
if(number == list.size()) {
if(number >= list.size()) {
return ObjectRestResponse.succ(list);
}
Set<Integer> set = new HashSet<>();
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ 855887e3
......@@ -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-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
View file @ 855887e3
......@@ -119,7 +119,7 @@ public interface TourFeign {
ObjectRestResponse getOne(@PathVariable Integer id);
//首页旅游列表
@GetMapping(value = "/gw/app/shopList")
@GetMapping(value = "/gw/shopList")
List<GoodDataVO> goodListAll(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit",defaultValue = "4") Integer limit);
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java
View file @ 855887e3
......@@ -334,7 +334,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
List<TourGood> list = mapper.getCoordinateList(param);
Set<TourGood> resultList = new HashSet<>();
if(CollectionUtils.isNotEmpty(list)) {
if(number == list.size()) {
if(number >= list.size()) {
return ObjectRestResponse.succ(list);
}
Set<Integer> set = new HashSet<>();
......
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/TypeEnum.java
View file @ 855887e3
......@@ -6,8 +6,8 @@ public enum TypeEnum {
VEHICLE(1, "车型"),
TOUR(2, "旅游"),
CAMPSITE(3, "营地"),
ACTIVITY(4, "活动");
ACTIVITY(4, "活动"),
NEWS(5, "新闻");
private Integer code;
private String msg;
......
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java
View file @ 855887e3
......@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.weekend.WeekendSqls;
import java.security.SecureRandom;
import java.util.*;
......@@ -31,6 +32,8 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
private final Integer HOME_PAGE_NUMBER = 4;
/**
* 文章列表
*
......@@ -41,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);
List articleList = mapper.getArticleList(type,null);
return PageInfo.of(articleList);
}
......@@ -73,7 +76,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
*/
public List getThree(Integer type) {
List<Article> articleList = mapper.getArticleList(type);
List<Article> articleList = mapper.getArticleList(type,null);
if (!Objects.isNull(articleList)) {
int size = articleList.size();
if (RANDOM_NUMBER >= size) {
......@@ -100,16 +103,16 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
* @return
*/
public List getHomePageArticle(Integer type) {
List<Article> articleList = mapper.getArticleList(type);
if (Objects.isNull(articleList)) {
return new ArrayList();
} else {
if (articleList.size() > HOME_PAGE_NUMBER) {
return articleList.subList(0, HOME_PAGE_NUMBER);
} else {
List<Article> articleList = mapper.getArticleList(type,HOME_PAGE_NUMBER);
// if (Objects.isNull(articleList)) {
// return new ArrayList();
// } else {
// if (articleList.size() > HOME_PAGE_NUMBER) {
// return articleList.subList(0, HOME_PAGE_NUMBER);
// } else {
return articleList;
}
}
// }
// }
}
@Transactional(rollbackFor = Exception.class)
......
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/RandomListBiz.java
View file @ 855887e3
......@@ -28,6 +28,9 @@ public class RandomListBiz {
@Autowired
SummitActivityBiz summitActivityBiz;
@Autowired
ArticleBiz articleBiz;
/**
* @param type 类型
......@@ -46,6 +49,8 @@ public class RandomListBiz {
return campsiteFeign.findRandomVehicle(number);
case ACTIVITY:
return ObjectRestResponse.succ(summitActivityBiz.getHostWithSummitActivity(number, location));
case NEWS:
}
}
return ObjectRestResponse.succ();
......
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java
View file @ 855887e3
......@@ -224,6 +224,9 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
PageDataVO<SummitActivity> summitActivityPageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
List<SummitActivity> summitActivities = summitActivityPageDataVO.getData();
if (CollectionUtils.isEmpty(summitActivities)){
dataVO.setPageNum(page);
dataVO.setPageSize(limit);
dataVO.setData(Collections.EMPTY_LIST);
return dataVO;
}
List<SummitActivityVo> summitActivityVos = new ArrayList<>();
......
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/ArticleMapper.java
View file @ 855887e3
......@@ -15,5 +15,5 @@ public interface ArticleMapper extends Mapper<Article> {
* @param type
* @return
*/
List<Article> getArticleList(@Param("type") Integer type);
List<Article> getArticleList(@Param("type") Integer type,@Param( "limit") Integer limit);
}
xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml
View file @ 855887e3
......@@ -5,7 +5,15 @@
<select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
select id, title,epitome,add_time,cover_image from article
where is_del=0 and status=1 and (type=#{type} or type=0) order by weight ASC ,add_time DESC
where
is_del=0
and status=1
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
View file @ 855887e3
......@@ -66,6 +66,10 @@ public class SmsTemplateDTO {
public static final int PAY_H = 24;
//取消旅游订单（客服）
public static final int CANCEL_F = 25;
//租车（取车提醒）26
public static final int PAY_I= 26;
//旅游（上车通知）27
public static final int PAY_J= 27;
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java 0 → 100644
View file @ 855887e3
package com.xxfc.platform.universal.biz;
import com.xxfc.platform.universal.service.SmsService;
import com.xxfc.platform.universal.utils.CCPRestSmsUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class AliYunSmsBiz {
//租车订单通知(普通用户)1
public static final String TEMPLATE_ID_ORDER = "SMS_173247815";
//租车订单短信(会员权益)2
public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_173252767";
//旅游订单短信3
public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_173247826";
//加入会员通知4
public static final String TEMPLATE_ID_MEMBER = "SMS_173247829";
//租/还车公司相同（订单支付后立即发送给相关负责人）5
public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_173247836";
//租/还车公司不同（发给租车公司负责人，订单支付后发送）6
public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621";
// 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7
public static final String TEMPLATE_ID_ALSO_CAR = "458620";
//取消订单9
public static final String TEMPLATE_ID_CANCEL = "458627";
//租车（通用）10
//public static final String TEMPLATE_ID_PAY_A = "460759";
public static final String TEMPLATE_ID_PAY_A = "SMS_171112286";
//租车（使用会员权益）11
//public static final String TEMPLATE_ID_PAY_B = "460760";
public static final String TEMPLATE_ID_PAY_B = "SMS_173340577";
//租车内部通知（客服）12
//public static final String TEMPLATE_ID_PAY_C = "460763";
public static final String TEMPLATE_ID_PAY_C = "SMS_173345572";
//租车内部通知（出车人）13
//public static final String TEMPLATE_ID_PAY_D = "460762";
public static final String TEMPLATE_ID_PAY_D = "SMS_173340609";
//租车内部通知（收车人）14
//public static final String TEMPLATE_ID_PAY_E = "460764";
public static final String TEMPLATE_ID_PAY_E = "SMS_173345589";
//旅游（通用）15
//public static final String TEMPLATE_ID_PAY_F = "460765";
public static final String TEMPLATE_ID_PAY_F = "SMS_173345597";
//会员购买（通用）16
//public static final String TEMPLATE_ID_PAY_G = "460766";
public static final String TEMPLATE_ID_PAY_G = "SMS_173340637";
//取消租车（通用）17
//public static final String TEMPLATE_ID_CANCEL_A= "460767";
public static final String TEMPLATE_ID_CANCEL_A= "SMS_173345633";
//取消租车（使用会员权益）18
//public static final String TEMPLATE_ID_CANCEL_B = "460768";
public static final String TEMPLATE_ID_CANCEL_B = "SMS_173340658";
//取消租车（通用扣违约金）19
//public static final String TEMPLATE_ID_CANCEL_C = "460769";
public static final String TEMPLATE_ID_CANCEL_C = "SMS_173345646";
//取消租车（会员权益&扣违 20
//public static final String TEMPLATE_ID_CANCEL_D = "460770";
public static final String TEMPLATE_ID_CANCEL_D = "SMS_173340671";
//取消租车（出车人）21
//public static final String TEMPLATE_ID_CANCEL_E = "460771";
public static final String TEMPLATE_ID_CANCEL_E = "SMS_173345667";
//租车押金退还 22
//public static final String TEMPLATE_ID_FINISH_A = "460772";
public static final String TEMPLATE_ID_FINISH_A = "SMS_173340710";
//违章押金退还 23
//public static final String TEMPLATE_ID_FINISH_B = "460773";
public static final String TEMPLATE_ID_FINISH_B = "SMS_173340712";
//旅游内部通知（客服）24
//public static final String TEMPLATE_ID_PAY_H = "461421";
public static final String TEMPLATE_ID_PAY_H = "SMS_173340630";
//取消旅游订单（客服）25
//public static final String TEMPLATE_ID_CANCEL_F = "461424";
public static final String TEMPLATE_ID_CANCEL_F = "SMS_173340695";
//租车（取车提醒）26
public static final String TEMPLATE_ID_PAY_I= "SMS_173345539";
//旅游（上车通知）27
public static final String TEMPLATE_ID_PAY_J= "SMS_173345606";
//发送模板消息
public void sendTemplateSMS(Integer type,String phoneNumbers,String[]params){
switch (type){
case 1 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_ORDER);
break;
case 2 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_ORDER_MEMBER);
break;
case 3 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_ORDER_TOUR);
break;
case 4 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_MEMBER);
break;
case 5 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_TAAKE_CAR);
break;
case 6 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_DIFFERENT_TAAKE_CAR);
break;
case 7 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_ALSO_CAR);
break;
case 8 :
CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL);
break;
case 10 :
//CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_A);
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_A);
break;
case 11:
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_B);
break;
case 12 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_C);
break;
case 13 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_D);
break;
case 14 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_E);
break;
case 15 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_F);
break;
case 16 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_G);
break;
case 17 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_A);
break;
case 18 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_B);
break;
case 19 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_C);
break;
case 20 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_D);
break;
case 21 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_E);
break;
case 22 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_FINISH_A);
break;
case 23 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_FINISH_B);
break;
case 24 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_H);
break;
case 25 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_CANCEL_F);
break;
case 26 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_I);
break;
case 27 :
SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_J);
break;
}
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/SmsController.java
View file @ 855887e3
......@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import com.xxfc.platform.universal.biz.AliYunSmsBiz;
import com.xxfc.platform.universal.biz.CCPRestSmsBiz;
import com.xxfc.platform.universal.dto.SmsTemplateDTO;
import com.xxfc.platform.universal.service.SmsService;
......@@ -32,6 +33,9 @@ public class SmsController {
@Autowired
CCPRestSmsBiz smsBiz;
@Autowired
AliYunSmsBiz aliYunSmsBiz;
@RequestMapping(value = "/app/unauth/send", method = RequestMethod.GET) //匹配的是href中的download请求
public JSONObject sendSms(@RequestParam("phone") String phone) throws Exception {
return smsService.smsCode(phone);
......@@ -52,7 +56,7 @@ public class SmsController {
Integer type=smsTemplateDTO.getType();
String[] params=smsTemplateDTO.getParams();
String phoneNumbers=smsTemplateDTO.getPhoneNumbers();
smsBiz.sendTemplateSMS(type,phoneNumbers,params);
aliYunSmsBiz.sendTemplateSMS(type,phoneNumbers,params);
return ObjectRestResponse.succ();
}
}
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java
View file @ 855887e3
......@@ -6,19 +6,9 @@ import com.aliyuncs.IAcsClient;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.http.FormatType;
import com.aliyuncs.http.HttpResponse;
import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile;
import com.aliyuncs.profile.IClientProfile;
import java.nio.charset.Charset;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import com.github.wxiaoqi.security.common.util.RandomUtil;
import com.github.wxiaoqi.security.common.util.process.SystemConfig;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
......@@ -43,6 +33,7 @@ public class SmsService {
//短信模板id
static final String TemplateCode = SystemConfig.TEMPLATECODE;
static final String TemplateParam="{\"code\":\"str\"}";
static final String param = "param";
public JSONObject smsCode(String mobile){
......@@ -157,7 +148,7 @@ public class SmsService {
return false;
}
public boolean sendTemplate(String PhoneNumbers,String params,String templateCode) throws ClientException {
public static boolean sendTemplate(String PhoneNumbers,String params,String templateCode) throws ClientException {
//可自助调整超时时间
System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
......@@ -168,9 +159,9 @@ public class SmsService {
DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
IAcsClient acsClient = new DefaultAcsClient(profile);
//组装请求对象-具体描述见控制台-文档部分内容
SendSmsRequest request = new SendSmsRequest();
//必填:待发送手机号
//组装请求对象
SendSmsRequest request = new SendSmsRequest ();
//必填:待发送手机号。支持JSON格式的批量调用，批量上限为100个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式
request.setPhoneNumbers(PhoneNumbers);
//必填:短信签名-可在短信控制台中找到
request.setSignName(SignName);
......@@ -186,7 +177,7 @@ public class SmsService {
//可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者
//request.setOutId("yourOutId");
//hint 此处可能会抛出异常，注意catch
SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
log.info("短信接口返回的数据----------------mobile======"+PhoneNumbers+"----templateParam===="+params);
log.info("Code=" + sendSmsResponse.getCode());
log.info("Message=" + sendSmsResponse.getMessage());
......@@ -200,60 +191,26 @@ public class SmsService {
return false;
}
public String getString(Map<String,Object> params){
if(params!=null){
StringBuilder sb = new StringBuilder("{");
for (Object o : params.keySet()) {
sb.append("\"" + o + "\"" +":"+"\"" + params.get(o) + "\"" +",");
public static void sendTemplateToJson(String PhoneNumbers,String[] params,String templateCode){
try {
JSONObject jsonParams=new JSONObject();
for (int i=0;i<params.length;i++){
jsonParams.put(param+(i+1),params[i]);
}
sb.replace(sb.length() - 1, sb.length(), "}");
return sb.toString();
}
return null;
}
/* public static QuerySendDetailsResponse querySendDetails(String bizId) throws ClientException {
//可自助调整超时时间
System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
System.setProperty("sun.net.client.defaultReadTimeout", "10000");
//初始化acsClient,暂不支持region化
IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
IAcsClient acsClient = new DefaultAcsClient(profile);
sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
}catch (Exception e){
e.printStackTrace();
}
//组装请求对象
QuerySendDetailsRequest request = new QuerySendDetailsRequest();
//必填-号码
request.setPhoneNumber("15000000000");
//可选-流水号
request.setBizId(bizId);
//必填-发送日期 支持30天内记录查询，格式yyyyMMdd
SimpleDateFormat ft = new SimpleDateFormat("yyyyMMdd");
request.setSendDate(ft.format(new Date()));
//必填-页大小
request.setPageSize(10L);
//必填-当前页码从1开始计数
request.setCurrentPage(1L);
//hint 此处可能会抛出异常，注意catch
QuerySendDetailsResponse querySendDetailsResponse = acsClient.getAcsResponse(request);
}
return querySendDetailsResponse;
}
*/
public static void main(String[] args) throws ClientException, InterruptedException {
SmsService smsService=new SmsService();
//发短信
Map<String,Object> params=new HashMap<>();
params.put("name","何振");
params.put("code","123456");
params.put("time",5);
params.put("other","何振2");
smsService.sendTemplate("13612688539","123","SMS_171112286");
String[] params={"1","2","3","2019-08-29","松山湖"};
SmsService.sendTemplateToJson("13612688539,13265487972",params,"SMS_169904346");
/*System.out.println("短信接口返回的数据----------------");
System.out.println("Code=" + response.getCode());
System.out.println("Message=" + response.getMessage());
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @ 855887e3
......@@ -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-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 855887e3
......@@ -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/biz/VehicleModelBiz.java
View file @ 855887e3
......@@ -83,7 +83,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
List<VehicleModelVo> list = mapper.findVehicleModelPage(vmqc);
Set<VehicleModelVo> resultList = new HashSet<>();
if(CollectionUtils.isNotEmpty(list)) {
if(number == list.size()) {
if(number >= list.size()) {
return ObjectRestResponse.succ(list);
}
Set<Integer> set = new HashSet<>();
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleLicenseController.java
View file @ 855887e3
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment