Browse Source

********************WX***********************
控制连接

zhangweixin 4 years ago
parent
commit
2f64adf593

+ 0 - 5
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/fors/RelShaftForFl.kt

@@ -26,14 +26,9 @@
 
 package com.persagy.server.datacenter.models.entities.graphtype.rel.fors
 
-import RelBuilding
-import com.persagy.server.datacenter.models.entities.base.BaseInfo
 import com.persagy.server.datacenter.models.entities.graphtype.rel.RelFloor
-import com.persagy.server.datacenter.models.entities.graphtype.rel.RelZoneSpace
 import com.persagy.service.models.annotations.SCascade
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**

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

@@ -37,7 +37,7 @@ import javax.persistence.Table
  *
  * @author 张维新
  */
-@Schema(description = "竖井和空间关系")
+@Schema(description = "竖井和楼层关系")
 @Table(name = "relationship.v_sh2fl")
 class RSh2FlTwo : RBaseInfo(){
 

+ 1 - 1
datacenter/src/main/kotlin/com/persagy/server/mappers/IRelationExcelExportMapper.kt

@@ -128,7 +128,7 @@ interface IRelationExcelExportMapper {
     @Select("SELECT r.id1 AS id, eq.name, eq.local_id, eq.local_name,eq.cad_id, '设备' AS object_type,\n" +
             "(SELECT local_name FROM public.building WHERE id = eq.building_id) AS building_name,\n" +
             "(SELECT local_name FROM public.floor WHERE id = eq.floor_id) AS floor_name\n" +
-            ",r.id2 AS _id, sp.name AS _name, sp.local_id AS _local_id, sp.local_name AS _local_name, '空间' AS _object_type, \n" +
+            ",r.id2 AS _id, sp.name AS _name, sp.local_id AS _local_id, sp.local_name AS _local_name, '设备' AS _object_type, \n" +
             "(SELECT local_name FROM building WHERE id = sp.building_id ) AS _building_name,\n" +
             "(SELECT local_name FROM floor WHERE id = sp.floor_id) AS _floor_name \n" +
             "FROM relationship.r_eq2eq r JOIN equipment AS eq ON r.id1 = eq.id JOIN equipment AS sp ON r.id2 = sp.id WHERE r.project_id = #{projectId} AND r.type = #{type} ")

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

@@ -521,7 +521,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
      * @param   zoneType        业务空间类型
      */
     fun exportExcelPoint(response: HttpServletResponse,buildingId: String,floorId: String,category: String) {
-        val projectId = SPageContext.getHeader("ProjectId")
+        val projectId = SPageContext.getHeader("projectId")
         val workbook = XSSFWorkbook(RelationTypeProjectService::class.java.classLoader.getResourceAsStream("excel/point_infos.xlsx"))
         response.contentType = "application/octet-stream"
         response.setHeader("Content-disposition", "attachment;filename=${projectId}-${category}.xlsx")

+ 3 - 3
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationCalcService.kt

@@ -4111,14 +4111,14 @@ open class ManualRelationCalcService {
             val rSp2SpTwoList = CommonServices.rSh2FlTwoService.select(listSF).exec()
             if (rSp2SpTwoList.size>0) {
 
-                val listId1 = ArrayList<String>()
-                val listId2 = ArrayList<String>()
+                val listId1 = HashSet<String>()
+                val listId2 = HashSet<String>()
                 for (rSp2SpTwo in rSp2SpTwoList){
                     listId1.add(rSp2SpTwo.id1!!)
                     listId2.add(rSp2SpTwo.id2!!)
                 }
                 val sCascadeQuery = sQueryRequest.cascade!!.get(0)
-                sCascadeQuery.filters = "id in ${listId2.toJson()}"
+                sCascadeQuery.filters = "id in ${listId2.toList().toJson()}"
                 list.add(SFilter.inList("id",listId1.toList()))
                 val pageQuery = CommonServices.relShaftForFlService.pageQuery(sQueryRequest, list)
                 manualRelationCalcResponse.direction = "Left"

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

@@ -34,8 +34,8 @@ spring:
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
-#    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
-    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.15:5432/datacenter
+#    url:                                jdbc:postgresql://39.102.40.239:5432/datacenter
     username:                           postgres
 #    password:                           persagy_2020qwe!@#
     password:                           cGVyc2FneV8yMDIwcXdlIUAj

+ 2 - 5
equip-component/src/main/kotlin/com/persagy/server/controllers/dict/DictCustomController.kt

@@ -46,10 +46,7 @@ import com.persagy.service.models.responses.SCreateResponse
 import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 /**
  * 项目化字典
@@ -125,7 +122,7 @@ class DictCustomController {
      * 需采集信息同步到所有项目
      */
     @Operation(summary = "需采集信息同步到所有项目", description = "")
-    @PostMapping(value = ["/syn-dic-project"])
+    @GetMapping(value = ["/syn-dic-project"])
     fun synDict(): SCreateResponse<DefFuncIdGather> {
         return DictDefClassService.synDictProject()
     }

+ 7 - 2
equip-component/src/main/kotlin/com/persagy/server/dao/mappers/CustomSql.kt

@@ -169,8 +169,13 @@ interface CustomSql {
     @Select("SELECT class_code as code ,(SELECT name FROM dict.def_class WHERE project_id = #{projectId} AND code = class_code ) FROM v_equipment WHERE project_id = #{projectId} GROUP BY class_code")
     fun  equipTypeName(projectId: String):ArrayList<DefClass>
 
-    @Update("UPDATE dict.def_funcid SET visible = #{visible}  class_code = #{classCode} AND code = #{code}")
-    fun updateVisible(visible: Boolean, classCode: String, code: String)
+    /** 项目定制表 */
+    @Update("UPDATE dict.def_funcid_project df1  SET visible = df2.visible FROM dict.def_funcid_gather df2 WHERE  df1.class_code = df2.class_code AND df1.code = df2.code")
+    fun updateVisible()
+
+    /** 主表 */
+    @Update("UPDATE dict.def_funcid df1  SET visible = df2.visible FROM dict.def_funcid_gather df2 WHERE  df1.class_code = df2.class_code AND df1.code = df2.code")
+    fun updateVisibleMain()
 
 
 } //

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

@@ -516,12 +516,14 @@ object DictDefClassService: SObjectService<DefFuncId>(SMybatisDao(DefFuncId::cla
      * 同步到项目
      */
     fun synDictProject(): SCreateResponse<DefFuncIdGather>{
-        val defFuncIdGatherList = defFuncIdGatherService.selectAll().exec()
-        if (defFuncIdGatherList.size>0) {
-            for (defFuncIdGather in defFuncIdGatherList) {
-                customSqlService.updateVisible(defFuncIdGather.visible!!,defFuncIdGather.classCode!!,defFuncIdGather.code!!)
-            }
+
+        try {
+            customSqlService.updateVisible()
+            customSqlService.updateVisibleMain()
+        } catch (e: Exception) {
+            e.localizedMessage
         }
+
         return SCreateResponse(SResponseType.success)
     }