Sfoglia il codice sorgente

********************WX******************
添加关系校验

zhangweixin 4 anni fa
parent
commit
a7f9a4ff55

+ 13 - 0
datacenter/src/main/kotlin/com/persagy/server/controllers/objects/ProjectController.kt

@@ -113,4 +113,17 @@ private open class ProjectController {
         }
     } // Function query()
 
+    /**
+     * 查询项目信息
+     *
+     * @param   request     查询信息条件
+     * @return              查询结果
+     */
+    @Operation(summary = "查询项目信息-全部或指定id", description = "")
+    @PostMapping(value = ["/query/obj"])
+    fun queryObj(@RequestBody request: SQueryRequest): SQueryResponse<Project> {
+//        logger.debug("projectQuery =${request.toJson()}")
+        return ProjectService.pageQuery(request)
+    } // Function query()
+
 } // Class ProjectController

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

@@ -123,7 +123,7 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
             DataVerification.getEquipAssetComponentsToolsTwo(pageQuery.content!!)
             if(pageQuery.result == SResponseType.success&&pageQuery.content!!.size>0){
                 val content = pageQuery.content!![0]
-                val exec1 =defClassService.select(SFilter.eq("projectId",Opt.projectId!!),SFilter.eq("equipmentCode",content.classCode!!)).exec()
+                val exec1 =defClassService.select(SFilter.eq("equipmentCode",content.classCode!!)).exec()
                 if (exec1!=null&&exec1.size>0){
                     pageQuery.message = "1"
                 }else{

+ 1 - 1
equip-component/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ server:
 
 spring:
   datasource:
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://8.140.129.63:5432/datacenter
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#

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

@@ -20,8 +20,8 @@ spring:
 #    username:                           postgres
 #    password:                           123qwe!@#
 #    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://192.168.64.15:5432/datacenter
+#    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://datacenter:5432/datacenterlabsl
     username:                           postgres
 #    password:                           persagy_2020qwe!@#