Эх сурвалжийг харах

返回格式统一调整,代码规范调整

hejq 7 жил өмнө
parent
commit
d2ac5cb5d7

+ 3 - 2
src/main/java/com/uas/platform/b2b/manage/controller/AccountController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.manage.controller.support.ResultBean;
 import com.uas.platform.b2b.manage.core.support.SystemSession;
 import com.uas.platform.b2b.manage.core.util.StringUtils;
 import com.uas.platform.b2b.manage.model.Constant;
@@ -40,8 +41,8 @@ public class AccountController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = "/account", method = RequestMethod.GET)
-	public ModelMap getAccountInfo() throws Exception {
-	    return success(SystemSession.getUser());
+	public ResultBean getAccountInfo() throws Exception {
+	    return ResultBean.success(SystemSession.getUser());
 	}
 
     /**

+ 3 - 2
src/main/java/com/uas/platform/b2b/manage/controller/UasSchedularController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
 import com.uas.platform.b2b.manage.core.util.StringUtils;
 import com.uas.platform.b2b.manage.model.UasSchedular;
 import com.uas.platform.b2b.manage.model.UseType;
@@ -67,7 +68,7 @@ public class UasSchedularController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Page<UasSchedular> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
+    public PageResultBean<UasSchedular> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
         PageInfo info = new PageInfo(params);
         Sort sort = new Sort(Sort.Direction.ASC, "id");
         info.setSort(sort);
@@ -75,6 +76,6 @@ public class UasSchedularController extends BaseController {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.UAS_SCHEDULAR_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        return schedularService.findConfigPageByKeyword(info, keyword);
+        return new PageResultBean<>(schedularService.findConfigPageByKeyword(info, keyword));
     }
 }

+ 3 - 3
src/main/webapp/resources/js/common/common.js

@@ -8,12 +8,12 @@ document.write("<script language=javascript src='static/js/common/toastr.js'></s
  */
 function getAccountInfo() {
 	$.get('/account', function(data) {
-		if (data.content) {
-            window.loginInfo = data;
+		if (data.code == 0) {
+            window.loginInfo = data.data;
 			$('.x-nologin').hide();
 			$('.x-login').show();
 
-            $('.x-login').find('.title').text(data.content.name);
+            $('.x-login').find('.title').text(data.data.name);
 
             $('.title').click(function () {
 				window.location.href = "/resetPassword";

+ 2 - 2
src/main/webapp/resources/js/common/schedular.js

@@ -28,8 +28,8 @@ function getList(count, page, keyword) {
         keyword: keyword,
     }, function (data) {
         $('#loadingDiv').hide();
-        schedularList = data.content;
-        var pageNumber = data.number;
+        schedularList = data.data;
+        var pageNumber = data.page;
         var pageSize = data.size;
         var total = data.totalElements;
         var totalPage = data.totalPages;