فهرست منبع

********************WX******************
控制系统数量

zhangweixin 4 سال پیش
والد
کامیت
3292053880

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/EquipmentBase.kt

@@ -65,7 +65,7 @@ open class EquipmentBase : Serializable , BaseInfo(){
     /** 设计图纸中编码 */
     @Schema(description = "设计图纸中编码")
     @Column(name = "cad_id")
-    @JSONField(name = "cADID")
+//    @JSONField(name = "cADID")
     var cadId: String? = null
 
     /** BIM模型中编码 */

+ 2 - 0
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelImportMapper.kt

@@ -536,5 +536,7 @@ interface IRelationExcelImportMapper {
     fun sp2sh(projectId: String, type: String, id1: String, id2: String, zoneType: String)
 
 
+    @Insert("INSERT INTO r_sy_for_sh(project_id, sys_id, shaft_id, type, sign) VALUES(#{projectId}, #{id1}, #{id2}, #{type}, 1)")
+    fun sy2shfor(projectId: String, type: String, id1: String, id2: String)
 
 } // Interface IRelationExcelImportMapper

+ 5 - 2
datacenter/src/main/kotlin/com/persagy/server/services/graphtype/RelationTypeProjectService.kt

@@ -441,7 +441,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
         try {
             var zoneType = zone
             val len = relType.indexOf("_")
-            val cmd = if (len > 0) {
+            var cmd = if (len > 0) {
                 relType.substring(0, len)
             } else {
                 relType
@@ -464,7 +464,10 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
                 excelImport.javaClass.getDeclaredMethod("sh2flfor", String::class.java, String::class.java, String::class.java, String::class.java)
             }else if (relType == "sh2sh_ArchForArch"){
                 excelImport.javaClass.getDeclaredMethod("sh2shfor", String::class.java, String::class.java, String::class.java, String::class.java)
-            }else if (cmd == "sp2sp"||cmd == "bd2sp"||cmd == "fl2sp"||cmd == "sh2sp"
+            }else if(relType == "sy2sh_for"){
+                cmd = "sy2shfor"
+                excelImport.javaClass.getDeclaredMethod(cmd, String::class.java, String::class.java, String::class.java, String::class.java)
+            } else if (cmd == "sp2sp"||cmd == "bd2sp"||cmd == "fl2sp"||cmd == "sh2sp"
                     ||cmd == "sp2bd"||cmd == "sp2fl"||cmd == "sp2sh"){
                  excelImport.javaClass.getDeclaredMethod(cmd, String::class.java, String::class.java, String::class.java, String::class.java, String::class.java)
             } else {