保存时同时保存网格ID

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentBlacklistDTO.java

@@ -28,6 +28,11 @@ public class RentBlacklistDTO implements Serializable {
     @NotBlank(message = "用户ID不能为空")
 	private String userId;
 
+    /**
+     * epmet网格ID
+     */
+    private String gridId;
+
     /**
      * 姓名
      */

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentDeathDTO.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 死亡名单表
@@ -16,40 +18,51 @@ public class RentDeathDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
     /**
      * 主键
      */
-	private String id;
+    private String id;
 
     /**
      * epmet用户主键
      */
-	private String userId;
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+    /**
+     * epmet网格ID
+     */
+    private String gridId;
 
     /**
      * 姓名
      */
-	private String name;
+    @NotBlank(message = "姓名不能为空")
+    private String name;
 
     /**
      * 身份证
      */
-	private String idCard;
+    @NotBlank(message = "身份证不能为空")
+    private String idCard;
 
     /**
      * 手机号
      */
-	private String mobile;
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
 
     /**
      * 性别 0女 1男
      */
-	private String gender;
+    @NotBlank(message = "性别不能为空")
+    private String gender;
 
     /**
      * 类型 0 租客 1 房东
      */
-	private String type;
+    private String type;
 
     /**
      * 加入时间

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentBlacklistEntity.java

@@ -26,6 +26,11 @@ public class RentBlacklistEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * epmet网格ID
+	 */
+	private String gridId;
+
     /**
      * 姓名
      */

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentDeathEntity.java

@@ -26,6 +26,11 @@ public class RentDeathEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * epmet网格ID
+	 */
+	private String gridId;
+
     /**
      * 姓名
      */

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java

@@ -97,6 +97,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
 
         dto.setIdCard(result.getData().getIdCard());
         dto.setMobile(result.getData().getMobile());
+        dto.setGridId(result.getData().getGridId());
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         if (!list(params).isEmpty()) {

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentDeathServiceImpl.java

@@ -97,6 +97,7 @@ public class RentDeathServiceImpl extends BaseServiceImpl<RentDeathDao, RentDeat
 
         dto.setIdCard(result.getData().getIdCard());
         dto.setMobile(result.getData().getMobile());
+        dto.setGridId(result.getData().getGridId());
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         if (!list(params).isEmpty()) {