Commit b06313ed by 黄森林

定时测试完毕

parent 9057d294
...@@ -51,8 +51,8 @@ public class RhZhiNenTask { ...@@ -51,8 +51,8 @@ public class RhZhiNenTask {
private OrderMapper orderMapper; private OrderMapper orderMapper;
@Scheduled(cron = "0 0 0 * * ? ") //@Scheduled(cron = "0 0 0 * * ? ")
//@Scheduled(cron = "0/5 * * * * ? ") @Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/rhZhiNenTask") @PostMapping("/rhZhiNenTask")
public void general() throws Exception { public void general() throws Exception {
...@@ -61,27 +61,27 @@ public class RhZhiNenTask { ...@@ -61,27 +61,27 @@ public class RhZhiNenTask {
wrapper.eq("order_status","未下单"); wrapper.eq("order_status","未下单");
List<Map<String, Object>> orders = orderMapper.selectMaps(wrapper); List<Map<String, Object>> orders = orderMapper.selectMaps(wrapper);
for (Map<String, Object> order :orders){ for (Map<String, Object> order :orders){
if(StringUtils.isNotBlank(order.get("rh_time").toString())){ if(StringUtils.isNotBlank(order.get("rhTime").toString())){
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date rhTime=simpleDateFormat1.parse(order.get("rh_time").toString()); Date rhTime=simpleDateFormat1.parse(order.get("rhTime").toString());
Date date=new Date(); Date date=new Date();
if(rhTime.getTime() <= date.getTime()){ if(rhTime.getTime() <= date.getTime()){
Wrapper<OrderView> wrapperOV = new EntityWrapper<>(); Wrapper<OrderView> wrapperOV = new EntityWrapper<>();
wrapperOV.eq("orderSeq",order.get("kd_order_id").toString()); wrapperOV.eq("orderSeq",order.get("kdOrderId").toString());
Map<String, Object> orderMap = orderViewMapper.selectMaps(wrapperOV).get(0); Map<String, Object> orderMap = orderViewMapper.selectMaps(wrapperOV).get(0);
Wrapper<UniversityInfo> wrapperUI = new EntityWrapper<>(); Wrapper<UniversityInfo> wrapperUI = new EntityWrapper<>();
wrapperUI.eq("university_name",(String) orderMap.get("order_university_name")); wrapperUI.eq("university_name",(String) orderMap.get("orderUniversityName"));
wrapperUI.eq("university_region", (String) orderMap.get("order_region")); wrapperUI.eq("university_region", (String) orderMap.get("orderRegion"));
// 根据学校名称,获取该学校信息 // 根据学校名称,获取该学校信息
List<Map<String, Object>> list1 = universityInfoMapper.selectMaps(wrapperUI); List<Map<String, Object>> list1 = universityInfoMapper.selectMaps(wrapperUI);
Map<String, Object> schoolMap = list1.get(0); Map<String, Object> schoolMap = list1.get(0);
if (orderMap.get("order_university_name").toString().equals("广州华立科技职业学院")) { if (orderMap.get("orderUniversityName").toString().equals("广州华立科技职业学院")) {
if ("中国电信校园高速宽带".equals(orderMap.get("productName").toString())) { if ("中国电信校园高速宽带".equals(orderMap.get("productName").toString())) {
schoolMap.put("university_package_number", "56119011"); schoolMap.put("universityPackageNumber", "56119011");
} else { } else {
schoolMap.put("university_package_number", "56119015"); schoolMap.put("universityPackageNumber", "56119015");
} }
}else if(orderMap.get("order_university_name").toString().equals("广州大学华软软件学院")){ }else if(orderMap.get("orderUniversityName").toString().equals("广州大学华软软件学院")){
if ("中国电信校园高速宽带".equals(orderMap.get("productName").toString())) { if ("中国电信校园高速宽带".equals(orderMap.get("productName").toString())) {
schoolMap.put("university_package_number", "16001253"); schoolMap.put("university_package_number", "16001253");
} else { } else {
...@@ -177,9 +177,8 @@ public class RhZhiNenTask { ...@@ -177,9 +177,8 @@ public class RhZhiNenTask {
} }
} }
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000)
.setConnectTimeout(500000).setConnectionRequestTimeout(500000).setProxy(proxy).build(); .setConnectTimeout(500000).setConnectionRequestTimeout(500000).build();
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig) CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig)
.build(); .build();
HttpEntity entity = null; HttpEntity entity = null;
...@@ -204,16 +203,19 @@ public class RhZhiNenTask { ...@@ -204,16 +203,19 @@ public class RhZhiNenTask {
qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型,必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移] qParams.add(new BasicNameValuePair("transactType", "新宽旧移"));// 办理类型,必填[新宽新移][新宽旧移][旧宽新移][旧宽旧移]
signMap.put("transactType", "新宽旧移"); signMap.put("transactType", "新宽旧移");
if(orderMap.get("webOrderAmount").toString().equals("0")){ /* if(orderMap.get("webOrderAmount").toString().equals("0")){
qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("business_number")));// 电信号码,办理类型,若选择[新宽旧移]或[旧宽旧移],此项必填 qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码,办理类型,若选择[新宽旧移]或[旧宽旧移],此项必填
signMap.put("ctNumber", (String) order.get("business_number")); signMap.put("ctNumber", (String) order.get("businessNumber"));
}else { }else {
qParams.add(new BasicNameValuePair("ctNumber", (String) orderMap.get("order_customer_remarks")));// 电信号码,办理类型,若选择[新宽旧移]或[旧宽旧移],此项必填 qParams.add(new BasicNameValuePair("ctNumber", (String) orderMap.get("orderCustomerRemarks")));// 电信号码,办理类型,若选择[新宽旧移]或[旧宽旧移],此项必填
signMap.put("ctNumber", (String) orderMap.get("order_customer_remarks")); signMap.put("ctNumber", (String) orderMap.get("orderCustomerRemarks"));
} }
qParams.add(new BasicNameValuePair("ctNumber", (String) order.get("businessNumber")));// 电信号码,办理类型,若选择[新宽旧移]或[旧宽旧移],此项必填
signMap.put("ctNumber", (String) order.get("businessNumber"));
*/
qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型,若选择[新宽新移][新宽旧移],此项必填 qParams.add(new BasicNameValuePair("addressProvince", "广东省"));// 报装地址-省 办理类型,若选择[新宽新移][新宽旧移],此项必填
signMap.put("addressProvince", "广东省"); signMap.put("addressProvince", "广东省");
...@@ -235,20 +237,20 @@ public class RhZhiNenTask { ...@@ -235,20 +237,20 @@ public class RhZhiNenTask {
String universityExteriorLines = null; String universityExteriorLines = null;
String universityChargeMode = null; String universityChargeMode = null;
if (BeanUtil.isNotBlank(schoolMap)) { if (BeanUtil.isNotBlank(schoolMap)) {
addressDistrict = (String) schoolMap.get("university_region"); addressDistrict = (String) schoolMap.get("universityRegion");
address = (String) schoolMap.get("university_installed_address"); address = (String) schoolMap.get("universityInstalledAddress");
addressID = (String) schoolMap.get("university_installed_address_ID"); addressID = (String) schoolMap.get("universityInstalledAddressId");
landId = (String) schoolMap.get("university_package_number"); landId = (String) schoolMap.get("universityPackageNumber");
universityTerminalType = (String) schoolMap.get("university_terminal_type"); universityTerminalType = (String) schoolMap.get("universityTerminalType");
universityUserCategory = (String) schoolMap.get("university_user_category"); universityUserCategory = (String) schoolMap.get("universityUserCategory");
universityUserType = (String) schoolMap.get("university_user_type"); universityUserType = (String) schoolMap.get("universityUserType");
universityMonthlyRentType = (String) schoolMap.get("university_monthly_rent_type"); universityMonthlyRentType = (String) schoolMap.get("universityMonthlyRentType");
universityChargingAttribute = (String) schoolMap.get("university_charging_attribute"); universityChargingAttribute = (String) schoolMap.get("universityChargingAttribute");
universityOnlineNumber = (String) schoolMap.get("university_online_number"); universityOnlineNumber = (String) schoolMap.get("universityOnlineNumber");
universityOneManTerminal = (String) schoolMap.get("university_one_man_terminal"); universityOneManTerminal = (String) schoolMap.get("universityOneManTerminal");
universityIsFtthHub = (String) schoolMap.get("university_is_ftth_hub"); universityIsFtthHub = (String) schoolMap.get("universityIsFtthHub");
universityExteriorLines = (String) schoolMap.get("university_exterior_lines"); universityExteriorLines = (String) schoolMap.get("universityExteriorLines");
universityChargeMode = (String) schoolMap.get("university_charge_mode"); universityChargeMode = (String) schoolMap.get("universityChargeMode");
} else { } else {
addressDistrict = "测试区"; addressDistrict = "测试区";
address = "广东省广州市测试区测试街道1号"; address = "广东省广州市测试区测试街道1号";
...@@ -426,9 +428,9 @@ public class RhZhiNenTask { ...@@ -426,9 +428,9 @@ public class RhZhiNenTask {
Map<String, Object> inPropertyListMap = new HashMap<String, Object>(); Map<String, Object> inPropertyListMap = new HashMap<String, Object>();
inPropertyListMap.put("name", "主卡号码"); inPropertyListMap.put("name", "主卡号码");
if(orderMap.get("webOrderAmount").toString().equals("0")){ if(orderMap.get("webOrderAmount").toString().equals("0")){
inPropertyListMap.put("value", (String) order.get("business_number")); inPropertyListMap.put("value", (String) order.get("businessNumber"));
}else { }else {
inPropertyListMap.put("value", orderMap.get("order_customer_remarks")); inPropertyListMap.put("value", orderMap.get("orderCustomerRemarks"));
} }
inPropertyList.add(inPropertyListMap); inPropertyList.add(inPropertyListMap);
...@@ -455,7 +457,7 @@ public class RhZhiNenTask { ...@@ -455,7 +457,7 @@ public class RhZhiNenTask {
//产品自定义属性;暂时默认属性名称只能传“日租卡号码” //产品自定义属性;暂时默认属性名称只能传“日租卡号码”
Map<String, Object> propertyMap = new HashMap<String, Object>(); Map<String, Object> propertyMap = new HashMap<String, Object>();
propertyMap.put("name", "宽带速率"); propertyMap.put("name", "宽带速率");
String setMeal = (String) orderMap.get("order_set_meal"); String setMeal = (String) orderMap.get("orderSetMeal");
if (StringUtils.isNotBlank(setMeal)) { if (StringUtils.isNotBlank(setMeal)) {
setMeal = setMeal.replace("包月", ""); setMeal = setMeal.replace("包月", "");
setMeal = setMeal.replace("包年", ""); setMeal = setMeal.replace("包年", "");
...@@ -463,7 +465,7 @@ public class RhZhiNenTask { ...@@ -463,7 +465,7 @@ public class RhZhiNenTask {
propertyMap.put("value", setMeal); propertyMap.put("value", setMeal);
Map<String, Object> propertyMap1 = new HashMap<String, Object>(); Map<String, Object> propertyMap1 = new HashMap<String, Object>();
propertyMap1.put("name", "学校名称"); propertyMap1.put("name", "学校名称");
propertyMap1.put("value", (String) orderMap.get("order_university_name")); propertyMap1.put("value", (String) orderMap.get("orderUniversityName"));
Map<String, Object> propertyMap2 = new HashMap<String, Object>(); Map<String, Object> propertyMap2 = new HashMap<String, Object>();
propertyMap2.put("name", "允许上网终端类型"); propertyMap2.put("name", "允许上网终端类型");
propertyMap2.put("value", universityTerminalType); propertyMap2.put("value", universityTerminalType);
...@@ -495,13 +497,13 @@ public class RhZhiNenTask { ...@@ -495,13 +497,13 @@ public class RhZhiNenTask {
Map<String, Object> propertyMap10 = new HashMap<String, Object>(); Map<String, Object> propertyMap10 = new HashMap<String, Object>();
propertyMap10.put("name", "多媒体账号"); propertyMap10.put("name", "多媒体账号");
propertyMap10.put("value", (String) orderMap.get("order_customer_account")); propertyMap10.put("value", (String) orderMap.get("orderCustomerAccount"));
Map<String, Object> propertyMap11 = new HashMap<String, Object>(); Map<String, Object> propertyMap11 = new HashMap<String, Object>();
propertyMap11.put("name", "多媒体账号密码"); propertyMap11.put("name", "多媒体账号密码");
propertyMap11.put("value", (String) orderMap.get("order_customer_pwd")); propertyMap11.put("value", (String) orderMap.get("orderCustomerPwd"));
Map<String, Object> propertyMap12 = new HashMap<String, Object>(); Map<String, Object> propertyMap12 = new HashMap<String, Object>();
propertyMap12.put("name", "学生证号"); propertyMap12.put("name", "学生证号");
propertyMap12.put("value", (String) orderMap.get("order_customer_student_id")); propertyMap12.put("value", (String) orderMap.get("orderCustomerStudentId"));
Map<String, Object> propertyMap13 = new HashMap<String, Object>(); Map<String, Object> propertyMap13 = new HashMap<String, Object>();
propertyMap13.put("name", "宽带首月费用类型"); propertyMap13.put("name", "宽带首月费用类型");
propertyMap13.put("value", universityChargeMode); propertyMap13.put("value", universityChargeMode);
......
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