添加应用配置列表

fill-manager/db/add.sql

 
 -- ----------------------------
-2023-02-26
+-- 2023-02-26
 -- ----------------------------
 ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `matterId` bigint(20)      COMMENT '事项id' AFTER orderId;
 ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `matterName` varchar(2048) default ''     COMMENT '事项名称' AFTER matterId;
@@ -13,13 +13,12 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) defau
 
 
 -- ----------------------------
-2023-03-22
+-- 2023-03-22
 -- ----------------------------
 INSERT INTO `mortals_xhx_task` (`id`, `name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('4', '同步设备', 'SyncSiteDeviceTask', '0', 'SyncSiteDeviceTask', NULL, NULL, '4', '120', '00:00', NULL, '127.0.1.1', '2023-02-26 22:15:59', '0', '2023-02-25 14:34:12', '1', NULL);
 
-
-    -- ----------------------------
-2023-06-21
+-- ----------------------------
+-- 2023-06-21
 -- ----------------------------
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `deviceFirmId` bigint(20) DEFAULT NULL COMMENT '设备生产厂商ID' AFTER siteName;
@@ -36,4 +35,29 @@ ALTER TABLE mortals_xhx_device
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER enabled;
 ALTER TABLE mortals_xhx_device
-    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
+    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
\ No newline at end of file
+
+
+
+-- ----------------------------
+-- 2025-02-11
+-- ----------------------------
+
+-- ----------------------------
+-- 应用列表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_app_config`;
+CREATE TABLE mortals_xhx_app_config(
+   `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+   `siteId` bigint(20)      COMMENT '站点ID',
+   `siteName` varchar(64)      COMMENT '站点名称',
+   `siteCode` varchar(64)      COMMENT '站点编号',
+   `appId` bigint(20)      COMMENT '应用ID',
+   `appCode` varchar(64)      COMMENT '应用编码',
+   `appName` varchar(64)      COMMENT '应用名称',
+   `order` int(9)      COMMENT '应用顺序',
+   `createTime` datetime      COMMENT '创建时间',
+   `createUserId` bigint(20)      COMMENT '创建用户',
+   `updateTime` datetime      COMMENT '修改时间',
+   PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='应用列';
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/dao/AppConfigDao.java

+package com.mortals.xhx.module.app.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import java.util.List;
+/**
+* 应用列Dao
+* 应用列 DAO接口
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+
+public interface  AppConfigDao extends ICRUDDao<AppConfigEntity,Long>{
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/app/dao/ibatis/AppConfigDaoImpl.java

+package com.mortals.xhx.module.app.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.app.dao.AppConfigDao;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 应用列DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@Repository("appConfigDao")
+public class AppConfigDaoImpl extends BaseCRUDDaoMybatis<AppConfigEntity,Long> implements AppConfigDao {
+
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/app/model/AppConfigEntity.java

+package com.mortals.xhx.module.app.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.app.model.vo.AppConfigVo;
+import lombok.Data;
+/**
+* 应用列实体对象
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@Data
+public class AppConfigEntity extends AppConfigVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点ID
+    */
+    private Long siteId;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 站点编号
+    */
+    private String siteCode;
+    /**
+    * 应用ID
+    */
+    private Long appId;
+    /**
+    * 应用编码
+    */
+    private String appCode;
+    /**
+    * 应用名称
+    */
+    private String appName;
+    /**
+    * 应用顺序
+    */
+    private Integer order;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof AppConfigEntity) {
+            AppConfigEntity tmp = (AppConfigEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.siteId = null;
+            this.siteName = "";
+            this.siteCode = "";
+            this.appId = null;
+            this.appCode = "";
+            this.appName = "";
+            this.order = 0;
+    }
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/model/AppConfigQuery.java

+package com.mortals.xhx.module.app.model;
+
+import java.util.List;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+/**
+* 应用列查询对象
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+public class AppConfigQuery extends AppConfigEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键，自增长排除列表 */
+    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;
+
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 站点编号 */
+    private List<String> siteCodeList;
+
+    /** 站点编号排除列表 */
+    private List <String> siteCodeNotList;
+    /** 开始 应用ID */
+    private Long appIdStart;
+
+    /** 结束 应用ID */
+    private Long appIdEnd;
+
+    /** 增加 应用ID */
+    private Long appIdIncrement;
+
+    /** 应用ID列表 */
+    private List <Long> appIdList;
+
+    /** 应用ID排除列表 */
+    private List <Long> appIdNotList;
+
+    /** 应用编码 */
+    private List<String> appCodeList;
+
+    /** 应用编码排除列表 */
+    private List <String> appCodeNotList;
+    /** 应用名称 */
+    private List<String> appNameList;
+
+    /** 应用名称排除列表 */
+    private List <String> appNameNotList;
+    /** 开始 应用顺序 */
+    private Integer orderStart;
+
+    /** 结束 应用顺序 */
+    private Integer orderEnd;
+
+    /** 增加 应用顺序 */
+    private Integer orderIncrement;
+
+    /** 应用顺序列表 */
+    private List <Integer> orderList;
+
+    /** 应用顺序排除列表 */
+    private List <Integer> orderNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppConfigQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppConfigQuery> andConditionList;
+
+    public AppConfigQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 站点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;
+    }
+
+
+    /**
+    * 获取 站点名称
+    * @return siteNameList
+    */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameNotList
+    */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameNotList
+    */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+    * 获取 站点编号
+    * @return siteCodeList
+    */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
+    }
+
+    /**
+    * 设置 站点编号
+    * @param siteCodeList
+    */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+
+    /**
+    * 获取 站点编号
+    * @return siteCodeNotList
+    */
+    public List<String> getSiteCodeNotList(){
+        return this.siteCodeNotList;
+    }
+
+    /**
+    * 设置 站点编号
+    * @param siteCodeNotList
+    */
+    public void setSiteCodeNotList(List<String> siteCodeNotList){
+        this.siteCodeNotList = siteCodeNotList;
+    }
+
+    /**
+    * 获取 开始 应用ID
+    * @return appIdStart
+    */
+    public Long getAppIdStart(){
+        return this.appIdStart;
+    }
+
+    /**
+    * 设置 开始 应用ID
+    * @param appIdStart
+    */
+    public void setAppIdStart(Long appIdStart){
+        this.appIdStart = appIdStart;
+    }
+
+    /**
+    * 获取 结束 应用ID
+    * @return $appIdEnd
+    */
+    public Long getAppIdEnd(){
+        return this.appIdEnd;
+    }
+
+    /**
+    * 设置 结束 应用ID
+    * @param appIdEnd
+    */
+    public void setAppIdEnd(Long appIdEnd){
+        this.appIdEnd = appIdEnd;
+    }
+
+    /**
+    * 获取 增加 应用ID
+    * @return appIdIncrement
+    */
+    public Long getAppIdIncrement(){
+        return this.appIdIncrement;
+    }
+
+    /**
+    * 设置 增加 应用ID
+    * @param appIdIncrement
+    */
+    public void setAppIdIncrement(Long appIdIncrement){
+        this.appIdIncrement = appIdIncrement;
+    }
+
+    /**
+    * 获取 应用ID
+    * @return appIdList
+    */
+    public List<Long> getAppIdList(){
+        return this.appIdList;
+    }
+
+    /**
+    * 设置 应用ID
+    * @param appIdList
+    */
+    public void setAppIdList(List<Long> appIdList){
+        this.appIdList = appIdList;
+    }
+
+    /**
+    * 获取 应用ID
+    * @return appIdNotList
+    */
+    public List<Long> getAppIdNotList(){
+        return this.appIdNotList;
+    }
+
+    /**
+    * 设置 应用ID
+    * @param appIdNotList
+    */
+    public void setAppIdNotList(List<Long> appIdNotList){
+        this.appIdNotList = appIdNotList;
+    }
+
+
+    /**
+    * 获取 应用编码
+    * @return appCodeList
+    */
+    public List<String> getAppCodeList(){
+        return this.appCodeList;
+    }
+
+    /**
+    * 设置 应用编码
+    * @param appCodeList
+    */
+    public void setAppCodeList(List<String> appCodeList){
+        this.appCodeList = appCodeList;
+    }
+
+    /**
+    * 获取 应用编码
+    * @return appCodeNotList
+    */
+    public List<String> getAppCodeNotList(){
+        return this.appCodeNotList;
+    }
+
+    /**
+    * 设置 应用编码
+    * @param appCodeNotList
+    */
+    public void setAppCodeNotList(List<String> appCodeNotList){
+        this.appCodeNotList = appCodeNotList;
+    }
+
+    /**
+    * 获取 应用名称
+    * @return appNameList
+    */
+    public List<String> getAppNameList(){
+        return this.appNameList;
+    }
+
+    /**
+    * 设置 应用名称
+    * @param appNameList
+    */
+    public void setAppNameList(List<String> appNameList){
+        this.appNameList = appNameList;
+    }
+
+    /**
+    * 获取 应用名称
+    * @return appNameNotList
+    */
+    public List<String> getAppNameNotList(){
+        return this.appNameNotList;
+    }
+
+    /**
+    * 设置 应用名称
+    * @param appNameNotList
+    */
+    public void setAppNameNotList(List<String> appNameNotList){
+        this.appNameNotList = appNameNotList;
+    }
+
+    /**
+    * 获取 开始 应用顺序
+    * @return orderStart
+    */
+    public Integer getOrderStart(){
+        return this.orderStart;
+    }
+
+    /**
+    * 设置 开始 应用顺序
+    * @param orderStart
+    */
+    public void setOrderStart(Integer orderStart){
+        this.orderStart = orderStart;
+    }
+
+    /**
+    * 获取 结束 应用顺序
+    * @return $orderEnd
+    */
+    public Integer getOrderEnd(){
+        return this.orderEnd;
+    }
+
+    /**
+    * 设置 结束 应用顺序
+    * @param orderEnd
+    */
+    public void setOrderEnd(Integer orderEnd){
+        this.orderEnd = orderEnd;
+    }
+
+    /**
+    * 获取 增加 应用顺序
+    * @return orderIncrement
+    */
+    public Integer getOrderIncrement(){
+        return this.orderIncrement;
+    }
+
+    /**
+    * 设置 增加 应用顺序
+    * @param orderIncrement
+    */
+    public void setOrderIncrement(Integer orderIncrement){
+        this.orderIncrement = orderIncrement;
+    }
+
+    /**
+    * 获取 应用顺序
+    * @return orderList
+    */
+    public List<Integer> getOrderList(){
+        return this.orderList;
+    }
+
+    /**
+    * 设置 应用顺序
+    * @param orderList
+    */
+    public void setOrderList(List<Integer> orderList){
+        this.orderList = orderList;
+    }
+
+    /**
+    * 获取 应用顺序
+    * @return orderNotList
+    */
+    public List<Integer> getOrderNotList(){
+        return this.orderNotList;
+    }
+
+    /**
+    * 设置 应用顺序
+    * @param orderNotList
+    */
+    public void setOrderNotList(List<Integer> orderNotList){
+        this.orderNotList = orderNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键，自增长
+    * @param id
+    */
+    public AppConfigQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public AppConfigQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public AppConfigQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public AppConfigQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public AppConfigQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键，自增长
+        * @param idNotList
+        */
+        public AppConfigQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  站点ID
+    * @param siteId
+    */
+    public AppConfigQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public AppConfigQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public AppConfigQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public AppConfigQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public AppConfigQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点ID
+        * @param siteIdNotList
+        */
+        public AppConfigQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public AppConfigQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public AppConfigQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 站点编号
+    * @param siteCode
+    */
+    public AppConfigQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+		return this;
+    }
+
+    /**
+    * 设置 站点编号
+    * @param siteCodeList
+    */
+    public AppConfigQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+		return this;
+    }
+
+    /**
+    * 设置  应用ID
+    * @param appId
+    */
+    public AppConfigQuery appId(Long appId){
+	    setAppId(appId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 应用ID
+    * @param appIdStart
+    */
+    public AppConfigQuery appIdStart(Long appIdStart){
+		this.appIdStart = appIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 应用ID
+    * @param appIdEnd
+    */
+    public AppConfigQuery appIdEnd(Long appIdEnd){
+		this.appIdEnd = appIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 应用ID
+    * @param appIdIncrement
+    */
+    public AppConfigQuery appIdIncrement(Long appIdIncrement){
+		this.appIdIncrement = appIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 应用ID
+    * @param appIdList
+    */
+    public AppConfigQuery appIdList(List<Long> appIdList){
+        this.appIdList = appIdList;
+		return this;
+        }
+
+        /**
+        * 设置 应用ID
+        * @param appIdNotList
+        */
+        public AppConfigQuery appIdNotList(List<Long> appIdNotList){
+        this.appIdNotList = appIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 应用编码
+    * @param appCode
+    */
+    public AppConfigQuery appCode(String appCode){
+        setAppCode(appCode);
+		return this;
+    }
+
+    /**
+    * 设置 应用编码
+    * @param appCodeList
+    */
+    public AppConfigQuery appCodeList(List<String> appCodeList){
+        this.appCodeList = appCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 应用名称
+    * @param appName
+    */
+    public AppConfigQuery appName(String appName){
+        setAppName(appName);
+		return this;
+    }
+
+    /**
+    * 设置 应用名称
+    * @param appNameList
+    */
+    public AppConfigQuery appNameList(List<String> appNameList){
+        this.appNameList = appNameList;
+		return this;
+    }
+
+    /**
+    * 设置  应用顺序
+    * @param order
+    */
+    public AppConfigQuery order(Integer order){
+	    setOrder(order);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 应用顺序
+    * @param orderStart
+    */
+    public AppConfigQuery orderStart(Integer orderStart){
+		this.orderStart = orderStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 应用顺序
+    * @param orderEnd
+    */
+    public AppConfigQuery orderEnd(Integer orderEnd){
+		this.orderEnd = orderEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 应用顺序
+    * @param orderIncrement
+    */
+    public AppConfigQuery orderIncrement(Integer orderIncrement){
+		this.orderIncrement = orderIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 应用顺序
+    * @param orderList
+    */
+    public AppConfigQuery orderList(List<Integer> orderList){
+        this.orderList = orderList;
+		return this;
+        }
+
+        /**
+        * 设置 应用顺序
+        * @param orderNotList
+        */
+        public AppConfigQuery orderNotList(List<Integer> orderNotList){
+        this.orderNotList = orderNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public AppConfigQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public AppConfigQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public AppConfigQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public AppConfigQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public AppConfigQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public AppConfigQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<AppConfigQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<AppConfigQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<AppConfigQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<AppConfigQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppConfigVo.java

+package com.mortals.xhx.module.app.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 应用列视图对象
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@Data
+public class AppConfigVo extends BaseEntityLong {
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/service/AppConfigService.java

+package com.mortals.xhx.module.app.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import com.mortals.xhx.module.app.dao.AppConfigDao;
+/**
+* AppConfigService
+*
+* 应用列 service接口
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+public interface AppConfigService extends ICRUDService<AppConfigEntity,Long>{
+
+    AppConfigDao getDao();
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppConfigServiceImpl.java

+package com.mortals.xhx.module.app.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.app.dao.AppConfigDao;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import com.mortals.xhx.module.app.service.AppConfigService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* AppConfigService
+* 应用列 service实现
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@Service("appConfigService")
+@Slf4j
+public class AppConfigServiceImpl extends AbstractCRUDServiceImpl<AppConfigDao, AppConfigEntity, Long> implements AppConfigService {
+    
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/app/web/AppConfigController.java

+package com.mortals.xhx.module.app.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import com.mortals.xhx.module.app.service.AppConfigService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 应用列
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@RestController
+@RequestMapping("app/config")
+public class AppConfigController extends BaseCRUDJsonBodyMappingController<AppConfigService,AppConfigEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public AppConfigController(){
+        super.setModuleDesc( "应用列");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -430,7 +430,6 @@ public class HomeController extends BaseJsonBodyController {
                 collect = appRest.getData().getData().stream().filter(f -> appWhiteSet.contains(f.getAppName()))
                         .peek(item -> {
                             item.setCustUrl(UrlBuilder.ofHttp(domainUrl).addPath(item.getCustUrl()).build());
-                            //item.setAppIconPath(UrlBuilder.ofHttp(domainUrl1).addPath(item.getAppIconPath()).build());
                             log.info(item.getCustUrl());
                             log.info(item.getAppIconPath());
                         }).collect(Collectors.toList());

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -643,7 +643,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     });
                     builderTable.useDefaultEL(false);
                     builderTable.buildGramer("[", "]");
-                    builderTable.useSpringEL();
+                    //builderTable.useSpringEL();
+
+                    builderTable.buildGrammerRegex(RegexUtils.createGeneral("[", "]"));
 
                     XWPFTemplate templateTable = XWPFTemplate.compile(filepath, builderTable.build());
 

fill-manager/src/main/resources/sqlmap/module/app/AppConfigMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppConfigDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="AppConfigEntity" id="AppConfigEntity-Map">
+            <id  property="id" column="id" />
+            <result property="siteId" column="siteId" />
+            <result property="siteName" column="siteName" />
+            <result property="siteCode" column="siteCode" />
+            <result property="appId" column="appId" />
+            <result property="appCode" column="appCode" />
+            <result property="appName" column="appName" />
+            <result property="order" column="order" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+    </resultMap>
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <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('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.siteName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                    a.siteCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appId') or colPickMode == 1 and data.containsKey('appId')))">
+                    a.appId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appCode') or colPickMode == 1 and data.containsKey('appCode')))">
+                    a.appCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appName') or colPickMode == 1 and data.containsKey('appName')))">
+                    a.appName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('order') or colPickMode == 1 and data.containsKey('order')))">
+                    a.`order`,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="AppConfigEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_app_config
+        (siteId,siteName,siteCode,appId,appCode,appName,`order`,createTime,createUserId,updateTime)
+        VALUES
+        (#{siteId},#{siteName},#{siteCode},#{appId},#{appCode},#{appName},#{order},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_app_config
+        (siteId,siteName,siteCode,appId,appCode,appName,`order`,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.siteName},#{item.siteCode},#{item.appId},#{item.appCode},#{item.appName},#{item.order},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_app_config 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('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appId')) or (colPickMode==1 and !data.containsKey('appId'))">
+                a.appId=#{data.appId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appIdIncrement')) or (colPickMode==1 and !data.containsKey('appIdIncrement'))">
+                a.appId=ifnull(a.appId,0) + #{data.appIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appCode')) or (colPickMode==1 and !data.containsKey('appCode'))">
+                a.appCode=#{data.appCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appName')) or (colPickMode==1 and !data.containsKey('appName'))">
+                a.appName=#{data.appName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('order')) or (colPickMode==1 and !data.containsKey('order'))">
+                a.`order`=#{data.order},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('orderIncrement')) or (colPickMode==1 and !data.containsKey('orderIncrement'))">
+                a.`order`=ifnull(a.`order`,0) + #{data.orderIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_app_config 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="siteName=(case" suffix="ELSE siteName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                            when a.id=#{item.id} then #{item.siteName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                            when a.id=#{item.id} then #{item.siteCode}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="appId=(case" suffix="ELSE appId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))">
+                                        when a.id=#{item.id} then #{item.appId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="appCode=(case" suffix="ELSE appCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('appCode')) or (colPickMode==1 and !item.containsKey('appCode'))">
+                            when a.id=#{item.id} then #{item.appCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="appName=(case" suffix="ELSE appName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('appName')) or (colPickMode==1 and !item.containsKey('appName'))">
+                            when a.id=#{item.id} then #{item.appName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="`order`=(case" suffix="ELSE `order` end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('order')) or (colPickMode==1 and !item.containsKey('order'))">
+                                        when a.id=#{item.id} then #{item.order}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('orderIncrement')) or (colPickMode==1 and !item.containsKey('orderIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.`order`,0) + #{item.orderIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="AppConfigEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_app_config as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_app_config as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_app_config where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_app_config where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_app_config where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_app_config as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="AppConfigEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_app_config as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_app_config as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_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('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.siteName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.siteName in
+                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+                ${_conditionType_} a.siteName not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteCode')">
+                <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                    ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
+                </if>
+                <if test="conditionParamRef.siteCode == null">
+                    ${_conditionType_} a.siteCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+                ${_conditionType_} a.siteCode in
+                <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+                ${_conditionType_} a.siteCode not in
+                <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('appId')">
+                <if test="conditionParamRef.appId != null ">
+                    ${_conditionType_} a.appId = #{${_conditionParam_}.appId}
+                </if>
+                <if test="conditionParamRef.appId == null">
+                    ${_conditionType_} a.appId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
+                ${_conditionType_} a.appId in
+                <foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('appIdNotList') and conditionParamRef.appIdNotList.size() > 0">
+                ${_conditionType_} a.appId not in
+                <foreach collection="conditionParamRef.appIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
+                ${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null">
+                ${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('appCode')">
+                <if test="conditionParamRef.appCode != null and conditionParamRef.appCode != ''">
+                    ${_conditionType_} a.appCode like #{${_conditionParam_}.appCode}
+                </if>
+                <if test="conditionParamRef.appCode == null">
+                    ${_conditionType_} a.appCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('appCodeList') and conditionParamRef.appCodeList.size() > 0">
+                ${_conditionType_} a.appCode in
+                <foreach collection="conditionParamRef.appCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('appCodeNotList') and conditionParamRef.appCodeNotList.size() > 0">
+                ${_conditionType_} a.appCode not in
+                <foreach collection="conditionParamRef.appCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('appName')">
+                <if test="conditionParamRef.appName != null and conditionParamRef.appName != ''">
+                    ${_conditionType_} a.appName like #{${_conditionParam_}.appName}
+                </if>
+                <if test="conditionParamRef.appName == null">
+                    ${_conditionType_} a.appName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('appNameList') and conditionParamRef.appNameList.size() > 0">
+                ${_conditionType_} a.appName in
+                <foreach collection="conditionParamRef.appNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('appNameNotList') and conditionParamRef.appNameNotList.size() > 0">
+                ${_conditionType_} a.appName not in
+                <foreach collection="conditionParamRef.appNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('order')">
+                <if test="conditionParamRef.order != null ">
+                    ${_conditionType_} a.`order` = #{${_conditionParam_}.order}
+                </if>
+                <if test="conditionParamRef.order == null">
+                    ${_conditionType_} a.`order` is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('orderList') and conditionParamRef.orderList.size() > 0">
+                ${_conditionType_} a.`order` in
+                <foreach collection="conditionParamRef.orderList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('orderNotList') and conditionParamRef.orderNotList.size() > 0">
+                ${_conditionType_} a.`order` not in
+                <foreach collection="conditionParamRef.orderNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('orderStart') and conditionParamRef.orderStart != null">
+                ${_conditionType_} a.`order` <![CDATA[ >= ]]> #{${_conditionParam_}.orderStart}
+            </if>
+            <if test="conditionParamRef.containsKey('orderEnd') and conditionParamRef.orderEnd != null">
+                ${_conditionType_} a.`order` <![CDATA[ <= ]]> #{${_conditionParam_}.orderEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <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('appIdList') and conditionParamRef.appIdList.size() > 0">
+                        field(a.appId,
+                        <foreach collection="conditionParamRef.appIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('orderList') and conditionParamRef.orderList.size() > 0">
+                        field(a.order,
+                        <foreach collection="conditionParamRef.orderList" 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=",">
+                     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('appIdList') and conditionParamRef.appIdList.size() > 0">
+                        field(a.appId,
+                        <foreach collection="conditionParamRef.appIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('orderList') and conditionParamRef.orderList.size() > 0">
+                        field(a.order,
+                        <foreach collection="conditionParamRef.orderList" 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('siteName')">
+                        a.siteName
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteCode')">
+                        a.siteCode
+                        <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('appId')">
+                        a.appId
+                        <if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('appCode')">
+                        a.appCode
+                        <if test='orderCol.appCode != null and "DESC".equalsIgnoreCase(orderCol.appCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('appName')">
+                        a.appName
+                        <if test='orderCol.appName != null and "DESC".equalsIgnoreCase(orderCol.appName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('order')">
+                        a.`order`
+                        <if test='orderCol.order != null and "DESC".equalsIgnoreCase(orderCol.order)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+
+
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

fill-manager/src/test/java/com/mortals/httpclient/app/AppConfigController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###应用列列表
+POST {{baseUrl}}/app/config/list
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###应用列更新与保存
+POST {{baseUrl}}/app/config/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "siteId":784,
+        "siteName":"kCSmfM",
+        "siteCode":"pmMsZp",
+        "appId":429,
+        "appCode":"3PjWEr",
+        "appName":"uutzud",
+        "order":409,
+}
+
+> {%
+client.global.set("AppConfig_id", JSON.parse(response.body).data.id);
+%}
+
+###应用列查看
+GET {{baseUrl}}/app/config/info?id=1
+
+###应用列编辑
+GET {{baseUrl}}/app/config/edit?id=1
+Accept: application/json
+
+
+###应用列删除
+GET {{baseUrl}}/app/config/delete?id=1
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+