ソースを参照

********************WX******************
批量处理附件

zhangweixin 4 年 前
コミット
209af15c5f

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ShaftController.kt

@@ -182,8 +182,8 @@ class ShaftController {
      */
     @Operation(summary ="查询和当前竖井没有关联的业务空间", description ="shaftId 为竖井id")
     @PostMapping(value = ["/un-shaft-zoneSpaceBaseTable"])
-    fun unShaftZoneSpaceBaseTable(@RequestParam ShaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace>{
-        return ShaftService.unShaftZoneSpaceBaseTable(ShaftId, request)
+    fun unShaftZoneSpaceBaseTable(@RequestParam shaftId: String,@RequestBody request: SQueryRequest): SQueryResponse<ZoneSpace>{
+        return ShaftService.unShaftZoneSpaceBaseTable(shaftId, request)
     } // Fun shaftZoneSpaceBaseTable()
 
 

+ 2 - 2
datacenter/src/main/kotlin/com/persagy/server/jms/TopicReceiver.kt

@@ -63,8 +63,8 @@ class TopicReceiver {
      *
      * @param
      */
-    @RabbitListener(queues = ["queue-center-adm"])
-    @RabbitHandler
+//    @RabbitListener(queues = ["queue-center-adm"])
+//    @RabbitHandler
     fun receiveMessage(message: String) {
         try {
             println("接收数据中心消息 , $message")

+ 0 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -82,7 +82,6 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
             equip.projectId = Opt.projectId
 
             if (equip.classCode.isNullOrEmpty()) {
-                logger.debug("33333333333333333333333333333333333")
                 return false
             }
             if (!Opt.coming.isNullOrEmpty()) {

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/services/objects/ShaftService.kt

@@ -360,7 +360,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
             val projectId = SPageContext.getHeader("projectId")
             val zoneSpaceBaseTableService = SObjectService(SMybatisDao(ZoneSpace::class.java))
 
-            val rShContainSpBaseList = rSh2SpService.select(SFilter.eq("Id1", shaftId), SFilter.eq("projectId", projectId!!)).exec()
+            val rShContainSpBaseList = rSh2SpService.select(SFilter.eq("id1", shaftId), SFilter.eq("projectId", projectId!!)).exec()
 
             for (rShContainSpBase in rShContainSpBaseList) {
                 list.add(rShContainSpBase.id2!!)

+ 9 - 9
datacenter/src/main/resources/application-test.yml

@@ -28,18 +28,18 @@ server:
 
 spring:
   datasource:
-#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
-    url:                                jdbc:postgresql://datacenter:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://datacenter:5432/datacenter
     username:                           postgres
     password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
-  rabbitmq:
-    host: 192.168.64.15
-    port: 9936
-    username: admin
-    password: brzj123456
-    #虚拟host 可以不设置,使用server默认host
-    virtual-host: /test
+#  rabbitmq:
+#    host: 192.168.64.15
+#    port: 9936
+#    username: admin
+#    password: brzj123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /test
 
   servlet:
     multipart:

+ 43 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/TestControllers.kt

@@ -29,6 +29,7 @@ package com.persagy.server.syn.controllers.obj
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
 import com.persagy.server.datacenter.models.entities.dictnew.DictProject
 import com.persagy.server.datacenter.models.entities.objects.Equipment
 import com.persagy.server.datacenter.models.entities.objects.Floor
@@ -36,6 +37,8 @@ import com.persagy.server.datacenter.models.entities.objects.Project
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
 import com.persagy.server.syn.models.tools.EquipUtil
+import com.persagy.server.syn.services.dict.DClassDefService
+import com.persagy.server.syn.utils.ShaftNameUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import com.persagy.service.models.enums.SResponseType
@@ -76,6 +79,9 @@ class TestControllers {
     /** 数据中心项目服务 */
     private val projectService = SObjectService(SMybatisDao(Project::class.java))
 
+    /** 信息点 */
+    private val dictDefFuncId = SObjectService(SMybatisDao(DefFuncId::class.java))
+
     /**
      * 设备
      *
@@ -183,4 +189,41 @@ class TestControllers {
     }
 
 
+    /**
+     * 设备项目下所有的设备名为类型名
+     */
+    @Operation(summary = "设备项目下所有的设备名为类型名 ", description = "")
+    @PostMapping(value = ["/update/name"])
+    fun updateClassCodeName(@RequestParam projectId: String): SCreateResponse<Equipment>  {
+        return try {
+        val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+        for (equipment in equipmentList) {
+
+            val entity =
+                DClassDefService.select(SFilter.eq("code", equipment.classCode!!), SFilter.eq("projectId", projectId))
+                    .entity()
+            if (entity!=null) {
+                equipment.name = ShaftNameUtil.shaftName(entity.name+"-")
+                equipmentService.update(equipment)
+            }
+
+        }
+        SCreateResponse(SResponseType.success)
+    } catch (e: Exception) {
+        e.printStackTrace()
+        SCreateResponse(SResponseType.failure, e.message!!)
+    }
+
+    }
+
+
+
+
+
+
+
+
+
+
+
 }

+ 66 - 0
datasyn/src/main/kotlin/com/persagy/server/syn/utils/ShaftNameUtil.kt

@@ -0,0 +1,66 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.syn.utils
+
+import java.util.*
+
+/**
+ * 竖井名称自动生成工具
+ *
+ * @author 张维新
+ */
+object ShaftNameUtil {
+
+    /**
+     * 竖井名字
+     *
+     * @param   name    名字
+     */
+    fun shaftName(name:String):String{
+        return name + getCode(5)
+    } // Function shaftName()
+
+    /**
+     * 字母和数字组合的随机数
+     *
+     * @param   n   随机数的位数
+     */
+    private fun getCode(n: Int): String {
+        val string = "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ"//保存数字0-9 和 大小写字母
+        val ch = CharArray(n) //声明一个字符数组对象ch 保存 验证码
+        for (i in 0 until n) {
+            val random = Random()//创建一个新的随机数生成器
+            val index = random.nextInt(string.length)//返回[0,string.length)范围的int值    作用:保存下标
+            ch[i] = string[index]//charAt() : 返回指定索引处的 char 值   ==》保存到字符数组对象ch里面
+        }
+        //将char数组类型转换为String类型保存到result
+        //String result = new String(ch);//方法一:直接使用构造方法      String(char[] value) :分配一个新的 String,使其表示字符数组参数中当前包含的字符序列。
+//        val result = String(ch)//方法二: String方法   valueOf(char c) :返回 char 参数的字符串表示形式。
+        return  String(ch)
+    }// Function getCode()
+
+} // Object ShaftNameUtil

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

@@ -5,9 +5,9 @@ spring:
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     #    username:                           postgres
     #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
-#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
     #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 211 - 41
equip-component/src/main/kotlin/com/persagy/server/service/objects/EquipmentService.kt

@@ -27,12 +27,15 @@
 package com.persagy.server.service.objects
 
 import com.alibaba.fastjson.JSONArray
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import com.persagy.base.extensions.toJson
 import com.persagy.database.SFilter
 import com.persagy.database.SQueryBuilder
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.Opt
 import com.persagy.server.dao.mappers.CustomSql
+import com.persagy.server.datacenter.models.entities.assistant.TaskPic
 import com.persagy.server.datacenter.models.entities.dict.EquipFamily
 import com.persagy.server.datacenter.models.entities.dictnew.DefClass
 import com.persagy.server.datacenter.models.entities.objects.Equipment
@@ -656,20 +659,31 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.pic.isNullOrEmpty()){
                             val containsKey1 = equip!!.infos!!.containsKey(Opt.PIC)
                             if (containsKey1) {
-                                val any = equip!!.infos!![Opt.PIC] as JSONArray
-                                any.addAll(equipUpDateEnclosure.pic!!)
-                                equip!!.infos!![Opt.PIC] = any
+                                if (!equip.infos!![Opt.PIC].toString().isNullOrEmpty()&&equip.infos!![Opt.PIC].toString()!="null"){
+                                    val gson = Gson()
+                                    val type  = object : TypeToken<ArrayList<TaskPic>>() {}.type
+                                    val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.PIC]!!.toString(), type)
+                                    list.addAll(equipUpDateEnclosure.pic!!)
+                                    equip!!.infos!![Opt.PIC] = list
+                                }else {
+                                    equip!!.infos!![Opt.PIC] = equipUpDateEnclosure.pic!!
+                                }
                             } else {
                                 equip!!.infos!![Opt.PIC] = equipUpDateEnclosure.pic!!
                             }
-
                     }
                     if (!equipUpDateEnclosure.archive.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.ARCHIVE)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.ARCHIVE] as JSONArray
-                            any.addAll(equipUpDateEnclosure.archive!!)
-                            equip!!.infos!![Opt.ARCHIVE] = any
+                            if (!equip.infos!![Opt.ARCHIVE].toString().isNullOrEmpty()&&equip.infos!![Opt.ARCHIVE].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ARCHIVE]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.archive!!)
+                                equip!!.infos!![Opt.ARCHIVE] = list
+                            }else {
+                                equip!!.infos!![Opt.ARCHIVE] = equipUpDateEnclosure.archive!!
+                            }
                         } else {
                             equip!!.infos!![Opt.ARCHIVE] = equipUpDateEnclosure.archive!!
                         }
@@ -679,9 +693,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
 
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.CHECKREPORT)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.CHECKREPORT] as JSONArray
-                            any.addAll(equipUpDateEnclosure.checkReport!!)
-                            equip!!.infos!![Opt.CHECKREPORT] = any
+
+                            if (!equip.infos!![Opt.CHECKREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.CHECKREPORT].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.CHECKREPORT]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.checkReport!!)
+                                equip!!.infos!![Opt.CHECKREPORT] = list
+                            }else {
+                                equip!!.infos!![Opt.CHECKREPORT] = equipUpDateEnclosure.checkReport!!
+                            }
+//                            val any = equip!!.infos!![Opt.CHECKREPORT] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.checkReport!!)
+//                            equip!!.infos!![Opt.CHECKREPORT] = any
                         } else {
                             equip!!.infos!![Opt.CHECKREPORT] = equipUpDateEnclosure.checkReport
                         }
@@ -689,9 +713,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.drawing.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.DRAWING)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.DRAWING] as JSONArray
-                            any.addAll(equipUpDateEnclosure.drawing!!)
-                            equip!!.infos!![Opt.DRAWING] = any
+
+                            if (!equip.infos!![Opt.DRAWING].toString().isNullOrEmpty()&&equip.infos!![Opt.DRAWING].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.DRAWING]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.drawing!!)
+                                equip!!.infos!![Opt.DRAWING] = list
+                            }else {
+                                equip!!.infos!![Opt.DRAWING] = equipUpDateEnclosure.drawing!!
+                            }
+//                            val any = equip!!.infos!![Opt.DRAWING] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.drawing!!)
+//                            equip!!.infos!![Opt.DRAWING] = any
                         } else {
                             equip!!.infos!![Opt.DRAWING] = equipUpDateEnclosure.drawing
                         }
@@ -699,9 +733,20 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.installDrawing.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLDRAWING)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.INSTALLDRAWING] as JSONArray
-                            any.addAll(equipUpDateEnclosure.installDrawing!!)
-                            equip!!.infos!![Opt.INSTALLDRAWING] = any
+
+                            if (!equip.infos!![Opt.INSTALLDRAWING].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLDRAWING].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLDRAWING]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.installDrawing!!)
+                                equip!!.infos!![Opt.INSTALLDRAWING] = list
+                            }else {
+                                equip!!.infos!![Opt.INSTALLDRAWING] = equipUpDateEnclosure.installDrawing!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.INSTALLDRAWING] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.installDrawing!!)
+//                            equip!!.infos!![Opt.INSTALLDRAWING] = any
                         } else {
                             equip!!.infos!![Opt.INSTALLDRAWING]
                         }
@@ -709,9 +754,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.installPic.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLPIC)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.INSTALLPIC] as JSONArray
-                            any.addAll(equipUpDateEnclosure.installPic!!)
-                            equip!!.infos!![Opt.INSTALLPIC] = any
+
+                            if (!equip.infos!![Opt.INSTALLPIC].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLPIC].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLPIC]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.installPic!!)
+                                equip!!.infos!![Opt.INSTALLPIC] = list
+                            }else {
+                                equip!!.infos!![Opt.INSTALLPIC] = equipUpDateEnclosure.installPic!!
+                            }
+//                            val any = equip!!.infos!![Opt.INSTALLPIC] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.installPic!!)
+//                            equip!!.infos!![Opt.INSTALLPIC] = any
                         } else {
                             equip!!.infos!![Opt.INSTALLPIC] = equipUpDateEnclosure.installPic
                         }
@@ -720,8 +775,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.insuranceFile.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.INSURANCEFILE)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.INSURANCEFILE] as JSONArray
-                            any.addAll(equipUpDateEnclosure.insuranceFile!!)
+
+                            if (!equip.infos!![Opt.INSURANCEFILE].toString().isNullOrEmpty()&&equip.infos!![Opt.INSURANCEFILE].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSURANCEFILE]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.insuranceFile!!)
+                                equip!!.infos!![Opt.INSURANCEFILE] = list
+                            }else {
+                                equip!!.infos!![Opt.INSURANCEFILE] = equipUpDateEnclosure.insuranceFile!!
+                            }
+//                            val any = equip!!.infos!![Opt.INSURANCEFILE] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.insuranceFile!!)
                         } else {
                             equip!!.infos!![Opt.INSURANCEFILE] = equipUpDateEnclosure.insuranceFile
                         }
@@ -730,8 +795,17 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
 
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.NAMEPLATE)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.NAMEPLATE] as JSONArray
-                            any.addAll(equipUpDateEnclosure.nameplate!!)
+                            if (!equip.infos!![Opt.NAMEPLATE].toString().isNullOrEmpty()&&equip.infos!![Opt.NAMEPLATE].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.NAMEPLATE]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.nameplate!!)
+                                equip!!.infos!![Opt.NAMEPLATE] = list
+                            }else {
+                                equip!!.infos!![Opt.NAMEPLATE] = equipUpDateEnclosure.nameplate!!
+                            }
+//                            val any = equip!!.infos!![Opt.NAMEPLATE] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.nameplate!!)
                         } else {
                             equip!!.infos!![Opt.NAMEPLATE] = equipUpDateEnclosure.nameplate
                         }
@@ -740,8 +814,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.operationManual.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.OPERATIONMANUAL)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.OPERATIONMANUAL] as JSONArray
-                            any.addAll(equipUpDateEnclosure.operationManual!!)
+
+                            if (!equip.infos!![Opt.OPERATIONMANUAL].toString().isNullOrEmpty()&&equip.infos!![Opt.OPERATIONMANUAL].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.OPERATIONMANUAL]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.operationManual!!)
+                                equip!!.infos!![Opt.OPERATIONMANUAL] = list
+                            }else {
+                                equip!!.infos!![Opt.OPERATIONMANUAL] = equipUpDateEnclosure.operationManual!!
+                            }
+//                            val any = equip!!.infos!![Opt.OPERATIONMANUAL] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.operationManual!!)
                         } else {
                             equip!!.infos!![Opt.OPERATIONMANUAL] = equipUpDateEnclosure.operationManual
                         }
@@ -750,8 +834,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.productCertification.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.PRODUCTCERTIFICATION)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.PRODUCTCERTIFICATION] as JSONArray
-                            any.addAll(equipUpDateEnclosure.productCertification!!)
+
+                            if (!equip.infos!![Opt.PRODUCTCERTIFICATION].toString().isNullOrEmpty()&&equip.infos!![Opt.PRODUCTCERTIFICATION].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.PRODUCTCERTIFICATION]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.productCertification!!)
+                                equip!!.infos!![Opt.PRODUCTCERTIFICATION] = list
+                            }else {
+                                equip!!.infos!![Opt.PRODUCTCERTIFICATION] = equipUpDateEnclosure.productCertification!!
+                            }
+//                            val any = equip!!.infos!![Opt.PRODUCTCERTIFICATION] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.productCertification!!)
                         } else {
                             equip!!.infos!![Opt.PRODUCTCERTIFICATION] = equipUpDateEnclosure.productCertification
                         }
@@ -760,8 +854,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.maintainManual.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.MAINTAINMANUAL)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.MAINTAINMANUAL] as JSONArray
-                            any.addAll(equipUpDateEnclosure.maintainManual!!)
+
+                            if (!equip.infos!![Opt.MAINTAINMANUAL].toString().isNullOrEmpty()&&equip.infos!![Opt.MAINTAINMANUAL].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.MAINTAINMANUAL]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.maintainManual!!)
+                                equip!!.infos!![Opt.MAINTAINMANUAL] = list
+                            }else {
+                                equip!!.infos!![Opt.MAINTAINMANUAL] = equipUpDateEnclosure.maintainManual!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.MAINTAINMANUAL] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.maintainManual!!)
                         } else {
                             equip!!.infos!![Opt.MAINTAINMANUAL] = equipUpDateEnclosure.maintainManual
                         }
@@ -770,8 +875,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.installInstruction.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.INSTALLINSTRUCTION)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.INSTALLINSTRUCTION] as JSONArray
-                            any.addAll(equipUpDateEnclosure.installInstruction!!)
+
+                            if (!equip.infos!![Opt.INSTALLINSTRUCTION].toString().isNullOrEmpty()&&equip.infos!![Opt.INSTALLINSTRUCTION].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.INSTALLINSTRUCTION]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.installInstruction!!)
+                                equip!!.infos!![Opt.INSTALLINSTRUCTION] = list
+                            }else {
+                                equip!!.infos!![Opt.INSTALLINSTRUCTION] = equipUpDateEnclosure.installInstruction!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.INSTALLINSTRUCTION] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.installInstruction!!)
                         } else {
                             equip!!.infos!![Opt.INSTALLINSTRUCTION] = equipUpDateEnclosure.installInstruction
                         }
@@ -780,8 +896,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.acceptanceReport.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.ACCEPTANCEREPORT)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.ACCEPTANCEREPORT] as JSONArray
-                            any.addAll(equipUpDateEnclosure.acceptanceReport!!)
+
+                            if (!equip.infos!![Opt.ACCEPTANCEREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.ACCEPTANCEREPORT].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ACCEPTANCEREPORT]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.acceptanceReport!!)
+                                equip!!.infos!![Opt.ACCEPTANCEREPORT] = list
+                            }else {
+                                equip!!.infos!![Opt.ACCEPTANCEREPORT] = equipUpDateEnclosure.acceptanceReport!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.ACCEPTANCEREPORT] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.acceptanceReport!!)
                         } else {
                             equip!!.infos!![Opt.ACCEPTANCEREPORT] = equipUpDateEnclosure.acceptanceReport
                         }
@@ -790,8 +917,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.approachingAcceptance.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.APPROACHINGACCEPTANCE)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.APPROACHINGACCEPTANCE] as JSONArray
-                            any.addAll(equipUpDateEnclosure.approachingAcceptance!!)
+
+                            if (!equip.infos!![Opt.APPROACHINGACCEPTANCE].toString().isNullOrEmpty()&&equip.infos!![Opt.APPROACHINGACCEPTANCE].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.APPROACHINGACCEPTANCE]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.approachingAcceptance!!)
+                                equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = list
+                            }else {
+                                equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = equipUpDateEnclosure.approachingAcceptance!!
+                            }
+//                            val any = equip!!.infos!![Opt.APPROACHINGACCEPTANCE] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.approachingAcceptance!!)
                         } else {
                             equip!!.infos!![Opt.APPROACHINGACCEPTANCE] = equipUpDateEnclosure.approachingAcceptance
                         }
@@ -800,8 +937,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.supplierContract.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.SUPPLIERCONTRACT)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.SUPPLIERCONTRACT] as JSONArray
-                            any.addAll(equipUpDateEnclosure.supplierContract!!)
+
+                            if (!equip.infos!![Opt.SUPPLIERCONTRACT].toString().isNullOrEmpty()&&equip.infos!![Opt.SUPPLIERCONTRACT].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.SUPPLIERCONTRACT]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.supplierContract!!)
+                                equip!!.infos!![Opt.SUPPLIERCONTRACT] = list
+                            }else {
+                                equip!!.infos!![Opt.SUPPLIERCONTRACT] = equipUpDateEnclosure.supplierContract!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.SUPPLIERCONTRACT] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.supplierContract!!)
                         } else {
                             equip!!.infos!![Opt.SUPPLIERCONTRACT] = equipUpDateEnclosure.supplierContract
                         }
@@ -810,8 +958,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.testReport.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.TESTREPORT)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.TESTREPORT] as JSONArray
-                            any.addAll(equipUpDateEnclosure.testReport!!)
+
+                            if (!equip.infos!![Opt.TESTREPORT].toString().isNullOrEmpty()&&equip.infos!![Opt.TESTREPORT].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.TESTREPORT]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.testReport!!)
+                                equip!!.infos!![Opt.TESTREPORT] = list
+                            }else {
+                                equip!!.infos!![Opt.TESTREPORT] = equipUpDateEnclosure.testReport!!
+                            }
+
+//                            val any = equip!!.infos!![Opt.TESTREPORT] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.testReport!!)
                         } else {
                             equip!!.infos!![Opt.TESTREPORT] = equipUpDateEnclosure.testReport
                         }
@@ -821,8 +980,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
                     if (!equipUpDateEnclosure.originalCertificate.isNullOrEmpty()){
                         val containsKey1 = equip!!.infos!!.containsKey(Opt.ORIGINALCERTIFICATE)
                         if (containsKey1) {
-                            val any = equip!!.infos!![Opt.ORIGINALCERTIFICATE] as JSONArray
-                            any.addAll(equipUpDateEnclosure.originalCertificate!!)
+
+                            if (!equip.infos!![Opt.ORIGINALCERTIFICATE].toString().isNullOrEmpty()&&equip.infos!![Opt.ORIGINALCERTIFICATE].toString()!="null"){
+                                val gson = Gson()
+                                val type  = object : TypeToken<ArrayList<TaskPic>>() {}.getType()
+                                val list: ArrayList<TaskPic> = gson.fromJson(equip.infos!![Opt.ORIGINALCERTIFICATE]!!.toJson(), type)
+                                list.addAll(equipUpDateEnclosure.originalCertificate!!)
+                                equip!!.infos!![Opt.ORIGINALCERTIFICATE] = list
+                            }else {
+                                equip!!.infos!![Opt.ORIGINALCERTIFICATE] = equipUpDateEnclosure.originalCertificate!!
+                            }
+//
+//                            val any = equip!!.infos!![Opt.ORIGINALCERTIFICATE] as JSONArray
+//                            any.addAll(equipUpDateEnclosure.originalCertificate!!)
                         } else {
                             equip!!.infos!![Opt.ORIGINALCERTIFICATE] = equipUpDateEnclosure.originalCertificate
                         }

+ 13 - 4
equip-component/src/main/kotlin/com/persagy/server/service/objects/ZoneSpaceBaseService.kt

@@ -72,10 +72,17 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
 
     override fun onQueryBefore(queryBuilder: SQueryBuilder<ZoneSpace>) {
         val projectId = SPageContext.getHeader("projectId")
-//        val spaceBdFlObjs = ZoneAirConditioningService.spaceBdFlObjs(projectId!!)
-//        if (spaceBdFlObjs.size>0){
-//            queryBuilder.filter(SFilter.inList("id",spaceBdFlObjs.toList()))
-//        }
+        val spaceBdFlObjs = spaceBdFlObjs(projectId!!)
+        if (spaceBdFlObjs.size>0){
+            queryBuilder.filter(SFilter.inList("id",spaceBdFlObjs.toList()))
+        }
+    }
+
+    /**
+     * 查询 多建筑和多楼层的的对象
+     */
+    fun  spaceBdFlObjs(projectId: String): HashSet<String>{
+        return customSqlService.spaceBdFlObj(projectId)
     }
 
     /**
@@ -194,4 +201,6 @@ object ZoneSpaceBaseService : SObjectService<ZoneSpace>(SMybatisDao(ZoneSpace::c
         }
     }
 
+
+
 }

+ 2 - 2
equip-component/src/main/resources/application-test.yml

@@ -19,8 +19,8 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://datacenter:5432/datacenter
-#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+#    url:                                jdbc:postgresql://datacenter:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
     username:                           postgres