diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java index e312f2dde..6ed065c33 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java @@ -1,12 +1,11 @@ package au.com.royalpay.payment.manage.activities.app_index.beans; import au.com.royalpay.payment.core.exceptions.ParamInvalidException; + import com.alibaba.fastjson.JSONObject; -import org.apache.commons.lang3.StringUtils; + import org.apache.commons.lang3.time.DateUtils; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import javax.xml.crypto.Data; import java.text.ParseException; import java.util.Date; @@ -18,11 +17,11 @@ public class AppActBean { private String act_name; private String act_url; private String params_json; - private Boolean is_valid = true; + private boolean is_valid = true; private String desc; private String act_content; private String show_type; - private Boolean is_show_window; + private boolean is_show_window; private String act_img; private String window_img; private String active_date; diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java index bd9d190b6..f9bbbfdb2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java @@ -3,15 +3,21 @@ package au.com.royalpay.payment.manage.activities.app_index.web; import au.com.royalpay.payment.manage.activities.app_index.beans.AppActBean; import au.com.royalpay.payment.manage.activities.app_index.beans.AppActQueryBean; import au.com.royalpay.payment.manage.activities.app_index.core.AppActService; -import au.com.royalpay.payment.manage.activities.monsettledelay.beans.MonDelayBean; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.utils.PageListUtils; + import com.alibaba.fastjson.JSONObject; import com.github.miemiedev.mybatis.paginator.domain.PageList; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/manager/app/act") @@ -31,7 +37,7 @@ public class AppActController { return appActService.getActDetail(manager,act_id); } - @ManagerMapping(value = "/new",method = RequestMethod.PUT,role = ManagerRole.SITE_MANAGER) + @ManagerMapping(method = RequestMethod.PUT,role = ManagerRole.SITE_MANAGER) public JSONObject newAppAct(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody AppActBean appActBean){ return appActService.newAppAct(manager,appActBean); } diff --git a/src/main/ui/static/actapp/app_act_list.js b/src/main/ui/static/actapp/app_act_list.js index 2f5751a63..5129eba17 100644 --- a/src/main/ui/static/actapp/app_act_list.js +++ b/src/main/ui/static/actapp/app_act_list.js @@ -71,7 +71,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS if ($scope.actDetail.msg_end_date) { $scope.actDetail.msg_end_date = $filter('date')($scope.actDetail.msg_end_date, 'yyyy-MM-dd'); } - $http.put('/manager/app/act/new', $scope.actDetail).then(function (resp) { + $http.put('/manager/app/act', $scope.actDetail).then(function (resp) { commonDialog.alert({title: 'Success', content: '新增成功', type: 'success'}); $state.go('^.detail',{act_id:resp.data.act_id},{reload:true}); }, function (resp) {