公共服务图层，城市管理图层新增联系人和联系电话字段

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java

@@ -73,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java

@@ -73,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

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

@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -76,6 +77,16 @@ public class IcCityManagementDTO implements Serializable {
      */
 	private String latitude;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
     /**
      * 删除标识
      */

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

@@ -76,6 +76,16 @@ public class IcPublicServiceDTO implements Serializable {
      */
 	private String latitude;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
     /**
      * 删除标识
      */

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

@@ -62,6 +62,16 @@ public class IcCityManagementAddEditFormDTO implements Serializable {
     @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class)
     private String address;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 
     private String customerId;
     private String userId;

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

@@ -62,6 +62,16 @@ public class IcPublicServiceAddEditFormDTO implements Serializable {
     @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class)
     private String address;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 
     private String customerId;
     private String userId;

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

@@ -65,4 +65,14 @@ public class IcCityManagementListResultDTO implements Serializable {
      */
     private String address;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 }

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

@@ -65,4 +65,14 @@ public class IcPublicServiceListResultDTO implements Serializable {
      */
     private String address;
 
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
 }

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

@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 城市管理图层
  *
@@ -76,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

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

@@ -1,13 +1,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 公共服务图层
  *
@@ -76,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java

@@ -38,6 +38,14 @@ public class IcCityManagementExcel {
     @NotBlank(message = "地址为必填项")
     private String address;
 
+    @ExcelProperty(value = "联系人")
+    @ColumnWidth(20)
+    private String principal;
+
+    @ExcelProperty(value = "联系电话")
+    @ColumnWidth(20)
+    private String mobile;
+
     @Data
     public static class RowRemarkMessage {
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java

@@ -38,6 +38,14 @@ public class IcPublicServiceExcel {
     @NotBlank(message = "地址为必填项")
     private String address;
 
+    @ExcelProperty(value = "联系人")
+    @ColumnWidth(20)
+    private String principal;
+
+    @ExcelProperty(value = "联系电话")
+    @ColumnWidth(20)
+    private String mobile;
+
     @Data
     public static class RowRemarkMessage {
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java

@@ -95,6 +95,8 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
             IcCityManagementEntity.setSourceType("import");
             IcCityManagementEntity.setCategory(data.getCategoryName());
             IcCityManagementEntity.setAreaCovered(data.getAreaCoveredName());
+            IcCityManagementEntity.setPrincipal(data.getPrincipal());
+            IcCityManagementEntity.setMobile(data.getMobile());
             if(StringUtils.isNotBlank(data.getCapacityName())){
                 IcCityManagementEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java

@@ -95,6 +95,8 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
             IcPublicServiceEntity.setSourceType("import");
             IcPublicServiceEntity.setCategory(data.getCategoryName());
             IcPublicServiceEntity.setAreaCovered(data.getAreaCoveredName());
+            IcPublicServiceEntity.setPrincipal(data.getPrincipal());
+            IcPublicServiceEntity.setMobile(data.getMobile());
             if(StringUtils.isNotBlank(data.getCapacityName())){
                 IcPublicServiceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
             }

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

@@ -74,7 +74,9 @@
             CONCAT(capacity,'人') capacityName,
             address address,
             longitude longitude,
-            latitude latitude
+            latitude latitude,
+            PRINCIPAL AS principal,
+            MOBILE AS mobile
         FROM
             ic_city_management
         WHERE

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

@@ -74,7 +74,9 @@
             CONCAT(capacity,'人') capacityName,
             address address,
             longitude longitude,
-            latitude latitude
+            latitude latitude,
+            PRINCIPAL AS principal,
+            MOBILE AS mobile
         FROM
             ic_public_service
         WHERE