瀏覽代碼

接口优化

yangbq 1 月之前
父節點
當前提交
2125f73f1e

+ 1 - 4
project-admin/src/main/java/com/project/web/controller/system/SysLoginController.java

@@ -1,6 +1,5 @@
 package com.project.web.controller.system;
 
-import com.project.common.constant.Constants;
 import com.project.common.core.domain.AjaxResult;
 import com.project.common.core.domain.entity.SysMenu;
 import com.project.common.core.domain.entity.SysUser;
@@ -42,12 +41,10 @@ public class SysLoginController {
      */
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody) {
-        AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
+        return AjaxResult.success("操作成功", token);
     }
 
     /**

+ 2 - 2
project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -152,8 +152,8 @@ public class LogisticsService {
             LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
             JSONObject assetItem = buildingAssetArray.getJSONObject(k);
             largeAssetDirs.setAppCode(appCode);
-            largeAssetDirs.setCategoryName(assetItem.getString("CATEGORY_NAME"));
-            largeAssetDirs.setAssetNum(assetItem.getLong("ASSET_NUM"));
+            largeAssetDirs.setCategoryName(assetItem.getString("categoryName"));
+            largeAssetDirs.setAssetNum(assetItem.getLong("assetNum"));
             list.add(largeAssetDirs);
         }
         return list;