组织网格增加centerAddress中心点位地址

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java

@@ -62,6 +62,11 @@ public class CustomerGridDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
+
     /**
      * 所属地区码（所属组织地区码）
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java

@@ -98,4 +98,9 @@ public class AddAgencyFormDTO implements Serializable {
      */
     // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
     private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java

@@ -113,4 +113,9 @@ public class AddAgencyV2FormDTO implements Serializable {
      */
     // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
     private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java

@@ -64,4 +64,9 @@ public class AddGridFormDTO implements Serializable {
      */
     // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
     private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -103,4 +103,9 @@ public class EditAgencyFormDTO implements Serializable {
      */
     // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
     private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java

@@ -72,4 +72,9 @@ public class EditGridFormDTO implements Serializable {
      */
     // @NotBlank(message = "请选择网格中心点位", groups = AddGridFormDTO.AddGrid.class)
     private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@@ -118,4 +118,19 @@ public class AgencysResultDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java

@@ -35,6 +35,11 @@ public class GridDetailResultDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 中心点位位置
+     */
+    private String centerAddress;
+
     /**
      * 所属地区码（所属组织地区码）
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@@ -124,6 +124,11 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String latitude;
 
+	/**
+	 * 中心点位位置
+	 */
+	private String centerAddress;
+
 	/**
 	 * 组织编码
 	 */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java

@@ -55,6 +55,11 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 */
 	private String latitude;
 
+	/**
+	 * 中心点位位置
+	 */
+	private String centerAddress;
+
 	/**
 	 * 所属地区码（所属组织地区码）
 	 */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -164,6 +164,7 @@ public class AgencyServiceImpl implements AgencyService {
         if(StringUtils.isNotBlank(formDTO.getLongitude())){
             originalEntity.setLongitude(formDTO.getLongitude());
         }
+        originalEntity.setCenterAddress(formDTO.getCenterAddress());
         //当前客户开启了area_code_switch参数：open: 选择地区编码必填；closed:  无需选择地区编码
         if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
             CustomerAgencyEntity parent = customerAgencyDao.selectById(originalEntity.getPid());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -275,6 +275,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         //新增网格增加中心点位必填
         customerGridEntity.setLatitude(addGridFormDTO.getLatitude());
         customerGridEntity.setLongitude(addGridFormDTO.getLongitude());
+        customerGridEntity.setCenterAddress(addGridFormDTO.getCenterAddress());
         //新增area_code,部门的area_code=所属组织的area_code
         customerGridEntity.setAreaCode(null != customerAgencyDTO && StringUtils.isNotBlank(customerAgencyDTO.getAreaCode()) ? customerAgencyDTO.getAreaCode() : StrConstant.EPMETY_STR);
 
@@ -322,6 +323,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         if(StringUtils.isNotBlank(editGridFormDTO.getLatitude())){
             customerGridDTO.setLatitude(editGridFormDTO.getLatitude());
         }
+        customerGridDTO.setCenterAddress(editGridFormDTO.getCenterAddress());
         baseDao.editGrid(customerGridDTO);
 
         return new Result();

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.12__addagency_grid_address.sql

@@ -0,0 +1,2 @@
+alter table customer_agency add COLUMN CENTER_ADDRESS VARCHAR(128) comment '中心点位地址' AFTER LATITUDE;
+alter table customer_grid add COLUMN CENTER_ADDRESS VARCHAR(128) comment '中心点位地址' AFTER LATITUDE;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -185,6 +185,7 @@
             grid_name AS gridName,
             longitude AS longitude,
             latitude AS latitude,
+            CENTER_ADDRESS AS centerAddress,
             area_code AS areaCode,
             manage_district AS manageDistrict,
             total_user AS totalUser,
@@ -248,6 +249,9 @@
             <if test="latitude != null and latitude !=''">
                 LATITUDE= #{latitude},
             </if>
+            <if test="centerAddress != null and centerAddress !=''">
+                CENTER_ADDRESS= #{centerAddress},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}