超级apibug

2024年12月19日14:14:26

modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java

@@ -424,7 +424,18 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
             return Maps.newHashMap();
         }
         //todo 这里主要是组态设计的websocket请求，可能需要修改
-        return encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), null);
+        String remark = dto.getRemark();
+        Long tenantCode = dto.getTenantCode();
+        if (StringUtils.equals(remark, "0")) {
+            tenantCode = UserContext.getRealTenantCode();
+        }
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("id", id);
+//        params.put("reqParams", dto.getReqParams());
+//        Map<String, Object> stringObjectMap1 = telemetryById(params);
+//        Map<String, Object> stringObjectMap = encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), tenantCode);
+
+        return encapsulationQuery(dto.getThingCondition(), dto.getAttrCondition(), dto.getTimeCondition(), dto.getReqParams(), null, null, dto.getSort(), tenantCode);
     }
 
     @Override
@@ -489,19 +500,25 @@ public class IotThingApiServiceImpl extends BaseServiceImpl<IotThingApiMapper, I
         parmsMap.put("sort", sort);
         resultMap.put("param", parmsMap);
         resultMap.put("filterParam", reqParams);
+
+        //属性查询类型
+        Map<String, Object> entityResultMap = new HashMap<>();
+        Map<String, IotThingViewDTO> entityInfoMap = new HashMap<>();
+        ApiEntityAttrDTO attrsEntity = ApiEntityAttrDTO.createFromJson(attrCondition);
+        String type = attrsEntity.getType();
         //过滤条件的封装
         if (StringUtils.isNotBlank(reqParams)) {
             reqParams = packageQueryFilterParams(reqParams);
             Map<String, Object> conditionMap = BeanUtil.jsonConvertMap(reqParams);
-            // thingCondition = (String)conditionMap.get("entitys");
-            attrCondition = (String) conditionMap.get("attrs");
+            if (StringUtils.equalsAnyIgnoreCase(type, ApiSeparateAttr.SEPARATE.getValue())) {
+                attrCondition = conditionMap.get("splitAttrs").toString();
+            }else{
+                attrCondition = conditionMap.get("attrs").toString();
+            }
             //timeCondition = (String)conditionMap.get("times");TODO 暂时时间没有过滤
         }
-        //属性查询类型
-        Map<String, Object> entityResultMap = new HashMap<>();
-        Map<String, IotThingViewDTO> entityInfoMap = new HashMap<>();
-        ApiEntityAttrDTO attrsEntity = ApiEntityAttrDTO.createFromJson(attrCondition);
-        String type = attrsEntity.getType();
+
+
         //查询物和属性的参数
         Map<String, Collection<String>> paramMap = Maps.newHashMap();
         //分属性

modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java

@@ -198,7 +198,7 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
     public Integer findMaxSort(Integer isDefault) {
         QueryWrapper queryWrapper = QueryWrapper
                 .create()
-                .select(max(IOT_THING_DICT_ENTITY.SORT)).eq(String.valueOf(IOT_THING_DICT_ENTITY.IS_DEFAULT), 1);
+                .select(max(IOT_THING_DICT_ENTITY.SORT)).eq(IotThingDictEntity::getIsDefault,1);
         Integer sort = mapper.selectOneByQueryAs(queryWrapper, Integer.class);
         return Objects.isNull(sort) ? 0 : sort;
     }

modules/thing/src/main/java/com/thing/thing/dictRelation/service/impl/IotThingDictRelationServiceImpl.java

@@ -46,6 +46,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -536,10 +537,23 @@ public class IotThingDictRelationServiceImpl extends BaseServiceImpl<IotThingDic
                 ).toList();
                 dictService.saveBatch(dictEntities);
             }
-            List<IotThingDictRelationEntity> iotThingDictRelationEntities = ConvertUtils.sourceToTarget(list, IotThingDictRelationEntity.class);
-            mapper.insertBatch(iotThingDictRelationEntities);
 
-            iotThingDictRelationEntities.forEach(entity -> cache.updateAccurateKeyEntity(CacheNameEnum.THING_DICT_RELATION,
+            List<IotThingDictRelationEntity> iotThingDictRelationEntities = mapper.selectListByQuery(QueryWrapper.create().eq(IotThingDictRelationEntity::getEntityId, optional.get().getId())
+                    .in(IotThingDictRelationEntity::getCode, codes));
+            Long maxSort = 0L;
+            if(CollectionUtils.isNotEmpty(iotThingDictRelationEntities)){
+                list =  list.stream().filter(e -> iotThingDictRelationEntities.stream().noneMatch(d -> StringUtils.equals(d.getCode(), e.getCode()))).toList();
+                maxSort = iotThingDictRelationEntities.stream().mapToLong(IotThingDictRelationEntity::getSort).max().getAsLong();
+            }
+            AtomicLong sort = new AtomicLong(maxSort);
+            List<IotThingDictRelationEntity> insertList = ConvertUtils.sourceToTarget(list, IotThingDictRelationEntity.class);
+            insertList.forEach(e -> {
+                e.setSort(sort.incrementAndGet());
+                e.setEntityId(optional.get().getId());
+                e.setTemplateMark(optional.get().getTemplateMark());
+            });
+            mapper.insertBatch(insertList);
+            insertList.forEach(entity -> cache.updateAccurateKeyEntity(CacheNameEnum.THING_DICT_RELATION,
                     entity.getTenantCode()+CacheInit.KEY+entity.getEntityCode()+CacheInit.KEY+entity.getCode()+CacheInit.KEY+entity.getId(),ConvertUtils.sourceToTarget(entity, IotThingDictRelationDTO.class)));
         }
     }