|
@@ -30,11 +30,13 @@ import com.persagy.database.SFilter
|
|
|
import com.persagy.mybatis.SMybatisDao
|
|
|
import com.persagy.server.Opt
|
|
|
import com.persagy.server.datacenter.models.entities.objects.Floor
|
|
|
+import com.persagy.server.datacenter.models.entities.objects.FloorOutline
|
|
|
import com.persagy.server.services.assistant.ObjInfoService
|
|
|
import com.persagy.server.services.base.Service
|
|
|
import com.persagy.server.services.log.DataCenterLogsService
|
|
|
import com.persagy.server.utils.IdUtils
|
|
|
import com.persagy.server.utils.ShaftNameUtil
|
|
|
+import com.persagy.service.SObjectService
|
|
|
import com.persagy.service.SPageContext
|
|
|
import com.persagy.service.models.enums.SResponseType
|
|
|
import com.persagy.service.models.requests.SCreateRequest
|
|
@@ -52,7 +54,8 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
|
|
|
/** 日志 */
|
|
|
private val logger = LoggerFactory.getLogger(FloorService::class.java)
|
|
|
-
|
|
|
+ /** 楼层轮廓线 */
|
|
|
+ val floorOutlineservice = SObjectService(SMybatisDao(FloorOutline::class.java))
|
|
|
/**
|
|
|
* 创建之前操作
|
|
|
*/
|
|
@@ -303,90 +306,28 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
*/
|
|
|
override fun onDeleteBefore(entity: Floor): Boolean {
|
|
|
val floor = this.select(SFilter.eq("id", entity.id!!)).entity()
|
|
|
-
|
|
|
- val projectId = SPageContext.getHeader("projectId")
|
|
|
- val coming = SPageContext.getHeader("coming")
|
|
|
- val account = SPageContext.getHeader("account")
|
|
|
/** 日志 */
|
|
|
-// val dataCenterLogs = DataCenterLogs()
|
|
|
-// dataCenterLogs.id = IdUtils.uuidCreate()
|
|
|
-// dataCenterLogs.author = "dataCenter"
|
|
|
-// dataCenterLogs.projectId = projectId
|
|
|
-// dataCenterLogs.objectType = entity.objectType
|
|
|
-// dataCenterLogs.type = "delete"
|
|
|
-// dataCenterLogs.coming = coming
|
|
|
-// dataCenterLogs.account = account
|
|
|
-// dataCenterLogs.objectId = floor!!.id
|
|
|
-// val hashMap = HashMap<String, Any?>()
|
|
|
-// hashMap[entity.objectType!!] = floor
|
|
|
-// dataCenterLogs.dataSource = hashMap
|
|
|
-// logService.insert(dataCenterLogs)
|
|
|
- DataCenterLogsService.addLogs(projectId!!,"delete","floor",
|
|
|
- floor!!.id!!,floor,account,coming)
|
|
|
+ if (floor!=null){
|
|
|
+ DataCenterLogsService.addLogs(Opt.projectId!!,"delete","floor",
|
|
|
+ floor!!.id!!,floor,Opt.account,Opt.coming)
|
|
|
+ }
|
|
|
+
|
|
|
return super.onDeleteBefore(entity)
|
|
|
} // Function onDeleteBefore()
|
|
|
|
|
|
/**
|
|
|
* 更新楼层 Outline
|
|
|
*/
|
|
|
- fun updateOutline(request: SUpdateRequest<Floor>): SBaseResponse{
|
|
|
+ fun updateOutline(request: SUpdateRequest<FloorOutline>): SBaseResponse{
|
|
|
return try {
|
|
|
- val projectId = SPageContext.getHeader("projectId")
|
|
|
- val coming = SPageContext.getHeader("coming")
|
|
|
- val account = SPageContext.getHeader("account")
|
|
|
- val listId = ArrayList<String>()
|
|
|
+ val sBaseResponse = SBaseResponse(SResponseType.success)
|
|
|
if (!request.content.isNullOrEmpty()){
|
|
|
-// val jsonObject = JSONObject()
|
|
|
-// jsonObject.put("type", "7")
|
|
|
-// jsonObject.put("projectId", projectId)
|
|
|
-// jsonObject.put("obj_type", "Floor")
|
|
|
-// val jsonArray = JSONArray()
|
|
|
- for (floor in request.content!!){
|
|
|
- try {
|
|
|
- val listOutline = ArrayList<String>()
|
|
|
- listOutline.add("Outline")
|
|
|
- val update = update(floor,listOutline)
|
|
|
- if (update){
|
|
|
- listId.add(floor.id!!)
|
|
|
- try {
|
|
|
- /** 日志 */
|
|
|
-// val dataCenterLogs = DataCenterLogs()
|
|
|
-// dataCenterLogs.id = IdUtils.uuidCreate()
|
|
|
-// dataCenterLogs.author = "dataCenter"
|
|
|
-// dataCenterLogs.projectId = projectId
|
|
|
-// dataCenterLogs.objectType = "Floor"
|
|
|
-// dataCenterLogs.type = "update-after"
|
|
|
-// dataCenterLogs.account = account
|
|
|
-// dataCenterLogs.coming = coming
|
|
|
-// dataCenterLogs.objectId = floor.id
|
|
|
-// val hashMap = HashMap<String, Any?>()
|
|
|
-// hashMap["Floor"] = floor
|
|
|
-// dataCenterLogs.dataSource = hashMap
|
|
|
-// logService.insert(dataCenterLogs)
|
|
|
- DataCenterLogsService.addLogs(projectId!!,"update-after","floor",
|
|
|
- floor.id!!,floor,account,coming)
|
|
|
- } catch (e: Exception) {
|
|
|
- e.printStackTrace()
|
|
|
- }
|
|
|
- }
|
|
|
+ floorOutlineservice.updateList(request)
|
|
|
|
|
|
- } catch (e: Exception) {
|
|
|
- e.printStackTrace()
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (listId.size>0){
|
|
|
- for (id in listId){
|
|
|
-// val jsonInfos = JSONObject()
|
|
|
-// jsonInfos.put("id", id)
|
|
|
-// jsonInfos.put("obj_type", "Floor")
|
|
|
-// jsonArray.put(jsonInfos)
|
|
|
- rabbitMqService.sendObjects(projectId!!, Opt.UPDATE,id)
|
|
|
+ if (!request.content.isNullOrEmpty()){
|
|
|
+ for (floorOutline in request.content!!){
|
|
|
+ rabbitMqService.sendObjects(Opt.projectId!!, Opt.UPDATE,floorOutline.id!!)
|
|
|
}
|
|
|
-// jsonObject.put("infos", jsonArray)
|
|
|
-// /** 发送消息 */
|
|
|
-// messageHandler.sendMessage(jsonObject.toString())
|
|
|
-
|
|
|
try {
|
|
|
/** 处理关系标记 */
|
|
|
val listtype = ArrayList<String>()
|
|
@@ -399,7 +340,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
listtype.add("pe2bd")
|
|
|
listtype.add("pe2fl")
|
|
|
for (type in listtype){
|
|
|
- val entity = EquipmentService.relationTypeProjectservice.select(SFilter.eq("projectId", projectId!!), SFilter.eq("relationType", type)).entity()
|
|
|
+ val entity = EquipmentService.relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
|
|
|
if (entity!=null){
|
|
|
entity.computationalState = 2
|
|
|
EquipmentService.relationTypeProjectservice.update(entity)
|
|
@@ -409,17 +350,18 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
e.printStackTrace()
|
|
|
}
|
|
|
}
|
|
|
- val sBaseResponse = SBaseResponse(SResponseType.success)
|
|
|
+
|
|
|
return sBaseResponse
|
|
|
}else{
|
|
|
- val sBaseResponse = SBaseResponse(SResponseType.failure)
|
|
|
+ sBaseResponse.result = SResponseType.failure
|
|
|
return sBaseResponse
|
|
|
}
|
|
|
+
|
|
|
} catch (e: Exception) {
|
|
|
e.printStackTrace()
|
|
|
SBaseResponse(SResponseType.failure,e.message.toString())
|
|
|
}
|
|
|
- } // Fun
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 删除之后
|
|
@@ -432,7 +374,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
val projectId = SPageContext.getHeader("projectId")
|
|
|
for (floor in entityList) {
|
|
|
ObjInfoService.delete(SFilter.eq("projectId",projectId!!), SFilter.eq("objId",floor.id!!), SFilter.eq("objType","Fl"))
|
|
|
- rabbitMqService.sendObjects(floor.projectId!!, Opt.DELETE,floor.id!!)
|
|
|
+ rabbitMqService.sendObjects(Opt.projectId!!, Opt.DELETE,floor.id!!)
|
|
|
}
|
|
|
} catch (e: Exception) {
|
|
|
e.printStackTrace()
|
|
@@ -475,4 +417,4 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
|
|
|
}
|
|
|
|
|
|
|
|
|
-} // Object FloorService
|
|
|
+}
|