Просмотр исходного кода

**************************************万达adm**********************************************
提交

zhangweixin 4 лет назад
Родитель
Сommit
ff84a98805

+ 3 - 3
datacenter/src/main/resources/application-prod.yml

@@ -31,12 +31,12 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
-#    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
+#    url:                                jdbc:postgresql://localhost:5432/datacenter
+    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
-    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+    password:                           123456
 
   rabbitmq:
     host: 39.102.43.179

+ 8 - 2
equip-component/src/main/kotlin/com/persagy/server/service/dict/DictDefClassService.kt

@@ -165,8 +165,14 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
                 for (dictInfosWanDaGroup in dictInfosWanDaGroupList){
                     setCode.add(dictInfosWanDaGroup.code!!)
                 }
-                var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
+                if (setCode.isNotEmpty()) {
+                    var funcIdList = DefFuncIdService.select(SFilter.eq("projectId", Opt.projectId!!),SFilter.eq("classCode", category),
                         SFilter.inList("code", setCode.toList())).order("code").exec()
+                    dictStage.infos = funcIdList
+                }else {
+                    dictStage.infos = ArrayList()
+                }
+
 //                if (funcIdList.size == 0 ) {
 //                    funcIdList = DefFuncIdService.select(SFilter.eq("type","group"),
 //                             SFilter.eq("groupCode",Opt.groupCode!!),SFilter.eq("classCode", category),
@@ -176,7 +182,7 @@ object DefFuncIdService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::class.
 //                                SFilter.inList("code",  setCode.toList())).order("code").exec()
 //                    }
 //                }
-                dictStage.infos = funcIdList
+
             }
             dictInfoResponse.basicInfos = defFuncIdList
             dictInfoResponse.dictStages = dictStageList

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

@@ -19,11 +19,11 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://localhost:5432/datacenter
 #    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
-    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+    password:                           123456
 
 

+ 1 - 1
message-center/src/main/kotlin/com/persagy/server/messagecenter/services/base/Service.kt

@@ -102,7 +102,7 @@ open class Service<ENTITY : BaseInfo>(daoClass: SAbstractDao<ENTITY>)
         return try {
             for (info in request.content!!) {
                 info.projectId = getProject()
-                baseDao.update(info, request.projection, SFilter.eq("id", info.id!!), SFilter.eq("projectId", getProject()))
+                baseDao.update(info, null, SFilter.eq("id", info.id!!), SFilter.eq("projectId", getProject()))
             }
             SBaseResponse(SResponseType.success)
         } catch (e: Exception) {

+ 4 - 4
message-center/src/main/resources/application-prod.yml

@@ -29,13 +29,13 @@ server:
 spring:
 
   datasource:
-#    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
-    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
+    url:                                jdbc:postgresql://localhost:5432/datacenter
+#    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     username:                           postgres
-    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+    password:                           123456
 
   activemq:
-    broker-url:                         tcp://60.205.177.43:61616
+    broker-url:                         tcp://localhost:61616
 #    broker-url:                         tcp://172.17.100.16:61616
   servlet:
     multipart: