电子围栏后台功能开发结束

zhilian-modules/zhilian-fence/src/main/java/com/zhilian/controller/FenceController.java

@@ -52,10 +52,10 @@ public class FenceController extends BaseController {
      * @param fence
      * @return
      */
-    @PutMapping
+    @PutMapping("/edit")
-    public Result edit(@Validated @RequestBody Fence fence){
+    public Result edit(@RequestBody Fence fence){
         fence.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(fenceService.updateById(fence));
+        return toAjax(fenceService.updateFence(Fence.updateReqBuild(fence)));
     }
 
     /**

zhilian-modules/zhilian-fence/src/main/java/com/zhilian/domain/Fence.java

@@ -1,6 +1,7 @@
 package com.zhilian.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.fasterxml.jackson.annotation.JsonFormat;
@@ -38,21 +39,25 @@ public class Fence extends BaseEntity {
      * 电子围栏名称
      */
     @Excel(name = "电子围栏名称")
+    @TableField("fence_name")
     private String fenceName;
     /**
      * 电子围栏类型编号
      */
     @Excel(name = "电子围栏类型编号")
+    @TableField("fence_type_id")
     private Long fenceTypeId;
     /**
      * 电子围栏状态
      */
     @Excel(name = "电子围栏状态")
+    @TableField("fence_state")
     private Long fenceState;
     /**
      * 电子围栏经纬度信息
      */
     @Excel(name = "电子围栏经纬度信息")
+    @TableField("fence_message")
     private String fenceMessage;
 
 //    /**
@@ -94,8 +99,7 @@ public class Fence extends BaseEntity {
     public void setFenceId(Long fenceId) {
         this.fenceId = fenceId;
     }
-    @NotBlank(message = "围栏名称不能为空")
+
-    @Size(min=0,max=100,message = "围栏名称不能超过100个字符")
     public String getFenceName() {
         return fenceName;
     }
@@ -103,8 +107,7 @@ public class Fence extends BaseEntity {
     public void setFenceName(String fenceName) {
         this.fenceName = fenceName;
     }
-    @NotBlank(message = "围栏类型不能为空")
+
-    @Size(min = 0,max = 10,message = "围栏类型不能超过10个字符")
     public Long getFenceTypeId() {
         return fenceTypeId;
     }
@@ -120,8 +123,7 @@ public class Fence extends BaseEntity {
     public void setFenceState(Long fenceState) {
         this.fenceState = fenceState;
     }
-    @NotBlank(message = "围栏经纬度不能为空")
+
-    @Size(min = 0,max = 300,message = "围栏经纬度不能超过300个字符")
     public String getFenceMessage() {
         return fenceMessage;
     }
@@ -149,4 +151,13 @@ public class Fence extends BaseEntity {
 //               .append("params", getParams())
 //               .toString();
 //    }
+
+    public static Fence updateReqBuild(Fence fence) {
+        return Fence.builder()
+                .fenceId(fence.getFenceId())
+                .fenceName(fence.getFenceName())
+                .fenceTypeId(fence.getFenceTypeId())
+                .fenceState(fence.getFenceState())
+                .build();
+    }
 }

zhilian-modules/zhilian-fence/src/main/java/com/zhilian/domain/FenceType.java

@@ -15,9 +15,8 @@ import lombok.experimental.SuperBuilder;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @TableName("fence_type")
-public class FenceType extends BaseEntity {
+public class FenceType{
     /**
      * 围栏类型编号
      */

zhilian-modules/zhilian-fence/src/main/java/com/zhilian/service/FenceService.java

@@ -14,4 +14,6 @@ public interface FenceService extends IService<Fence> {
      */
     List<Fence> pageQuery(FenceRequest fenceRequest);
 
+    int updateFence(Fence fence);
+
 }

zhilian-modules/zhilian-fence/src/main/java/com/zhilian/service/impl/FenceServiceImpl.java

@@ -7,6 +7,7 @@ import com.zhilian.domain.Fence;
 import com.zhilian.domain.request.FenceRequest;
 import com.zhilian.mapper.FenceMapper;
 import com.zhilian.service.FenceService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -15,7 +16,8 @@ import java.util.Objects;
 
 @Service
 public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements FenceService {
-
+    @Autowired
+    private FenceMapper fenceMapper;
     @Override
     public List<Fence> pageQuery(FenceRequest fenceRequest) {
         LambdaQueryWrapper<Fence> queryWrapper = new LambdaQueryWrapper<>();
@@ -27,4 +29,9 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
         }
         return this.list(queryWrapper);
     }
+
+    @Override
+    public int updateFence(Fence fence) {
+        return fenceMapper.updateById(fence);
+    }
 }