|
@@ -240,12 +240,6 @@ public class ErpDataController {
|
|
log.info("month="+month);
|
|
log.info("month="+month);
|
|
String yearMonth = year+"年"+month+"月份";
|
|
String yearMonth = year+"年"+month+"月份";
|
|
// 验证token
|
|
// 验证token
|
|
-// Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
-// if(!result.isSuccess()){
|
|
|
|
-// return result;
|
|
|
|
-// }
|
|
|
|
- //
|
|
|
|
- // 验证token
|
|
|
|
Result result = tokenUtil.verifyToken(accessToken);
|
|
Result result = tokenUtil.verifyToken(accessToken);
|
|
if(!result.isSuccess()){
|
|
if(!result.isSuccess()){
|
|
return result;
|
|
return result;
|
|
@@ -315,7 +309,7 @@ public class ErpDataController {
|
|
if(!result.isSuccess()){
|
|
if(!result.isSuccess()){
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
-//
|
|
|
|
|
|
+ //
|
|
return erpDataService.getWarningMessage();
|
|
return erpDataService.getWarningMessage();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -332,12 +326,12 @@ public class ErpDataController {
|
|
@RequestMapping(value = "/getWorkPlan",method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getWorkPlan",method = RequestMethod.GET)
|
|
public Result getWorkPlan( @RequestParam(value = "startDate",required = true) String startDate,
|
|
public Result getWorkPlan( @RequestParam(value = "startDate",required = true) String startDate,
|
|
@RequestParam(value = "endDate",required = true) String endDate,
|
|
@RequestParam(value = "endDate",required = true) String endDate,
|
|
- @RequestParam(value = "accessToken",required = false) String accessToken) throws IOException {
|
|
|
|
|
|
+ @RequestParam(value = "accessToken",required = true) String accessToken) throws IOException {
|
|
// 验证token
|
|
// 验证token
|
|
-// Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
-// if(!result.isSuccess()){
|
|
|
|
-// return result;
|
|
|
|
-// }
|
|
|
|
|
|
+ Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
+ if(!result.isSuccess()){
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
//
|
|
//
|
|
return erpDataService.getWorkPlan(startDate,endDate);
|
|
return erpDataService.getWorkPlan(startDate,endDate);
|
|
}
|
|
}
|
|
@@ -353,12 +347,12 @@ public class ErpDataController {
|
|
* @Time : 17:58
|
|
* @Time : 17:58
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getPrepareStatusQuantity",method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getPrepareStatusQuantity",method = RequestMethod.GET)
|
|
- public Result getPrepareStatusQuantity(@RequestParam(value = "accessToken",required = false) String accessToken){
|
|
|
|
-// 验证token
|
|
|
|
-// Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
-// if(!result.isSuccess()){
|
|
|
|
-// return result;
|
|
|
|
-// }
|
|
|
|
|
|
+ public Result getPrepareStatusQuantity(@RequestParam(value = "accessToken",required = true) String accessToken){
|
|
|
|
+ // 验证token
|
|
|
|
+ Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
+ if(!result.isSuccess()){
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
//
|
|
//
|
|
return erpDataService.getPrepareStatusQuantity();
|
|
return erpDataService.getPrepareStatusQuantity();
|
|
}
|
|
}
|
|
@@ -374,12 +368,12 @@ public class ErpDataController {
|
|
* @Time : 18:05
|
|
* @Time : 18:05
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getPayable",method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getPayable",method = RequestMethod.GET)
|
|
- public Result getPayable(){
|
|
|
|
-// 验证token
|
|
|
|
-// Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
-// if(!result.isSuccess()){
|
|
|
|
-// return result;
|
|
|
|
-// }
|
|
|
|
|
|
+ public Result getPayable(@RequestParam(value = "accessToken",required = true) String accessToken){
|
|
|
|
+ //验证token
|
|
|
|
+ Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
+ if(!result.isSuccess()){
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
//
|
|
//
|
|
return erpDataService.getPayable();
|
|
return erpDataService.getPayable();
|
|
}
|
|
}
|
|
@@ -395,12 +389,12 @@ public class ErpDataController {
|
|
* @Time : 19:11
|
|
* @Time : 19:11
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/getSales",method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getSales",method = RequestMethod.GET)
|
|
- public Result getSales(){
|
|
|
|
-// 验证token
|
|
|
|
-// Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
-// if(!result.isSuccess()){
|
|
|
|
-// return result;
|
|
|
|
-// }
|
|
|
|
|
|
+ public Result getSales(@RequestParam(value = "accessToken",required = true) String accessToken){
|
|
|
|
+ //验证token
|
|
|
|
+ Result result = tokenUtil.verifyToken(accessToken);
|
|
|
|
+ if(!result.isSuccess()){
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
//
|
|
//
|
|
return erpDataService.getSales();
|
|
return erpDataService.getSales();
|
|
}
|
|
}
|