feature(电子围栏):配置增加名称

performance-api/src/main/java/com/clx/performance/param/pc/SaveDriverNoticeConfigParam.java

@@ -16,9 +16,12 @@ public class SaveDriverNoticeConfigParam {
     @ApiModelProperty(value = "id")
     private Integer id;
 
+    @ApiModelProperty("配置名称")
+    private String name;
+
     @ApiModelProperty(value = "通知触发距离：默认1.5，最大9999.9")
     private BigDecimal noticeTriggerDistance;
 
     @ApiModelProperty(value = "启用状态 ,0:禁用,1:启用")
     private Integer status;
-}
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/param/pc/SaveOrderChildOperateLimitConfigParam.java

@@ -16,6 +16,9 @@ public class SaveOrderChildOperateLimitConfigParam {
     @ApiModelProperty(value = "id")
     private Integer id;
 
+    @ApiModelProperty("配置名称")
+    private String name;
+
     @ApiModelProperty("可上传装车信息范围")
     private BigDecimal allowUploadDistance;
 

performance-api/src/main/java/com/clx/performance/vo/pc/DriverNoticeConfigVO.java

@@ -20,6 +20,9 @@ public class DriverNoticeConfigVO {
     @ApiModelProperty(value = "id")
     private Integer id;
 
+    @ApiModelProperty("配置名称")
+    private String name;
+    
     @ApiModelProperty(value = "通知触发距离：默认1.5，最大9999.9")
     private BigDecimal noticeTriggerDistance;
 

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildOperateLimitConfigVO.java

@@ -19,6 +19,9 @@ public class OrderChildOperateLimitConfigVO {
     @ApiModelProperty(value = "id")
     private Integer id;
 
+    @ApiModelProperty("配置名称")
+    private String name;
+
     @ApiModelProperty("可上传装车信息范围：默认2.0，最大9999.9")
     private BigDecimal allowUploadDistance;
 

performance-web/src/main/java/com/clx/performance/dao/impl/DriverNoticeConfigDaoImpl.java

@@ -4,6 +4,7 @@ import com.clx.performance.dao.DriverNoticeConfigDao;
 import com.clx.performance.mapper.DriverNoticeConfigMapper;
 import com.clx.performance.model.DriverNoticeConfig;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -22,7 +23,9 @@ public class DriverNoticeConfigDaoImpl extends BaseDaoImpl<DriverNoticeConfigMap
     public boolean updateConfig(DriverNoticeConfig config) {
         return update(lUdWrapper()
                 .eq(DriverNoticeConfig::getId, config.getId())
-                .set(DriverNoticeConfig::getNoticeTriggerDistance, config.getNoticeTriggerDistance())
+                .set(StringUtils.isNotBlank(config.getName()), DriverNoticeConfig::getName, config.getName())
+                .set(config.getNoticeTriggerDistance() != null, DriverNoticeConfig::getNoticeTriggerDistance, config.getNoticeTriggerDistance())
+                .set(config.getStatus() != null, DriverNoticeConfig::getStatus, config.getStatus())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildOperateLimitConfigDaoImpl.java

@@ -4,6 +4,7 @@ import com.clx.performance.dao.OrderChildOperateLimitConfigDao;
 import com.clx.performance.mapper.OrderChildOperateLimitConfigMapper;
 import com.clx.performance.model.OrderChildOperateLimitConfig;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -23,7 +24,9 @@ public class OrderChildOperateLimitConfigDaoImpl extends BaseDaoImpl<OrderChildO
     public boolean updateConfig(OrderChildOperateLimitConfig config) {
         return update(lUdWrapper()
                 .eq(OrderChildOperateLimitConfig::getId, config.getId())
-                .set(OrderChildOperateLimitConfig::getAllowUploadDistance, config.getAllowUploadDistance())
+                .set(StringUtils.isNotBlank(config.getName()), OrderChildOperateLimitConfig::getName, config.getName())
+                .set(config.getAllowUploadDistance() != null, OrderChildOperateLimitConfig::getAllowUploadDistance, config.getAllowUploadDistance())
+                .set(config.getStatus() != null, OrderChildOperateLimitConfig::getStatus, config.getStatus())
         );
     }
 

performance-web/src/main/java/com/clx/performance/model/DriverNoticeConfig.java

@@ -28,6 +28,10 @@ public class DriverNoticeConfig implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @TableField("name")
+    @ApiModelProperty("配置名称")
+    private String name;
+
     @TableField("notice_trigger_distance")
     @ApiModelProperty("通知触发距离")
     private BigDecimal noticeTriggerDistance;

performance-web/src/main/java/com/clx/performance/model/OrderChildOperateLimitConfig.java

@@ -28,6 +28,10 @@ public class OrderChildOperateLimitConfig implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @TableField("name")
+    @ApiModelProperty("配置名称")
+    private String name;
+
     @TableField("allow_upload_distance")
     @ApiModelProperty("可上传装车信息范围")
     private BigDecimal allowUploadDistance;