实现业务功能

couplet-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/web/domain/BaseEntity.java

@@ -33,6 +33,8 @@ public class BaseEntity implements Serializable {
     @TableField(exist = false)
     private String searchValue;
 
+    @TableField(exist = false)
+
     /**
      * 创建者
      */
@@ -44,6 +46,7 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    @TableField(exist = false)
     /**
      * 更新者
      */
@@ -55,6 +58,7 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @TableField(exist = false)
     /**
      * 备注
      */

couplet-common/couplet-common-log/src/main/java/com/couplet/common/log/enums/BusinessType.java

@@ -55,4 +55,5 @@ public enum BusinessType {
      * 清空数据
      */
     CLEAN,
+
 }

couplet-common/couplet-common-security/src/main/java/com/couplet/common/security/utils/SecurityUtils.java

@@ -65,7 +65,7 @@ public class SecurityUtils {
      * 根据request获取请求token
      */
     public static String getToken (HttpServletRequest request) {
-        // 从header获取token标识
+        // 从header标识
         String token = request.getHeader(TokenConstants.AUTHENTICATION);
         return replaceTokenPrefix(token);
     }

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java

@@ -1,5 +1,6 @@
 package com.couplet.common.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.couplet.common.core.web.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -82,8 +83,11 @@ public class SysDept extends BaseEntity {
     /**
      * 父部门名称
      */
+
+    @TableField(exist = false)
     private String parentName;
 
+    @TableField(exist = false)
     /**
      * 子部门
      */

couplet-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java

@@ -0,0 +1,126 @@
+package com.couplet.map.common.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.couplet.common.core.web.domain.BaseEntity;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ * 电子围栏类
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("couplet_fence_info")
+public class Fence extends BaseEntity{
+
+    @TableId(value = "fence_id", type = IdType.AUTO)
+    /**
+     * 围栏id
+     */
+    private Long fenceId;
+    /**
+     * 围栏名称
+     */
+    private String fenceName;
+    /**
+     * 围栏经纬度
+     */
+    private String fenceLongitudeLatitude;
+    /**
+     * 围栏描述
+     */
+    private String fenceDescription;
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+    /**
+     * 围栏状态
+     */
+    private Integer fenceState;
+    /**
+     * 创建时间
+     */
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private String createName;
+    /**
+     * 维护人
+     */
+
+    private String maintainerName;
+    /**
+     * 告警状态
+     */
+
+    private Integer alarmStatus;
+
+    @TableField(exist = false)
+    /**
+     * 标识
+     */
+    private Integer[] logoId;
+    @TableField(exist = false)
+    private String logoName;
+
+    public static Fence updateFenceStatus(FenceUpdateRequest fenceUpdateRequest) {
+
+        return Fence.builder()
+                .fenceName(fenceUpdateRequest.getFenceName())
+                .fenceDescription(fenceUpdateRequest.getFenceDescription())
+                .fenceState(fenceUpdateRequest.getFenceState())
+                .fenceLongitudeLatitude(fenceUpdateRequest.getFenceLongitudeLatitude())
+                .createName(fenceUpdateRequest.getCrateName())
+                .createTime(fenceUpdateRequest.getCreateTime())
+                .isDelete(fenceUpdateRequest.getIsDelete())
+                .maintainerName(fenceUpdateRequest.getMaintainerName())
+                .alarmStatus(fenceUpdateRequest.getAlarmStatus())
+                .updateTime(fenceUpdateRequest.getUpdateTime())
+                .fenceId(fenceUpdateRequest.getFenceId())
+                .build();
+
+    }
+
+
+    public static Fence fenceInsert(FenceRequest fenceRequest) {
+
+        return Fence.builder()
+                .fenceName(fenceRequest.getFenceName())
+                .fenceLongitudeLatitude(fenceRequest.getFenceLongitudeLatitude())
+                .fenceState(fenceRequest.getFenceState())
+                .fenceDescription(fenceRequest.getFenceDescription())
+                .createTime(fenceRequest.getCreateTime())
+                .updateTime(fenceRequest.getUpdateTime())
+                .isDelete(fenceRequest.getIsDelete())
+                .alarmStatus(fenceRequest.getAlarmStatus())
+                .logoId(fenceRequest.getLogoId())
+                .build();
+    }
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Logo.java

@@ -0,0 +1,24 @@
+package com.couplet.map.common.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/29
+ * 标识实体类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+@TableName("couplet_logo_info")
+public class Logo {
+
+    private Integer logoId;
+    private String logoName;
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java

@@ -0,0 +1,26 @@
+package com.couplet.map.common.domain.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FenceConfig {
+
+
+    private String fenceName;
+    /**
+     * 围栏状态
+     */
+
+    private Integer fenceState;
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java

@@ -1,32 +1,29 @@
-package com.couplet.map.common.domin;
+package com.couplet.map.common.domain.request;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Builder;
-import com.couplet.common.core.web.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 /**
  * @Author: LiJiaYao
- * @Date: 2024/3/28
+ * @Date: 2024/3/29
  */
 @Data
-@SuperBuilder
+@AllArgsConstructor
-@TableName("couplet_fence")
+@NoArgsConstructor
-public class Fence extends BaseEntity {
+@Builder
-
+public class FenceRequest {
-    @TableId(value = "fence_id", type = IdType.AUTO)
     /**
      * 围栏id
      */
-    private Long fenceId;
+    private Integer fenceId;
     /**
-     * 围栏名称
+     * 新增电子名称
      */
     private String fenceName;
     /**
@@ -45,36 +42,32 @@ public class Fence extends BaseEntity {
      * 围栏状态
      */
     private Integer fenceState;
-    /**
-     * 创建时间
-     */
-     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
     /**
      * 更新时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     /**
      * 创建人
      */
-    private String createName;
+    private String crateName;
     /**
      * 维护人
      */
-
     private String maintainerName;
     /**
-     * 告警状态
+     * 报警状态
      */
-
     private Integer alarmStatus;
     /**
-     * 围栏类型
+     * 标识
      */
-    private Integer fenceType;
+    @TableField(exist = false)
-
+    private String[] logoId;
 }

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java

@@ -0,0 +1,70 @@
+package com.couplet.map.common.domain.request;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/29
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class FenceUpdateRequest {
+
+    /**
+     * 新增电子
+     */
+    private Long fenceId;
+    /**
+     * 新增电子名称
+     */
+    private String fenceName;
+    /**
+     * 围栏经纬度
+     */
+    private String fenceLongitudeLatitude;
+    /**
+     * 围栏描述
+     */
+    private String fenceDescription;
+    /**
+     * 是否删除
+     */
+    private Integer isDelete;
+    /**
+     * 围栏状态
+     */
+    private Integer fenceState;
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String crateName;
+    /**
+     * 维护人
+     */
+    private String maintainerName;
+    /**
+     * 报警状态
+     */
+    private Integer alarmStatus;
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domin/request/FenceConfig.java

@@ -1,24 +0,0 @@
-package com.couplet.map.common.domin.request;
-
-import com.couplet.common.core.web.domain.BaseEntity;
-import com.couplet.map.common.domin.Fence;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/3/28
- */
-@Data
-public class FenceConfig{
-
-
-    private String fenceName;
-    /**
-     * 围栏经纬度
-     */
-    private String fenceLongitudeLatitude;
-    private Integer pageNum=1;
-    private Integer pageSize=3;
-
-}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml

@@ -48,6 +48,7 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+
         <!-- Swagger UI -->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -84,6 +85,10 @@
             <groupId>com.couplet</groupId>
             <artifactId>couplet-common-swagger</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-system</artifactId>
+        </dependency>
 
     </dependencies>
 

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java

@@ -2,15 +2,19 @@ package com.couplet.map.server.controller;
 
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
-import com.couplet.map.common.domin.Fence;
+import com.couplet.common.log.annotation.Log;
-import com.couplet.map.common.domin.request.FenceConfig;
+import com.couplet.common.log.enums.BusinessType;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.map.common.domain.Fence;
+import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import com.couplet.map.server.service.FenceService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 import static com.couplet.common.core.utils.PageUtils.startPage;
@@ -18,6 +22,7 @@ import static com.couplet.common.core.utils.PageUtils.startPage;
 /**
  * @Author: LiJiaYao
  * @Date: 2024/3/28
+ * 电子围栏信息
  */
 @RestController
 @RequestMapping("/fence")
@@ -29,12 +34,10 @@ public class FenceController extends BaseController {
     @Autowired
     private FenceService fenceService;
 
-    /**
+
-     * 获取围栏列表
+    @Log(title = "电子围栏管理", businessType = BusinessType.OTHER)
-     * @return
+    @RequiresPermissions("couplet:fence:fenceList")
-     * @param fenceConfig
+    @PostMapping("/fenceList")
-     */
-    @GetMapping("/fenceList")
     public Result<?> fenceList(@RequestBody FenceConfig fenceConfig){
 
         startPage();
@@ -42,5 +45,59 @@ public class FenceController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 电子围栏新增
+     * @param fenceRequest
+     * @return
+     *
+     */
+    @PostMapping("/fenceAdd")
+    @RequiresPermissions("couplet:fence:fenceAdd")
+    @Log(title = "电子围栏新增",businessType = BusinessType.INSERT)
+    public Result<?> fenceInsert(HttpServletRequest request, @RequestBody FenceRequest fenceRequest){
+
+        fenceService.fenceInsert(request,fenceRequest);
+        return Result.success("新增成功");
+
+    }
+
+    /**
+     * 电子围栏修改
+     * @param fenceUpdateRequest
+     * @return
+     */
+    @PostMapping("/fenceUpdate")
+    @RequiresPermissions("couplet:fence:fenceUpdate")
+    @Log(title = "电子围栏修改",businessType = BusinessType.UPDATE)
+    public Result<?> fenceUpdate(@Validated @RequestBody FenceUpdateRequest fenceUpdateRequest){
+
+        fenceService.changeFenceStatus(fenceUpdateRequest);
+        return Result.success("修改成功");
+    }
+
+    /**
+     * 电子围栏删除
+     * @param fenceId
+     * @return
+     */
+    @DeleteMapping("/{fenceDelete}")
+    @RequiresPermissions("couplet:fence:fenceDelete")
+    @Log(title = "电子围栏删除",businessType = BusinessType.DELETE)
+    public Result<?> fenceDelete(@PathVariable Long fenceId){
+        boolean b = fenceService.removeById(fenceId);
+        fenceService.removeByFenceId(fenceId);
+        return toAjax(b);
+    }
+
+    @PostMapping("/fenceState")
+    @RequiresPermissions("couplet:fence:fenceState")
+    @Log(title = "围栏启用和停用",businessType = BusinessType.OTHER)
+    public Result<?> fenceState(@RequestBody FenceUpdateRequest fenceUpdateRequest){
+
+        fenceService.changeFenceStatus(fenceUpdateRequest);
+
+        return  success();
+    }
+
 
 }

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/LogoController.java

@@ -0,0 +1,49 @@
+package com.couplet.map.server.controller;
+
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.log.annotation.Log;
+import com.couplet.common.log.enums.BusinessType;
+import com.couplet.common.security.annotation.RequiresPermissions;
+import com.couplet.map.common.domain.Logo;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.couplet.map.server.service.LogoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/29
+ * 标识信息
+ */
+@RestController
+@RequestMapping("/logo")
+public class LogoController extends BaseController {
+
+    /**
+     * 调用服务
+     */
+    @Autowired
+    private LogoService logoService;
+
+    /**
+     * 标识信息列表
+     *
+     * @param
+     * @return
+     */
+    @Log(title = "标识管理", businessType = BusinessType.OTHER)
+    @RequiresPermissions("couplet:fence:fenceList")
+    @PostMapping("/queryByLogo")
+    public Result<?> queryByLogo(){
+        List<Logo> list = logoService.queryByLogo();
+        return success(list);
+    }
+
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenAndLogoMapper.java

@@ -0,0 +1,22 @@
+package com.couplet.map.server.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.couplet.map.common.domain.Fence;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+@Mapper
+public interface FenAndLogoMapper extends BaseMapper<Fence> {
+
+
+    /**
+     * 批量新增
+     * @param fenceId
+     * @param logoIds
+     */
+    void addBach(@Param("fenceId") Integer fenceId, @Param("logoIds") String[] logoIds);
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java

@@ -1,7 +1,9 @@
 package com.couplet.map.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.map.common.domin.Fence;
+import com.couplet.map.common.domain.Fence;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,4 +12,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface FenceMapper extends BaseMapper<Fence> {
+    /**
+     * 改变围栏信息
+     * @param fenceUpdateRequest
+     */
+    void changeFence(FenceUpdateRequest  fenceUpdateRequest);
+
+    int insertFence(FenceRequest fenceRequest);
+
+    void removeByFenceId(Long fenceId);
+
 }

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/LogoMapper.java

@@ -0,0 +1,18 @@
+package com.couplet.map.server.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.couplet.map.common.domain.Fence;
+import com.couplet.map.common.domain.Logo;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+@Mapper
+public interface LogoMapper extends BaseMapper<Logo> {
+
+
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenAndLogoService.java

@@ -0,0 +1,18 @@
+package com.couplet.map.server.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.couplet.map.common.domain.Fence;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+public interface FenAndLogoService extends IService<Fence> {
+
+    /**
+     * 批量添加
+     * @param fenceId
+     * @param logoIds
+     */
+    void addBach(Integer fenceId, String[] logoIds);
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java

@@ -1,9 +1,12 @@
 package com.couplet.map.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.map.common.domin.Fence;
+import com.couplet.map.common.domain.Fence;
-import com.couplet.map.common.domin.request.FenceConfig;
+import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -12,4 +15,24 @@ import java.util.List;
  */
 public interface FenceService extends IService<Fence> {
     List<Fence> pageQuery(FenceConfig fenceConfig);
+
+    /**
+     * 更改围栏状态
+     * @param fenceUpdateRequest
+     */
+    void changeFenceStatus(FenceUpdateRequest fenceUpdateRequest);
+
+    /**
+     * 新增电子围栏
+     *
+     * @param fenceRequest
+     */
+    void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest);
+
+    /**
+     * 删除电子围栏
+     * @param fenceId
+     */
+    void removeByFenceId(Long fenceId);
+
 }

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/LogoService.java

@@ -0,0 +1,15 @@
+package com.couplet.map.server.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.couplet.map.common.domain.Logo;
+
+import java.util.List;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+public interface LogoService extends IService<Logo> {
+    List<Logo> queryByLogo();
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenAndLogoServiceImpl.java

@@ -0,0 +1,37 @@
+package com.couplet.map.server.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.couplet.map.common.domain.Fence;
+import com.couplet.map.server.mapper.FenAndLogoMapper;
+import com.couplet.map.server.service.FenAndLogoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ * 中间表信息
+ */
+@Service
+public class FenAndLogoServiceImpl extends ServiceImpl<FenAndLogoMapper, Fence> implements FenAndLogoService {
+
+    /**
+     * 调用围栏mapper
+     */
+    @Autowired
+    private FenAndLogoMapper fenAndLogoMapper;
+
+    /**
+     * 注入redis模板
+     */
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+
+    @Override
+    public void addBach(Integer fenceId, String[] logoIds) {
+        fenAndLogoMapper.addBach(fenceId,logoIds);
+
+    }
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java

@@ -1,15 +1,20 @@
 package com.couplet.map.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.map.common.domin.Fence;
+import com.couplet.map.common.domain.Fence;
-import com.couplet.map.common.domin.request.FenceConfig;
+import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import com.couplet.map.server.mapper.FenceMapper;
+import com.couplet.map.server.service.FenAndLogoService;
 import com.couplet.map.server.service.FenceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -25,10 +30,62 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
     @Autowired
     private FenceMapper fenceMapper;
 
+    /**
+     * 调用围栏和标识中间表
+     */
+    @Autowired
+    private FenAndLogoService fenAndLogoService;
+    /**
+     * 注入redis模板
+     */
+    @Autowired
+    private StringRedisTemplate redisTemplate;
 
     @Override
     public List<Fence> pageQuery(FenceConfig fenceConfig) {
         LambdaQueryWrapper<Fence> queryWrapper = new LambdaQueryWrapper<>();
+
+        /**
+         * 模糊查询电子围栏名称
+         */
+        if (StringUtils.isNotEmpty(fenceConfig.getFenceName())){
+
+            queryWrapper.like(Fence::getFenceName,fenceConfig.getFenceName());
+        }
+        /**
+         * 查询标识类型
+         */
+        if (fenceConfig.getFenceState()!=null){
+            queryWrapper.like(Fence::getFenceState,fenceConfig.getFenceState());
+        }
         return this.list(queryWrapper);
     }
+
+    @Override
+    public void changeFenceStatus(FenceUpdateRequest fenceUpdateRequest) {
+
+        fenceMapper.changeFence(fenceUpdateRequest);
+
+    }
+
+    @Override
+    public void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest) {
+
+
+        int a= fenceMapper.insertFence(fenceRequest);
+        String[] logoId = fenceRequest.getLogoId();
+        String[] split=null;
+        if (logoId != null && logoId.length> 0){
+            split = logoId[0].split(",");
+        }
+        if (a>0){
+            fenAndLogoService.addBach(fenceRequest.getFenceId(),split);
+        }
+
+    }
+
+    @Override
+    public void removeByFenceId(Long fenceId) {
+        fenceMapper.removeByFenceId(fenceId);
+    }
 }

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/LogoServiceImpl.java

@@ -0,0 +1,45 @@
+package com.couplet.map.server.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.couplet.map.common.domain.Fence;
+import com.couplet.map.common.domain.Logo;
+import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.couplet.map.server.mapper.LogoMapper;
+import com.couplet.map.server.service.LogoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/3/28
+ */
+@Service
+public class LogoServiceImpl extends ServiceImpl<LogoMapper, Logo> implements LogoService {
+
+    /**
+     * 调用围栏mapper
+     */
+    @Autowired
+    private LogoMapper fenceMapper;
+
+    /**
+     * 注入redis模板
+     */
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @Override
+    public List<Logo> queryByLogo() {
+        LambdaQueryWrapper<Logo> queryWrapper = new LambdaQueryWrapper<>();
+        return this.list(queryWrapper);
+    }
+
+
+}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml

@@ -16,11 +16,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml

@@ -0,0 +1,30 @@
+<?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.couplet.map.server.mapper.FenAndLogoMapper">
+
+    <resultMap id="map" type="com.couplet.map.common.domain.Fence">
+        <id property="fenceId" column="fence_id"/>
+        <result property="fenceName" column="fence_name"/>
+        <result property="fenceDescription" column="fence_description"/>
+        <result property="fenceLongitudeLatitude" column="fence_longitude_latitude"/>
+        <result property="fenceState" column="fence_state"/>
+        <result property="createName" column="create_name" />
+        <result property="updateTime" column="update_time" />
+        <result property="isDelete" column="is_delete" />
+        <result property="maintainerName" column="maintainer_name" />
+    </resultMap>
+    <resultMap id="logoMap" type="com.couplet.map.common.domain.Logo">
+        <id property="logoId" column="logo_id"/>
+        <result property="logoName" column="logo_name" />
+    </resultMap>
+
+    <insert id="addBach">
+        INSERT INTO `couplet-cloud`.`couplet_fences_and_logo`
+            (`fences_id`, `logo_id`) VALUES
+                <foreach collection="logoIds" item="logoItemId" separator="," close="(" open=")">
+                        (#{fenceId}, #{logoItemId})
+                </foreach>
+    </insert>
+</mapper>

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml

@@ -4,6 +4,49 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.couplet.map.server.mapper.FenceMapper">
 
+    <resultMap id="map" type="com.couplet.map.common.domain.Fence">
+        <id property="fenceId" column="fence_id"/>
+        <result property="fenceName" column="fence_name"/>
+        <result property="fenceDescription" column="fence_description"/>
+        <result property="fenceLongitudeLatitude" column="fence_longitude_latitude"/>
+        <result property="fenceState" column="fence_state"/>
+        <result property="createName" column="create_name" />
+        <result property="updateTime" column="update_time" />
+        <result property="isDelete" column="is_delete" />
+        <result property="maintainerName" column="maintainer_name" />
+    </resultMap>
+    <resultMap id="logoMap" type="com.couplet.map.common.domain.Logo">
+        <id property="logoId" column="logo_id"/>
+        <result property="logoName" column="logo_name" />
+    </resultMap>
+    <insert id="insertFence" parameterType="com.couplet.map.common.domain.request.FenceRequest" keyProperty="fenceId"
+            useGeneratedKeys="true">
+
+        INSERT INTO `couplet-cloud`.`couplet_fence_info`
+            (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
+              `create_name`, `maintainer_name`, `alarm_status`)
+        VALUES
+            (#{fenceName}, #{fenceLongitudeLatitude}, #{fenceDescription}, 0, 0, now(), #{createTime},
+             #{createName}, 0);
 
 
+    </insert>
+
+    <update id="changeFence" parameterType="com.couplet.map.common.domain.request.FenceUpdateRequest">
+
+        UPDATE `couplet-cloud`.`couplet_fence_info`
+            SET `fence_name` = #{fenceName},
+                `fence_longitude_latitude` = #{fenceLongitudeLatitude},
+                `fence_description` = #{fenceDescription},
+                `is_delete` = #{isdelete},
+                `fence_state` = #{fenceState},
+                `update_time` = now(),
+                `maintainer_name` = 'admin',
+                `alarm_status` = #{alarmStatus}
+            WHERE `fence_id` = #{fenceId}
+
+    </update>
+    <delete id="removeByFenceId" parameterType="java.lang.Long">
+        delete from  t_fence where fence_id = #{fenceId}
+    </delete>
 </mapper>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java

@@ -17,15 +17,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class ManageServiceImpl implements ManageServer {
 
-    @Autowired
+//    @Autowired
-    private RemoteDeptService remoteDeptService;
+//    private RemoteDeptService remoteDeptService;
-    {
+//    {
-        Long enterpriseId = SecurityUtils.getEnterpriseId();
+//        Long enterpriseId = SecurityUtils.getEnterpriseId();
-        Result<SysDept> sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId);
+//        Result<SysDept> sysDeptByEnterpriseId = remoteDeptService.getSysDeptByEnterpriseId(enterpriseId);
-        if (sysDeptByEnterpriseId.getCode() == 200){
+//        if (sysDeptByEnterpriseId.getCode() == 200){
-            SysDept sysDept = sysDeptByEnterpriseId.getData();
+//            SysDept sysDept = sysDeptByEnterpriseId.getData();
-        }
+//        }
-    }
+//    }
 
 
 

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -245,7 +245,6 @@
                 <artifactId>couplet-enterprisemanagement-remote</artifactId>
                 <version>${couplet.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>