From d71aa4575db10e4d2f69aaaf5d068bbc8c4eafc7 Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Thu, 23 May 2024 12:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F0523?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/StationAreaService.java |  9 +++--
 .../service/impl/StationAreaServiceImpl.java  | 13 +++++--
 .../controller/StationAreaController.java     |  7 ++++
 .../jnpf-web/src/views/stationarea/Detail.vue | 35 ++++++++++++++-----
 4 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java
index 96ebe7f..13972fd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java
@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.stationarea.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface StationAreaService extends IService<StationAreaEntity> {
     List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination);
 
-    List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,String dataType);
+    List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination, String dataType);
 
     StationAreaEntity getInfo(String id);
 
@@ -28,8 +30,9 @@ public interface StationAreaService extends IService<StationAreaEntity> {
 
     //子表方法
     //副表数据方法
-	String checkForm(StationAreaForm form,int i);
+    String checkForm(StationAreaForm form, int i);
 
-    void saveOrUpdate(StationAreaForm stationAreaForm,String id, boolean isSave) throws Exception;
+    void saveOrUpdate(StationAreaForm stationAreaForm, String id, boolean isSave) throws Exception;
 
+    List<StationAreaEntity> getOthersArea(String id);
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java
index e1bd880..0458676 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java
@@ -1,5 +1,6 @@
 package jnpf.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import jnpf.entity.*;
 import jnpf.mapper.StationAreaMapper;
 import jnpf.service.*;
@@ -358,7 +359,7 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
             entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
             entity.setLastModifyUserId(userInfo.getUserId());
             entity.setLastModifyTime(DateUtil.getNowDate());
-            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"company"));
+            entity.setCompanyId("");
             entity.setId(mainId);
         } else {
             entity.setCreatorUserId(userInfo.getUserId());
@@ -366,9 +367,17 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
             entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
             entity.setLastModifyUserId(null);
             entity.setLastModifyTime(null);
-            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"company"));
+            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "company"));
         }
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public List<StationAreaEntity> getOthersArea(String id) {
+        QueryWrapper<StationAreaEntity> wrapper = new QueryWrapper<>();
+        wrapper.ne("id", id);
+        List<StationAreaEntity> list = this.list(wrapper);
+        return list;
+    }
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java
index 3fc28ef..c1156a2 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java
@@ -251,4 +251,11 @@ public class StationAreaController {
         }
     }
 
+    @PostMapping("/getOthersArea/{id}")
+    @Operation(summary = "获取非当前编辑的其他区域信息")
+    public ActionResult getOthersArea(@PathVariable String id) {
+        List<StationAreaEntity> othersArea = stationAreaService.getOthersArea(id);
+        return ActionResult.success(othersArea);
+    }
+
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue
index 8aa85f4..20945ed 100644
--- a/jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue
@@ -13,49 +13,49 @@
 <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="区域名称"  
+                <jnpf-form-tip-item  label="区域名称"
  prop="areaName"   tip-label="围栏区域名称" >
                         <p>{{dataForm.areaName}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="区域类型"  
+                <jnpf-form-tip-item  label="区域类型"
  prop="areaType"   tip-label="请选择围栏类型" >
                         <p>{{dataForm.areaType}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="是否启用"  
+                <jnpf-form-tip-item  label="是否启用"
  prop="status"  >
                         <p>{{dataForm.status}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="绑定商户"  
+                <jnpf-form-tip-item  label="绑定商户"
  prop="companyId"   tip-label="绑定商户" >
                         <p>{{dataForm.companyId}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="地图信息"  
+                <jnpf-form-tip-item  label="地图信息"
  prop="areaMapInfo"   tip-label="在地图上绘制电子围栏" >
                         <p>{{dataForm.areaMapInfo}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="区域描述"  
+                <jnpf-form-tip-item  label="区域描述"
  prop="areaDesc"   tip-label="请输入区域描述" >
                         <p>{{dataForm.areaDesc}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="修改用户"  
+                <jnpf-form-tip-item  label="修改用户"
  prop="lastModifyUserId"  >
                         <p>{{dataForm.lastModifyUserId}}</p>
                 </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24"  >
-                <jnpf-form-tip-item  label="修改时间"  
+                <jnpf-form-tip-item  label="修改时间"
  prop="lastModifyTime"  >
                         <p>{{dataForm.lastModifyTime}}</p>
                 </jnpf-form-tip-item>
@@ -88,7 +88,24 @@
                             areaType : "",
                             status : "1",
                             companyId : "",
-                            areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]",
+                            areaMapInfo : "[\n" +
+                              "    {\n" +
+                              "        \"lat\": 39.9629611771165,\n" +
+                              "        \"lng\": 116.30936980247498\n" +
+                              "    },\n" +
+                              "    {\n" +
+                              "        \"lat\": 39.96348746127829,\n" +
+                              "        \"lng\": 116.46523833274841\n" +
+                              "    },\n" +
+                              "    {\n" +
+                              "        \"lat\": 39.85815003104041,\n" +
+                              "        \"lng\": 116.4590585231781\n" +
+                              "    },\n" +
+                              "    {\n" +
+                              "        \"lat\": 39.85235177327065,\n" +
+                              "        \"lng\": 116.31966948509216\n" +
+                              "    }\n" +
+                              "] \n",
                             areaDesc : '',
                             creatorUserId : "",
                             creatorTime : "",