Skip to content

E
extend
Commit cac4c594 by xieshixiang
Options

Merge branch 'test' into dev 

# Conflicts:
#	domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
parents 093eb50f 428156dd
Showing with 116 additions and 302 deletions
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
......@@ -17,10 +17,10 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.cache.ViolationCache;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.IdCardQueryReq;
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.DrivingLicenseRes;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.VehicleRes;
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.feign.pvt_service_traffic.parm.request.ViolationListByTimeReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.response.ViolationMicRes;
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.entity.ParkBindInfo;
......@@ -96,8 +96,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
boundQuery.eq("status", "1");
List<ParkBindInfo> phones = mapper.selectList(phone);
if (phones != null && !phones.isEmpty()) {
boolean equals = phones.get(0).getUserId().equals(info.getUserId());
if (!equals) {
boolean phoneExist = phones.get(0).getUserId().equals(info.getUserId());
if (!phoneExist) {
return ResponseGenerator.fail(StatusCode.BUSINESS_ERROR, "当前手机号已被其他客户绑定");
}
......@@ -150,7 +150,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
*/
QueryWrapper<ParkBindInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", req.getUnqId());
queryWrapper.eq("unbind_time", DateUtil.offsetDay(new Date(), -30));
queryWrapper.lt("unbind_time", DateUtil.offsetDay(new Date(), -30));
queryWrapper.eq("status", "0");
Integer integer = mapper.selectCount(queryWrapper);
......@@ -261,25 +261,25 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
/**
* 查询违章信息
*/
ViolationPlateNumAndTypeQueryReq queryReq = new ViolationPlateNumAndTypeQueryReq();
ViolationListByTimeReq queryReq = new ViolationListByTimeReq();
queryReq.setPlateNum(bindInfo.getPlateNum());
queryReq.setPlateType(bindInfo.getPlateType());
queryReq.setTimeEnd(new Date());
queryReq.setTimeStart(DateUtil.offsetMonth(new Date(), -12));
List<ViolationRes> byPlateNumAndType = violationCache.getByPlateNumAndType(queryReq);
List<ViolationMicRes> byPlateNumAndType = violationCache.getByPlateNumAndType(queryReq);
/**
* 构建违章信息返回列表
*/
List<ViolationInfoRes> violationInfoResList = new ArrayList<>();
for (ViolationRes res : byPlateNumAndType) {
for (ViolationMicRes res : byPlateNumAndType) {
ViolationInfoRes info = new ViolationInfoRes();
info.setPlateNum(res.getHphm());
info.setAction(res.getWfxw());
info.setAddress(res.getWfdz());
info.setGrade(res.getWfjfs());
info.setMoney(res.getFkje());
info.setTime(res.getClsj());
info.setPlateNum(res.getPlateNum());
info.setAction(res.getVioActDesc());
info.setAddress(res.getAddress());
info.setGrade(res.getScore().toString());
info.setMoney(res.getForfeit().toString());
info.setTime(res.getDate());
violationInfoResList.add(info);
}
return ResponseGenerator.success(new ResultList<>(violationInfoResList));
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/ViolationCache.java
package com.hikcreate.edl.pub.web.mobile.infra.data.cache;
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.ViolationPlateNumAndTypeQueryReq;
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.feign.pvt_service_traffic.parm.ViolationFeign;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.request.ViolationListByTimeReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.response.ViolationMicRes;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
......@@ -27,7 +27,7 @@ public class ViolationCache {
*/
@Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType+':timeStart:'+#req" +
".timeStart.toString()+':timeEnd:'+#req.timeEnd.toString()", unless = "#result==null or #result.size()==0")
public List<ViolationRes> getByPlateNumAndType(ViolationPlateNumAndTypeQueryReq req) {
return violatio.getByPlateNumAndType(req);
public List<ViolationMicRes> getByPlateNumAndType(ViolationListByTimeReq req) {
return violatio.listByTime(req).getData();
}
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/param/request/ViolationIdCardQueryReq.java deleted 100644 → 0
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request;
import lombok.Data;
import java.util.Date;
/**
* @author MOUBK
* @create 2019/7/8 11:34
*/
@Data
public class ViolationIdCardQueryReq {
private String idCard;
private Date timeStart;
private Date timeEnd;
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/param/response/ViolationRes.java deleted 100644 → 0
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response;
import lombok.Data;
/**
* @author MOUBK
* @create 2019/7/5 15:01
*/
@Data
public class ViolationRes {
// 1代表此字段VIO_VIOLATION中有，2代表此字段VIO_SURVEIL中有
// rowkey
private String id;
// 1 2 违法编号
private String wfbh;
//1 2 决定书类别
private String jdslb;
//1 2 决定书编号
private String jdsbh;
//1 2 文书校验位
private String wsjyw;
//1 #N/A 人员分类
private String ryfl;
//1 #N/A 驾驶证号
private String jszh;
//1 #N/A 档案编号
private String dabh;
//1 2 发证机关
private String fzjg;
//1 #N/A 准驾车型
private String zjcx;
//1 2 当事人
private String dsr;
//1 2 住所行政区划
private String zsxzqh;
//1 2 住所详细地址
private String zsxxdz;
//1 2 电话
private String dh;
//1 2 联系方式
private String lxfs;
//1 2 车辆分类
private String clfl;
//1 2 号牌种类
private String hpzl;
//1 2 号牌号码
private String hphm;
//1 2 机动车所有人
private String jdcsyr;
//1 2 机动车使用性质
private String syxz;
//1 2 交通方式
private String jtfs;
//1 2 违法时间
private String wfsj;
//1 2 行政区划
private String xzqh;
//1 2 道路类型 DMLB = 3124
private String dllx;
//1 2 公路行政等级 DMLB3116
private String glxzdj;
//1 2 违法地点
private String wfdd;
//1 2 路口路段代码 当为城市道路时存放路口号，为高速、省道等时存放公里数
private String lddm;
//1 2 地点米数
private String ddms;
//1 2 地点绝对位置
private String ddjdwz;
//1 2 违法地址
private String wfdz;
//1 2 违法行为
private String wfxw;
//1 #N/A 违法记分数
private String wfjfs;
//1 2 罚款金额
private String fkje;
//1 2 实测值
private String scz;
//1 2 标准值
private String bzz;
//1 #N/A 滞纳金
private String znj;
//1 2 执勤民警
private String zqmj;
//1 2 交款方式
private String jkfs;
//1 #N/A 发现机关
private String fxjg;
//1 #N/A 发现机关名称
private String fxjgmc;
//1 2 处理机关
private String cljg;
//1 2 处理机关名称
private String cljgmc;
//1 #N/A 处罚种类
private String cfzl;
//1 2 处理时间
private String clsj;
//1 2 交款标记
private String jkbj;
//1 2 交款日期
private String jkrq;
//1 2 强制措施凭证号
private String pzbh;
//1 #N/A 拒收拒签标记
private String jsjqbj;
//1 2 记录类型
private String jllx;
//1 2 录入人
private String lrr;
//1 2 录入时间
private String lrsj;
//1 #N/A 经办人1
private String jbr1;
//1 #N/A 经办人2
private String jbr2;
//1 #N/A 事故等级 code61
private String sgdj;
//1 2 处理对象标记 0-本地;1-本省外地市;2-外省
private String cldxbj;
//1 #N/A 机动车处理对象标记
private String jdccldxbj;
//1 2 转递记录标记 0-本地;1-异地转入
private String zdjlbj;
//1 #N/A 信息来源 1-现场处罚，2-非现场处罚
private String xxly;
//1 2 写入模式 1-系统写入;2-接口写入;3-内部其他系统写入
private String xrms;
//1 2 导库标记
private String dkbj;
//1 #N/A 减免滞纳金标记 code64
private String jmznjbj;
//1 2 转递标记
private String zdbj;
//1 2 接受机关
private String jsjg;
//1 2 发送机关
private String fsjg;
//1 2 更新时间
private String gxsj;
//1 2 备注
private String bz;
//1 2 校验位
private String ywjyw;
//1 #N/A 证件名称
private String zjmc;
//1 #N/A 初次领证日期
private String cclzrq;
//1 #N/A 年龄
private String nl;
//1 #N/A 性别 code50
private String xb;
//1 #N/A 0-否;1-是;2-未核查
private String hcbj;
//1 #N/A 精度
private String jd;
//1 #N/A 维度
private String wd;
//1 2 预留字段
private String ylzz1;
//1 2 预留字段
private String ylzz2;
//1 2 预留字段
private String ylzz3;
//1 2 预留字段
private String ylzz4;
//1 2 预留字段
private String ylzz5;
//1 2 存放支队工作库接受时间
private String ylzz6;
//1 2 预留字段
private String ylzz7;
//1 2 预留字段
private String ylzz8;
//1 2 noKey
private String cjfs;
//1 #N/A noKey
private String wfsj1;
//1 #N/A noKey
private String wfdd1;
//1 #N/A noKey
private String lddm1;
//1 #N/A noKey
private String ddms1;
//1 #N/A 驾驶人性质
private String jsrxz;
//1 2 车辆用途
private String clyt;
//1 2 是否提供校车服务
private String xcfw;
//1 2 电子坐标
private String dzzb;
//1 #N/A 是否指导人员
private String sfzdry;
//1 #N/A 学员身份证明号码
private String xysfzmhm;
//1 #N/A 学员姓名
private String xyxm;
//1 2 ylzz11
private String ylzz11;
//1 2 ylzz12
private String ylzz12;
//1 2 ylzz13
private String ylzz13;
//1 2 ylzz14
private String ylzz14;
//1 2 ylzz15
private String ylzz15;
//1 2 ylzz16
private String ylzz16;
//1 2 ylzz17
private String ylzz17;
//1 2 ylzz18
private String ylzz18;
//#N/A 2 序号
private String xh;
//#N/A 2 违法采集机关
private String cjjg;
//#N/A 2 采集机关名称
private String cjjgmc;
//#N/A 2 发动机号
private String fdjh;
//#N/A 2 车辆识别代号
private String clsbdh;
//#N/A 2 车身颜色
private String csys;
//#N/A 2 车辆品牌
private String clpp;
//#N/A 2 通知书号
private String tzsh;
//#N/A 2 通知标记:0未通知，1已通知，2无需通知
private String tzbj;
//#N/A 2 通知日期
private String tzrq;
//#N/A 2 处理标记
private String clbj;
//#N/A 2 强制措施处理标记: 0,简易处罚；1,一般处罚完毕；2,转入一般处罚但尚未完毕）
private String qzclbj;
//#N/A 2 经办人
private String jbr;
//#N/A 2 异地处理标记:0未异地处理,1本地处理本省外地市记录,2本地处理外省记录,3本省外地市处理本地记录,4发现地处理记录
private String ydclbj;
// #N/A 2 视频地址
private String spdz;
// #N/A 2 设备编号
private String sbbh;
// 图片
private String fastDfsUrl1;
private String fastDfsUrl2;
private String fastDfsUrl3;
private String fastDfsUrl4;
private String fastDfsUrl5;
private String fastDfsUrl6;
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/ViolationFeign.java → infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/ViolationFeign.java
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle;
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm;
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.ViolationRes;
import com.hikcreate.common.sdk.response.apiparam.Response;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.request.ViolationListByTimeReq;
import com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.response.ViolationMicRes;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -14,8 +16,8 @@ import java.util.List;
* @author: xieshixiang
* @time：2020/6/19 15:26
**/
@FeignClient(name = "dcp-service-vehicle",path = "dcp/violation", contextId = "dcp" +
"-service-vehicle-violation")
@FeignClient(url = "http://10.197.236.198:8116", name = "edl-pvt-service-traffic", path = "violation", contextId =
"dcp-pvt-service-traffic")
public interface ViolationFeign {
/**
* 查询违法数据
......@@ -23,8 +25,8 @@ public interface ViolationFeign {
* @param req 号牌+号牌类型，时间开始-结束
* @return
*/
@PostMapping("/getByPlateNumAndType")
List<ViolationRes> getByPlateNumAndType(@RequestBody ViolationPlateNumAndTypeQueryReq req);
@PostMapping("listByTime")
Response<List<ViolationMicRes>> listByTime(@Validated @RequestBody ViolationListByTimeReq req);
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/param/request/ViolationPlateNumAndTypeQueryReq.java → infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/request/ViolationListByTimeReq.java
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request;
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.request;
import lombok.Data;
......@@ -10,11 +10,23 @@ import java.util.Date;
* @create 2019/7/8 11:38
*/
@Data
public class ViolationPlateNumAndTypeQueryReq {
public class ViolationListByTimeReq {
/**
* 车牌号
*/
private String plateNum;
/**
* 车牌类型
*/
private String plateType;
/**
* 开始时间
*/
private Date timeStart;
/**
* 结束时间
*/
private Date timeEnd;
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/response/ViolationMicRes.java 0 → 100644
package com.hikcreate.edl.pub.web.mobile.infra.data.feign.pvt_service_traffic.parm.response;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @author MOUBK
* @create 2019/7/5 15:01
*/
@Data
public class ViolationMicRes {
// 违法主键ID
private String id;
// 违法地址
private String address;
// 违法日期
private String date;
// 违法编号
private String vioNum;
// 违法行为类型
private String vioType;
// 号牌类型
private String plateType;
// 号牌号码
private String plateNum;
// 违法行为类型（枚举值）
private String vioTypeName;
// 违法行为
private String vioAct;
// 违法行为描述
private String vioActDesc;
// 违法扣分数
private Integer score;
// 违法罚款金额
private BigDecimal forfeit;
// 处理状态
private String status;
// 处理状态（已转枚举）
private String statusName;
// 采集单位
private String collectionDepartment;
// 违法图片
private String vioImage;
// 违法图片
private List<String> vioImages;
// 处理时间
private String handleTime;
// 扣分时间
private Date deductionTime;
// 处理机关
private String handleDepartment;
}
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