添加窗口大厅站点选项

base-manager/db/add.sql

@@ -20,7 +20,6 @@ ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default "
 
 
 
-
 -- ----------------------------
 2023-3-28
 -- ----------------------------
@@ -211,3 +210,11 @@ ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceApiParams` varchar(10
 
 ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceApi` varchar(255)   default ''   COMMENT '事件服务接口请求地址';
 ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceApiParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';
+
+
+
+-- ----------------------------
+2023-10-17
+-- ----------------------------
+
+ALTER TABLE mortals_sys_window_hall ADD COLUMN  `siteId` bigint(20) default '1'     COMMENT '站点Id';

base-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java

@@ -38,7 +38,9 @@ public class UserEntityExt extends BaseEntityLong {
 
     private List<ModelEntity> modleList;
 
-
-
+    /**
+     * 所属区域code,多个逗号分隔
+     */
+    private String areaCodes;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -43,14 +43,8 @@ public class SyncTreeSiteThread implements Runnable {
                 Context contextTemp = new Context();
                 contextTemp.setUser(userEntity);
                 siteService.setSiteTree(siteTreeSelects, contextTemp);
-                if(userEntity.getId()==2065L){
-
-                    log.info("2065===>{}",JSON.toJSONString(userEntity));
-                }
-
             }
         }
-       // log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
     }
 
 }

base-manager/src/main/java/com/mortals/xhx/module/area/service/AreaService.java

@@ -55,6 +55,7 @@ public interface AreaService extends ICRUDCacheService<AreaEntity,Long> {
 
 
 
+
     /**
      * 获取当前节点所有子节点
      * @param rootId

base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java

@@ -186,6 +186,7 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
         return collect;
     }
 
+
     @Override
     public List<AreaTreeSelect> getListByRootId(String rootId, Context context) {
         if (ObjectUtils.isEmpty(rootId)) {

base-manager/src/main/java/com/mortals/xhx/module/area/web/AreaController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,6 +74,33 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic
     }
 
 
+    /**
+     * 获取站点下拉树列表
+     */
+    @PostMapping("authAreaTree")
+    public String authAreaTree() {
+        Map<String, Object> model = new HashMap<>();
+        JSONObject ret = new JSONObject();
+        String busiDesc = "查询" + this.getModuleDesc();
+        int code = VALUE_RESULT_SUCCESS;
+        try {
+            List<String> areaCodeList = Arrays.asList(this.getContext().getUser().getAreaCodes().split(","));
+            AreaQuery areaQuery = new AreaQuery();
+            areaQuery.setAreaCodeList(areaCodeList);
+            List<AreaEntity> list = this.service.find(areaQuery);
+            List<AreaTreeSelect> treeSelects = this.service.buildAreaTreeSelect(list);
+            model.put(KEY_RESULT_DATA, treeSelects);
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(request, busiDesc, model, e);
+        }
+        ret.put(KEY_RESULT_DATA, model);
+        ret.put(KEY_RESULT_CODE, code);
+        return ret.toJSONString();
+    }
+
+
     /**
      * 根据parentId查询子信息
      */
@@ -122,5 +150,4 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic
         return ret.toJSONString();
     }
 
-
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowHallEntity.java

 package com.mortals.xhx.module.window.model;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.vo.WindowHallVo;
 import lombok.Data;
 /**
-* 大厅窗口实体对象
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * 大厅窗口实体对象
+ *
+ * @author zxfei
+ * @date 2023-10-17
+ */
 @Data
 public class WindowHallEntity extends WindowHallVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 站点Id
+     */
+    private Long siteId;
     /**
      * 窗口ID
      */
@@ -57,17 +64,12 @@ public class WindowHallEntity extends WindowHallVo {
     }
 
     public void initAttrValue(){
-
+        this.siteId = null;
         this.windowId = null;
-
         this.windowName = "";
-
         this.hallId = null;
-
         this.hallName = "";
-
         this.sort = 0;
-
         this.remark = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowHallQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.window.model;
 import java.util.List;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
 /**
-* 大厅窗口查询对象
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * 大厅窗口查询对象
+ *
+ * @author zxfei
+ * @date 2023-10-17
+ */
 public class WindowHallQuery extends WindowHallEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -24,6 +24,21 @@ public class WindowHallQuery extends WindowHallEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 开始 站点Id */
+    private Long siteIdStart;
+
+    /** 结束 站点Id */
+    private Long siteIdEnd;
+
+    /** 增加 站点Id */
+    private Long siteIdIncrement;
+
+    /** 站点Id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点Id排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 开始 窗口ID */
     private Long windowIdStart;
 
@@ -200,6 +215,87 @@ public class WindowHallQuery extends WindowHallEntity {
     }
 
 
+    /**
+     * 获取 开始 站点Id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点Id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点Id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点Id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 开始 窗口ID
      * @return windowIdStart
@@ -738,6 +834,60 @@ public class WindowHallQuery extends WindowHallEntity {
         return this;
     }
 
+    /**
+     * 设置  站点Id
+     * @param siteId
+     */
+    public WindowHallQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点Id
+     * @param siteIdStart
+     */
+    public WindowHallQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点Id
+     * @param siteIdEnd
+     */
+    public WindowHallQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点Id
+     * @param siteIdIncrement
+     */
+    public WindowHallQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdList
+     */
+    public WindowHallQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点Id
+     * @param siteIdNotList
+     */
+    public WindowHallQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
     /**
      * 设置  窗口ID
      * @param windowId

base-manager/src/main/resources/sqlmap/module/window/WindowHallMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.window.dao.ibatis.WindowHallDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="WindowHallEntity" id="WindowHallEntity-Map">
         <id  property="id" column="id" />
+        <result property="siteId" column="siteId" />
         <result property="windowId" column="windowId" />
         <result property="windowName" column="windowName" />
         <result property="hallId" column="hallId" />
@@ -25,6 +26,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                 a.id,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowId') or colPickMode == 1 and data.containsKey('windowId')))">
                 a.windowId,
             </if>
@@ -57,18 +61,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="WindowHallEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_window_hall
-        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        (siteId,windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
         VALUES
-        (#{windowId},#{windowName},#{hallId},#{hallName},#{sort},#{remark},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{windowId},#{windowName},#{hallId},#{hallName},#{sort},#{remark},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_window_hall
-        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        (siteId,windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.windowId},#{item.windowName},#{item.hallId},#{item.hallName},#{item.sort},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.windowId},#{item.windowName},#{item.hallId},#{item.hallName},#{item.sort},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -78,6 +82,12 @@
         update mortals_sys_window_hall as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('windowId')) or (colPickMode==1 and !data.containsKey('windowId'))">
                 a.windowId=#{data.windowId},
             </if>
@@ -129,6 +139,18 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_sys_window_hall as a
         <trim prefix="set" suffixOverrides=",">
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
             <trim prefix="windowId=(case" suffix="ELSE windowId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -355,6 +377,33 @@
             ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
         <if test="conditionParamRef.containsKey('windowId')">
             <if test="conditionParamRef.windowId != null ">
                 ${_conditionType_} a.windowId = #{${_conditionParam_}.windowId}
@@ -560,20 +609,109 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdList') and conditionParamRef.windowIdList.size() > 0">
+                field(a.windowId,
+                <foreach collection="conditionParamRef.windowIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdList') and conditionParamRef.hallIdList.size() > 0">
+                field(a.hallId,
+                <foreach collection="conditionParamRef.hallIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                field(a.sort,
+                <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdList') and conditionParamRef.windowIdList.size() > 0">
+                field(a.windowId,
+                <foreach collection="conditionParamRef.windowIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdList') and conditionParamRef.hallIdList.size() > 0">
+                field(a.hallId,
+                <foreach collection="conditionParamRef.hallIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                field(a.sort,
+                <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
                     <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('windowId')">
                     a.windowId
                     <if test='orderCol.windowId != null and "DESC".equalsIgnoreCase(orderCol.windowId)'>DESC</if>
@@ -621,6 +759,8 @@
                 </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">