自定义白名单修改

pull/1/head
bmpandlcm 11 months ago
parent d7779b45a7
commit 918eefd0ef

@ -60,7 +60,7 @@ public class WhiteCarnoDicController {
@OperationLogDesc(module = "自定义白名单管理>新增", events = "新增记录")
@ApiOperation(httpMethod="POST",value="新增记录")
public ResultData<String> addCarnoDicData(HttpServletRequest request, @RequestBody(required = false) Map<String, Object> req) throws Exception {
int ret = iWhiteCarnoDicService.insertData((WhiteCarnoDic)PubTools.map2Object(req,WhiteCarnoDic.class));
int ret = iWhiteCarnoDicService.insertData(req);
if(ret>-1){
return ResultData.success("新增成功","",0);
}else{

@ -17,11 +17,11 @@ public interface IWhiteCarnoDicService {
/**
*
* @param whiteCarnoDic
* @param params
* @return
* @throws Exception
*/
int insertData(WhiteCarnoDic whiteCarnoDic) throws Exception;
int insertData(Map<String, Object> params) throws Exception;
/**
*

@ -32,13 +32,13 @@ public class SelectDataImpl implements ISelectData {
roadNoSql=paramsData.get("roadNoSql").toString();
}
if("ROAD".equals(selectType)){//自定义白名单全部路段
sql="select a.roadno value,a.roadname||':'||a.roadno label from WHITE_ROAD_TABLE a where a.ENABLED='Y' ";
sql="select a.roadno value,a.roadname||':'||a.roadno label from ROAD_TABLE a where 1=1 ";
if(!PubTools.isNull(roadNoSql)){
sql += roadNoSql;
}
sql +=" order by a.roadname ";
} else if("ROAD_STA_STA".equals(selectType)){//自定义白名单全:站站路段,需要排除全部路段
sql="select distinct a.roadno value,a.roadname||':'||a.roadno label from WHITE_ROAD_TABLE a where a.ENABLED='Y' ";
sql="select a.roadno value,a.roadname||':'||a.roadno label from ROAD_TABLE a where 1=1 ";
if(!PubTools.isNull(roadNoSql)){
sql += roadNoSql;
}

@ -41,15 +41,45 @@ public class WhiteCarnoDicSeviceImpl implements IWhiteCarnoDicService {
}
@Override
public int insertData(WhiteCarnoDic whiteAccountText) throws Exception {
public int insertData(Map<String, Object> params) throws Exception {
int ret=-1;
try{
//先根据车牌号与颜色判断是否已经存在
Map<String,Object> params=new HashMap<String,Object>();
params.put("id",whiteAccountText.getMemo());
List<WhiteCarnoDic> whiteCarnoList1 = whiteCarnoDicMapper.getWhiteCarnoDicList(params);
WhiteCarnoDic whiteAccountText=new WhiteCarnoDic();
String memo=params.get("memo").toString();//免费路段的值
String memoSS=params.get("memoSS").toString();//站站免费中的路段值
String memoDb="";
if (!PubTools.isNull(memo)){
String[] ckgFree=memo.split(",");
for (int i = 0; i < ckgFree.length; i++){
String r = ckgFree[i]+"";
if (!PubTools.isNull(ckgFree[i]+"")){
//不足两位补0,
if (Integer.parseInt(ckgFree[i]+"") < 10){
memoDb += GetHex("0" + ckgFree[i]+"" + "0" + ckgFree[i]+"" + "00" + "0" + ckgFree[i]+"" + "00");
}else if(Integer.parseInt(ckgFree[i]+"") < 100 && Integer.parseInt(ckgFree[i]+"")>=10){//两位的
memoDb += GetHex(ckgFree[i]+"" + ckgFree[i]+"" + "00" + ckgFree[i]+"" + "00");
}else{
memoDb += GetHex(ckgFree[i].substring(0,2)+ ckgFree[i].substring(0,2)+ ckgFree[i].substring(0,2)+ ckgFree[i].substring(0,2)+ ckgFree[i].substring(0,2));
}
}
}
}
if (!PubTools.isNull(memoSS)){
String[] ckgFree=memoSS.split(",");
for (int i = 0; i < ckgFree.length; i++){
String r = ckgFree[i]+"";
memoDb += GetHex(r);
}
}
whiteAccountText.setDicname(params.get("dicname").toString());
whiteAccountText.setDiscrp(params.get("discrp").toString());
whiteAccountText.setMemo(memoDb);
Map<String,Object> paramsQuery=new HashMap<String,Object>();
paramsQuery.put("memo",whiteAccountText.getMemo());
List<WhiteCarnoDic> whiteCarnoList1 = whiteCarnoDicMapper.getWhiteCarnoDicList(paramsQuery);
if(whiteCarnoList1.size()>0){
return -2;//白名单存在该信息!
return -2;//字典表中存在该信息!
}
ret= whiteCarnoDicMapper.insert(whiteAccountText);
}catch (Exception e){
@ -98,4 +128,21 @@ public class WhiteCarnoDicSeviceImpl implements IWhiteCarnoDicService {
List<WhiteCarnoDic> records = whiteCarnoDicMapper.getWhiteCarnoDicList(params);
return records;
}
private String GetHex(Object o)
{
String r = "", s1 = "", s2 = "";
String s = o.toString();
if (s.length() >= 10)
{
r = "00" + Integer.toHexString(Integer.parseInt(s.substring(0, 2)));
s1 = "0000" + Integer.toHexString(Integer.parseInt(s.substring(2, 6)));
s2 = "0000" + Integer.toHexString(Integer.parseInt(s.substring(6, 10)));
r = r.substring(r.length() - 2, r.length());
s1 = s1.substring(s1.length() - 4, s1.length());
s2 = s2.substring(s2.length() - 4, s2.length());
}
return r + s1 + s2;
}
}

@ -84,18 +84,13 @@ public class main {
System.out.println(PassWordUtils.encrypt("123456"));
SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
String data = "qweasdasdasd";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
String currentTime = sdf.format(calendar.getTime());
Date date = null;
try {
date = sdf.parse(currentTime);
} catch (Exception e) {
e.printStackTrace();
}
System.out.println(date); // 输出格式化后的Date
String r = "0041", s1 = "00001425", s2 = "00001964";
r = r.substring(r.length() - 2, 2);
s1 = s1.substring(s1.length() - 4, s1.length());
s2 = s2.substring(s2.length() - 4, s2.length());
System.out.println(" r=====>"+r); // 输出格式化后的Date
System.out.println(" s1=====>"+s1); // 输出格式化后的Date
System.out.println(" s2=====>"+s2); // 输出格式化后的Date
// crc32.update(bytes);
}
}
Loading…
Cancel
Save