revert: 回滚设备状态相关BUG

@@ -245,7 +245,11 @@ public class YtDeviceController extends BaseController {
     queryMap.put("alarmStatus", alarmStatus);
     queryMap.put("profileId", profileId);
     if (deviceState != null) {
-      queryMap.put("deviceState", deviceState.name());
+      if(deviceState != DeviceState.INACTIVE){
+        queryMap.put("deviceState", deviceState == DeviceState.ONLINE);
+      }else{
+        queryMap.put("activeState",DeviceState.INACTIVE);
+      }
     }
     if (deviceType != null) {
       queryMap.put("deviceType", deviceType.name());

@@ -22,14 +22,9 @@ public class YtDevice extends TenantBaseEntity {
 
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode deviceInfo;
-
-  private LocalDateTime activeTime;
-  @TableField(typeHandler = EnumTypeHandler.class)
-  private DeviceState deviceState;
   private String profileId;
   private String tbDeviceId;
   private String deviceTypeId;
-  private LocalDateTime lastConnectTime;
   private String label;
   @TableField(typeHandler = EnumTypeHandler.class)
   private DeviceTypeEnum deviceType;

@@ -79,23 +79,21 @@ public class HomePageServiceImpl implements HomePageService {
     LocalDateTime endTime = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MAX);
     HomePageTopMessage messageInfo = new HomePageTopMessage(FastIotConstants.MagicNumber.ZERO);
     BaseHomePageTop alarm = new BaseHomePageTop(FastIotConstants.MagicNumber.ZERO);
-    List<YtDevice> deviceList;
+    Map<String,Object> queryMap = new HashMap<>();
+    List<DeviceDTO> deviceList;
     if (isPtSysAdmin || isPtAdmin) {
-      deviceList = deviceMapper.selectList(new LambdaQueryWrapper<>());
       setTenantInfoData(homePageLeftTopDTO, startTime, endTime);
       setCustomerInfoData(homePageLeftTopDTO, startTime, endTime);
     } else if (isTenantAdmin) {
-      deviceList =
-          deviceMapper.selectList(
-              new LambdaQueryWrapper<YtDevice>().eq(YtDevice::getTenantId, tenantId));
+      queryMap.put("tenantId",tenantId);
       setAlarmAndMessageInfo(tenantId, messageInfo, alarm);
 
     } else {
-      User user = userMapper.selectById(currentUserId);
-      deviceList =
-          ReflectUtils.sourceToTarget(
-              deviceMapper.getDeviceByCustomerTbUserId(user.getTbUser()), YtDevice.class);
+      String customerId =  userMapper.findCustomerIdByUserId(currentUserId);
+      //查询customerId
+      queryMap.put("customerId",customerId);
     }
+    deviceList = deviceMapper.findDevices(queryMap);
     homeDeviceInfo = new HomeDeviceInfoDTO(FastIotConstants.MagicNumber.ZERO);
     if (null != deviceList) {
       setDeviceInfoData(deviceList, homeDeviceInfo);
@@ -223,7 +221,7 @@ public class HomePageServiceImpl implements HomePageService {
    * @param deviceList 拥有的设备
    * @param homeDeviceInfoDTO 首页信息
    */
-  private void setDeviceInfoData(List<YtDevice> deviceList, HomeDeviceInfoDTO homeDeviceInfoDTO) {
+  private void setDeviceInfoData(List<DeviceDTO> deviceList, HomeDeviceInfoDTO homeDeviceInfoDTO) {
     homeDeviceInfoDTO.setSumCount(deviceList.size());
     deviceList.forEach(
         ytDevice -> {

@@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
@@ -51,14 +50,14 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     @Transactional
     public DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO) {
 
-        if (StringUtils.isBlank(deviceDTO.getId())) {
-            return insert(deviceDTO);
-        } else {
-            return update(tenantId, deviceDTO);
-        }
+    if (StringUtils.isBlank(deviceDTO.getId())) {
+      return insert(deviceDTO);
+    } else {
+      return update(deviceDTO);
     }
+  }
 
-    private DeviceDTO update(String tenantId, DeviceDTO deviceDTO) {
+  private DeviceDTO update(DeviceDTO deviceDTO) {
 
         validateUpdate(deviceDTO);
 
@@ -84,64 +83,25 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         }
     }
 
-    private boolean detectDeviceChange(DeviceDTO deviceDTO, YtDevice device) {
-        boolean changed =
-                !deviceDTO.getName().equalsIgnoreCase(device.getName())
-                        || !deviceDTO.getProfileId().equalsIgnoreCase(device.getProfileId());
-        if (changed) {
-            return true;
-        }
-        boolean dtoGateway =
-                Optional.ofNullable(deviceDTO.getDeviceType())
-                        .map(deviceType -> deviceType.equals(DeviceTypeEnum.GATEWAY))
-                        .orElse(false);
-        boolean entityGateway =
-                Optional.ofNullable(device.getDeviceType())
-                        .map(deviceType -> deviceType.equals(DeviceTypeEnum.GATEWAY))
-                        .orElse(false);
-        if (entityGateway != dtoGateway) {
-            changed = true;
-        }
-        if (changed) {
-            return true;
-        }
-        String dtoDesc =
-                Optional.ofNullable(deviceDTO.getDeviceInfo())
-                        .map(deviceInfo -> deviceInfo.get("description"))
-                        .map(JsonNode::asText)
-                        .orElse("");
-        String dtoLabel = deviceDTO.getLabel() == null ? "" : deviceDTO.getLabel();
-        String entityDesc =
-                Optional.ofNullable(device.getDeviceInfo())
-                        .map(deviceInfo -> deviceInfo.get("description"))
-                        .map(JsonNode::asText)
-                        .orElse("");
-        String entityLabel = device.getLabel() == null ? "" : device.getLabel();
-        if (!dtoDesc.equals(entityDesc) || !dtoLabel.equals(entityLabel)) {
-            changed = true;
-        }
-        return changed;
+  @Override
+  public boolean validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
+    boolean insert = StringUtils.isBlank(deviceDTO.getId());
+    String deviceTenantId = deviceDTO.getTenantId();
+    if (StringUtils.isBlank(deviceDTO.getName())) {
+      throw new YtDataValidationException("device name cannot be blank");
+    }
+    // validate IOT DB
+    if (StringUtils.isBlank(deviceDTO.getProfileId())) {
+      throw new YtDataValidationException("device profile cannot be blank");
     }
 
-    @Override
-    public boolean validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
-        boolean insert = StringUtils.isBlank(deviceDTO.getId());
-        String deviceTenantId = deviceDTO.getTenantId();
-        if (StringUtils.isBlank(deviceDTO.getName())) {
-            throw new YtDataValidationException("device name cannot be blank");
-        }
-        // validate IOT DB
-        if (StringUtils.isBlank(deviceDTO.getProfileId())) {
-            throw new YtDataValidationException("device profile cannot be blank");
-        }
-
-        // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
-        if (insert) {
-            DeviceDTO check = new DeviceDTO();
-            check.setName(deviceDTO.getName());
-            if (findTbDeviceId(deviceTenantId, check).size() > 0) {
-                throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
-            }
+    // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
+    if (insert) {
+      DeviceDTO check = new DeviceDTO();
+      check.setName(deviceDTO.getName());
+      if (findTbDeviceId(deviceTenantId, check).size() > 0) {
+        throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+      }
 
             deviceTenantId = currentTenantId;
             deviceDTO.setTenantId(currentTenantId);
@@ -168,30 +128,23 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         return true;
     }
 
-    private DeviceDTO insert(DeviceDTO deviceDTO) {
+  private DeviceDTO insert(DeviceDTO deviceDTO) {
 
-        YtDevice device = new YtDevice();
-        deviceDTO.copyToEntity(
-                device,
-                ModelConstants.TablePropertyMapping.ACTIVE_TIME,
-                ModelConstants.TablePropertyMapping.DEVICE_STATE,
-                ModelConstants.TablePropertyMapping.CREATOR,
-                ModelConstants.TablePropertyMapping.UPDATER,
-                ModelConstants.TablePropertyMapping.CREATE_TIME,
-                ModelConstants.TablePropertyMapping.UPDATE,
-                ModelConstants.TablePropertyMapping.UPDATE_TIME);
+    YtDevice device = new YtDevice();
+    deviceDTO.copyToEntity(
+        device,
+        ModelConstants.TablePropertyMapping.ACTIVE_TIME,
+        ModelConstants.TablePropertyMapping.DEVICE_STATE,
+        ModelConstants.TablePropertyMapping.CREATOR,
+        ModelConstants.TablePropertyMapping.UPDATER,
+        ModelConstants.TablePropertyMapping.CREATE_TIME,
+        ModelConstants.TablePropertyMapping.UPDATE,
+        ModelConstants.TablePropertyMapping.UPDATE_TIME);
 
-        device.setAlarmStatus(0);
-        DeviceState deviceState;
-        if (null != deviceDTO.getDeviceState()) {
-            deviceState = deviceDTO.getDeviceState();
-        } else {
-            deviceState = DeviceState.INACTIVE;
-        }
-        device.setDeviceState(deviceState);
-        baseMapper.insert(device);
-        return device.getDTO(DeviceDTO.class);
-    }
+    device.setAlarmStatus(0);
+    baseMapper.insert(device);
+    return device.getDTO(DeviceDTO.class);
+  }
 
     @Override
     public List<String> findTbDeviceId(String tenantId, Set<String> ids) {

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 
@@ -21,14 +20,6 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
     DeviceDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
 
     /**
-     * 通过客户的ID，查询改客户能查看的所有设备
-     *
-     * @param userId 客户ID
-     * @return 能查看的设备
-     */
-    List<DeviceDTO> getDeviceByCustomerTbUserId(@Param("userId") String userId);
-
-    /**
      * 通过网关子设备的TB设备ID查询网关设备信息
      * @param tbDeviceId  网关子设备的TB设备ID
      * @return 网关设备信息
@@ -43,4 +34,11 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
      * @return
      */
     boolean freshAlarmStatus(@Param("tbDeviceId") String tbDeviceId,@Param("created") Integer created);
+
+    /**
+     * 用于统计设备相关信息
+     * @param queryMap 查询条件
+     * @return 查询的设备信息
+     */
+    List<DeviceDTO> findDevices(@Param("queryMap") Map<String,Object> queryMap);
 }

@@ -41,4 +41,6 @@ public interface UserMapper extends BaseMapper<User> {
     List<UserDTO> getMyCustomers(@Param("tenantId") String tenantId, @Param("customerId") String customerId, @Param("userIds") Collection<String> userIds);
 
     List<UserDTO> findUsersAsyncByTs(@Param("startTs") String startTs,@Param("endTs") String endTs);
+
+    String findCustomerIdByUserId(@Param("id") String id);
 }

@@ -72,8 +72,12 @@
             <if test="queryMap.deviceType !=null and queryMap.deviceType !=''">
                 AND ifd.device_type = #{queryMap.deviceType}
             </if>
-            <if test="queryMap.deviceState !=null and queryMap.deviceState !=''">
-                AND ifd.device_state = #{queryMap.deviceState}
+            <if test="queryMap.deviceState !=null">
+                AND a.bool_v = #{queryMap.deviceState}
+                AND b.long_v IS NOT NULL
+            </if>
+            <if test="queryMap.activeState !=null">
+                AND b.long_v IS NULL
             </if>
             <if test="queryMap.customerId !=null">
                 AND d.customer_id::TEXT =  #{queryMap.customerId}
@@ -107,14 +111,6 @@
 
         </where>
     </select>
-
-    <select id="getDeviceByCustomerTbUserId" resultMap="deviceMap">
-        SELECT <include refid="basicColumns"/> FROM iotfs_device ifd
-        LEFT JOIN device d ON d.ID :: TEXT = ifd.tb_device_id
-        LEFT JOIN tb_user tu ON d.customer_id = tu.customer_id
-        WHERE tu.id::TEXT = #{userId}
-    </select>
-
     <select id="findGateWayDeviceByTbDeviceId" resultMap="deviceMap">
         SELECT
         <include refid="basicColumns"/>
@@ -131,4 +127,40 @@
         SET  alarm_status=#{created}
         WHERE tb_device_id = #{tbDeviceId}
     </update>
+
+    <select id="findDevices" resultMap="deviceMap">
+        SELECT
+                ifd.ID,
+                ifd.NAME,
+                ifd.tenant_id,
+                ifd.organization_id,
+                ifd.create_time,
+                ifdp.NAME AS profile_name,
+                io.NAME AS organization_name,
+                A.bool_v status,
+                b.long_v last_online_time,
+                d.customer_id :: TEXT AS customer_id
+        FROM
+                iotfs_device ifd
+                        LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.ID ::
+	TEXT LEFT JOIN iotfs_organization io ON io.ID = ifd.organization_id
+                LEFT JOIN attribute_kv A ON ifd.tb_device_id = A.entity_id :: TEXT
+                AND A.entity_type = 'DEVICE'
+                AND A.attribute_key = 'active'
+                LEFT JOIN attribute_kv b ON ifd.tb_device_id = b.entity_id :: TEXT
+                AND b.entity_type = 'DEVICE'
+                AND b.attribute_key = 'lastActivityTime'
+                LEFT JOIN attribute_kv C ON ifd.tb_device_id = C.entity_id :: TEXT
+                AND C.entity_type = 'DEVICE'
+                AND C.attribute_key = 'inactivityAlarmTime'
+                LEFT JOIN device d ON d.ID :: TEXT = ifd.tb_device_id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND ifd.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.customerId !=null and queryMap.customerId !=''">
+                AND d.customer_id = #{queryMap.customerId}
+            </if>
+        </where>
+    </select>
 </mapper>

@@ -202,4 +202,8 @@
         AND su.create_time >= #{startTs} ::TIMESTAMP
         AND su.create_time <#{endTs} ::TIMESTAMP
     </select>
+
+    <select id="findCustomerIdByUserId" resultType="java.lang.String">
+        SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user = tu.id WHERE su.id = #{id}
+    </select>
 </mapper>