Merge remote-tracking branch 'origin/master'

base-manager/db/base_modules.sql

@@ -79,6 +79,8 @@ CREATE TABLE mortals_sys_site(
     `building` int(4)     COMMENT '楼栋',
     `logoPath` varchar(255)     COMMENT 'logo图片地址',
     `englishName` varchar(255)     COMMENT '英文名称',
+    `leadingOfficial` varchar(64)     COMMENT '负责人',
+    `leadingOfficialTelephone` varchar(64)     COMMENT '联系电话',
     `modelIds` varchar(256)     COMMENT '部署模块，逗号分隔',
     `createTime` datetime     COMMENT '创建时间',
     `createUserId` bigint(20)     COMMENT '创建用户',

base-manager/doc/api.md

@@ -908,6 +908,8 @@ data|object|数据对象|-
   logoPath|String|设备logo地址
   logoFullPath|String|设备logo全地址
   englishName|String|站点英文名称
+  leadingOfficial|String|负责人
+  leadingOfficialTelephone|String|联系电话
   createTime|Date|创建时间|-
   createUserId|Long|创建用户|-
   updateTime|Date|修改时间|-
@@ -998,6 +1000,9 @@ data|object|数据对象|-
  level|Integer|楼层|-
  building|Integer|楼栋|-
  modelIds|String|部署模块，逗号分隔|-
+ englishName|String|站点英文名称
+ leadingOfficial|String|负责人
+ leadingOfficialTelephone|String|联系电话
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
@@ -1079,6 +1084,8 @@ data|object|数据对象|-
  logoFullPath|String|设备logo全地址
  englishName|String|站点英文名称
  modelIds|String|部署模块，逗号分隔|-
+ leadingOfficial|String|负责人
+ leadingOfficialTelephone|String|联系电话
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
@@ -1140,8 +1147,10 @@ workday6|Integer|周六 (1.上班，0.不上)|是|-
 workday7|Integer|周日 (1.上班，0.不上)|是|-
 level|Integer|楼层|是|-
 building|Integer|楼栋|是|-
-logoPath|String|是|设备logo地址
-englishName|String|是|站点英文名称
+logoPath|String|是|设备logo地址|-
+englishName|String|是|站点英文名称|-
+leadingOfficial|String|是|负责人|-
+leadingOfficialTelephone|String|是|联系电话|-
 modelIds|String|部署模块，逗号分隔|是|-
 
 **请求样例:**

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java

 package com.mortals.xhx.module.site.model;
 
-import com.mortals.xhx.module.site.model.vo.SiteVo;
-
 import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.site.model.vo.SiteVo;
 /**
  * 站点实体对象
  *
  * @author zxfei
- * @date 2022-06-29
+ * @date 2022-07-14
  */
 
 public class SiteEntity extends SiteVo {
@@ -133,6 +137,14 @@ public class SiteEntity extends SiteVo {
      * 英文名称
      */
     private String englishName;
+    /**
+     * 负责人
+     */
+    private String leadingOfficial;
+    /**
+     * 联系电话
+     */
+    private String leadingOfficialTelephone;
     /**
      * 部署模块，逗号分隔
      */
@@ -561,6 +573,34 @@ public class SiteEntity extends SiteVo {
     public void setEnglishName(String englishName){
         this.englishName = englishName;
     }
+    /**
+     * 获取 负责人
+     * @return String
+     */
+    public String getLeadingOfficial(){
+        return leadingOfficial;
+    }
+    /**
+     * 设置 负责人
+     * @param leadingOfficial
+     */
+    public void setLeadingOfficial(String leadingOfficial){
+        this.leadingOfficial = leadingOfficial;
+    }
+    /**
+     * 获取 联系电话
+     * @return String
+     */
+    public String getLeadingOfficialTelephone(){
+        return leadingOfficialTelephone;
+    }
+    /**
+     * 设置 联系电话
+     * @param leadingOfficialTelephone
+     */
+    public void setLeadingOfficialTelephone(String leadingOfficialTelephone){
+        this.leadingOfficialTelephone = leadingOfficialTelephone;
+    }
     /**
      * 获取 部署模块，逗号分隔
      * @return String
@@ -627,15 +667,17 @@ public class SiteEntity extends SiteVo {
         sb.append(",building:").append(getBuilding());
         sb.append(",logoPath:").append(getLogoPath());
         sb.append(",englishName:").append(getEnglishName());
+        sb.append(",leadingOfficial:").append(getLeadingOfficial());
+        sb.append(",leadingOfficialTelephone:").append(getLeadingOfficialTelephone());
         sb.append(",modelIds:").append(getModelIds());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-        this.siteName = "";
+        this.siteName = null;
 
-        this.siteCode = "";
+        this.siteCode = null;
 
         this.areaID = null;
 
@@ -693,6 +735,10 @@ public class SiteEntity extends SiteVo {
 
         this.englishName = "";
 
+        this.leadingOfficial = "";
+
+        this.leadingOfficialTelephone = "";
+
         this.modelIds = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
  * 站点查询对象
  *
  * @author zxfei
- * @date 2022-06-29
+ * @date 2022-07-14
  */
 public class SiteQuery extends SiteEntity {
     /** 开始 序号，主键，自增长 */
@@ -205,6 +205,12 @@ public class SiteQuery extends SiteEntity {
     /** 英文名称 */
     private List<String> englishNameList;
 
+    /** 负责人 */
+    private List<String> leadingOfficialList;
+
+    /** 联系电话 */
+    private List<String> leadingOfficialTelephoneList;
+
     /** 部署模块，逗号分隔 */
     private List<String> modelIdsList;
 
@@ -1263,6 +1269,36 @@ public class SiteQuery extends SiteEntity {
     public void setEnglishNameList(List<String> englishNameList){
         this.englishNameList = englishNameList;
     }
+    /**
+     * 获取 负责人
+     * @return leadingOfficialList
+     */
+    public List<String> getLeadingOfficialList(){
+        return this.leadingOfficialList;
+    }
+
+    /**
+     * 设置 负责人
+     * @param leadingOfficialList
+     */
+    public void setLeadingOfficialList(List<String> leadingOfficialList){
+        this.leadingOfficialList = leadingOfficialList;
+    }
+    /**
+     * 获取 联系电话
+     * @return leadingOfficialTelephoneList
+     */
+    public List<String> getLeadingOfficialTelephoneList(){
+        return this.leadingOfficialTelephoneList;
+    }
+
+    /**
+     * 设置 联系电话
+     * @param leadingOfficialTelephoneList
+     */
+    public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+    }
     /**
      * 获取 部署模块，逗号分隔
      * @return modelIdsList
@@ -2184,6 +2220,44 @@ public class SiteQuery extends SiteEntity {
     }
 
 
+    /**
+     * 设置 负责人
+     * @param leadingOfficial
+     */
+    public SiteQuery leadingOfficial(String leadingOfficial){
+        setLeadingOfficial(leadingOfficial);
+        return this;
+    }
+
+    /**
+     * 设置 负责人
+     * @param leadingOfficialList
+     */
+    public SiteQuery leadingOfficialList(List<String> leadingOfficialList){
+        this.leadingOfficialList = leadingOfficialList;
+        return this;
+    }
+
+
+    /**
+     * 设置 联系电话
+     * @param leadingOfficialTelephone
+     */
+    public SiteQuery leadingOfficialTelephone(String leadingOfficialTelephone){
+        setLeadingOfficialTelephone(leadingOfficialTelephone);
+        return this;
+    }
+
+    /**
+     * 设置 联系电话
+     * @param leadingOfficialTelephoneList
+     */
+    public SiteQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+        return this;
+    }
+
+
     /**
      * 设置 部署模块，逗号分隔
      * @param modelIds