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

base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml

@@ -36,6 +36,8 @@
         <result property="building" column="building" />
         <result property="logoPath" column="logoPath" />
         <result property="englishName" column="englishName" />
+        <result property="leadingOfficial" column="leadingOfficial" />
+        <result property="leadingOfficialTelephone" column="leadingOfficialTelephone" />
         <result property="modelIds" column="modelIds" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
@@ -140,6 +142,12 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
                 a.englishName,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficial') or colPickMode == 1 and data.containsKey('leadingOfficial')))">
+                a.leadingOfficial,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficialTelephone') or colPickMode == 1 and data.containsKey('leadingOfficialTelephone')))">
+                a.leadingOfficialTelephone,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
                 a.modelIds,
             </if>
@@ -157,18 +165,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SiteEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site
-        (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
+        (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime)
         VALUES
-        (#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{logoPath},#{englishName},#{modelIds},#{createTime},#{createUserId},#{updateTime})
+        (#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{logoPath},#{englishName},#{leadingOfficial},#{leadingOfficialTelephone},#{modelIds},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site
-        (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
+        (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -295,6 +303,12 @@
             <if test="(colPickMode==0 and data.containsKey('englishName')) or (colPickMode==1 and !data.containsKey('englishName'))">
                 a.englishName=#{data.englishName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('leadingOfficial')) or (colPickMode==1 and !data.containsKey('leadingOfficial'))">
+                a.leadingOfficial=#{data.leadingOfficial},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !data.containsKey('leadingOfficialTelephone'))">
+                a.leadingOfficialTelephone=#{data.leadingOfficialTelephone},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
                 a.modelIds=#{data.modelIds},
             </if>
@@ -577,6 +591,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="leadingOfficial=(case" suffix="ELSE leadingOfficial end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('leadingOfficial')) or (colPickMode==1 and !item.containsKey('leadingOfficial'))">
+                        when a.id=#{item.id} then #{item.leadingOfficial}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="leadingOfficialTelephone=(case" suffix="ELSE leadingOfficialTelephone end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !item.containsKey('leadingOfficialTelephone'))">
+                        when a.id=#{item.id} then #{item.leadingOfficialTelephone}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
@@ -1237,6 +1265,36 @@
             </foreach>
         </if>
 
+        <if test="conditionParamRef.containsKey('leadingOfficial')">
+            <if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''">
+                ${_conditionType_} a.leadingOfficial like #{${_conditionParam_}.leadingOfficial}
+            </if>
+            <if test="conditionParamRef.leadingOfficial == null">
+                ${_conditionType_} a.leadingOfficial is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('leadingOfficialList')">
+            ${_conditionType_} a.leadingOfficial in
+            <foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('leadingOfficialTelephone')">
+            <if test="conditionParamRef.leadingOfficialTelephone != null and conditionParamRef.leadingOfficialTelephone != ''">
+                ${_conditionType_} a.leadingOfficialTelephone like #{${_conditionParam_}.leadingOfficialTelephone}
+            </if>
+            <if test="conditionParamRef.leadingOfficialTelephone == null">
+                ${_conditionType_} a.leadingOfficialTelephone is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('leadingOfficialTelephoneList')">
+            ${_conditionType_} a.leadingOfficialTelephone in
+            <foreach collection="conditionParamRef.leadingOfficialTelephoneList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('modelIds')">
             <if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
                 ${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
@@ -1470,6 +1528,16 @@
                     <if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('leadingOfficial')">
+                    a.leadingOfficial
+                    <if test='orderCol.leadingOfficial != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficial)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('leadingOfficialTelephone')">
+                    a.leadingOfficialTelephone
+                    <if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('modelIds')">
                     a.modelIds
                     <if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>