Bläddra i källkod

**********************************wx*************************
设备控制关系下载表格为空

weixinVSjinlai 4 år sedan
förälder
incheckning
78557679d6

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt

@@ -125,13 +125,13 @@ interface IRelationExcelExportMapper {
      * @param   type            关系类型
      * @return  关系记录
      */
-    @Select("SELECT r.eq_id AS id, eq.name, eq.local_id, eq.local_name,eq.cad_id, '设备' AS object_type,\n" +
+    @Select("SELECT r.id1 AS id, eq.name, eq.local_id, eq.local_name,eq.cad_id, '设备' AS object_type,\n" +
             "(SELECT local_name FROM public.building WHERE id = eq.building_id) AS building_name,\n" +
             "(SELECT local_name FROM public.floor WHERE id = eq.floor_id) AS floor_name\n" +
-            ",r.sp_id AS _id, sp.name AS _name, sp.local_id AS _local_id, sp.local_name AS _local_name, '空间' AS _object_type, \n" +
+            ",r.id2 AS _id, sp.name AS _name, sp.local_id AS _local_id, sp.local_name AS _local_name, '空间' AS _object_type, \n" +
             "(SELECT local_name FROM building WHERE id = sp.building_id ) AS _building_name,\n" +
             "(SELECT local_name FROM floor WHERE id = sp.floor_id) AS _floor_name \n" +
-            "FROM relationship.r_eq2sp r JOIN equipment AS eq ON r.eq_id = eq.id JOIN zone_space_base AS sp ON r.sp_id = sp.id WHERE r.project_id = #{projectId} AND r.type = #{type} ")
+            "FROM relationship.r_eq2eq r JOIN equipment AS eq ON r.id1 = eq.id JOIN equipment AS sp ON r.id2 = sp.id WHERE r.project_id = #{projectId} AND r.type = #{type} ")
     fun eq2eq(projectId: String, type: String): List<HashMap<String, Any?>>
 
     /**

+ 2 - 1
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt

@@ -1040,7 +1040,8 @@ class ManualRelationAddService {
                 sCreateResponse.errorType = "1"
                 return sCreateResponse
             }
-            if (relationAddRequest.relType =="eq2eq_EquipPower_1") {
+            if (relationAddRequest.relType =="eq2eq_EquipPower_1"||relationAddRequest.relType =="eq2eq_EquipPower_2"||
+                    relationAddRequest.relType =="eq2eq_EquipPower_3"||relationAddRequest.relType =="eq2eq_EquipPower_4"){
                 if (equipmentList[0].classCode!! == "SETDLS"||equipmentList[0].classCode!! == "SETDHS") {
                     /** 符合条件不做操作 */
                 }else {

+ 2 - 2
datacenter/src/main/resources/application-dev.yml

@@ -34,8 +34,8 @@ spring:
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj