修改跨库链表查询的情况

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProjectService.java

@@ -15,6 +15,8 @@ import com.middle.platform.manage.biz.entity.IotProject;
 import com.middle.platform.manage.biz.mapper.IotProjectDeviceMapper;
 import com.middle.platform.manage.biz.mapper.IotProjectMapper;
 import com.middle.platform.pagehelper.core.PageRes;
+import com.middle.platform.system.api.enums.DictType;
+import com.middle.platform.system.api.feign.DictApi;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +24,7 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 项目
@@ -35,7 +38,7 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
 
     private final IotProjectMapper iotProjectMapper;
     private final IotProjectDeviceMapper iotProjectDeviceMapper;
-
+    private final DictApi dictApi;
 
     /**
      * 分页查询
@@ -111,6 +114,9 @@ public class IotProjectService extends ServiceImpl<IotProjectMapper, IotProject>
         Integer deviceOnlineNum = iotProjectDeviceMapper.queryDeviceNum(iotProjectVo.getId(), DeviceStatus.ONLINE_VAL);
         iotProjectVo.setDeviceNum(deviceNum);
         iotProjectVo.setDeviceOnlineNum(deviceOnlineNum);
+        Optional.ofNullable(dictApi.query(DictType.COMPANY_TYPE, String.valueOf(iotProjectVo.getCompanyId()))).ifPresent(d -> {
+            iotProjectVo.setCompanyName(d.getLabel());
+        });
         return iotProjectVo;
     }
 

iot-module/iot-module-manage/iot-module-manage-biz/src/main/resources/mapper/IotProjectMapper.xml

@@ -45,13 +45,10 @@
                ipr.update_by,
                ipr.update_time,
                ipr.delete_time,
-               ipr.del_flag,
-               sdi.label companyName
+               ipr.del_flag
         from iot_project ipr
-                 left join sys_dict_item sdi on ipr.company_id = sdi.value
         <where>
             ipr.del_flag = 0
-              and sdi.type = 'company_msg'
             <if test="keywords != null and keywords != ''">
                 and ipr.title like concat('%', #{keywords,jdbcType=VARCHAR}, '%')
             </if>
@@ -79,13 +76,10 @@
                ipr.update_by,
                ipr.update_time,
                ipr.delete_time,
-               ipr.del_flag,
-               sdi.label companyName
+               ipr.del_flag
         from iot_project ipr
-                 left join sys_dict_item sdi on ipr.company_id = sdi.value
         <where>
             ipr.del_flag = 0
-              and sdi.type = 'company_msg'
               and ipr.id = #{id,jdbcType=BIGINT}
         </where>
     </select>

iot-module/iot-module-system/iot-module-system-api/src/main/java/com/middle/platform/system/api/enums/DictType.java

@@ -20,6 +20,7 @@ public interface DictType {
     String CATEGORY_TYPE = "category_type";//分类类型
     String FUNC_TYPE = "func_type";//功能类型
     String PERMISSION_TYPE = "permission_type";//权限类型
+    String COMPANY_TYPE = "company_type";//权限类型
 
 
 }