Browse Source

修复queryObjectListSuperiorId接口返回有无效关系的bug
调整请求字段

lijie 3 years ago
parent
commit
63a9db3683

+ 4 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoServiceImpl.java

@@ -148,6 +148,10 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
             if(isUpdate) {
                 idList.add(vo.getId());
             }
+            // 补充valid值
+            if (null==vo.getValid()){
+                vo.setValid(ValidEnum.TRUE.getType());
+            }
         }
         // 查询条件
         LambdaQueryWrapper<ObjectInfoDefine> queryWrapper = new LambdaQueryWrapper<>();

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/RelationCaclController.java

@@ -48,7 +48,7 @@ public class RelationCaclController {
                 || StrUtil.isBlank(requestData.getSlaveObjType())
                 || StrUtil.isBlank(requestData.getType())
                 || StrUtil.isBlank(requestData.getMainContent())
-                || CollUtil.isEmpty(requestData.getFromContent())){
+                || CollUtil.isEmpty(requestData.getSlaveContent())){
             throw new BusinessException(ResponseCode.A0400.getCode(),ResponseCode.A0400.getDesc());
         }
         if (StrUtil.isNotBlank(requestData.getSign()) && !NumberUtil.isInteger(requestData.getSign())){

+ 1 - 11
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -190,17 +190,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
     @Override
     public CommonResult<List<ObjectDigital>> queryObjectListSuperiorId(RequestData requestData){
         // 1.计算分页参数
-        Long page = requestData.getPage();
-        Long size = requestData.getSize();
-        // 防止人不自觉,最大仅允许查500条数据
-        if (null==page){
-            page=1L;
-        }
-        if (null==size){
-            size=500L;
-            requestData.setSize(500L);
-        }
-        requestData.setSkip((page-1)*size);
+        computePageParam(requestData);
         // 2.当只有项目id时不查询关系,直接根据项目id筛选所有对象
         if (StrUtil.isBlank(requestData.getBuildingId())
                 && StrUtil.isBlank(requestData.getFloorId())

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/RelationCaclServiceImpl.java

@@ -314,7 +314,7 @@ public class RelationCaclServiceImpl implements RelationCaclService {
         long count = resultList.stream()
                 .filter(objectDigital -> !objectDigital.getMainFlag()).count();
         if (count<=0){
-            throw new BusinessException(BusinessErrorRwdCode.A7303.getCode(), requestData.getFromContent()+BusinessErrorRwdCode.A7303.getDesc());
+            throw new BusinessException(BusinessErrorRwdCode.A7303.getCode(), requestData.getSlaveContent()+BusinessErrorRwdCode.A7303.getDesc());
         }
         if (ObjectDigital.NAME.equals(requestData.getType())){
             Map<String, List<ObjectDigital>> nameMap = resultList.stream()

+ 12 - 12
dmp-business/dmp-rwd/src/main/resources/mapper/ObjectDigitalMapper.xml

@@ -342,28 +342,28 @@
         WHERE
         1=1
         <choose>
-            <when test='null!=param.type and param.type=="id" and null!=param.fromContent and param.fromContent.size()>0'>
-                <foreach collection="param.fromContent" open="AND dobj.id IN(" close=")" separator="," item="keyword">
+            <when test='null!=param.type and param.type=="id" and null!=param.slaveContent and param.slaveContent.size()>0'>
+                <foreach collection="param.slaveContent" open="AND dobj.id IN(" close=")" separator="," item="keyword">
                     #{keyword}
                 </foreach>
             </when>
-            <when test='null!=param.type and param.type=="name" and null!=param.fromContent and param.fromContent.size()>0'>
-                <foreach collection="param.fromContent" open="AND dobj.name IN(" close=")" separator="," item="keyword">
+            <when test='null!=param.type and param.type=="name" and null!=param.slaveContent and param.slaveContent.size()>0'>
+                <foreach collection="param.slaveContent" open="AND dobj.name IN(" close=")" separator="," item="keyword">
                     #{keyword}
                 </foreach>
             </when>
-            <when test='null!=param.type and param.type=="localId" and null!=param.fromContent and param.fromContent.size()>0'>
-                <foreach collection="param.fromContent" open="AND dobj.local_id IN(" close=")" separator="," item="keyword">
+            <when test='null!=param.type and param.type=="localId" and null!=param.slaveContent and param.slaveContent.size()>0'>
+                <foreach collection="param.slaveContent" open="AND dobj.local_id IN(" close=")" separator="," item="keyword">
                     #{keyword}
                 </foreach>
             </when>
-            <when test='null!=param.type and param.type=="localName" and null!=param.fromContent and param.fromContent.size()>0'>
-                <foreach collection="param.fromContent" open="AND dobj.local_name IN(" close=")" separator="," item="keyword">
+            <when test='null!=param.type and param.type=="localName" and null!=param.slaveContent and param.slaveContent.size()>0'>
+                <foreach collection="param.slaveContent" open="AND dobj.local_name IN(" close=")" separator="," item="keyword">
                     #{keyword}
                 </foreach>
             </when>
-            <when test='null!=param.type and param.type=="cadId" and null!=param.fromContent and param.fromContent.size()>0'>
-                <foreach collection="param.fromContent" open="AND JSON_UNQUOTE(JSON_EXTRACT(dobj.infos, '$.cADID')) IN(" close=")" separator="," item="keyword">
+            <when test='null!=param.type and param.type=="cadId" and null!=param.slaveContent and param.slaveContent.size()>0'>
+                <foreach collection="param.slaveContent" open="AND JSON_UNQUOTE(JSON_EXTRACT(dobj.infos, '$.cADID')) IN(" close=")" separator="," item="keyword">
                     #{keyword}
                 </foreach>
             </when>
@@ -452,8 +452,8 @@
             ) AS dtoA
             LEFT JOIN dt_object AS dtoB ON (
                 JSON_SEARCH( dtoA.objToIds, 'one', dtoB.id ) > 0
-                <if test="null!=param.fromContent and param.fromContent.size()>0">
-                    <foreach collection="param.fromContent" item="keyword" open="AND (" close=")" separator=" OR ">
+                <if test="null!=param.slaveContent and param.slaveContent.size()>0">
+                    <foreach collection="param.slaveContent" item="keyword" open="AND (" close=")" separator=" OR ">
                         dtoB.id = #{keyword}
                         OR dtoB.`name` LIKE CONCAT( '%', #{keyword}, '%' )
                         OR dtoB.local_name LIKE CONCAT( '%', #{keyword}, '%' )

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

@@ -96,6 +96,7 @@
                 #{relCode}
             </foreach>
         </if>
+        AND dtr.valid=TRUE
         GROUP BY
         dtr.obj_to
         ) UNION
@@ -118,6 +119,7 @@
                 #{relCode}
             </foreach>
         </if>
+        AND dtr.valid=TRUE
         GROUP BY
         dtr.obj_from
         )

+ 1 - 1
dmp-common/src/main/java/com/persagy/dmp/common/constant/CommonConstant.java

@@ -23,7 +23,7 @@ public interface CommonConstant {
     String QUERY_APPID = "appId";
 
     /** 默认配置的分页key */
-    String QUERY_PAGE_SIZE_KEY = "persagy.bdtp.page.size";
+    String QUERY_PAGE_SIZE_KEY = "persagy.bdtp.rwd.page.size";
 
     /** 默认配置的分页key */
     Long QUERY_DEFAULT_PAGE_SIZE = 500L;

+ 4 - 4
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/dto/RequestData.java

@@ -254,10 +254,10 @@ public class RequestData {
     @JSONField(name = "mainContent",alternateNames = {"mainContent","main_content"})
     private String mainContent;
     /** 从对象内容 */
-    @JsonAlias({"fromContent","from_content"})
-    @JsonProperty("fromContent")
-    @JSONField(name = "fromContent",alternateNames = {"fromContent","from_content"})
-    private Set<String> fromContent;
+    @JsonAlias({"slaveContent","slave_content"})
+    @JsonProperty("slaveContent")
+    @JSONField(name = "slaveContent",alternateNames = {"slaveContent","slave_content"})
+    private Set<String> slaveContent;
     /** 计算标记 1 为手动 2为自动 */
     @JsonProperty("sign")
     @JSONField(name = "sign")