Skip to content

E
extend
Commit be72e56d by lixian7
Options

实体类调整调整

parent 9cc3ad5c
Showing with 61 additions and 63 deletions
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
......@@ -3,12 +3,10 @@ package com.hikcreate.edl.pub.web.mobile.api.controller;
import com.hikcreate.common.orika.DefaultConverter;
import com.hikcreate.common.sdk.response.apiparam.Response;
import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator;
import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.BodyDecryptAnnotation;
import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.ResponseEncryptAnnotation;
import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.UnBindReq;
......@@ -21,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 绑定信息的controller
*
......@@ -54,7 +50,7 @@ public class BindInfoControlller extends BaseController {
@ResponseEncryptAnnotation
public Response<String> bindInfo(@RequestBody @Validated BindInfoReq req) {
BindInfo bindInfo = new BindInfo();
ParkBindInfo bindInfo = new ParkBindInfo();
defaultConverter.getMapperFacade().map(req, bindInfo);
return service.bind(bindInfo);
}
......@@ -86,8 +82,8 @@ public class BindInfoControlller extends BaseController {
@PostMapping("query")
@BodyDecryptAnnotation
@ResponseEncryptAnnotation
public Response<ResultList<BindInfo>> bindInfoQery(@RequestBody @Validated BindInfoQueryReq query) {
return ResponseGenerator.success(new ResultList<BindInfo>(service.selectByQuery(query)));
public Response<ResultList<ParkBindInfo>> bindInfoQery( @RequestBody @Validated BindInfoQueryReq query) {
return ResponseGenerator.success(new ResultList<ParkBindInfo>(service.selectByQuery(query)));
}
}
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java
......@@ -14,7 +14,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pub_service_sms.par
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pub_service_sms.param.request.SendVerifyCodeMicReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.VerifyInfoMapper;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
import com.hikcreate.edl.pub.web.mobile.infra.model.VerifyInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.CheckVerifyCodeReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.SendVerifyCodeReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.CheckValidityRes;
......@@ -125,7 +125,7 @@ public class H5Controller {
@HeaderDecryptAnnotation
public Response<CheckValidityRes> checkValidity( @RequestBody @Validated H5BindInfoQuery query) {
VerifyInfo verifyInfo = verifyInfoMapper.checkValidity(query.getPhone(), query.getUserId(),
ParkVerifyInfo verifyInfo = verifyInfoMapper.checkValidity(query.getPhone(), query.getUserId(),
DateUtil.offsetDay(DateTime.now(), -10));
CheckValidityRes checkValidityRes = new CheckValidityRes();
......@@ -174,7 +174,7 @@ public class H5Controller {
Response<Void> checkResult = smsFeign.checkVerifyCode(micReq);
if (StatusCode.SUCCESS.getCode() == (checkResult.getCode())) {
VerifyInfo verifyInfo = new VerifyInfo();
ParkVerifyInfo verifyInfo = new ParkVerifyInfo();
verifyInfo.setUserId(req.getUserId());
verifyInfo.setVerifyCode(req.getVerifyCode());
verifyInfo.setPhone(req.getPhone());
......
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/TestController.java → api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java
......@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 工具
* @menu 工具接口
* @author lixian
* @description
* @date 2020/6/18 17:57
......@@ -16,10 +18,15 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping( "/test" )
public class TestController {
public class ToolController {
@Autowired
SignKeyConfigBean signKeyConfigBean;
/**
* 加密
* @param plain 明文
* @return
*/
@GetMapping( value = "encrypt" )
public String encrypt( String plain ) {
return EncryptStringAes.encryptAes(plain, signKeyConfigBean.getKey());
......
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/IBindService.java
......@@ -2,7 +2,7 @@ package com.hikcreate.edl.pub.web.mobile.domain;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hikcreate.common.sdk.response.apiparam.Response;
import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.UnBindReq;
......@@ -17,7 +17,7 @@ import java.util.List;
* @author: xieshixiang
* @time：2020/6/18 16:11
**/
public interface IBindService extends IService<BindInfo> {
public interface IBindService extends IService<ParkBindInfo> {
/**
* 信息绑定接口
......@@ -27,7 +27,7 @@ public interface IBindService extends IService<BindInfo> {
* @author: xsx
* @date: 2020/6/19 10:32
*/
Response bind( BindInfo info);
Response bind( ParkBindInfo info);
/**
* 信息解绑
......@@ -41,7 +41,7 @@ public interface IBindService extends IService<BindInfo> {
* @param query
* @return
*/
List<BindInfo> selectByQuery( BindInfoQueryReq query);
List<ParkBindInfo> selectByQuery( BindInfoQueryReq query);
/**
* 年检信息查询接口
......
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
......@@ -25,8 +25,8 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.par
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.ViolationRes;
import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.VerifyInfoMapper;
import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.VerifyInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.UnBindReq;
......@@ -55,7 +55,7 @@ import java.util.UUID;
@Service
@EnableScheduling
@Slf4j
public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> implements IBindService {
public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> implements IBindService {
@Resource
BindInfoMapper mapper;
......@@ -78,7 +78,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
@Override
public Response bind(BindInfo info) {
public Response bind( ParkBindInfo info) {
info.setUnqId(UUID.randomUUID().toString());
info.setGmtBindTime(DateTime.now().toString());
......@@ -108,12 +108,12 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
}
//规则3:判断当前车牌号是否已绑定
QueryWrapper<BindInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<ParkBindInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", info.getUserId());
queryWrapper.eq("plate_num", info.getPlateNum());
queryWrapper.eq("plate_type", info.getPlateType());
queryWrapper.eq("status", "1");
BindInfo bindExist = mapper.selectOne(queryWrapper);
ParkBindInfo bindExist = mapper.selectOne(queryWrapper);
if (bindExist != null) {
return ResponseGenerator.fail(StatusCode.DATA_ERROR,"此车牌号已绑定");
} else {
......@@ -134,7 +134,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
/**
* 解绑规则:30天内,同一客户解绑次数总计不能超过10次
*/
QueryWrapper<BindInfo> queryWrapper = new QueryWrapper<>();
QueryWrapper<ParkBindInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", req.getUnqId());
queryWrapper.eq("unbind_time", DateUtil.offsetDay(new Date(), -30));
queryWrapper.eq("status", "0");
......@@ -154,15 +154,15 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
* @return
*/
@Override
public List<BindInfo> selectByQuery(BindInfoQueryReq query) {
public List<ParkBindInfo> selectByQuery( BindInfoQueryReq query) {
return bindCache.selectByQuery(query.getUserId());
}
@Override
public Response<YearCheckInfoRes> yearCheckInfo(H5BindInfoQuery query) {
BindInfo bindInfo = bindCache.getById(query.getUnqId());
ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return ResponseGenerator.fail(StatusCode.DATA_ERROR);
return ResponseGenerator.fail(StatusCode.DATA_ERROR, "绑定信息不存在");
}
PlateNumAndTypeQueryReq req = new PlateNumAndTypeQueryReq();
req.setPlateNum(bindInfo.getPlateNum());
......@@ -187,9 +187,9 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
@Override
public Response<InsuranceInfoRes> insuranceInfo(H5BindInfoQuery query) {
BindInfo bindInfo = bindCache.getById(query.getUnqId());
ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return ResponseGenerator.fail(StatusCode.DATA_ERROR);
return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
}
PlateNumAndTypeQueryReq req = new PlateNumAndTypeQueryReq();
req.setPlateNum(bindInfo.getPlateNum());
......@@ -225,9 +225,9 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
/**
* 校验当前的绑定信息是否存在
*/
BindInfo bindInfo = bindCache.getById(query.getUnqId());
ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return ResponseGenerator.fail(StatusCode.DATA_ERROR);
return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
}
/**
......@@ -261,15 +261,15 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
/**
* 校验当前的绑定信息是否存在
*/
BindInfo bindInfo = bindCache.getById(query.getUnqId());
ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
return ResponseGenerator.fail(StatusCode.DATA_ERROR);
return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
}
/**
* 校验当前电话号码是否在10天内已通过验证
*/
VerifyInfo verify = verifyInfo.checkValidity(query.getPhone(), query.getUserId(),
ParkVerifyInfo verify = verifyInfo.checkValidity(query.getPhone(), query.getUserId(),
DateUtil.offsetDay(DateTime.now(), -10));
if (verify == null) {
return ResponseGenerator.fail(StatusCode.PERMISSION_DENIED);
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/BindCache.java
......@@ -2,9 +2,8 @@ package com.hikcreate.edl.pub.web.mobile.infra.data.cache;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator;
import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.annotation.Caching;
......@@ -30,10 +29,10 @@ public class BindCache {
* @return
*/
@Cacheable( value = "bindinfo", key = "'id:'+#unqId", unless = "#result==null" )
public BindInfo getById( String unqId ) {
LambdaQueryWrapper<BindInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BindInfo::getUnqId, unqId);
queryWrapper.eq(BindInfo::getStatus, 1);
public ParkBindInfo getById( String unqId ) {
LambdaQueryWrapper<ParkBindInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParkBindInfo::getUnqId, unqId);
queryWrapper.eq(ParkBindInfo::getStatus, 1);
return mapper.selectOne(queryWrapper);
}
......@@ -43,7 +42,7 @@ public class BindCache {
* @return
*/
@Cacheable( value = "bindinfo", key = "'userId:'+#userId", unless = "#result==null or #result.size()==0" )
public List<BindInfo> selectByQuery( String userId) {
public List<ParkBindInfo> selectByQuery( String userId) {
return mapper.selectByQuery(userId);
}
......@@ -59,7 +58,7 @@ public class BindCache {
})
public boolean unBind(String unqId, String userId){
BindInfo bindInfo = new BindInfo();
ParkBindInfo bindInfo = new ParkBindInfo();
bindInfo.setUnqId(unqId);
bindInfo.setStatus("0");
bindInfo.setUnbindTime(DateTime.now().toString());
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/mapper/BindInfoMapper.java
package com.hikcreate.edl.pub.web.mobile.infra.data.mapper;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hikcreate.edl.pub.web.mobile.infra.core.page.PageResult;
import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
......@@ -17,14 +13,14 @@ import java.util.List;
* @author: xieshixiang
* @time：2020/6/18 15:56
**/
public interface BindInfoMapper extends BaseMapper<BindInfo> {
public interface BindInfoMapper extends BaseMapper<ParkBindInfo> {
List<BindInfo> selectByQuery( String userId);
List<ParkBindInfo> selectByQuery( String userId);
Integer bindInfoInsert(BindInfo info);
Integer bindInfoInsert( ParkBindInfo info);
Integer clearPast(@Param("dateTime") Date dateTime);
Integer unbind(BindInfo info);
Integer unbind( ParkBindInfo info);
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/mapper/VerifyInfoMapper.java
......@@ -2,7 +2,7 @@ package com.hikcreate.edl.pub.web.mobile.infra.data.mapper;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hikcreate.edl.pub.web.mobile.infra.model.VerifyInfo;
import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo;
import org.apache.ibatis.annotations.Param;
/**
......@@ -11,8 +11,8 @@ import org.apache.ibatis.annotations.Param;
* @author: xieshixiang
* @time：2020/6/19 18:34
**/
public interface VerifyInfoMapper extends BaseMapper<VerifyInfo> {
public interface VerifyInfoMapper extends BaseMapper<ParkVerifyInfo> {
VerifyInfo checkValidity(@Param("phone") String phone,@Param("userId") String userId,@Param("time") DateTime last);
ParkVerifyInfo checkValidity( @Param("phone") String phone, @Param("userId") String userId, @Param("time") DateTime last);
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/BindInfo.java → infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/entity/ParkBindInfo.java
package com.hikcreate.edl.pub.web.mobile.infra.model;
package com.hikcreate.edl.pub.web.mobile.infra.model.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
......@@ -12,7 +12,7 @@ import java.io.Serializable;
* @date: 2020/6/19 9:50
*/
@Data
public class BindInfo implements Serializable {
public class ParkBindInfo implements Serializable {
/**
* 绑定信息唯一标识,使用UUID
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/VerifyInfo.java → infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/entity/ParkVerifyInfo.java
package com.hikcreate.edl.pub.web.mobile.infra.model;
package com.hikcreate.edl.pub.web.mobile.infra.model.entity;
import cn.hutool.core.date.DateTime;
import lombok.Data;
......@@ -9,7 +9,7 @@ import lombok.Data;
* @date: 2020/6/19 18:33
*/
@Data
public class VerifyInfo {
public class ParkVerifyInfo {
/**
* 记录唯一id
......
infra/src/main/resources/mapper/BindInfoMapper.xml
......@@ -2,14 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper">
<insert id="bindInfoInsert" parameterType="com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo">
<insert id="bindInfoInsert" parameterType="com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo">
insert ignore into edl_public.bind_info(unq_id,user_id,phone,plate_color,plate_num,plate_type,gmt_bind_time)
values (#{unqId},#{userId},#{phone},#{plateColor},#{plateNum},#{plateType},#{gmtBindTime})
</insert>
<select id="selectByQuery" parameterType="java.lang.String"
resultType="com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo">
resultType="com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo">
select b.unq_id, b.user_id, b.phone,
case plate_color
when 'A' then '白'
......@@ -28,7 +28,7 @@
when '1' then '已绑定'
end status,
b.plate_num,b.plate_type,b.gmt_bind_time
from edl_public.bind_info as b
from edl_public.park_bind_info as b
where b.status='1'
<if test="userId!=null and userId!=''">
and b.user_id=#{userId}
......@@ -36,7 +36,7 @@
</select>
<update id="unbind">
update edl_public.bind_info as b set b.status="0",b.unbind_time=#{unbindTime} where b.unq_id=#{unqId}
update edl_public.park_bind_info as b set b.status="0",b.unbind_time=#{unbindTime} where b.unq_id=#{unqId}
</update>
......
infra/src/main/resources/mapper/VerifyInfoMapper.xml
......@@ -3,8 +3,8 @@
<mapper namespace="com.hikcreate.edl.pub.web.mobile.infra.data.mapper.VerifyInfoMapper">
<select id="checkValidity" resultType="com.hikcreate.edl.pub.web.mobile.infra.model.VerifyInfo">
select id, user_id, verify_code, phone,pass_time from edl_public.verify_info as v
<select id="checkValidity" resultType="com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo">
select id, user_id, verify_code, phone,pass_time from edl_public.park_verify_info as v
where pass_time <![CDATA[ >= ]]> #{time} and phone=#{phone} and user_id=#{userId}
</select>
</mapper>
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