Commit 3ef7649d by panaichi

增加判断返回值

parent 8b653a1d
...@@ -277,17 +277,20 @@ public class XxcxController { ...@@ -277,17 +277,20 @@ public class XxcxController {
if (StringUtils.isEmpty(sfzh)){ if (StringUtils.isEmpty(sfzh)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入身份证号"); result.setMsg("请输入身份证号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (days > 183 * 24 * 3600) { if (days > 183 * 24 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("日期间隔过大,日期最大只能相差183天"); result.setMsg("日期间隔过大,日期最大只能相差183天");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getHbcxxxBySfzh(params.getSfzh(), dateStr); String data = xxcxService.getHbcxxxBySfzh(params.getSfzh(), dateStr);
...@@ -326,17 +329,20 @@ public class XxcxController { ...@@ -326,17 +329,20 @@ public class XxcxController {
if (StringUtils.isEmpty(sfzh)){ if (StringUtils.isEmpty(sfzh)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入身份证号"); result.setMsg("请输入身份证号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (days > 183 * 24 * 3600) { if (days > 183 * 24 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("日期间隔过大,日期最大只能相差183天"); result.setMsg("日期间隔过大,日期最大只能相差183天");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getHbdpxxBySfzh(params.getSfzh(), dateStr); String data = xxcxService.getHbdpxxBySfzh(params.getSfzh(), dateStr);
...@@ -375,17 +381,20 @@ public class XxcxController { ...@@ -375,17 +381,20 @@ public class XxcxController {
if (StringUtils.isEmpty(sfzh)){ if (StringUtils.isEmpty(sfzh)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入身份证号"); result.setMsg("请输入身份证号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (days > 183 * 24 * 3600) { if (days > 183 * 24 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("日期间隔过大,日期最大只能相差183天"); result.setMsg("日期间隔过大,日期最大只能相差183天");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getHcdpxxBySfzh(params.getSfzh(), dateStr); String data = xxcxService.getHcdpxxBySfzh(params.getSfzh(), dateStr);
...@@ -424,17 +433,20 @@ public class XxcxController { ...@@ -424,17 +433,20 @@ public class XxcxController {
if (StringUtils.isEmpty(sfzh)){ if (StringUtils.isEmpty(sfzh)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入身份证号"); result.setMsg("请输入身份证号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (days > 183 * 24 * 3600) { if (days > 183 * 24 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("日期间隔过大,日期最大只能相差183天"); result.setMsg("日期间隔过大,日期最大只能相差183天");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getGkxxBySfzh(params.getSfzh(), dateStr); String data = xxcxService.getGkxxBySfzh(params.getSfzh(), dateStr);
...@@ -474,11 +486,13 @@ public class XxcxController { ...@@ -474,11 +486,13 @@ public class XxcxController {
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int days = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (days > 183 * 24 * 3600) { if (days > 183 * 24 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("日期间隔过大,日期最大只能相差183天"); result.setMsg("日期间隔过大,日期最大只能相差183天");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getKyxxBySfzh(params.getCcrSfzh(), params.getDprSfzh(), dateStr); String data = xxcxService.getKyxxBySfzh(params.getCcrSfzh(), params.getDprSfzh(), dateStr);
...@@ -517,17 +531,20 @@ public class XxcxController { ...@@ -517,17 +531,20 @@ public class XxcxController {
if (StringUtils.isEmpty(cph)){ if (StringUtils.isEmpty(cph)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入车牌号"); result.setMsg("请输入车牌号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int hours = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int hours = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (hours > 2 * 3600) { if (hours > 2 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("时间间隔过大,时间最大只能相差2小时"); result.setMsg("时间间隔过大,时间最大只能相差2小时");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getGcxx(params.getCph(), dateStr); String data = xxcxService.getGcxx(params.getCph(), dateStr);
...@@ -566,6 +583,7 @@ public class XxcxController { ...@@ -566,6 +583,7 @@ public class XxcxController {
if (StringUtils.isEmpty(cph)){ if (StringUtils.isEmpty(cph)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入车牌号"); result.setMsg("请输入车牌号");
return result;
} }
String data = xxcxService.getZhgcxx(params.getCph()); String data = xxcxService.getZhgcxx(params.getCph());
result.setData(data); result.setData(data);
...@@ -603,17 +621,20 @@ public class XxcxController { ...@@ -603,17 +621,20 @@ public class XxcxController {
if (StringUtils.isEmpty(kkbh)){ if (StringUtils.isEmpty(kkbh)){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入卡口编号"); result.setMsg("请输入卡口编号");
return result;
} }
Date startDate = params.getStartDate(); Date startDate = params.getStartDate();
Date endDate = params.getEndDate(); Date endDate = params.getEndDate();
if (endDate == null || startDate == null){ if (endDate == null || startDate == null){
result.setStatus("error"); result.setStatus("error");
result.setMsg("请输入起始日期和结束日期"); result.setMsg("请输入起始日期和结束日期");
return result;
} }
int hours = (int) ((endDate.getTime() - startDate.getTime()) / (1000)); int hours = (int) ((endDate.getTime() - startDate.getTime()) / (1000));
if (hours > 2 * 3600) { if (hours > 2 * 3600) {
result.setStatus("error"); result.setStatus("error");
result.setMsg("时间间隔过大,时间最大只能相差2小时"); result.setMsg("时间间隔过大,时间最大只能相差2小时");
return result;
} }
String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss"); String dateStr = DateUtil.format(startDate, "yyyyMMddHHmmss") + "," + DateUtil.format(endDate, "yyyyMMddHHmmss");
String data = xxcxService.getKkxx(params.getKkbh(), dateStr); String data = xxcxService.getKkxx(params.getKkbh(), dateStr);
......
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