feat: 新增、删除

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -58,7 +58,6 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @TableField(exist = false)
     /**
      * 备注
      */

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -20,7 +20,8 @@ public class FenceConfig {
     /**
      * 围栏状态
      */
-
     private Integer fenceState;
+    private Integer pageNum=1;
+    private Integer pageSize=3;
 
 }

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

@@ -1,6 +1,7 @@
 package com.couplet.map.common.domain.request;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -47,11 +48,13 @@ public class FenceUpdateRequest {
      * 更新时间
      */
     @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")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -67,4 +70,11 @@ public class FenceUpdateRequest {
      */
     private Integer alarmStatus;
 
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
 }

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

@@ -80,12 +80,12 @@ public class FenceController extends BaseController {
      * @param fenceId
      * @return
      */
-    @DeleteMapping("/{fenceDelete}")
+    @DeleteMapping("/{fenceId}")
     @RequiresPermissions("couplet:fence:fenceDelete")
     @Log(title = "电子围栏删除",businessType = BusinessType.DELETE)
     public Result<?> fenceDelete(@PathVariable Long fenceId){
         boolean b = fenceService.removeById(fenceId);
-        fenceService.removeByFenceId(fenceId);
+//        fenceService.removeByFenceId(fenceId);
         return toAjax(b);
     }
 

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

@@ -2,10 +2,13 @@ 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.request.FenceConfig;
 import com.couplet.map.common.domain.request.FenceRequest;
 import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @Author: LiJiaYao
  * @Date: 2024/3/28
@@ -22,4 +25,11 @@ public interface FenceMapper extends BaseMapper<Fence> {
 
     void removeByFenceId(Long fenceId);
 
+    /**
+     * 分页查询
+     * @param fenceConfig
+     * @return
+     */
+    List<Fence> pageQuery(FenceConfig fenceConfig);
+
 }

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

@@ -43,22 +43,8 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
 
     @Override
     public List<Fence> pageQuery(FenceConfig fenceConfig) {
-        LambdaQueryWrapper<Fence> queryWrapper = new LambdaQueryWrapper<>();
+        List<Fence> list= fenceMapper.pageQuery(fenceConfig);
-
+        return list;
-        /**
-         * 模糊查询电子围栏名称
-         */
-        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

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

@@ -19,14 +19,32 @@
         <id property="logoId" column="logo_id"/>
         <result property="logoName" column="logo_name" />
     </resultMap>
+    <sql id="selectFence">
+        SELECT
+            fence_id,
+            fence_name,
+            fence_longitude_latitude,
+            fence_description,
+            is_delete,
+            fence_state,
+            create_time,
+            update_time,
+            create_name,
+            maintainer_name,
+            alarm_status,
+            l.logo_id,
+            logo_name
+        FROM couplet_fence_info f INNER JOIN couplet_fences_and_logo m on
+            f.fence_id=m.fences_id INNER JOIN couplet_logo_info l on l.logo_id=m.logo_id GROUP BY fence_id
+    </sql>
     <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`,
+            (`fence_name`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
               `create_name`, `maintainer_name`, `alarm_status`)
         VALUES
-            (#{fenceName}, #{fenceLongitudeLatitude}, #{fenceDescription}, 0, 0, now(), #{createTime},
+            (#{fenceName}, #{fenceDescription}, 0, 0, now(), #{createTime},
              #{createName}, 0);
 
 
@@ -38,7 +56,7 @@
             SET `fence_name` = #{fenceName},
                 `fence_longitude_latitude` = #{fenceLongitudeLatitude},
                 `fence_description` = #{fenceDescription},
-                `is_delete` = #{isdelete},
+                `is_delete` = #{isDelete},
                 `fence_state` = #{fenceState},
                 `update_time` = now(),
                 `maintainer_name` = 'admin',
@@ -47,6 +65,18 @@
 
     </update>
     <delete id="removeByFenceId" parameterType="java.lang.Long">
-        delete from  t_fence where fence_id = #{fenceId}
+        delete from  couplet_fence_info where fence_id = #{fenceId}
     </delete>
+    <select id="pageQuery" resultMap="map"
+            parameterType="com.couplet.map.common.domain.request.FenceConfig">
+        <include refid="selectFence"></include>
+        <where>
+            <if test="fenceName!=null and fenceName!='' ">
+                and fence_name like concat('%',#{fenceName},'%')
+            </if>
+            <if test="fenceState!=null">
+                and fence_state = #{fenceState}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置