|
|
@@ -7,9 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import com.fasterxml.jackson.core.format.InputAccessor;
|
|
|
import com.kede.activity.bo.InputActivity;
|
|
|
-import com.kede.activity.service.Impl.ActivityService;
|
|
|
+import com.kede.activity.service.ActivityService;
|
|
|
import com.kede.common.bo.Result;
|
|
|
import com.kede.common.constant.ErrorConstants;
|
|
|
import com.kede.common.controller.BaseApiController;
|
|
|
@@ -26,8 +25,8 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
private ActivityService activityService;
|
|
|
|
|
|
|
|
|
- @RequestMapping(value = "/addNews", method = RequestMethod.POST)
|
|
|
- public Result addNews(InputActivity in) {
|
|
|
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
|
|
|
+ public Result add(InputActivity in) {
|
|
|
Result res =new Result();
|
|
|
inputcheke(in, res);
|
|
|
if(!res.getError().isEmpty())return res;
|
|
|
@@ -57,15 +56,15 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
|
|
|
|
|
|
|
|
|
- @RequestMapping(value = "/updateNews", method = RequestMethod.POST)
|
|
|
- public Result updateNews(InputActivity in) {
|
|
|
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
+ public Result update(InputActivity in) {
|
|
|
Result res =new Result();
|
|
|
res.data(activityService.update(in));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/deleteNews", method = RequestMethod.POST)
|
|
|
- public Result deleteNews(InputActivity in) {
|
|
|
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
|
+ public Result delete(InputActivity in) {
|
|
|
Result res =new Result();
|
|
|
if(in.getId()==null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
|
|
|
@@ -76,27 +75,27 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
- public Result listNews(InputActivity in,Integer pageSize,Integer pageNo) {
|
|
|
+ public Result list(InputActivity in,Integer pageSize,Integer pageNo) {
|
|
|
Result res =new Result();
|
|
|
|
|
|
res.data(activityService.listDetails(in,pageSize,pageNo));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/selectNews", method = RequestMethod.GET)
|
|
|
- public Result selectNews(InputNews in) {
|
|
|
+ @RequestMapping(value = "/select", method = RequestMethod.GET)
|
|
|
+ public Result select(InputNews in) {
|
|
|
Result res =new Result();
|
|
|
if(in.getId()==null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
|
|
|
return res;
|
|
|
}
|
|
|
if (!res.getError().isEmpty()) return res;
|
|
|
-// res.data(activityService.selectNews(in));
|
|
|
+ res.data(activityService.select(in));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
/** 上传图片 **/
|
|
|
- @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/upload", method = RequestMethod.POST)
|
|
|
public Result uploadOrderInvoiceFile(HttpServletRequest req){
|
|
|
Result res = new Result();
|
|
|
res.setData(handleFile(res, "/activity/", false, req, "activity"));
|