Skip to content

E
extend
Commit f1aace6b by xieshixiang
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/param/response/InsuranceInfoRes.java
parents b106cfc5 5aba7a0b
Showing with 199 additions and 8 deletions
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/ApiApplication.java
......@@ -5,6 +5,7 @@ import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
......@@ -15,6 +16,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableFeignClients("com.hikcreate")
@EnableEurekaClient
@EnableApolloConfig
@EnableCaching
public class ApiApplication {
public static void main(String[] args) {
......
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java
......@@ -11,6 +11,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ViolationInfo
import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -39,7 +40,7 @@ public class H5Controller {
* @date: 2020/6/19 10:32
*/
@GetMapping("yearCheckInfo")
public Result<YearCheckInfoRes> yearCheckInfo(@RequestBody BindInfoQuery query) {
public Result<YearCheckInfoRes> yearCheckInfo(@RequestBody @Validated BindInfoQuery query) {
if (query == null) {
return Result.errorResult(ResultCode.PARAMETER_ERROR);
}
......@@ -55,7 +56,7 @@ public class H5Controller {
* @date: 2020/6/19 16:28
*/
@GetMapping("violationInfo")
public Result<ResultList<ViolationInfoRes>> violationInfo(@RequestBody BindInfoQuery query) {
public Result<ResultList<ViolationInfoRes>> violationInfo(@RequestBody @Validated BindInfoQuery query) {
if (query == null) {
return Result.errorResult(ResultCode.PARAMETER_ERROR);
}
......@@ -71,7 +72,7 @@ public class H5Controller {
* @date: 2020/6/19 16:28
*/
@GetMapping("insuranceInfo")
public Result<InsuranceInfoRes> insuranceInfo(@RequestBody BindInfoQuery query) {
public Result<InsuranceInfoRes> insuranceInfo(@RequestBody @Validated BindInfoQuery query) {
if (query == null) {
return Result.errorResult(ResultCode.PARAMETER_ERROR);
}
......
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/intercept/EncryptResponseBodyAdvice.java
......@@ -40,6 +40,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
if( ResultCode.SUCCESS.getCode().equals(result.getCode()) ) {
//进行加密
Object data = result.getData();
if( data!=null ) {
String dataStr = objectMapper.writeValueAsString(data);
String encryptStr = EncryptStringAes.encryptAes(dataStr, "AES/ECB/PKCS5Padding");
BaseEncryptRes baseEncryptRes = new BaseEncryptRes();
......@@ -49,6 +50,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
log.info("Response body 密文: {}",objectMapper.writeValueAsString(o));
}
}
}
} catch ( Exception e ) {
log.error("Response body 加密异常：{}", e);
}
......
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
......@@ -3,6 +3,7 @@ package com.hikcreate.edl.pub.web.mobile.domain.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
......@@ -10,6 +11,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.core.Result;
import com.hikcreate.edl.pub.web.mobile.infra.core.enums.ResultCode;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.VechicleFeign;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.ViolationFeign;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumAndTypeQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.ViolationPlateNumAndTypeQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.VehicleRes;
......@@ -24,6 +26,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.InsuranceInfo
import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ResultList;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ViolationInfoRes;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
......@@ -32,6 +35,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
/**
......@@ -90,7 +94,22 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return Result.errorResult(ResultCode.DATA_ERROR);
}
return null;
PlateNumAndTypeQueryReq req = new PlateNumAndTypeQueryReq();
req.setPlateNum(bindInfo.getPlateNum());
req.setPlateType(bindInfo.getPlateType());
VehicleRes vehicleRes = vechicle.getByPlateNumAndType(req);
if( Objects.isNull(vehicleRes) ) {
return Result.successResult();
}
YearCheckInfoRes yearCheckInfoRes = new YearCheckInfoRes();
yearCheckInfoRes.setYxqz(vehicleRes.getYxqz());
Long checkTime = DateUtil.parse(vehicleRes.getYxqz(),"yyyy-MM-dd HH:mm:ss").getTime();
if( checkTime>=System.currentTimeMillis() ) {
yearCheckInfoRes.setZt("未到期");
} else {
yearCheckInfoRes.setZt("已到期");
}
return Result.successResult(yearCheckInfoRes);
}
@Override
......@@ -99,6 +118,19 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return Result.errorResult(ResultCode.DATA_ERROR);
}
PlateNumAndTypeQueryReq req = new PlateNumAndTypeQueryReq();
req.setPlateNum(bindInfo.getPlateNum());
req.setPlateType(bindInfo.getPlateType());
VehicleRes vehicleRes = vechicle.getByPlateNumAndType(req);
if( Objects.isNull(vehicleRes) ) {
return Result.successResult();
}
InsuranceInfoRes insuranceInfoRes = new InsuranceInfoRes();
if( StrUtil.isNotBlank(vehicleRes.getBxzzrq()) ) {
} else {
}
return null;
}
......
infra/pom.xml
......@@ -48,7 +48,7 @@
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>1.6.0</version>
<version>${apollo.version}</version>
</dependency>
<!--Apollo End-->
......@@ -65,6 +65,15 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
</dependencies>
</project>
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/config/RedisCacheConfig.java 0 → 100644
package com.hikcreate.edl.pub.web.mobile.infra.core.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.interceptor.KeyGenerator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheConfiguration;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.time.Duration;
import java.util.HashMap;
/**
* @author 赵东
* @create 2019/5/31 17:30
*/
@Slf4j
@Configuration
public class RedisCacheConfig extends CachingConfigurerSupport {
@Resource
private RedisConnectionFactory connectionFactory;
/**
* 自定义生成key的规则
*/
@Override
public KeyGenerator keyGenerator() {
return ( Object o, Method method, Object... objects ) -> {
StringBuilder sb = new StringBuilder();
sb.append(o.getClass().getName());
sb.append(method.getName());
for ( Object obj : objects ) {
sb.append(obj.toString());
}
return sb.toString();
};
}
/**
* 采用RedisCacheManager作为缓存管理器
*
* @return
*/
@Bean( "cacheManager" )
@Override
public CacheManager cacheManager() {
RedisSerializer<String> redisSerializer = new StringRedisSerializer();
Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
ObjectMapper om = new ObjectMapper();
om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
// 将类型序列化到属性json字符串中
om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
// 只针对非空的值进行序列化(这个是为了减少json序列化之后所占用的空间)
om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
// 对于找不到匹配属性的时候忽略报错
om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
// 不包含任何属性的bean也不报错
om.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
jackson2JsonRedisSerializer.setObjectMapper(om);
RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
.entryTtl(Duration.ofDays(1))
.disableCachingNullValues()
.computePrefixWith(cacheName -> "park:".concat("extend").concat(":").concat(cacheName).concat(":"))
.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer));
return RedisCacheManager.builder(connectionFactory)
.cacheDefaults(defaultCacheConfig)
.withInitialCacheConfigurations(new HashMap<String, RedisCacheConfiguration>())
.transactionAware()
.build();
}
@Bean
public RedisTemplate<String, String> redisTemplate( RedisConnectionFactory factory ) {
////解决键、值序列化问题
StringRedisTemplate template = new StringRedisTemplate(factory);
Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
ObjectMapper om = new ObjectMapper();
om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
jackson2JsonRedisSerializer.setObjectMapper(om);
template.setValueSerializer(jackson2JsonRedisSerializer);
template.setHashValueSerializer(jackson2JsonRedisSerializer);
template.afterPropertiesSet();
return template;
}
}
\ No newline at end of file
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/VechicleFeign.java
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumAndTypeQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.VehicleRes;
import org.springframework.cloud.openfeign.FeignClient;
......@@ -23,4 +24,16 @@ public interface VechicleFeign {
*/
@PostMapping("/getByPlateNum")
List<VehicleRes> getByPlateNum(@RequestBody PlateNumQueryReq req);
/**
* -----获取车辆信息------
* 查询车辆信息-号牌号码和号牌类型
*
* @param req
* @return
* @param号牌号码
* @param号牌类型
*/
@PostMapping("/getByPlateNumAndType")
VehicleRes getByPlateNumAndType(@RequestBody PlateNumAndTypeQueryReq req);
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/param/request/PlateNumAndTypeQueryReq.java 0 → 100644
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request;
import lombok.Data;
/**
* 违法
*
* @author MOUBK
* @create 2019/7/5 14:51
*/
@Data
public class PlateNumAndTypeQueryReq {
private String plateType;
private String plateNum;
}
\ No newline at end of file
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/BindInfoQuery.java
package com.hikcreate.edl.pub.web.mobile.infra.model;
import cn.hutool.core.date.DateTime;
import com.hikcreate.edl.pub.web.mobile.infra.core.page.PageQuery;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
......@@ -18,14 +18,17 @@ public class BindInfoQuery implements Serializable {
/**
* 绑定信息的唯一标识.
*/
@NotBlank(message = "绑定信息的唯一标识不能为空")
private String unqId;
/**
* 查询客户的id
*/
@NotBlank(message = "客户唯一编码不能为空")
private String userId;
/**
*查询客户的电话号码
* 查询客户的电话号码
*/
@NotBlank(message = "客户手机号不能为空")
private String phone;
}
pom.xml
......@@ -25,6 +25,7 @@
<hutoll.version>5.3.7</hutoll.version>
<druid.version>1.1.22</druid.version>
<apollo.version>1.6.0</apollo.version>
<dynamic-datasource.version>2.5.4</dynamic-datasource.version>
</properties>
<modules>
......
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