添加应用配置列表

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/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/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
+
+
+
+