物联网1.0

device-manager-ui/admin/src/views/sitestat/list.vue

@@ -4,9 +4,14 @@
       <el-col :span="6" :xs="12" class="mytree">
         <el-card>
           <div slot="header">
-            <span style="font-size: 13px;">站点分布</span>
+            <span style="font-size: 13px">站点分布</span>
 
-            <el-button style="float: right; padding: 3px 0"   @click="switchStat"  type="text">切换为地图模式</el-button>
+            <el-button
+              style="float: right; padding: 3px 0"
+              @click="switchStat"
+              type="text"
+              >切换为地图模式</el-button
+            >
           </div>
           <el-scrollbar style="height: 100%">
             <el-tree
@@ -111,9 +116,8 @@ export default {
     },
     /** 重写查看方法 */
     toView(row) {
-
-        //进入设备列表页面
-          this.$router.push({
+      //进入设备列表页面
+      this.$router.push({
         path: "/device/list",
         query: {
           siteId: row.siteId,
@@ -122,13 +126,12 @@ export default {
     },
 
     switchStat() {
-    console.log("切换地图页面")
-     this.$router.push({
-        path: "/sitestat/maplist"
+      console.log("切换地图页面");
+      this.$router.push({
+        path: "/sitestat/maplist",
       });
     },
 
-
     handleNodeClick(node) {
       console.log("click node", node);
       this.currentNode = node;
@@ -136,7 +139,13 @@ export default {
         //分页查询站点业务列表
         // this.siteMatterTable.siteId = node.id;
         //this.getSiteMatterTableData();
-        this.query = { siteId: node.id};
+
+        if (node.id.search(",")) {
+          this.query = { siteId: node.id.split(",")[0] };
+        } else {
+          this.query = { siteId: node.id };
+        }
+
         this.getData();
       }
     },

device-manager/src/main/java/com/mortals/xhx/module/sitestat/model/vo/SitestatVo.java

 package com.mortals.xhx.module.sitestat.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.sitestat.model.SitestatEntity;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
+
 /**
-* 站点统计视图对象
-*
-* @author zxfei
-* @date 2022-07-01
-*/
+ * 站点统计视图对象
+ *
+ * @author zxfei
+ * @date 2022-07-01
+ */
+@Data
 public class SitestatVo extends BaseEntityLong {
-
+    /**
+     * 站点Id，来源基础服务平台列表
+     */
+    private List<Long> siteIdList;
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java

@@ -64,6 +64,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
     public Result<SitestatEntity> find(SitestatEntity entity, PageInfo pageInfo, Context context) throws AppException {
         Result<SitestatEntity> res = new Result<>();
         //根据站点查询所以站点子集列表
+
+        if(!ObjectUtils.isEmpty(entity.getSiteIdList())){
+            // TODO: 2022/7/1 站点为多站点时候合并
+        }
+
         if (ObjectUtils.isEmpty(entity.getSiteId())) {
             return res;
             //throw new AppException("当前站点ID不能为空！");