Browse Source

修复bug,手机端查询人员列表,房间列表无数据
查询房间数据超时。

Wang-Xiao-Ran 1 year ago
parent
commit
681aa7cc41

+ 5 - 6
src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutionController/AppRoomController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -41,17 +42,16 @@ public class AppRoomController extends BaseController {
      */
     @GetMapping("/comprehensiveroom/list")
     public AjaxResult list(ComprehensiveRoom comprehensiveroom) {
-        System.out.println("start --> " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
         PageDomain pageDomain = TableSupport.buildPageRequest();
-        TableDataInfo tableDataInfo = remoteRoomService.selectComprehensiveRoomList(
+        AjaxResult tableDataInfo = remoteRoomService.selectComprehensiveRoomList(
                 pageDomain.getPageNum(),
                 pageDomain.getPageSize(),
                 comprehensiveroom.getName(),
                 comprehensiveroom.getEstateId(),
                 comprehensiveroom.getTotal()
         );
-        if (HttpStatus.SUCCESS == tableDataInfo.getCode()) {
-            List<ComprehensiveRoom> rows = (List<ComprehensiveRoom>) tableDataInfo.getRows();
+        if (HttpStatus.SUCCESS == Integer.parseInt(tableDataInfo.get("code").toString())) {
+            List<ComprehensiveRoom> rows = (List<ComprehensiveRoom>) tableDataInfo.get("data");
             String[] dictArray = new String[]{RFH_FJ_GLFS, RFH_FJ_WYH, RFH_FJ_FJXZ, RFH_FJ_SHLX};
             Map<String, Map<String, Object>> dictMaps = DictUtils.getDictCacheToMapByArray(dictArray);
             String s = JSON.toJSONString(rows);
@@ -61,10 +61,9 @@ public class AppRoomController extends BaseController {
                     setDictValue(data, dictMaps);
                 }
             }
-            System.out.println("end --> " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
             return AjaxResult.success(rows);
         } else {
-            return AjaxResult.error(tableDataInfo.getCode(), tableDataInfo.getMsg());
+            return AjaxResult.error(tableDataInfo.get("code").toString(), tableDataInfo.get("msg"));
         }
     }
 

+ 1 - 3
src/main/java/com/sooka/sponest/mobile/comprehensive/personBasicInfoController/AppPersonBasicInfoController.java

@@ -37,7 +37,6 @@ public class AppPersonBasicInfoController {
      */
     @GetMapping("/PersonBasicInfo/list")
     public AjaxResult list(PersonBasicInfo info) {
-        System.out.println("start --> " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
         PageDomain pageDomain = TableSupport.buildPageRequest();
         //noinspection unchecked
         List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) personBasicInfoService.getList(
@@ -46,11 +45,10 @@ public class AppPersonBasicInfoController {
                 pageDomain.getPageSize(),
                 info.getDelFlag(),
                 info.getTotal()
-        ).getRows();
+        ).get("data");
         if (StringUtils.isNotEmpty(rows)) {
             setDictValue(rows);
         }
-        System.out.println("end --> " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date()));
         return AjaxResult.success(rows);
     }