Merge remote-tracking branch 'origin/master'

ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/RemoteTdEngineService.java

@@ -63,4 +63,8 @@ public interface RemoteTdEngineService {
 
     @PostMapping("/tdengine/getDeviceStatusList")
     R<List<Map<String, Object>>> getDeviceStatusList(@Validated @RequestBody DeviceStatus queryDeviceStatus, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+    @PostMapping("/tdengine/dropTable")
+    R<?> dropTable(@Validated @RequestBody TdTableDropVo tdTableDropVo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/domain/TdTableDropVo.java

@@ -0,0 +1,29 @@
+package com.ruoyi.tdengine.api.domain;
+
+import com.ruoyi.common.core.hw.validated.tdengine.InsertTdTable;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Description: drop子表实体类
+ * @ClassName: TdTableDropVo
+ * @Author  : xins
+ * @Date    :2024-04-20  11:09
+ * @Version :1.0
+ */
+@Data
+public class TdTableDropVo {
+
+    //数据库名称
+    @NotEmpty(message="databaseName cannot be empty")
+    private String databaseName;
+
+
+    //子表名称
+    @NotEmpty(message="tableName cannot be empty")
+    private String tableName;
+
+
+}

ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/factory/RemoteTdEngineFallbackFactory.java

@@ -102,6 +102,11 @@ public class RemoteTdEngineFallbackFactory implements FallbackFactory<RemoteTdEn
                 return R.fail("获取设备状态信息失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<?> dropTable(TdTableDropVo tdTableDropVo, String source) {
+                return R.fail("drop子表失败:" + throwable.getMessage());
+            }
+
         };
     }
 }

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDeviceMode.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.domain;
 
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -12,55 +13,84 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author xins
  * @date 2023-09-04
  */
-public class HwDeviceMode extends BaseEntity
-{
+public class HwDeviceMode extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 设备模型ID */
+    /**
+     * 设备模型ID
+     */
     @Excel(name = "设备模型ID")
     private Long deviceModeId;
 
-    /** 设备模型名称 */
+    /**
+     * 设备模型名称
+     */
     @Excel(name = "设备模型名称")
     private String deviceModeName;
 
-    /** 租户ID，关联hw_tenant的tenant_id */
+    /**
+     * 租户ID，关联hw_tenant的tenant_id
+     */
     @Excel(name = "租户ID")
     private Long tenantId;
 
-    /** 所属场景，关联hw_scene表的scene_id字段 */
+    /**
+     * 所属场景，关联hw_scene表的scene_id字段
+     */
     @Excel(name = "所属场景")
     private Long sceneId;
 
-    /** 语言code,关联表hw_language的language_code字段 */
+    /**
+     * 语言code,关联表hw_language的language_code字段
+     */
     @Excel(name = "语言")
     private String languageCode;
 
-    /** 定位标识（1：是，0：否） */
+    /**
+     * 定位标识（1：是，0：否）
+     */
     @Excel(name = "定位标识", readConverterExp = "1=是,0=否")
     private String gpsFlag;
 
-    /** 设备模型状态（1：启用，9：删除） */
+    /**
+     * 设备模型状态（1：启用，9：删除）
+     */
     @Excel(name = "设备模型状态", readConverterExp = "1=启用,9=删除")
     private String deviceModeStatus;
 
-    /** 是否通用物模型（1、是，0：否） */
+    /**
+     * 是否通用物模型（1、是，0：否）
+     */
     @Excel(name = "通用标识", readConverterExp = "1=是,0=否")
     private String commonFlag;
 
-    /** 模型分类（在平台字典数据表中定义） */
+    /**
+     * 模型类型（在平台字典数据表中定义）
+     */
+    @Excel(name = "模型类型")
+    private String modeType;
+
+    /**
+     * 模型分类（在平台字典数据表中定义）
+     */
     @Excel(name = "模型分类")
-    private Long modeClassfication;
+    private String modeClassfication;
 
-    /** 设备模型图片地址 */
+    /**
+     * 设备模型图片地址
+     */
     @Excel(name = "设备模型图片地址")
     private String deviceModePic;
 
-    /** 预留字段，数据校验级别 */
+    /**
+     * 预留字段，数据校验级别
+     */
 //    @Excel(name = "预留字段，数据校验级别")
     private String dataVerifyLevel;
 
-    /** 预留字段 */
+    /**
+     * 预留字段
+     */
 //    @Excel(name = "预留字段")
     private String deviceModeField;
 
@@ -68,125 +98,120 @@ public class HwDeviceMode extends BaseEntity
 
     private String sceneName;
 
-    /** 设备模型功能信息 */
+    /**
+     * 设备模型功能信息
+     */
     private List<HwDeviceModeFunction> hwDeviceModeFunctionList;
 
-    public void setDeviceModeId(Long deviceModeId) 
-    {
+    public void setDeviceModeId(Long deviceModeId) {
         this.deviceModeId = deviceModeId;
     }
 
-    public Long getDeviceModeId() 
-    {
+    public Long getDeviceModeId() {
         return deviceModeId;
     }
-    public void setDeviceModeName(String deviceModeName) 
-    {
+
+    public void setDeviceModeName(String deviceModeName) {
         this.deviceModeName = deviceModeName;
     }
 
-    public String getDeviceModeName() 
-    {
+    public String getDeviceModeName() {
         return deviceModeName;
     }
-    public void setTenantId(Long tenantId) 
-    {
+
+    public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
 
-    public Long getTenantId() 
-    {
+    public Long getTenantId() {
         return tenantId;
     }
-    public void setSceneId(Long sceneId) 
-    {
+
+    public void setSceneId(Long sceneId) {
         this.sceneId = sceneId;
     }
 
-    public Long getSceneId() 
-    {
+    public Long getSceneId() {
         return sceneId;
     }
-    public void setLanguageCode(String languageCode) 
-    {
+
+    public void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
 
-    public String getLanguageCode() 
-    {
+    public String getLanguageCode() {
         return languageCode;
     }
-    public void setGpsFlag(String gpsFlag) 
-    {
+
+    public void setGpsFlag(String gpsFlag) {
         this.gpsFlag = gpsFlag;
     }
 
-    public String getGpsFlag() 
-    {
+    public String getGpsFlag() {
         return gpsFlag;
     }
-    public void setDeviceModeStatus(String deviceModeStatus) 
-    {
+
+    public void setDeviceModeStatus(String deviceModeStatus) {
         this.deviceModeStatus = deviceModeStatus;
     }
 
-    public String getDeviceModeStatus() 
-    {
+    public String getDeviceModeStatus() {
         return deviceModeStatus;
     }
-    public void setCommonFlag(String commonFlag) 
-    {
+
+    public void setCommonFlag(String commonFlag) {
         this.commonFlag = commonFlag;
     }
 
-    public String getCommonFlag() 
-    {
+    public String getCommonFlag() {
         return commonFlag;
     }
-    public void setModeClassfication(Long modeClassfication) 
-    {
+
+    public String getModeType() {
+        return modeType;
+    }
+
+    public void setModeType(String modeType) {
+        this.modeType = modeType;
+    }
+
+    public void setModeClassfication(String modeClassfication) {
         this.modeClassfication = modeClassfication;
     }
 
-    public Long getModeClassfication() 
-    {
+    public String getModeClassfication() {
         return modeClassfication;
     }
-    public void setDeviceModePic(String deviceModePic) 
-    {
+
+    public void setDeviceModePic(String deviceModePic) {
         this.deviceModePic = deviceModePic;
     }
 
-    public String getDeviceModePic() 
-    {
+    public String getDeviceModePic() {
         return deviceModePic;
     }
-    public void setDataVerifyLevel(String dataVerifyLevel) 
-    {
+
+    public void setDataVerifyLevel(String dataVerifyLevel) {
         this.dataVerifyLevel = dataVerifyLevel;
     }
 
-    public String getDataVerifyLevel() 
-    {
+    public String getDataVerifyLevel() {
         return dataVerifyLevel;
     }
-    public void setDeviceModeField(String deviceModeField) 
-    {
+
+    public void setDeviceModeField(String deviceModeField) {
         this.deviceModeField = deviceModeField;
     }
 
-    public String getDeviceModeField() 
-    {
+    public String getDeviceModeField() {
         return deviceModeField;
     }
 
-    public List<HwDeviceModeFunction> getHwDeviceModeFunctionList()
-    {
+    public List<HwDeviceModeFunction> getHwDeviceModeFunctionList() {
         return hwDeviceModeFunctionList;
     }
 
-    public void setHwDeviceModeFunctionList(List<HwDeviceModeFunction> hwDeviceModeFunctionList)
-    {
+    public void setHwDeviceModeFunctionList(List<HwDeviceModeFunction> hwDeviceModeFunctionList) {
         this.hwDeviceModeFunctionList = hwDeviceModeFunctionList;
     }
 
@@ -217,6 +242,7 @@ public class HwDeviceMode extends BaseEntity
                 .append("gpsFlag", getGpsFlag())
                 .append("deviceModeStatus", getDeviceModeStatus())
                 .append("commonFlag", getCommonFlag())
+                .append("modeType", getModeType())
                 .append("modeClassfication", getModeClassfication())
                 .append("deviceModePic", getDeviceModePic())
                 .append("dataVerifyLevel", getDataVerifyLevel())

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwTenant.java

@@ -85,12 +85,26 @@ public class HwTenant extends BaseEntity {
 //    @Excel(name = "租户等级，预留字段")
     private Long tenantGrade;
 
+    /**
+     * 租户看板标题
+     */
+    @Excel(name = "租户看板标题")
+    private String tenantBoardTopic;
+
+    /**
+     * 租户名称
+     */
+    @Excel(name = "租户看板图片")
+    private String tenantBoardPic;
+
+
     /**
      * 预留字段
      */
 //    @Excel(name = "预留字段")
     private String tenantField;
 
+
     public void setTenantId(Long tenantId) {
         this.tenantId = tenantId;
     }
@@ -187,6 +201,22 @@ public class HwTenant extends BaseEntity {
         return tenantGrade;
     }
 
+    public String getTenantBoardTopic() {
+        return tenantBoardTopic;
+    }
+
+    public void setTenantBoardTopic(String tenantBoardTopic) {
+        this.tenantBoardTopic = tenantBoardTopic;
+    }
+
+    public String getTenantBoardPic() {
+        return tenantBoardPic;
+    }
+
+    public void setTenantBoardPic(String tenantBoardPic) {
+        this.tenantBoardPic = tenantBoardPic;
+    }
+
     public void setTenantField(String tenantField) {
         this.tenantField = tenantField;
     }

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java

@@ -107,12 +107,12 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService {
 
         hwDeviceModeFunctionList.forEach(d -> {
             if (TdEngineConstants.ABNDON_FUNCTION_IDENTIFIERS.contains(d.getFunctionIdentifier().toLowerCase())) {
-                throw new ServiceException("标识符不能等于:" + d.getFunctionIdentifier());
+                throw new ServiceException("标识符不能是:" + d.getFunctionIdentifier());
             }
             if (StringUtils.isEmpty(d.getCoordinate()) &&
                     (d.getFunctionIdentifier().equalsIgnoreCase(keyLongitude)
                             || d.getFunctionIdentifier().equalsIgnoreCase(keyLatitude))) {
-                throw new ServiceException("非定位设备模型标识符不能等于:" + keyLongitude + "或" + keyLatitude);
+                throw new ServiceException("非定位设备模型标识符不能是:" + keyLongitude + "或" + keyLatitude);
             }
         });
 

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java

@@ -151,7 +151,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
      * @author xins
      * @date 2023-09-19 10:06
      */
-    private void updateMqttAuth(HwDevice hwDevice) {
+    public void updateMqttAuth(HwDevice hwDevice) {
         try {
             HwScene scene = hwSceneMapper.selectHwSceneBySceneId(hwDevice.getSceneId());
             String modeAccount = scene.getModeAccount();
@@ -193,7 +193,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
      * @author xins
      * @date 2023-09-19 10:07
      */
-    private void createTdTable(HwDevice hwDevice) {
+    public void createTdTable(HwDevice hwDevice) {
         TdTableVo tdTableVo = new TdTableVo();
         String databaseName = TdEngineConstants.getDatabaseName();
         String superTableName = TdEngineConstants.getSuperTableName(hwDevice.getDeviceModeId());
@@ -212,7 +212,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
         }
     }
 
-    private void createTdDeviceStatusTable(HwDevice hwDevice) {
+    public void createTdDeviceStatusTable(HwDevice hwDevice) {
         TdTableVo tdTableVo = new TdTableVo();
         tdTableVo.setDatabaseName(TdEngineConstants.PLATFORM_DB_NAME);
         tdTableVo.setSuperTableName(TdEngineConstants.DEFAULT_DEVICE_STATUS_SUPER_TABLE_NAME);
@@ -375,9 +375,22 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteHwDeviceByDeviceId(Long deviceId) {
+        //逻辑删除，修改状态为9，修改设备编号为null，
+        // 可以不drop子表，drop了也不会省出空间，而且子表的名称是用主键ID作为后缀的，不影响后续表的新建
+//        String databaseName = TdEngineConstants.getDatabaseName();
+//        String tableName = TdEngineConstants.getDeviceDataTableName(deviceId);
+//        TdTableDropVo tdTableDropVo = new TdTableDropVo();
+//        tdTableDropVo.setDatabaseName(databaseName);
+//        tdTableDropVo.setTableName(tableName);
+        int rows = hwDeviceMapper.deleteHwDeviceByDeviceId(deviceId);
+//        R<?> tdReturnMsg = this.remoteTdEngineService.dropTable(tdTableDropVo,SecurityConstants.INNER);
+//        if (tdReturnMsg.getCode() != Constants.SUCCESS) {//抛出异常，回滚事务
+//            throw new RuntimeException(tdReturnMsg.getMsg());
+//        }
 
-        return hwDeviceMapper.deleteHwDeviceByDeviceId(deviceId);
+        return rows;
     }
 
 
@@ -409,7 +422,9 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
             List<HwDeviceModeFunction> modeFunctions = new ArrayList<>();
 
             deviceModeFunctions.forEach(mf -> {
-                if (mf.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_ATTRIBUTE)) {
+                //是属性的，并且是可显示的
+                if (mf.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_ATTRIBUTE)
+                        && !mf.getDisplayFlag().equals(HwDictConstants.DEVICE_MODE_FUNCTION_DISPLAY_FLAG_NO)) {
                     TdField field = new TdField();
                     String functionIdentifierTransfer = TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(mf.getFunctionIdentifier());
                     String functionIdentifier = functionIdentifierTransfer == null ? mf.getFunctionIdentifier() : functionIdentifierTransfer;
@@ -863,7 +878,7 @@ public class HwDeviceServiceImpl implements IHwDeviceService {
      * @author xins
      * @date 2023-09-19 10:55
      */
-    private void updateTdEngine(HwDevice hwDevice, HwDevice dbDevice) {
+    public void updateTdEngine(HwDevice hwDevice, HwDevice dbDevice) {
         String deviceType = hwDevice.getDeviceType();
         String databaseName = TdEngineConstants.getDatabaseName();
         String tableName = TdEngineConstants.getDeviceDataTableName(hwDevice.getDeviceId());

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwElectronicFenceServiceImpl.java

@@ -134,30 +134,34 @@ public class HwElectronicFenceServiceImpl implements IHwElectronicFenceService {
         List<ElectronicFenceVo> electronicFenceVos = new ArrayList<>();
         HwElectronicFence queryElectronicFence = new HwElectronicFence();
         queryElectronicFence.setSceneId(sceneId);
+        //先获取所有的电子围栏数据
         List<HwElectronicFence> electronicFenceList = hwElectronicFenceMapper.selectHwElectronicFenceList(queryElectronicFence);
         electronicFenceList.forEach(electronicFence -> {
             HwFenceArea queryFenceArea = new HwFenceArea();
             queryFenceArea.setElectronicFenceId(electronicFence.getElectronicFenceId());
             List<HwFenceArea> fenceAreas = hwFenceAreaMapper.selectHwFenceAreaList(queryFenceArea);
+            //获取每个电子围栏的区域坐标数据，返回给前端画区域
             for (HwFenceArea fenceArea : fenceAreas) {
                 ElectronicFenceVo e = new ElectronicFenceVo();
                 String fenceType = electronicFence.getFenceType();
                 String areaShapeFlag = fenceArea.getAreaShapeFlag();
                 String areaRange = fenceArea.getAreaRange();
                 Integer deviceCount = 0;
+                //根据类型为设备的获取设备数量
                 if (fenceType.equals(HwDictConstants.FENCE_TYPE_DEVICE)
                         || fenceType.equals(HwDictConstants.FENCE_TYPE_MONITOR_UNIT)) {
                     deviceCount = hwElectronicFenceMapper.selectDeviceCount(electronicFence.getElectronicFenceId());
                 }
 
+                //根据类型为监控单元的获取设备数量
                 if (fenceType.equals(HwDictConstants.FENCE_TYPE_MONITOR_UNIT)) {
                     deviceCount = hwElectronicFenceMapper.selectDeviceCountByMonitorUnit(electronicFence.getElectronicFenceId());
 
-                } else if (fenceType.equals(HwDictConstants.FENCE_TYPE_SCENE)) {
+                } else if (fenceType.equals(HwDictConstants.FENCE_TYPE_SCENE)) {//根据类型为场景的获取设备数量
                     deviceCount = hwElectronicFenceMapper.selectDeviceCountByScene(electronicFence.getSceneId());
                 }
 
-                if (areaShapeFlag.equals(HwDictConstants.AREA_SHAPE_FLAG_POLYGN)) {
+                if (areaShapeFlag.equals(HwDictConstants.AREA_SHAPE_FLAG_POLYGN)) {//多边形
                     String[] areaRangeArr = areaRange.split("_");
                     List<ElectronicFenceVo.AreaPoint> points = new ArrayList<ElectronicFenceVo.AreaPoint>();
                     for (String areaR : areaRangeArr) {
@@ -169,7 +173,7 @@ public class HwElectronicFenceServiceImpl implements IHwElectronicFenceService {
                     }
                     e.setAreaPoints(points);
 
-                } else if (areaShapeFlag.equals(HwDictConstants.AREA_SHAPE_FLAG_CIRCULA)) {
+                } else if (areaShapeFlag.equals(HwDictConstants.AREA_SHAPE_FLAG_CIRCULA)) {//圆形
                     String[] areaRangeArr = areaRange.split(",");
                     ElectronicFenceVo.AreaPoint p = new ElectronicFenceVo.AreaPoint();
                     p.setLongitude(Double.valueOf(areaRangeArr[0]));
@@ -179,6 +183,7 @@ public class HwElectronicFenceServiceImpl implements IHwElectronicFenceService {
                     e.setRadius(Double.valueOf(areaRangeArr[2]));
                 }
 
+                //根据电子围栏设置的区域获取报警信息，然后获取异常设备数量
                 AlarmInfoVo alarmInfoVo = hwAlarmInfoMapper.selectAlarmCountByFenceArea(fenceArea.getFenceAreaId());
                 e.setAbnormalCount(alarmInfoVo.getAlarmCount());
                 e.setAreaShapeFlag(areaShapeFlag);

ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwMonitorPlatformServiceImpl.java

@@ -15,6 +15,7 @@ import com.ruoyi.tdengine.api.domain.TdField;
 import com.ruoyi.tdengine.api.domain.TdHistorySelectDto;
 import com.ruoyi.tdengine.api.domain.TdReturnDataVo;
 import com.ruoyi.tdengine.api.domain.TdSuperTableSelectVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,11 +53,12 @@ public class HwMonitorPlatformServiceImpl implements IHwMonitorPlatformService {
         JSONObject returnObj = new JSONObject();
         Long deviceModeId = deviceLatestDataVo.getDeviceModeId();
         HwDeviceModeFunction queryModeFunction = new HwDeviceModeFunction();
-        queryModeFunction.setDeviceModeId(deviceModeId);
-        queryModeFunction.setFunctionMode(HwDictConstants.FUNCTION_MODE_ATTRIBUTE);
+        queryModeFunction.setDeviceModeId(deviceModeId);//索引，先查出数据再过滤
+//        queryModeFunction.setFunctionMode(HwDictConstants.FUNCTION_MODE_ATTRIBUTE);
         List<HwDeviceModeFunction> deviceModeFunctions = deviceModeFunctionMapper.selectHwDeviceModeFunctionList(queryModeFunction);
-        Map<String, String> functionIndentifierName = deviceModeFunctions.stream().collect(
-                Collectors.toMap(HwDeviceModeFunction::getFunctionIdentifier, HwDeviceModeFunction::getFunctionName));
+        Map<String, String> functionIndentifierName = deviceModeFunctions.stream()
+                .filter(deviceModeFunction -> deviceModeFunction.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_ATTRIBUTE) && !deviceModeFunction.getDisplayFlag().equals(HwDictConstants.DEVICE_MODE_FUNCTION_DISPLAY_FLAG_NO))
+                .collect(Collectors.toMap(HwDeviceModeFunction::getFunctionIdentifier, HwDeviceModeFunction::getFunctionName));
         functionIndentifierName.putAll(TdEngineConstants.DEVICE_DATA_COLUMN_MAP);
 
         Map<String, String> functionIndentifierNameMap = new HashMap<>();
@@ -84,7 +86,6 @@ public class HwMonitorPlatformServiceImpl implements IHwMonitorPlatformService {
         tdSuperTableSelectVo.setLimit(deviceLatestDataVo.getLimit());
 
         List<TdField> schemaFieldValues = new ArrayList<TdField>();
-        List<HwDeviceModeFunction> modeFunctions = new ArrayList<>();
 
         deviceModeFunctions.forEach(mf -> {
             TdField field = new TdField();
@@ -101,16 +102,23 @@ public class HwMonitorPlatformServiceImpl implements IHwMonitorPlatformService {
 
 
         List<DeviceDataColumnVo> deviceDataColumnVos = new ArrayList<DeviceDataColumnVo>();
-        if (latestDataMaps != null && latestDataMaps.size() > 0) {
-            Map<String, Object> latestDataMap = latestDataMaps.get(0);
-            for (Map.Entry<String, Object> entry : latestDataMap.entrySet()) {
+//            Map<String, Object> latestDataMap = latestDataMaps.get(0);
+        for (Map.Entry<String, String> entry : functionIndentifierNameMap.entrySet()) {
             DeviceDataColumnVo deviceDataColumnVo = new DeviceDataColumnVo();
             String columnKey = entry.getKey();
             if (!columnKey.equalsIgnoreCase(TdEngineConstants.ST_TAG_DEVICEID)
-                        && !columnKey.equalsIgnoreCase(TdEngineConstants.ST_TAG_DEVICEMODEID)) {
+                    && !columnKey.equalsIgnoreCase(TdEngineConstants.ST_TAG_DEVICEMODEID)
+                    && functionIndentifierNameMap.get(columnKey) != null) {
                 deviceDataColumnVo.setColumnKey(columnKey);
                 deviceDataColumnVo.setColumnName(functionIndentifierNameMap.get(columnKey) == null
                         ? columnKey : functionIndentifierNameMap.get(columnKey));
+                if (columnKey.equalsIgnoreCase(TdEngineConstants.ST_TAG_DEVICECODE)) {
+                    deviceDataColumnVos.add(0, deviceDataColumnVo);
+                } else if (columnKey.equalsIgnoreCase(TdEngineConstants.ST_TAG_DEVICENAME)) {
+                    deviceDataColumnVos.add(1, deviceDataColumnVo);
+                } else if (columnKey.equalsIgnoreCase(TdEngineConstants.DEFAULT_FIRST_FIELD_NAME)) {
+                    deviceDataColumnVos.add(2, deviceDataColumnVo);
+                } else {
                     deviceDataColumnVos.add(deviceDataColumnVo);
                 }
             }
@@ -157,33 +165,35 @@ public class HwMonitorPlatformServiceImpl implements IHwMonitorPlatformService {
      * @date 2023-09-25 15:40
      */
     @Override
-    public List<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId, List<Map<String, Object>> latestDataMaps) {
+    public List<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId) {
         HwDeviceModeFunction queryModeFunction = new HwDeviceModeFunction();
-        queryModeFunction.setDeviceModeId(deviceModeId);
-        queryModeFunction.setFunctionMode(HwDictConstants.FUNCTION_MODE_ATTRIBUTE);
+        queryModeFunction.setDeviceModeId(deviceModeId);//devicemodeid是索引，先根据索引查出再过滤
+//        queryModeFunction.setFunctionMode(HwDictConstants.FUNCTION_MODE_ATTRIBUTE);
         List<HwDeviceModeFunction> deviceModeFunctions = deviceModeFunctionMapper.selectHwDeviceModeFunctionList(queryModeFunction);
-        Map<String, String> functionIndentifierName = deviceModeFunctions.stream().collect(
-                Collectors.toMap(HwDeviceModeFunction::getFunctionIdentifier, HwDeviceModeFunction::getFunctionName));
-        functionIndentifierName.putAll(TdEngineConstants.DEVICE_DATA_COLUMN_MAP);
-        functionIndentifierName.putAll(TdEngineConstants.DEVICE_DATA_COLUMN_MAP);
-
-        Map<String, String> functionIndentifierNameMap = new HashMap<>();
-        functionIndentifierName.forEach((key, val) ->
+        //key是functionidentifier，用来获取具体值使用；value是functionname，用来显示使用
+        Map<String, String> functionIndentifierNameMap = deviceModeFunctions.stream().
+                filter(deviceModeFunction -> deviceModeFunction.getFunctionMode().equals(HwDictConstants.FUNCTION_MODE_ATTRIBUTE) && !deviceModeFunction.getDisplayFlag().equals(HwDictConstants.DEVICE_MODE_FUNCTION_DISPLAY_FLAG_NO))
+                .collect(Collectors.toMap(HwDeviceModeFunction::getFunctionIdentifier, HwDeviceModeFunction::getFunctionName));
+        functionIndentifierNameMap.put(TdEngineConstants.DEFAULT_FIRST_FIELD_NAME, TdEngineConstants.DEFAULT_FIRST_FIELD_NAME_DISPLAY);
+//        functionIndentifierName.putAll(TdEngineConstants.DEVICE_DATA_COLUMN_MAP);
+
+        Map<String, String> functionIndentifierNameTransferMap = new HashMap<>();
+        functionIndentifierNameMap.forEach((key, val) ->
         {
             String keyTransfer = TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(key) == null ?
                     key : TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(key);
-            functionIndentifierNameMap.put(keyTransfer, val);
+            functionIndentifierNameTransferMap.put(keyTransfer, val);
         });
 
-        List<DeviceDataColumnVo> deviceDataColumnVos = new ArrayList<DeviceDataColumnVo>();
-        if (latestDataMaps != null && latestDataMaps.size() > 0) {
-            Map<String, Object> latestDataMap = latestDataMaps.get(0);
-            for (Map.Entry<String, Object> entry : latestDataMap.entrySet()) {
-                DeviceDataColumnVo deviceDataColumnVo = new DeviceDataColumnVo();
+        List<DeviceDataColumnVo> deviceDataColumnVos = new ArrayList<>();
+        if (functionIndentifierNameTransferMap != null) {
+            DeviceDataColumnVo deviceDataColumnVo = null;
+            for (Map.Entry<String, String> entry : functionIndentifierNameTransferMap.entrySet()) {
+                deviceDataColumnVo = new DeviceDataColumnVo();
                 String columnKey = entry.getKey();
                 deviceDataColumnVo.setColumnKey(columnKey);
-                deviceDataColumnVo.setColumnName(functionIndentifierNameMap.get(columnKey) == null
-                        ? columnKey : functionIndentifierNameMap.get(columnKey));
+                deviceDataColumnVo.setColumnName(StringUtils.isEmpty(functionIndentifierNameTransferMap.get(columnKey))
+                        ? columnKey : functionIndentifierNameTransferMap.get(columnKey));
                 deviceDataColumnVos.add(deviceDataColumnVo);
             }
         }

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml

@@ -220,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteHwDeviceByDeviceId" parameterType="Long">
-        update hw_device set device_status = '9' where device_id = #{deviceId}
+        update hw_device set device_status = '9',device_code=null where device_id = #{deviceId}
     </delete>
 
     <delete id="deleteHwDeviceByDeviceIds" parameterType="String">

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceModeMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceModeStatus"    column="device_mode_status"    />
         <result property="commonFlag"    column="common_flag"    />
         <result property="modeClassfication"    column="mode_classfication"    />
+        <result property="modeType"    column="mode_type"    />
         <result property="deviceModePic"    column="device_mode_pic"    />
         <result property="dataVerifyLevel"    column="data_verify_level"    />
         <result property="remark"    column="remark"    />
@@ -69,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectHwDeviceModeVo">
-        select device_mode_id, device_mode_name, tenant_id, scene_id, language_code, gps_flag, device_mode_status, common_flag, mode_classfication, device_mode_pic, data_verify_level, remark, create_by, create_time, update_by, update_time, device_mode_field from hw_device_mode hdm
+        select device_mode_id, device_mode_name, tenant_id, scene_id, language_code, gps_flag, device_mode_status, common_flag, mode_classfication,mode_type, device_mode_pic, data_verify_level, remark, create_by, create_time, update_by, update_time, device_mode_field from hw_device_mode hdm
     </sql>
 
     <sql id="selectHwDeviceModeParameterVo">
@@ -86,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gpsFlag != null  and gpsFlag != ''"> and gps_flag = #{gpsFlag}</if>
             <if test="deviceModeStatus != null  and deviceModeStatus != ''"> and device_mode_status = #{deviceModeStatus}</if>
             <if test="commonFlag != null  and commonFlag != ''"> and common_flag = #{commonFlag}</if>
-            <if test="modeClassfication != null "> and mode_classfication = #{modeClassfication}</if>
+            <if test="modeClassfication != null and modeClassfication != ''"> and mode_classfication = #{modeClassfication}</if>
+            <if test="modeType != null and modeType != ''"> and mode_type = #{modeType}</if>
             <if test="deviceModePic != null  and deviceModePic != ''"> and device_mode_pic = #{deviceModePic}</if>
             <if test="dataVerifyLevel != null  and dataVerifyLevel != ''"> and data_verify_level = #{dataVerifyLevel}</if>
             <if test="deviceModeField != null  and deviceModeField != ''"> and device_mode_field = #{deviceModeField}</if>
@@ -114,7 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gpsFlag != null and gpsFlag != ''">gps_flag,</if>
             <if test="deviceModeStatus != null and deviceModeStatus != ''">device_mode_status,</if>
             <if test="commonFlag != null and commonFlag != ''">common_flag,</if>
-            <if test="modeClassfication != null">mode_classfication,</if>
+            <if test="modeType != null and modeType != ''">mode_type,</if>
+            <if test="modeClassfication != null and modeClassfication != ''">mode_classfication,</if>
             <if test="deviceModePic != null">device_mode_pic,</if>
             <if test="dataVerifyLevel != null">data_verify_level,</if>
             <if test="remark != null">remark,</if>
@@ -132,7 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gpsFlag != null and gpsFlag != ''">#{gpsFlag},</if>
             <if test="deviceModeStatus != null and deviceModeStatus != ''">#{deviceModeStatus},</if>
             <if test="commonFlag != null and commonFlag != ''">#{commonFlag},</if>
-            <if test="modeClassfication != null">#{modeClassfication},</if>
+            <if test="modeType != null and modeType != ''">#{modeType},</if>
+            <if test="modeClassfication != null and modeClassfication != ''">#{modeClassfication},</if>
             <if test="deviceModePic != null">#{deviceModePic},</if>
             <if test="dataVerifyLevel != null">#{dataVerifyLevel},</if>
             <if test="remark != null">#{remark},</if>
@@ -154,7 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gpsFlag != null and gpsFlag != ''">gps_flag = #{gpsFlag},</if>
             <if test="deviceModeStatus != null and deviceModeStatus != ''">device_mode_status = #{deviceModeStatus},</if>
             <if test="commonFlag != null and commonFlag != ''">common_flag = #{commonFlag},</if>
-            <if test="modeClassfication != null">mode_classfication = #{modeClassfication},</if>
+            <if test="modeType != null and modeType != ''">mode_type = #{modeType},</if>
+            <if test="modeClassfication != null and modeClassfication != ''">mode_classfication = #{modeClassfication},</if>
             <if test="deviceModePic != null">device_mode_pic = #{deviceModePic},</if>
             <if test="dataVerifyLevel != null">data_verify_level = #{dataVerifyLevel},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -307,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gpsFlag != null  and gpsFlag != ''"> and hdm.gps_flag = #{gpsFlag}</if>
             <if test="deviceModeStatus != null  and deviceModeStatus != ''"> and hdm.device_mode_status = #{deviceModeStatus}</if>
             <if test="commonFlag != null  and commonFlag != ''"> and hdm.common_flag = #{commonFlag}</if>
-            <if test="modeClassfication != null "> and hdm.mode_classfication = #{modeClassfication}</if>
+            <if test="modeClassfication != null and modeClassfication != ''"> and hdm.mode_classfication = #{modeClassfication}</if>
             <if test="deviceModePic != null  and deviceModePic != ''"> and hdm.device_mode_pic = #{deviceModePic}</if>
             <if test="dataVerifyLevel != null  and dataVerifyLevel != ''"> and hdm.data_verify_level = #{dataVerifyLevel}</if>
             <if test="deviceModeField != null  and deviceModeField != ''"> and hdm.device_mode_field = #{deviceModeField}</if>

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwTenantMapper.xml

@@ -21,12 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="tenantGrade"    column="tenant_grade"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="tenantBoardTopic"    column="tenant_board_topic"    />
+        <result property="tenantBoardPic"    column="tenant_board_pic"    />
         <result property="tenantField"    column="tenant_field"    />
     </resultMap>
 
     <sql id="selectHwTenantVo">
-        select tenant_id, tenant_type, tenant_name, tenant_industry, contact_name, contact_phone, email, area_id, contact_address, remark, tenant_status, is_register, create_by, create_time, update_by, update_time, tenant_grade, tenant_field from hw_tenant ht
+        select tenant_id, tenant_type, tenant_name, tenant_industry, contact_name, contact_phone, email, area_id, contact_address, remark, tenant_status, is_register, create_by, create_time, update_by, update_time,tenant_board_topic, tenant_board_pic,tenant_grade, tenant_field from hw_tenant ht
     </sql>
 
     <select id="selectHwTenantList" parameterType="HwTenant" resultMap="HwTenantResult">
@@ -73,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="tenanBoardTopic != null and tenantBoardTopic != ''">tenant_board_topic,</if>
+            <if test="tenantBoardPic != null and tenantBoardPic != ''">tenant_board_pic,</if>
             <if test="tenantGrade != null">tenant_grade,</if>
             <if test="tenantField != null">tenant_field,</if>
          </trim>
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="tenanBoardTopic != null and tenanBoardTopic != ''">#{tenanBoardTopic},</if>
+            <if test="tenantBoardPic != null and tenantBoardPic != ''">#{tenantBoardPic},</if>
             <if test="tenantGrade != null">#{tenantGrade},</if>
             <if test="tenantField != null">#{tenantField},</if>
          </trim>
@@ -115,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="tenanBoardTopic != null and tenanBoardTopic != ''">tenant_board_topic = #{tenanBoardTopic},</if>
+            <if test="tenantBoardPic != null and tenantBoardPic != ''">tenant_board_pic = #{tenantBoardPic},</if>
             <if test="tenantGrade != null">tenant_grade = #{tenantGrade},</if>
             <if test="tenantField != null">tenant_field = #{tenantField},</if>
         </trim>

ruoyi-modules/hw-data-process/src/main/java/com/ruoyi/dataprocess/service/impl/DataProcessServiceImpl.java

@@ -134,14 +134,14 @@ public class DataProcessServiceImpl extends CommanHandleService implements IData
                 Object latitude = null;
 
                 for (Map.Entry<String, Object> entry : dataValueJson.entrySet()) {
-                    String key = entry.getKey();
+                    String originalKey = entry.getKey();//原来的key
                     Object value = entry.getValue();
 
                     /**
                      * 先对key进行转换，例如对于key是value的需要转换成value1；
                      */
-                    key = TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(key) == null ? key
-                            : TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(key);
+                    String key = TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(originalKey) == null ? originalKey
+                            : TdEngineConstants.TDENGINE_KEY_TRANSFER_MAP.get(originalKey);
 
                     if (key.equalsIgnoreCase(TdEngineConstants.PAYLOAD_DEVICE_DATA_TYPE_TYPE)) {
                         continue;
@@ -193,7 +193,10 @@ public class DataProcessServiceImpl extends CommanHandleService implements IData
                         } else if (key.equalsIgnoreCase(HwDictConstants.DEFAULT_FUNCTION_LATITUDE_IDENTIFIER)) {
                             latitude = value;
                         } else {
-                            alarmSchemaFields.add(tdField);
+                            TdField alarmTdField = new TdField();
+                            alarmTdField.setFieldName(originalKey);
+                            alarmTdField.setFieldValue(value);
+                            alarmSchemaFields.add(alarmTdField);
                         }
                     }
                 }

ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/controller/TdEngineController.java

@@ -481,4 +481,33 @@ public class TdEngineController {
         }
     }
 
+
+
+    /**
+     * @return R<?>
+     * @param: tableDto
+     * @description 创建子表
+     * @author xins
+     * @date 2023-08-28 16:17
+     */
+    @InnerAuth
+    @PostMapping("/dropTable")
+    public R<?> dropTable(@Validated @RequestBody TdTableDropVo tdTableDropVo) {
+        try {
+            String databaseName = tdTableDropVo.getDatabaseName();
+            String tableName = tdTableDropVo.getTableName();
+            this.tdEngineService.dropTable(databaseName, tableName);
+            log.info("successfully droped table " + tableName);
+            return R.ok("successfully droped table " + tableName);
+        } catch (Exception e) {
+            String message = e.getCause().getMessage();
+            try {
+                message = message.substring(message.lastIndexOf("invalid operation"));
+            } catch (Exception ex) {
+                log.error(ex.getMessage());
+            }
+            log.error(message);
+            return R.fail(message);
+        }
+    }
 }

ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/mapper/TdEngineMapper.java

@@ -153,6 +153,16 @@ public interface TdEngineMapper {
 
     int getCountOfHistoryData(TdHistorySelectDto tdHistorySelectDto);
 
+
+    /**
+     * drop 子表
+     *
+     * @param databaseName
+     * @param tableName
+     */
+    void dropTable(@Param("databaseName") String databaseName,
+                   @Param("tableName") String tableName);
+
 //    /**
 //     * 检查表是否存在
 //     * @param dataBaseName

ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/service/ITdEngineService.java

@@ -133,7 +133,14 @@ public interface ITdEngineService {
      */
     public int getCountOfHistoryData(TdHistorySelectDto tdHistorySelectDto);
 
-
+    /**
+     * @param: databaseName
+     * @param: tableName
+     * @description drop子表
+     * @author xins
+     * @date 2024-04-20 11:08
+     */
+    public void dropTable(String databaseName, String tableName) throws Exception;
 //    void initSTableFrame(String msg) throws Exception;
 
 //    List<Map<String, Object>> getRealtimeData(SelectVisualDto selectVisualDto);

ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/service/impl/TdEngineServiceImpl.java

@@ -240,6 +240,23 @@ public class TdEngineServiceImpl implements ITdEngineService {
         int count = this.tdEngineMapper.getCountOfHistoryData(tdHistorySelectDto);
         return count;
     }
+
+
+
+    /**
+     * @param: databaseName
+     * @param: tableName
+     * @description drop子表
+     * @author xins
+     * @date 2024-04-20 11:08
+     */
+    @Override
+    public void dropTable(String databaseName, String tableName) throws Exception {
+        this.tdEngineMapper.dropTable(databaseName, tableName);
+
+    }
+
+
 //
 //    /**
 //     * 检查数据库表是否存在

ruoyi-modules/hw-tdengine/src/main/resources/mapper/tdengine/TdEngineMapper.xml

@@ -311,7 +311,9 @@
     </select>
 
 
-
+    <update id="dropTable">
+        drop table #{databaseName}.#{tableName}
+    </update>
 
     <!--
    <select id="checkTableExists" resultType="java.lang.Integer">