yucheng 3 rokov pred
rodič
commit
5399db7c80

+ 13 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/controllers/modelFile/FloorModelController.kt

@@ -19,6 +19,7 @@
  */
 package cn.sagacloud.server.algorithm.controllers.modelFile
 
+import cn.sagacloud.server.algorithm.backstage.state.ExportPassedState_3
 import cn.sagacloud.server.algorithm.backstage.sync.SyncUtil
 import cn.sagacloud.server.algorithm.dao.mapper.FloorMapper
 import cn.sagacloud.server.algorithm.models.config.MyProperties
@@ -97,7 +98,12 @@ class FloorModelController {
     @ApiOperation(value = "查询文件夹下的所有楼层", notes = "")
     @PostMapping(value = ["/query-list"])
     fun queryList(@RequestBody request: SQueryRequest): SQueryResponse<FloorModelView> {
-        val response = FloorModelService.pageQuery(request)
+        val response: SQueryResponse<FloorModelView>
+        if(SPageContext.getHeader("ProjectId") != null && SPageContext.getHeader("ProjectId")!!.isNotEmpty()) {
+            response = FloorModelService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        } else {
+            response = FloorModelService.pageQuery(request)
+        }
         val list = response.content
         if(list != null && list.isNotEmpty())
             response.content = list.sortedWith(floorComparator)
@@ -114,7 +120,12 @@ class FloorModelController {
     @ApiOperation(value = "查询文件夹下的所有楼层", notes = "")
     @PostMapping(value = ["/query-list-missing"])
     fun queryListWithMissing(@RequestBody request: SQueryRequest): SQueryResponse<FloorModelView> {
-        val response = FloorModelService.pageQuery(request)
+        val response: SQueryResponse<FloorModelView>
+        if(SPageContext.getHeader("ProjectId") != null && SPageContext.getHeader("ProjectId")!!.isNotEmpty()) {
+            response = FloorModelService.pageQuery(request, arrayListOf(SFilter.eq("projectId", SPageContext.getHeader("ProjectId").toString())))
+        } else {
+            response = FloorModelService.pageQuery(request)
+        }
         val list = response.content
         if(list != null && list.isNotEmpty())
             response.content = list.sortedWith(floorComparator)

+ 1 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/endpoint/FloorModelService.kt

@@ -26,8 +26,7 @@ object FloorModelService : SObjectService<FloorModelView>(SMybatisDao(FloorModel
         tableName.append("  file.data_check_result, file.size, file.original_name, file.revit_version ");
         tableName.append("FROM revit.model_floor floor INNER JOIN revit.model_file file ");
         tableName.append("  ON floor.current_model_id = file.id ");
-        tableName.append("WHERE file.removed != true ");
-        tableName.append("  and floor.project_id = '" + SPageContext.getHeader("ProjectId") + "') model_floor_file ");
+        tableName.append("WHERE file.removed != true) model_floor_file ");
         queryBuilder.tableName = tableName.toString()
     }
 }

+ 5 - 2
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/modelCheck/ModelCheckService.kt

@@ -21,12 +21,15 @@ import com.sybotan.database.SFilter
 import com.sybotan.mybatis.SMybatisDao
 import com.sybotan.service.SBaseService
 import com.sybotan.service.SObjectService
+import com.sybotan.service.SPageContext
 import com.sybotan.service.models.requests.SQueryRequest
 import com.sybotan.service.utils.SSpringContextUtil
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import java.lang.StringBuilder
 import java.util.stream.Collectors
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletRequestWrapper
 import kotlin.collections.Map as Map
 
 @Component
@@ -46,7 +49,7 @@ class ModelCheckService {
 //        queryBuilder.tableName = "revit_calc.check_grid_valid('${projectId}', '${folderId}', '${modelId}')"
         // 查询楼层模型
         var request = SQueryRequest()
-        request.filters = " folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
+        request.filters = " projectId = '"+projectId+"' and folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
         val select = FloorModelService.pageQuery(request)
         var list = select.content
         if(list == null || list.isEmpty()){
@@ -76,7 +79,7 @@ class ModelCheckService {
 //        return queryBuilder.exec()
         // 查询楼层模型
         var request = SQueryRequest()
-        request.filters = " folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
+        request.filters = " projectId = '"+projectId+"' and folderId = '"+ folderId!! +"' and ( status = 4 or currentModelId = '" + modelId!! + "') ";
         val select = FloorModelService.pageQuery(request)
         var list = select.content
         if(list == null || list.isEmpty()){

+ 14 - 12
revit-algorithm/src/main/resources-dev/application.yml

@@ -80,10 +80,10 @@ properties:
   #文件服务器配置
   fileService:
     # 基本属性
-    #url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
-    url:                               http://develop.persagy.com/image-service/
-    systemId:                          revit
-    secret:                            63afbef6906c342b
+    url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
+    #url:                               http://image-service:8080/
+    systemId:                          dataPlatform
+    secret:                            9e0891a7a8c8e885
     dir:                               model
     baseGraph:                         base
     report:                            report
@@ -105,7 +105,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://39.105.112.36/scheduler/
+    url:                               http://82.157.26.241:8080/
     createTask:                        ${properties.scheduler.url}task/create
     queryTask:                         ${properties.scheduler.url}task/query
     queryTaskResult:                   ${properties.scheduler.url}result/query
@@ -113,7 +113,7 @@ properties:
 
 
   datacenter:
-    url:                               http://39.105.112.36/datacenter/
+    url:                                http://39.105.112.36/datacenter/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}object/equip/create
     equipDelete: ${properties.datacenter.url}object/equip/delete
@@ -135,15 +135,17 @@ properties:
     floorCreate: ${properties.datacenter.url}object/floor/create
     # 绑定楼层接口
     floorBind: ${properties.datacenter.url}rel/update/equip-ispace
-#    # 资产接口
-#    propertyQuery: ${properties.datacenter.url}object/property/query
-#    propertyUpdate: ${properties.datacenter.url}object/property/update
+    #    # 资产接口
+
+    #    propertyQuery: ${properties.datacenter.url}object/property/query
+
+    #    propertyUpdate: ${properties.datacenter.url}object/property/update
     # 同步构件接口
     windowCreate: ${properties.datacenter.url}window/create_ignore
     vwallCreate: ${properties.datacenter.url}vwall/create_ignore
     doorCreate: ${properties.datacenter.url}door/create_ignore
 
-  #message:
-    #url: http://192.168.64.17:28888/message-center/
+  message:
+    url: http://39.105.112.36/message-center/
     # 发送消息接口
-    #createPath: ${properties.message.url}message/create
+    createPath: ${properties.message.url}message/create