Commit 0e81751d by java-李谡

修改论证类型

parent 9eee3809
...@@ -853,7 +853,8 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} ) ...@@ -853,7 +853,8 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
OR a.verif_type = '02' OR a.verif_type = '02'
OR a.verif_type = '03' OR a.verif_type = '03'
OR a.verif_type = '04' OR a.verif_type = '04'
OR a.verif_type = '05' THEN OR a.verif_type = '05'
OR a.verif_type = '09' THEN
tmp.depName tmp.depName
ELSE ELSE
r.airport_name r.airport_name
...@@ -863,7 +864,8 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} ) ...@@ -863,7 +864,8 @@ LEFT JOIN foc_airports t2 on t.arrIata = t2.airport_iata where s.id=#{verifId} )
OR a.verif_type = '02' OR a.verif_type = '02'
OR a.verif_type = '03' OR a.verif_type = '03'
OR a.verif_type = '04' OR a.verif_type = '04'
OR a.verif_type = '05' THEN OR a.verif_type = '05'
OR a.verif_type = '09' THEN
tmp.depIata tmp.depIata
ELSE ELSE
a.depIata a.depIata
......
...@@ -245,10 +245,10 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo ...@@ -245,10 +245,10 @@ public class SecurityPropertyPlaceholderConfigurer extends PropertyPlaceholderCo
// String decrypted = DES3Utils.decrypt("dc6788486fc8fa4660890b4cba7ee6ada527e2e604dbe7fa0fdcf7401a0dd11996450d7fea85f2d9724b7d8fff30a4826c098fd51da0815035030eec22e491802aa2975c67259d9ca89540576b301b6d", CONF_DESC_KEY); // String decrypted = DES3Utils.decrypt("dc6788486fc8fa4660890b4cba7ee6ada527e2e604dbe7fa0fdcf7401a0dd11996450d7fea85f2d9724b7d8fff30a4826c098fd51da0815035030eec22e491802aa2975c67259d9ca89540576b301b6d", CONF_DESC_KEY);
// System.out.println(decrypted); // System.out.println(decrypted);
System.out.println(DES3Utils.encrypt("jdbc:mysql://10.70.78.27:3306/foc?useUnicode=true&characterEncoding=utf-8", CONF_DESC_KEY)); System.out.println(DES3Utils.encrypt("foctest", CONF_DESC_KEY));
//// DESPlus des = new DESPlus(CONF_DESC_KEY);//定义密钥 //// DESPlus des = new DESPlus(CONF_DESC_KEY);//定义密钥
// System.out.println(DES3Utils.encrypt("jdbc:mysql://10.70.78.27:3306/foc?useUnicode=true&characterEncoding=utf-8", CONF_DESC_KEY)); // System.out.println(DES3Utils.encrypt("jdbc:mysql://10.70.78.27:3306/foc?useUnicode=true&characterEncoding=utf-8", CONF_DESC_KEY));
// System.out.println(DES3Utils.decrypt("dc6788486fc8fa4660890b4cba7ee6adad2da747310eb02e0fdcf7401a0dd11996450d7fea85f2d9724b7d8fff30a4826c098fd51da0815035030eec22e491802aa2975c67259d9ca89540576b301b6d", CONF_DESC_KEY)); System.out.println(DES3Utils.decrypt("0e8dfd0927dd5d88fee454c6aef2a68a38e20f99110a3d5a933c45a72bf468e954c33fb8cfe5bcae", CONF_DESC_KEY));
// } catch (Exception e) { // } catch (Exception e) {
// e.printStackTrace(); // e.printStackTrace();
// } // }
......
...@@ -233,6 +233,7 @@ public class PlanUtil { ...@@ -233,6 +233,7 @@ public class PlanUtil {
case "02": case "02":
case "03": case "03":
case "04": case "04":
case "09":
if(StringUtils.isBlank(start)&&StringUtils.isBlank(end)){ if(StringUtils.isBlank(start)&&StringUtils.isBlank(end)){
......
...@@ -512,11 +512,11 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> { ...@@ -512,11 +512,11 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
verifNoFrex = "XL" + year; verifNoFrex = "XL" + year;
type="05"; type="05";
} }
else if ("03".equals(verifType) || "04".equals(verifType)) { else if ("03".equals(verifType) || "04".equals(verifType) || "05".equals(verifType) || "07".equals(verifType) || "09".equals(verifType)) {
verifNoFrex = "LZC" + year; verifNoFrex = "LZC" + year;
type="04"; type="04";
} else { } else {
// 01、02、05、06、07 // 01、02、06
verifNoFrex = "LZX" + year; verifNoFrex = "LZX" + year;
type="03"; type="03";
} }
......
...@@ -311,6 +311,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen ...@@ -311,6 +311,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
case "02": case "02":
case "03": case "03":
case "04": case "04":
case "09":
{ {
List<Connect> connects = new ArrayList<>(); List<Connect> connects = new ArrayList<>();
Connect connect = new Connect(); Connect connect = new Connect();
......
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