Merge branch 'master' of http://47.103.159.168:10012/GZHM/HM-SPMS

installer/registry_software.bat

@@ -11,7 +11,7 @@ REM
 set "softwarePath=%parentDir%"
 
 REM 定义注册表项路径
-set "REG_PATH=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\EnergyHub"
+set "REG_PATH=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HMEnergy"
 
 REM 删除现有的注册表项（如果存在）
 reg query "%REG_PATH%" >nul 2>&1
@@ -21,11 +21,11 @@ if %errorlevel%==0 (
 )
 
 REM 添加注册表项和值
-reg add "%REG_PATH%" /v DisplayName /t REG_SZ /d "EnergyHub" /f
+reg add "%REG_PATH%" /v DisplayName /t REG_SZ /d "HMEnergy" /f
 reg add "%REG_PATH%" /v UninstallString /t REG_SZ /d "%softwarePath%\uninst.exe" /f
 reg add "%REG_PATH%" /v DisplayIcon /t REG_SZ /d "%scriptPath%\rqeh6000.ico" /f
 reg add "%REG_PATH%" /v DisplayVersion /t REG_SZ /d "1.0.0" /f
-reg add "%REG_PATH%" /v Publisher /t REG_SZ /d "RelyEZ" /f
+reg add "%REG_PATH%" /v Publisher /t REG_SZ /d "GZHM" /f
 ::reg add "%REG_PATH%" /v InstallLocation /t REG_SZ /d "%softwarePath%" /f
 
 echo 注册表项已添加

platform/src/sys/sys.pro

@@ -28,3 +28,4 @@ sys_proc_mng.depends = sys_network_check_api sys_proc_mng_api
 sys_node_mng.depends = sys_network_check_api sys_proc_mng_api
 sys_network_check.depends = sys_network_check_api sys_proc_mng_api
 sys_nodeinfo_tran.depends = sys_proc_mng_api sys_node_mng_api
+file_sync_auto.depends = sys_proc_mng_api sys_node_mng_api

product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp

@@ -383,13 +383,13 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb)
     {
         return ;
     }
-    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 order by");
+    QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3");
     if(!strLoctionFilter.isEmpty())
     {
-        sqlSequenceQuery.append(QString("  %1 asc,dev_group_no asc,tag_name;").arg(strLoctionFilter));
+        sqlSequenceQuery.append(QString(" and %1 order by location_id , rtu_no , dev_group_no  ,tag_name;").arg(strLoctionFilter));
     }else
     {
-        sqlSequenceQuery.append(QStringLiteral(" dev_group_no asc,tag_name;"));
+        sqlSequenceQuery.append(QStringLiteral(" order by  location_id , rtu_no , dev_group_no  ,tag_name;"));
     }
     query.setForwardOnly(true);
     pReadDb->execute(sqlSequenceQuery, query);
@@ -423,9 +423,10 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb)
     QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info ");
     if(!strLoctionFilter.isEmpty())
     {
-        sqlSequenceQuery.append(QString(" where %1;").arg(strLoctionFilter));
+        sqlSequenceQuery.append(QString(" where %1 ").arg(strLoctionFilter));
     }
-    sqlSequenceQuery.append(" order by tag_name");
+    sqlSequenceQuery.append(" order by location_id, tag_name;");
+
     query.setForwardOnly(true);
     pReadDb->execute(sqlSequenceQuery, query);
     while(query.next())