From a2f6f1975b6e0eca7ae24cb19cfe30343d93fab6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 16 六月 2023 12:59:54 +0800
Subject: [PATCH] 重构三维实景业务
---
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/ArdTiles3dMapper.java | 69 ++++
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java | 65 +++
ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml | 4
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml | 1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java | 2
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java | 115 ++++++
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 2
ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml | 184 ++++++++++
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java | 252 ++++++++++++++
/dev/null | 119 -------
ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java | 151 ++++++++
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 6
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java | 9
14 files changed, 856 insertions(+), 127 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 68386dd..e8123e7 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -509,6 +509,10 @@
ardVideoInspectTask.setCurrentStepStartTime("");
ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
}
+ else
+ {
+ log.debug("寮曞鎴愬姛!");
+ }
}
}
} catch (Exception ex) {
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
new file mode 100644
index 0000000..a5912b2
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/ArdTiles3dController.java
@@ -0,0 +1,115 @@
+package com.ruoyi.management3d.tiles3d.controller;
+
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
+import com.ruoyi.management3d.tiles3d.service.IArdTiles3dService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 涓夌淮瀹炴櫙Controller
+ *
+ * @author ard
+ * @date 2023-06-16
+ */
+@RestController
+@RequestMapping("/management3d/tiles3d")
+@Api(tags = "涓夌淮瀹炴櫙鎺ュ彛")
+public class ArdTiles3dController extends BaseController
+{
+ @Autowired
+ private IArdTiles3dService ardTiles3dService;
+
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ArdTiles3d ardTiles3d)
+ {
+ startPage();
+ List<ArdTiles3d> list = ardTiles3dService.selectArdTiles3dList(ardTiles3d);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭涓夌淮瀹炴櫙鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:export')")
+ @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArdTiles3d ardTiles3d)
+ {
+ List<ArdTiles3d> list = ardTiles3dService.selectArdTiles3dList(ardTiles3d);
+ ExcelUtil<ArdTiles3d> util = new ExcelUtil<ArdTiles3d>(ArdTiles3d.class);
+ util.exportExcel(response, list, "涓夌淮瀹炴櫙鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇涓夌淮瀹炴櫙璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:query')")
+ @GetMapping(value = "/{tilesId}")
+ public AjaxResult getInfo(@PathVariable("tilesId") String tilesId)
+ {
+ return success(ardTiles3dService.selectArdTiles3dByTilesId(tilesId));
+ }
+
+ /**
+ * 鏂板涓夌淮瀹炴櫙
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:add')")
+ @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ArdTiles3d ardTiles3d)
+ {
+ return toAjax(ardTiles3dService.insertArdTiles3d(ardTiles3d));
+ }
+
+ /**
+ * 淇敼涓夌淮瀹炴櫙
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:edit')")
+ @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ArdTiles3d ardTiles3d)
+ {
+ return toAjax(ardTiles3dService.updateArdTiles3d(ardTiles3d));
+ }
+
+ /**
+ * 鍒犻櫎涓夌淮瀹炴櫙
+ */
+ @PreAuthorize("@ss.hasPermi('management3d:tiles3d:remove')")
+ @Log(title = "涓夌淮瀹炴櫙", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{tilesIds}")
+ public AjaxResult remove(@PathVariable String[] tilesIds)
+ {
+ return toAjax(ardTiles3dService.deleteArdTiles3dByTilesIds(tilesIds));
+ }
+ @GetMapping("/getDeptAndTiles3d")
+ @ApiOperation("鑾峰彇閮ㄩ棬鍜屼笁缁村疄鏅�")
+ public AjaxResult getDeptAndTiles3d()
+ {
+ Map deptAndTiles3d = ardTiles3dService.getChildDeptAndTiles3d();
+ return AjaxResult.success(deptAndTiles3d);
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/tiles3d/Tiles3dController.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/tiles3d/Tiles3dController.java
deleted file mode 100644
index 19c05c2..0000000
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/controller/tiles3d/Tiles3dController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.management3d.tiles3d.controller.tiles3d;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.management3d.tiles3d.domain.Tiles3d;
-import com.ruoyi.management3d.tiles3d.service.ITiles3dService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 涓夌淮瀹炴櫙绠＄悊Controller
- *
- * @author liusuyi
- * @date 2023-02-10
- */
-@RestController
-@RequestMapping("/tiles3d/tilesmap")
-public class Tiles3dController extends BaseController
-{
- @Autowired
- private ITiles3dService tiles3dService;
-
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:list')")
- @GetMapping("/list")
- public TableDataInfo list(Tiles3d tiles3d)
- {
- startPage();
- List<Tiles3d> list = tiles3dService.selectTiles3dList(tiles3d);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭涓夌淮瀹炴櫙绠＄悊鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:export')")
- @Log(title = "涓夌淮瀹炴櫙绠＄悊", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, Tiles3d tiles3d)
- {
- List<Tiles3d> list = tiles3dService.selectTiles3dList(tiles3d);
- ExcelUtil<Tiles3d> util = new ExcelUtil<Tiles3d>(Tiles3d.class);
- util.exportExcel(response, list, "涓夌淮瀹炴櫙绠＄悊鏁版嵁");
- }
-
- /**
- * 鑾峰彇涓夌淮瀹炴櫙绠＄悊璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:query')")
- @GetMapping(value = "/{tilesId}")
- public AjaxResult getInfo(@PathVariable("tilesId") String tilesId)
- {
- return success(tiles3dService.selectTiles3dByTilesId(tilesId));
- }
-
- /**
- * 鏂板涓夌淮瀹炴櫙绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:add')")
- @Log(title = "涓夌淮瀹炴櫙绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody Tiles3d tiles3d)
- {
- return toAjax(tiles3dService.insertTiles3d(tiles3d));
- }
-
- /**
- * 淇敼涓夌淮瀹炴櫙绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:edit')")
- @Log(title = "涓夌淮瀹炴櫙绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody Tiles3d tiles3d)
- {
- return toAjax(tiles3dService.updateTiles3d(tiles3d));
- }
-
- /**
- * 鍒犻櫎涓夌淮瀹炴櫙绠＄悊
- */
- @PreAuthorize("@ss.hasPermi('tiles3d:tilesmap:remove')")
- @Log(title = "涓夌淮瀹炴櫙绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{tilesIds}")
- public AjaxResult remove(@PathVariable String[] tilesIds)
- {
- return toAjax(tiles3dService.deleteTiles3dByTilesIds(tilesIds));
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
new file mode 100644
index 0000000..41c1eb8
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
@@ -0,0 +1,252 @@
+package com.ruoyi.management3d.tiles3d.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 涓夌淮瀹炴櫙瀵硅薄 ard_tiles3d
+ *
+ * @author ard
+ * @date 2023-06-16
+ */
+public class ArdTiles3d extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ @Excel(name = "ID")
+ private String tilesId;
+
+ /** 瀹炴櫙涓夌淮鍚嶇О */
+ @Excel(name = "瀹炴櫙涓夌淮鍚嶇О")
+ private String tilesName;
+
+ /** 瀹炴櫙涓夌淮璺緞 */
+ @Excel(name = "瀹炴櫙涓夌淮璺緞")
+ private String tilesUrl;
+
+ /** 鏄惁榛樿鍔犺浇ff榛樿鍒濆鍖� */
+ @Excel(name = "鏄惁榛樿鍔犺浇ff榛樿鍒濆鍖�")
+ private String tilesType;
+
+ /** x杞村亸绉� */
+ @Excel(name = "x杞村亸绉�")
+ private Integer tilesX;
+
+ /** y杞村亸绉� */
+ @Excel(name = "y杞村亸绉�")
+ private Integer tilesY;
+
+ /** z杞村亸绉� */
+ @Excel(name = "z杞村亸绉�")
+ private Integer tilesZ;
+
+ /** 鐩告満鍧愭爣 */
+ @Excel(name = "鐩告満鍧愭爣")
+ private String camPoi;
+
+ /** 鐩告満鏂逛綅 */
+ @Excel(name = "鐩告満鏂逛綅")
+ private Double camHeading;
+
+ /** 鐩告満淇话 */
+ @Excel(name = "鐩告満淇话")
+ private Double camPitch;
+
+ /** 灞忓箷绌洪棿璇樊 */
+ @Excel(name = "灞忓箷绌洪棿璇樊")
+ private Integer maximumScreenSpaceError;
+
+ /** 鍐呭瓨鏈�澶т娇鐢ㄩ噺 */
+ @Excel(name = "鍐呭瓨鏈�澶т娇鐢ㄩ噺")
+ private Integer maximumMemoryUsage;
+
+ /** 鑷姩瓒呮竻鍖栨ā鍨� */
+ @Excel(name = "鑷姩瓒呮竻鍖栨ā鍨�")
+ private Integer cullRequestsWhileMovingMultiplier;
+
+ /** 妯″瀷鍔犺浇閫熷害 */
+ @Excel(name = "妯″瀷鍔犺浇閫熷害")
+ private Integer dynamicScreenSpaceErrorDensity;
+
+ /** 閮ㄩ棬id */
+ @Excel(name = "閮ㄩ棬id")
+ private Integer deptId;
+
+ /** 鐢ㄦ埛id */
+ @Excel(name = "鐢ㄦ埛id")
+ private String userId;
+
+ public void setTilesId(String tilesId)
+ {
+ this.tilesId = tilesId;
+ }
+
+ public String getTilesId()
+ {
+ return tilesId;
+ }
+ public void setTilesName(String tilesName)
+ {
+ this.tilesName = tilesName;
+ }
+
+ public String getTilesName()
+ {
+ return tilesName;
+ }
+ public void setTilesUrl(String tilesUrl)
+ {
+ this.tilesUrl = tilesUrl;
+ }
+
+ public String getTilesUrl()
+ {
+ return tilesUrl;
+ }
+ public void setTilesType(String tilesType)
+ {
+ this.tilesType = tilesType;
+ }
+
+ public String getTilesType()
+ {
+ return tilesType;
+ }
+ public void setTilesX(Integer tilesX)
+ {
+ this.tilesX = tilesX;
+ }
+
+ public Integer getTilesX()
+ {
+ return tilesX;
+ }
+ public void setTilesY(Integer tilesY)
+ {
+ this.tilesY = tilesY;
+ }
+
+ public Integer getTilesY()
+ {
+ return tilesY;
+ }
+ public void setTilesZ(Integer tilesZ)
+ {
+ this.tilesZ = tilesZ;
+ }
+
+ public Integer getTilesZ()
+ {
+ return tilesZ;
+ }
+ public void setCamPoi(String camPoi)
+ {
+ this.camPoi = camPoi;
+ }
+
+ public String getCamPoi()
+ {
+ return camPoi;
+ }
+ public void setCamHeading(Double camHeading)
+ {
+ this.camHeading = camHeading;
+ }
+
+ public Double getCamHeading()
+ {
+ return camHeading;
+ }
+ public void setCamPitch(Double camPitch)
+ {
+ this.camPitch = camPitch;
+ }
+
+ public Double getCamPitch()
+ {
+ return camPitch;
+ }
+ public void setMaximumScreenSpaceError(Integer maximumScreenSpaceError)
+ {
+ this.maximumScreenSpaceError = maximumScreenSpaceError;
+ }
+
+ public Integer getMaximumScreenSpaceError()
+ {
+ return maximumScreenSpaceError;
+ }
+ public void setMaximumMemoryUsage(Integer maximumMemoryUsage)
+ {
+ this.maximumMemoryUsage = maximumMemoryUsage;
+ }
+
+ public Integer getMaximumMemoryUsage()
+ {
+ return maximumMemoryUsage;
+ }
+ public void setCullRequestsWhileMovingMultiplier(Integer cullRequestsWhileMovingMultiplier)
+ {
+ this.cullRequestsWhileMovingMultiplier = cullRequestsWhileMovingMultiplier;
+ }
+
+ public Integer getCullRequestsWhileMovingMultiplier()
+ {
+ return cullRequestsWhileMovingMultiplier;
+ }
+ public void setDynamicScreenSpaceErrorDensity(Integer dynamicScreenSpaceErrorDensity)
+ {
+ this.dynamicScreenSpaceErrorDensity = dynamicScreenSpaceErrorDensity;
+ }
+
+ public Integer getDynamicScreenSpaceErrorDensity()
+ {
+ return dynamicScreenSpaceErrorDensity;
+ }
+ public void setDeptId(Integer deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public Integer getDeptId()
+ {
+ return deptId;
+ }
+ public void setUserId(String userId)
+ {
+ this.userId = userId;
+ }
+
+ public String getUserId()
+ {
+ return userId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("tilesId", getTilesId())
+ .append("tilesName", getTilesName())
+ .append("tilesUrl", getTilesUrl())
+ .append("tilesType", getTilesType())
+ .append("tilesX", getTilesX())
+ .append("tilesY", getTilesY())
+ .append("tilesZ", getTilesZ())
+ .append("camPoi", getCamPoi())
+ .append("camHeading", getCamHeading())
+ .append("camPitch", getCamPitch())
+ .append("maximumScreenSpaceError", getMaximumScreenSpaceError())
+ .append("maximumMemoryUsage", getMaximumMemoryUsage())
+ .append("cullRequestsWhileMovingMultiplier", getCullRequestsWhileMovingMultiplier())
+ .append("dynamicScreenSpaceErrorDensity", getDynamicScreenSpaceErrorDensity())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/Tiles3d.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/Tiles3d.java
deleted file mode 100644
index 1611466..0000000
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/Tiles3d.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.management3d.tiles3d.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 涓夌淮瀹炴櫙绠＄悊瀵硅薄 tiles3d
- *
- * @author liusuyi
- * @date 2023-02-10
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Tiles3d extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** ID */
- @Excel(name = "ID")
- private String tilesId;
-
- /** 瀹炴櫙涓夌淮鍚嶇О */
- @Excel(name = "瀹炴櫙涓夌淮鍚嶇О")
- private String tilesName;
-
- /** 瀹炴櫙涓夌淮璺緞 */
- @Excel(name = "瀹炴櫙涓夌淮璺緞")
- private String tilesUrl;
-
- /** 鏄惁榛樿鍔犺浇ff榛樿鍒濆鍖� */
- @Excel(name = "鏄惁榛樿鍔犺浇ff榛樿鍒濆鍖�")
- private String tilesType;
-
- /** x杞村亸绉� */
- @Excel(name = "x杞村亸绉�")
- private Double tilesX;
-
- /** y杞村亸绉� */
- @Excel(name = "y杞村亸绉�")
- private Double tilesY;
-
- /** z杞村亸绉� */
- @Excel(name = "z杞村亸绉�")
- private Double tilesZ;
-
- /** 鐩告満鍧愭爣 */
- @Excel(name = "鐩告満鍧愭爣")
- private String camPoi;
-
- /** 鐩告満鏂逛綅 */
- @Excel(name = "鐩告満鏂逛綅")
- private Double camHeading;
-
- /** 鐩告満淇话 */
- @Excel(name = "鐩告満淇话")
- private Double camPitch;
- /** 娓呮櫚搴�1 */
- @Excel(name = "娓呮櫚搴�1")
- private String maximumScreenSpaceError;
-
- /** 娓呮櫚搴�2 */
- @Excel(name = "娓呮櫚搴�2")
- private String maximumMemoryUsage;
-
- /** 娓呮櫚搴�3 */
- @Excel(name = "娓呮櫚搴�3")
- private String cullRequestsWhileMovingMultiplier;
-
- /** 娓呮櫚搴�4 */
- @Excel(name = "娓呮櫚搴�4")
- private String dynamicScreenSpaceErrorDensity;
-
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("tilesId", getTilesId())
- .append("tilesName", getTilesName())
- .append("tilesUrl", getTilesUrl())
- .append("tilesType", getTilesType())
- .append("tilesX", getTilesX())
- .append("tilesY", getTilesY())
- .append("tilesZ", getTilesZ())
- .append("camPoi", getCamPoi())
- .append("camHeading", getCamHeading())
- .append("camPitch", getCamPitch())
- .toString();
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/ArdTiles3dMapper.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/ArdTiles3dMapper.java
new file mode 100644
index 0000000..774ba8b
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/ArdTiles3dMapper.java
@@ -0,0 +1,69 @@
+package com.ruoyi.management3d.tiles3d.mapper;
+
+import java.util.List;
+import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
+
+/**
+ * 涓夌淮瀹炴櫙Mapper鎺ュ彛
+ *
+ * @author ard
+ * @date 2023-06-16
+ */
+public interface ArdTiles3dMapper
+{
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 涓夌淮瀹炴櫙
+ */
+ public ArdTiles3d selectArdTiles3dByTilesId(String tilesId);
+
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙鍒楄〃
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 涓夌淮瀹炴櫙闆嗗悎
+ */
+ public List<ArdTiles3d> selectArdTiles3dList(ArdTiles3d ardTiles3d);
+
+ /**
+ * 鏂板涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ public int insertArdTiles3d(ArdTiles3d ardTiles3d);
+
+ /**
+ * 淇敼涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ public int updateArdTiles3d(ArdTiles3d ardTiles3d);
+
+ /**
+ * 鍒犻櫎涓夌淮瀹炴櫙
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdTiles3dByTilesId(String tilesId);
+
+ /**
+ * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙
+ *
+ * @param tilesIds 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTiles3dByTilesIds(String[] tilesIds);
+
+ /**
+ * 鏍规嵁閮ㄩ棬ID鏌ヨ鍏宠仈鐨勪笁缁村疄鏅�
+ *
+ * @param deptId 閮ㄩ棬ID
+ * @return 閮ㄩ棬鍒楄〃
+ */
+ public List<ArdTiles3d> selectArdTiles3dByDeptId(Long deptId);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/Tiles3dMapper.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/Tiles3dMapper.java
deleted file mode 100644
index 000701d..0000000
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/mapper/Tiles3dMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.management3d.tiles3d.mapper;
-
-
-import com.ruoyi.management3d.tiles3d.domain.Tiles3d;
-import java.util.List;
-
-/**
- * 涓夌淮瀹炴櫙绠＄悊Mapper鎺ュ彛
- *
- * @author liusuyi
- * @date 2023-02-10
- */
-public interface Tiles3dMapper
-{
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 涓夌淮瀹炴櫙绠＄悊
- */
- public Tiles3d selectTiles3dByTilesId(String tilesId);
-
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊鍒楄〃
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 涓夌淮瀹炴櫙绠＄悊闆嗗悎
- */
- public List<Tiles3d> selectTiles3dList(Tiles3d tiles3d);
-
- /**
- * 鏂板涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- public int insertTiles3d(Tiles3d tiles3d);
-
- /**
- * 淇敼涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- public int updateTiles3d(Tiles3d tiles3d);
-
- /**
- * 鍒犻櫎涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 缁撴灉
- */
- public int deleteTiles3dByTilesId(String tilesId);
-
- /**
- * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesIds 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTiles3dByTilesIds(String[] tilesIds);
-}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java
new file mode 100644
index 0000000..520b372
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/IArdTiles3dService.java
@@ -0,0 +1,65 @@
+package com.ruoyi.management3d.tiles3d.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
+
+/**
+ * 涓夌淮瀹炴櫙Service鎺ュ彛
+ *
+ * @author ard
+ * @date 2023-06-16
+ */
+public interface IArdTiles3dService
+{
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 涓夌淮瀹炴櫙
+ */
+ public ArdTiles3d selectArdTiles3dByTilesId(String tilesId);
+
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙鍒楄〃
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 涓夌淮瀹炴櫙闆嗗悎
+ */
+ public List<ArdTiles3d> selectArdTiles3dList(ArdTiles3d ardTiles3d);
+
+ /**
+ * 鏂板涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ public int insertArdTiles3d(ArdTiles3d ardTiles3d);
+
+ /**
+ * 淇敼涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ public int updateArdTiles3d(ArdTiles3d ardTiles3d);
+
+ /**
+ * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙
+ *
+ * @param tilesIds 闇�瑕佸垹闄ょ殑涓夌淮瀹炴櫙涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTiles3dByTilesIds(String[] tilesIds);
+
+ /**
+ * 鍒犻櫎涓夌淮瀹炴櫙淇℃伅
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdTiles3dByTilesId(String tilesId);
+
+ public Map getChildDeptAndTiles3d();
+}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/ITiles3dService.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/ITiles3dService.java
deleted file mode 100644
index 41b4a59..0000000
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/ITiles3dService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ruoyi.management3d.tiles3d.service;
-
-import java.util.List;
-import com.ruoyi.management3d.tiles3d.domain.Tiles3d;
-
-
-/**
- * 涓夌淮瀹炴櫙绠＄悊Service鎺ュ彛
- *
- * @author liusuyi
- * @date 2023-02-10
- */
-public interface ITiles3dService
-{
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 涓夌淮瀹炴櫙绠＄悊
- */
- public Tiles3d selectTiles3dByTilesId(String tilesId);
-
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊鍒楄〃
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 涓夌淮瀹炴櫙绠＄悊闆嗗悎
- */
- public List<Tiles3d> selectTiles3dList(Tiles3d tiles3d);
-
- /**
- * 鏂板涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- public int insertTiles3d(Tiles3d tiles3d);
-
- /**
- * 淇敼涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- public int updateTiles3d(Tiles3d tiles3d);
-
- /**
- * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesIds 闇�瑕佸垹闄ょ殑涓夌淮瀹炴櫙绠＄悊涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTiles3dByTilesIds(String[] tilesIds);
-
- /**
- * 鍒犻櫎涓夌淮瀹炴櫙绠＄悊淇℃伅
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 缁撴灉
- */
- public int deleteTiles3dByTilesId(String tilesId);
-}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java
new file mode 100644
index 0000000..820612d
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/ArdTiles3dServiceImpl.java
@@ -0,0 +1,151 @@
+package com.ruoyi.management3d.tiles3d.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.device.camera.domain.ArdCameras;
+import com.ruoyi.management3d.tiles3d.domain.ArdTiles3d;
+import com.ruoyi.management3d.tiles3d.mapper.ArdTiles3dMapper;
+import com.ruoyi.management3d.tiles3d.service.IArdTiles3dService;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.utils.tools.ArdTool;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 涓夌淮瀹炴櫙Service涓氬姟灞傚鐞�
+ *
+ * @author ard
+ * @date 2023-06-16
+ */
+@Service
+public class ArdTiles3dServiceImpl implements IArdTiles3dService {
+ @Resource
+ private ArdTiles3dMapper ardTiles3dMapper;
+ @Resource
+ private SysDeptMapper sysDeptMapper;
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 涓夌淮瀹炴櫙
+ */
+ @Override
+ public ArdTiles3d selectArdTiles3dByTilesId(String tilesId) {
+ return ardTiles3dMapper.selectArdTiles3dByTilesId(tilesId);
+ }
+
+ /**
+ * 鏌ヨ涓夌淮瀹炴櫙鍒楄〃
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 涓夌淮瀹炴櫙
+ */
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public List<ArdTiles3d> selectArdTiles3dList(ArdTiles3d ardTiles3d) {
+ return ardTiles3dMapper.selectArdTiles3dList(ardTiles3d);
+ }
+
+ /**
+ * 鏂板涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdTiles3d(ArdTiles3d ardTiles3d) {
+ ardTiles3d.setUserId(SecurityUtils.getUserId());
+ ardTiles3d.setCreateBy(SecurityUtils.getUsername());
+ ardTiles3d.setCreateTime(DateUtils.getNowDate());
+ return ardTiles3dMapper.insertArdTiles3d(ardTiles3d);
+ }
+
+ /**
+ * 淇敼涓夌淮瀹炴櫙
+ *
+ * @param ardTiles3d 涓夌淮瀹炴櫙
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdTiles3d(ArdTiles3d ardTiles3d) {
+ ardTiles3d.setUpdateBy(SecurityUtils.getUsername());
+ ardTiles3d.setUpdateTime(DateUtils.getNowDate());
+ return ardTiles3dMapper.updateArdTiles3d(ardTiles3d);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙
+ *
+ * @param tilesIds 闇�瑕佸垹闄ょ殑涓夌淮瀹炴櫙涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTiles3dByTilesIds(String[] tilesIds) {
+ return ardTiles3dMapper.deleteArdTiles3dByTilesIds(tilesIds);
+ }
+
+ /**
+ * 鍒犻櫎涓夌淮瀹炴櫙淇℃伅
+ *
+ * @param tilesId 涓夌淮瀹炴櫙涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTiles3dByTilesId(String tilesId) {
+ return ardTiles3dMapper.deleteArdTiles3dByTilesId(tilesId);
+ }
+
+ @Override
+ public Map getChildDeptAndTiles3d() {
+ Long deptId = SecurityUtils.getDeptId();
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ Map<String, Object> map = fetchChildDepartments(sysDept);
+ return map;
+ }
+
+ /**
+ * @鎻忚堪 閫掑綊鏌ヨ
+ * @鍙傛暟 [sysDept]
+ * @杩斿洖鍊� java.util.Map<java.lang.String, java.lang.Object>
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/2 14:38
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public Map<String, Object> fetchChildDepartments(SysDept sysDept) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", sysDept.getDeptName());
+ map.put("deptId", sysDept.getDeptId());
+ map.put("disabled", true);
+ List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptById(sysDept.getDeptId());
+ List<ArdTiles3d> ardTiles3ds = ardTiles3dMapper.selectArdTiles3dByDeptId(sysDept.getDeptId());
+ List<Object> childList = new ArrayList<>();
+ for (SysDept childDept : sysDepts) {
+ Map<String, Object> childMap = new HashMap<>();
+ childMap.put("name", childDept.getDeptName());
+ childMap.put("deptId", childDept.getDeptId());
+ childMap.put("disabled", true);
+ Map<String, Object> map1 = fetchChildDepartments(childDept);
+ childMap.putAll(map1);
+ childList.add(childMap);
+ }
+ if (ardTiles3ds.size() > 0) {
+ for (ArdTiles3d tiles3d : ardTiles3ds) {
+ Map<String, Object> cameraMap = ArdTool.convertEntityToMap(tiles3d);
+ childList.add(cameraMap);
+ }
+ }
+ map.put("children", childList);
+ return map;
+
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/Tiles3dServiceImpl.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/Tiles3dServiceImpl.java
deleted file mode 100644
index bc556fa..0000000
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/service/impl/Tiles3dServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ruoyi.management3d.tiles3d.service.impl;
-
-import java.util.List;
-import com.ruoyi.management3d.tiles3d.domain.Tiles3d;
-import com.ruoyi.management3d.tiles3d.mapper.Tiles3dMapper;
-import com.ruoyi.management3d.tiles3d.service.ITiles3dService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * 涓夌淮瀹炴櫙绠＄悊Service涓氬姟灞傚鐞�
- *
- * @author liusuyi
- * @date 2023-02-10
- */
-@Service
-public class Tiles3dServiceImpl implements ITiles3dService
-{
- @Resource
- private Tiles3dMapper tiles3dMapper;
-
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 涓夌淮瀹炴櫙绠＄悊
- */
- @Override
- public Tiles3d selectTiles3dByTilesId(String tilesId)
- {
- return tiles3dMapper.selectTiles3dByTilesId(tilesId);
- }
-
- /**
- * 鏌ヨ涓夌淮瀹炴櫙绠＄悊鍒楄〃
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 涓夌淮瀹炴櫙绠＄悊
- */
- @Override
- public List<Tiles3d> selectTiles3dList(Tiles3d tiles3d)
- {
- return tiles3dMapper.selectTiles3dList(tiles3d);
- }
-
- /**
- * 鏂板涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertTiles3d(Tiles3d tiles3d)
- {
- return tiles3dMapper.insertTiles3d(tiles3d);
- }
-
- /**
- * 淇敼涓夌淮瀹炴櫙绠＄悊
- *
- * @param tiles3d 涓夌淮瀹炴櫙绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int updateTiles3d(Tiles3d tiles3d)
- {
- return tiles3dMapper.updateTiles3d(tiles3d);
- }
-
- /**
- * 鎵归噺鍒犻櫎涓夌淮瀹炴櫙绠＄悊
- *
- * @param tilesIds 闇�瑕佸垹闄ょ殑涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTiles3dByTilesIds(String[] tilesIds)
- {
- return tiles3dMapper.deleteTiles3dByTilesIds(tilesIds);
- }
-
- /**
- * 鍒犻櫎涓夌淮瀹炴櫙绠＄悊淇℃伅
- *
- * @param tilesId 涓夌淮瀹炴櫙绠＄悊涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTiles3dByTilesId(String tilesId)
- {
- return tiles3dMapper.deleteTiles3dByTilesId(tilesId);
- }
-}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
index aa334a5..f7bdf58 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
@@ -36,8 +36,9 @@
@Override
public void connectionLost(Throwable cause) {
log.info("MQTT杩炴帴鏂紑锛屽彂璧烽噸杩�......");
- try {
- while (!client.isConnected()) {
+ while (!client.isConnected()) {
+ try {
+
Thread.sleep(5000);
if (null != client && !client.isConnected()) {
client.reconnect();
@@ -46,9 +47,9 @@
client.connect(options);
log.error("灏濊瘯寤虹珛鏂拌繛鎺�");
}
+ } catch (Exception e) {
+ log.error("鏂紑閲嶈繛寮傚父:" + e.getMessage());
}
- } catch (Exception e) {
- e.printStackTrace();
}
}
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index 51cd281..2a2c452 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -26,7 +26,7 @@
</resultMap>
<sql id="selectArdAlarmTubeVo">
- select id, host, tube_id, tube_name, tube_type, pipe_diameter, color, position, type, alarm_type, alarm_time, watcher, create_time, longitude, latitude, altitude,, record_url, view_time from ard_alarm_tube
+ select id, host, tube_id, tube_name, tube_type, pipe_diameter, color, position, type, alarm_type, alarm_time, watcher, create_time, longitude, latitude, altitude, record_url, view_time from ard_alarm_tube
</sql>
<select id="selectArdAlarmTubeList" parameterType="ArdAlarmTube" resultMap="ArdAlarmTubeResult">
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
index 53e4571..31741f3 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipExternalMapper.xml
@@ -39,8 +39,8 @@
c.altitude,
c.username,
c.password,
- c.dept_id,
- c.user_id,
+ d.dept_id,
+ u.user_id,
c.port,
c.longitude,
c.latitude
diff --git a/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml b/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml
new file mode 100644
index 0000000..adfbdcb
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/management3d/ArdTiles3dMapper.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.management3d.tiles3d.mapper.ArdTiles3dMapper">
+
+ <resultMap type="ArdTiles3d" id="ArdTiles3dResult">
+ <result property="tilesId" column="tiles_id"/>
+ <result property="tilesName" column="tiles_name"/>
+ <result property="tilesUrl" column="tiles_url"/>
+ <result property="tilesType" column="tiles_type"/>
+ <result property="tilesX" column="tiles_x"/>
+ <result property="tilesY" column="tiles_y"/>
+ <result property="tilesZ" column="tiles_z"/>
+ <result property="camPoi" column="cam_poi"/>
+ <result property="camHeading" column="cam_heading"/>
+ <result property="camPitch" column="cam_pitch"/>
+ <result property="maximumScreenSpaceError" column="maximum_screen_space_error"/>
+ <result property="maximumMemoryUsage" column="maximum_memory_usage"/>
+ <result property="cullRequestsWhileMovingMultiplier" column="cull_requests_while_moving_multiplier"/>
+ <result property="dynamicScreenSpaceErrorDensity" column="dynamic_screen_space_error_density"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="userId" column="user_id"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <sql id="selectArdTiles3dVo">
+ select c.tiles_id,
+ c.tiles_name,
+ c.tiles_url,
+ c.tiles_type,
+ c.tiles_x,
+ c.tiles_y,
+ c.tiles_z,
+ c.cam_poi,
+ c.cam_heading,
+ c.cam_pitch,
+ c.maximum_screen_space_error,
+ c.maximum_memory_usage,
+ c.cull_requests_while_moving_multiplier,
+ c.dynamic_screen_space_error_density,
+ d.dept_id,
+ u.user_id,
+ c.create_by,
+ c.create_time,
+ c.update_by,
+ c.update_time
+ from ard_tiles3d c
+ left join sys_dept d on d.dept_id = c.dept_id
+ left join sys_user u on u.user_id = c.user_id
+ </sql>
+
+ <select id="selectArdTiles3dList" parameterType="ArdTiles3d" resultMap="ArdTiles3dResult">
+ <include refid="selectArdTiles3dVo"/>
+ <where>
+ <if test="tilesId != null and tilesId != ''">and c.tiles_id = #{tilesId}</if>
+ <if test="tilesName != null and tilesName != ''">and c.tiles_name like '%'||#{tilesName}||'%'</if>
+ <if test="tilesUrl != null and tilesUrl != ''">and c.tiles_url = #{tilesUrl}</if>
+ <if test="tilesType != null and tilesType != ''">and c.tiles_type = #{tilesType}</if>
+ <if test="tilesX != null ">and c.tiles_x = #{tilesX}</if>
+ <if test="tilesY != null ">and c.tiles_y = #{tilesY}</if>
+ <if test="tilesZ != null ">and c.tiles_z = #{tilesZ}</if>
+ <if test="camPoi != null and camPoi != ''">and c.cam_poi = #{camPoi}</if>
+ <if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
+ <if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
+ <if test="maximumScreenSpaceError != null ">and c.maximum_screen_space_error = #{maximumScreenSpaceError}</if>
+ <if test="maximumMemoryUsage != null ">and c.maximum_memory_usage = #{maximumMemoryUsage}</if>
+ <if test="cullRequestsWhileMovingMultiplier != null ">and c.cull_requests_while_moving_multiplier =
+ #{cullRequestsWhileMovingMultiplier}
+ </if>
+ <if test="dynamicScreenSpaceErrorDensity != null ">and c.dynamic_screen_space_error_density =
+ #{dynamicScreenSpaceErrorDensity}
+ </if>
+ <if test="deptId != null ">and c.dept_id = #{deptId}</if>
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
+ </where>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
+ </select>
+
+ <select id="selectArdTiles3dByTilesId" parameterType="String" resultMap="ArdTiles3dResult">
+ <include refid="selectArdTiles3dVo"/>
+ where tiles_id = #{tilesId}
+ </select>
+
+ <insert id="insertArdTiles3d" parameterType="ArdTiles3d">
+ insert into ard_tiles3d
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="tilesId != null">tiles_id,</if>
+ <if test="tilesName != null">tiles_name,</if>
+ <if test="tilesUrl != null">tiles_url,</if>
+ <if test="tilesType != null">tiles_type,</if>
+ <if test="tilesX != null">tiles_x,</if>
+ <if test="tilesY != null">tiles_y,</if>
+ <if test="tilesZ != null">tiles_z,</if>
+ <if test="camPoi != null">cam_poi,</if>
+ <if test="camHeading != null">cam_heading,</if>
+ <if test="camPitch != null">cam_pitch,</if>
+ <if test="maximumScreenSpaceError != null">maximum_screen_space_error,</if>
+ <if test="maximumMemoryUsage != null">maximum_memory_usage,</if>
+ <if test="cullRequestsWhileMovingMultiplier != null">cull_requests_while_moving_multiplier,</if>
+ <if test="dynamicScreenSpaceErrorDensity != null">dynamic_screen_space_error_density,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="userId != null">user_id,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="tilesId != null">#{tilesId},</if>
+ <if test="tilesName != null">#{tilesName},</if>
+ <if test="tilesUrl != null">#{tilesUrl},</if>
+ <if test="tilesType != null">#{tilesType},</if>
+ <if test="tilesX != null">#{tilesX},</if>
+ <if test="tilesY != null">#{tilesY},</if>
+ <if test="tilesZ != null">#{tilesZ},</if>
+ <if test="camPoi != null">#{camPoi},</if>
+ <if test="camHeading != null">#{camHeading},</if>
+ <if test="camPitch != null">#{camPitch},</if>
+ <if test="maximumScreenSpaceError != null">#{maximumScreenSpaceError},</if>
+ <if test="maximumMemoryUsage != null">#{maximumMemoryUsage},</if>
+ <if test="cullRequestsWhileMovingMultiplier != null">#{cullRequestsWhileMovingMultiplier},</if>
+ <if test="dynamicScreenSpaceErrorDensity != null">#{dynamicScreenSpaceErrorDensity},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="userId != null">#{userId},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdTiles3d" parameterType="ArdTiles3d">
+ update ard_tiles3d
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="tilesName != null">tiles_name = #{tilesName},</if>
+ <if test="tilesUrl != null">tiles_url = #{tilesUrl},</if>
+ <if test="tilesType != null">tiles_type = #{tilesType},</if>
+ <if test="tilesX != null">tiles_x = #{tilesX},</if>
+ <if test="tilesY != null">tiles_y = #{tilesY},</if>
+ <if test="tilesZ != null">tiles_z = #{tilesZ},</if>
+ <if test="camPoi != null">cam_poi = #{camPoi},</if>
+ <if test="camHeading != null">cam_heading = #{camHeading},</if>
+ <if test="camPitch != null">cam_pitch = #{camPitch},</if>
+ <if test="maximumScreenSpaceError != null">maximum_screen_space_error = #{maximumScreenSpaceError},</if>
+ <if test="maximumMemoryUsage != null">maximum_memory_usage = #{maximumMemoryUsage},</if>
+ <if test="cullRequestsWhileMovingMultiplier != null">cull_requests_while_moving_multiplier =
+ #{cullRequestsWhileMovingMultiplier},
+ </if>
+ <if test="dynamicScreenSpaceErrorDensity != null">dynamic_screen_space_error_density =
+ #{dynamicScreenSpaceErrorDensity},
+ </if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="userId != null">user_id = #{userId},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where tiles_id = #{tilesId}
+ </update>
+
+ <delete id="deleteArdTiles3dByTilesId" parameterType="String">
+ delete
+ from ard_tiles3d
+ where tiles_id = #{tilesId}
+ </delete>
+
+ <delete id="deleteArdTiles3dByTilesIds" parameterType="String">
+ delete from ard_tiles3d where tiles_id in
+ <foreach item="tilesId" collection="array" open="(" separator="," close=")">
+ #{tilesId}
+ </foreach>
+ </delete>
+ <select id="selectArdTiles3dByDeptId" parameterType="Long" resultMap="ArdTiles3dResult">
+ select *
+ from ard_tiles3d
+ where dept_id = #{deptId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/tiles3d/Tiles3dMapper.xml b/ard-work/src/main/resources/mapper/tiles3d/Tiles3dMapper.xml
deleted file mode 100644
index 50e7c04..0000000
--- a/ard-work/src/main/resources/mapper/tiles3d/Tiles3dMapper.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.management3d.tiles3d.mapper.Tiles3dMapper">
-
- <resultMap type="Tiles3d" id="Tiles3dResult">
- <result property="tilesId" column="tiles_id" />
- <result property="tilesName" column="tiles_name" />
- <result property="tilesUrl" column="tiles_url" />
- <result property="tilesType" column="tiles_type" />
- <result property="tilesX" column="tiles_x" />
- <result property="tilesY" column="tiles_y" />
- <result property="tilesZ" column="tiles_z" />
- <result property="camPoi" column="cam_poi" />
- <result property="camHeading" column="cam_heading" />
- <result property="camPitch" column="cam_pitch" />
- <result property="maximumScreenSpaceError" column="maximum_screen_space_error" />
- <result property="maximumMemoryUsage" column="maximum_memory_usage" />
- <result property="cullRequestsWhileMovingMultiplier" column="cull_requests_while_moving_multiplier" />
- <result property="dynamicScreenSpaceErrorDensity" column="dynamic_screen_space_error_density" />
- </resultMap>
-
- <sql id="selectTiles3dVo">
- select tiles_id, tiles_name, tiles_url, tiles_type, tiles_x, tiles_y, tiles_z, cam_poi, cam_heading, cam_pitch, maximum_screen_space_error, maximum_memory_usage, cull_requests_while_moving_multiplier, dynamic_screen_space_error_density from ard_tiles3d
- </sql>
-
- <select id="selectTiles3dList" parameterType="Tiles3d" resultMap="Tiles3dResult">
- <include refid="selectTiles3dVo"/>
- <where>
- <if test="tilesId != null and tilesId != ''"> and tiles_id = #{tilesId}</if>
- <if test="tilesName != null and tilesName != ''"> and tiles_name like '%'||#{tilesName}||'%'</if>
- <if test="tilesUrl != null and tilesUrl != ''"> and tiles_url = #{tilesUrl}</if>
- <if test="tilesType != null and tilesType != ''"> and tiles_type = #{tilesType}</if>
- <if test="tilesX != null "> and tiles_x = #{tilesX}</if>
- <if test="tilesY != null "> and tiles_y = #{tilesY}</if>
- <if test="tilesZ != null "> and tiles_z = #{tilesZ}</if>
- <if test="camPoi != null and camPoi != ''"> and cam_poi = #{camPoi}</if>
- <if test="camHeading != null "> and cam_heading = #{camHeading}</if>
- <if test="camPitch != null "> and cam_pitch = #{camPitch}</if>
- <if test="maximumScreenSpaceError != null and maximumScreenSpaceError != ''"> and maximum_screen_space_error = #{maximumScreenSpaceError}</if>
- <if test="maximumMemoryUsage != null and maximumMemoryUsage != ''"> and maximum_memory_usage = #{maximumMemoryUsage}</if>
- <if test="cullRequestsWhileMovingMultiplier != null and cullRequestsWhileMovingMultiplier != ''"> and cull_requests_while_moving_multiplier = #{cullRequestsWhileMovingMultiplier}</if>
- <if test="dynamicScreenSpaceErrorDensity != null and dynamicScreenSpaceErrorDensity != ''"> and dynamic_screen_space_error_density = #{dynamicScreenSpaceErrorDensity}</if>
- </where>
- </select>
-
- <select id="selectTiles3dByTilesId" parameterType="String" resultMap="Tiles3dResult">
- <include refid="selectTiles3dVo"/>
- where tiles_id = #{tilesId}
- </select>
-
- <insert id="insertTiles3d" parameterType="Tiles3d">
- insert into ard_tiles3d
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="tilesId != null">tiles_id,</if>
- <if test="tilesName != null">tiles_name,</if>
- <if test="tilesUrl != null">tiles_url,</if>
- <if test="tilesType != null">tiles_type,</if>
- <if test="tilesX != null">tiles_x,</if>
- <if test="tilesY != null">tiles_y,</if>
- <if test="tilesZ != null">tiles_z,</if>
- <if test="camPoi != null">cam_poi,</if>
- <if test="camHeading != null">cam_heading,</if>
- <if test="camPitch != null">cam_pitch,</if>
- <if test="maximumScreenSpaceError != null">maximum_screen_space_error,</if>
- <if test="maximumMemoryUsage != null">maximum_memory_usage,</if>
- <if test="cullRequestsWhileMovingMultiplier != null">cull_requests_while_moving_multiplier,</if>
- <if test="dynamicScreenSpaceErrorDensity != null">dynamic_screen_space_error_density,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="tilesId != null">#{tilesId},</if>
- <if test="tilesName != null">#{tilesName},</if>
- <if test="tilesUrl != null">#{tilesUrl},</if>
- <if test="tilesType != null">#{tilesType},</if>
- <if test="tilesX != null">#{tilesX},</if>
- <if test="tilesY != null">#{tilesY},</if>
- <if test="tilesZ != null">#{tilesZ},</if>
- <if test="camPoi != null">#{camPoi},</if>
- <if test="camHeading != null">#{camHeading},</if>
- <if test="camPitch != null">#{camPitch},</if>
- <if test="maximumScreenSpaceError != null">#{maximumScreenSpaceError},</if>
- <if test="maximumMemoryUsage != null">#{maximumMemoryUsage},</if>
- <if test="cullRequestsWhileMovingMultiplier != null">#{cullRequestsWhileMovingMultiplier},</if>
- <if test="dynamicScreenSpaceErrorDensity != null">#{dynamicScreenSpaceErrorDensity},</if>
- </trim>
- </insert>
-
- <update id="updateTiles3d" parameterType="Tiles3d">
- update ard_tiles3d
- <trim prefix="SET" suffixOverrides=",">
- <if test="tilesName != null">tiles_name = #{tilesName},</if>
- <if test="tilesUrl != null">tiles_url = #{tilesUrl},</if>
- <if test="tilesType != null">tiles_type = #{tilesType},</if>
- <if test="tilesX != null">tiles_x = #{tilesX},</if>
- <if test="tilesY != null">tiles_y = #{tilesY},</if>
- <if test="tilesZ != null">tiles_z = #{tilesZ},</if>
- <if test="camPoi != null">cam_poi = #{camPoi},</if>
- <if test="camHeading != null">cam_heading = #{camHeading},</if>
- <if test="camPitch != null">cam_pitch = #{camPitch},</if>
- <if test="maximumScreenSpaceError != null">maximum_screen_space_error = #{maximumScreenSpaceError},</if>
- <if test="maximumMemoryUsage != null">maximum_memory_usage = #{maximumMemoryUsage},</if>
- <if test="cullRequestsWhileMovingMultiplier != null">cull_requests_while_moving_multiplier = #{cullRequestsWhileMovingMultiplier},</if>
- <if test="dynamicScreenSpaceErrorDensity != null">dynamic_screen_space_error_density = #{dynamicScreenSpaceErrorDensity},</if>
- </trim>
- where tiles_id = #{tilesId}
- </update>
-
- <delete id="deleteTiles3dByTilesId" parameterType="String">
- delete from ard_tiles3d where tiles_id = #{tilesId}
- </delete>
-
- <delete id="deleteTiles3dByTilesIds" parameterType="String">
- delete from ard_tiles3d where tiles_id in
- <foreach item="tilesId" collection="array" open="(" separator="," close=")">
- #{tilesId}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
index 6667d4e..b988080 100644
--- a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
+++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -18,6 +18,5 @@
</settings>
<typeAliases>
<package name="com.ruoyi.*.*.domain"/> <!--鏇挎崲鎴愪綘鐨勯」鐩殑瀹炰綋绫荤殑璺緞(杩欎釜閰嶇疆瀵逛簬椤圭洰鏉ヨ娌℃湁浣滅敤锛屼粎浠呮槸鍐欑粰IDEA涓婂畨瑁呯殑 MyBatis 鎻掍欢鐪嬬殑锛岄槻姝㈡爣绾�)-->
-
</typeAliases>
</configuration>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
index 3217b04..dd79534 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
@@ -9,6 +9,7 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -18,6 +19,8 @@
import javax.annotation.Resource;
import java.util.Date;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
/**
* SDK鎺у埗澶勭悊
*
@@ -25,6 +28,7 @@
*/
@Aspect
@Component
+@Slf4j(topic = "hikSdk")
public class SdkOperateAspect {
@Resource
@@ -41,8 +45,10 @@
public Object around(ProceedingJoinPoint point) throws Throwable {
Boolean result = controlScopeFilter(point);
if (result) {
+ log.debug("宸茶幏鍙栫浉鏈烘帶鍒舵潈");
return point.proceed();
} else {
+ log.debug("鏈幏鍙栫浉鏈烘帶鍒舵潈");
return false;//浠ｆ浛鐩爣鏂规硶鐨勮繑鍥炲��
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index 94d608d..05700bc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -122,4 +122,6 @@
* @return 缁撴灉
*/
public int deleteDeptById(Long deptId);
+
+
}
--
Gitblit v1.9.3