Browse Source

中心中台融合 系统定制接口 查询不确定建筑或者不确定楼层下的系统

lvxianyun 3 years ago
parent
commit
8355c22e2e

+ 4 - 6
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/controller/SystemController.java

@@ -1,14 +1,13 @@
 package com.persagy.dmp.rwd.simple.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.exception.BusinessException;
-import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ParamCheckUtil;
-import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.rwd.simple.service.ISystemService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,14 +34,14 @@ public class SystemController {
      * 查询不确定楼层/不确定建筑 的系统
      */
     @PostMapping("/queryNotSureSystem")
-    public CommonResult<List<Map<String,Object>>> queryNotSureSystem(@RequestBody RequestData requestData) {
+    public Page<Map<String,Object>> queryNotSureSystem(@RequestBody RequestData requestData) {
         //基础参数校验
         ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
         if (StrUtil.isAllEmpty(AppContext.getContext().getProjectId(),requestData.getObjType())){
             throw new BusinessException(ResponseCode.A0402.getCode(),ResponseCode.A0402.getDesc());
         }
-        List<Map<String, Object>> result = systemService.queryNotSureSystem(requestData);
-        return ResultHelper.multi(result);
+        Page<Map<String,Object>> result = systemService.queryNotSureSystem(requestData);
+        return result;
     }
 
 }

+ 2 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/ISystemService.java

@@ -1,8 +1,8 @@
 package com.persagy.dmp.rwd.simple.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.dto.RequestData;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,5 +15,5 @@ public interface ISystemService {
     /**
      * 查询不确定楼层/不确定建筑 的系统
      */
-    List<Map<String,Object>> queryNotSureSystem(RequestData requestData);
+    Page<Map<String,Object>> queryNotSureSystem(RequestData requestData);
 }

+ 4 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/impl/SystemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.persagy.dmp.rwd.simple.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.rwd.basic.utils.DigitalCommonUtils;
 import com.persagy.dmp.rwd.simple.dao.SystemCustomMapper;
@@ -10,7 +11,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,15 +25,15 @@ public class SystemServiceImpl implements ISystemService {
     @Resource
     private SystemCustomMapper mapper;
     @Override
-    public List<Map<String, Object>> queryNotSureSystem(RequestData requestData) {
+    public Page<Map<String,Object>> queryNotSureSystem(RequestData requestData) {
         // 2.不确定建筑 buildingId is null
         // 3.确定建筑不确定楼层 buildingId is not null
         if(StrUtil.isEmpty(requestData.getBuildingId())){
             return mapper.querySystemNotSureBuilding(DigitalCommonUtils
-                    .computePageObject(requestData),requestData).getRecords();
+                    .computePageObject(requestData),requestData);
         }else{
             return mapper.querySystemNotSureFloor(DigitalCommonUtils
-                    .computePageObject(requestData),requestData).getRecords();
+                    .computePageObject(requestData),requestData);
         }
     }
 }

+ 2 - 2
dmp-business/dmp-rwd/src/main/resources/mapper/SystemCustomMapper.xml

@@ -8,7 +8,7 @@
         where 1=1
         <include refid="commonWhereSql"/>
         <if test="null!=param.classCode and param.classCode.length>0">
-            AND class_code = #{classCode}
+            AND class_code = #{param.classCode}
         </if>
         AND id in
         (select obj_from from dt_relation where rel_code='Sy2Bd' AND graph_code='MechInArch' AND obj_to=#{param.buildingId} AND obj_from not in
@@ -22,7 +22,7 @@
         where 1=1
             <include refid="commonWhereSql"/>
             <if test="null!=param.classCode and param.classCode.length>0">
-                AND class_code = #{classCode}
+                AND class_code = #{param.classCode}
             </if>
             AND id not in (select obj_from from dt_relation where rel_code='Sy2Bd' AND graph_code='MechInArch' order by id asc) ORDER BY id asc
     </select>

+ 4 - 3
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/simple/client/DigitalObjectSimpleClient.java

@@ -1,5 +1,6 @@
 package com.persagy.dmp.simple.client;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.config.DigitalFeignConfig;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.model.response.CommonResult;
@@ -94,7 +95,7 @@ public interface DigitalObjectSimpleClient {
      * @return
      */
     @PostMapping("custom/system/queryNotSureSystem")
-    CommonResult<List<Map<String, Object>>> queryNotSureSystem(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
-                                                                     @RequestParam("appId") String appId,
-                                                                     @RequestParam("userId") String userId, @RequestBody RequestData requestData);
+    Page<Map<String,Object>> queryNotSureSystem(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
+                                                @RequestParam("appId") String appId,
+                                                @RequestParam("userId") String userId, @RequestBody RequestData requestData);
 }

+ 4 - 3
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/simple/client/DigitalObjectSimpleFacade.java

@@ -1,6 +1,7 @@
 package com.persagy.dmp.simple.client;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ResultHelper;
@@ -100,11 +101,11 @@ public class DigitalObjectSimpleFacade {
      * @param requestData: 请求参数
      * @return
      */
-    public static List<Map<String, Object>> queryNotSureSystem(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
+    public Page<Map<String,Object>> queryNotSureSystem(@RequestParam("groupCode") String groupCode, @RequestParam("projectId") String projectId,
                                                                      @RequestParam("appId") String appId,
                                                                      @RequestParam("userId") String userId, @RequestBody RequestData requestData){
-        CommonResult<List<Map<String, Object>>> result = client.queryNotSureSystem(groupCode, projectId,appId, userId, requestData);
-        return ResultHelper.getContent(result);
+        Page<Map<String,Object>> result = client.queryNotSureSystem(groupCode, projectId,appId, userId, requestData);
+        return result;
 
     }
 }