添加appconfig

common-lib/src/main/java/com/mortals/xhx/feign/app/IAppFeign.java

+package com.mortals.xhx.feign.app;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.app.AppPdu;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+/**
+ * 自助终端应用 Feign接口
+ * @author zxfei
+ * @date 2023-02-17
+ */
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = AppFeignFallbackFactory.class)
+public interface IAppFeign extends IFeign {
+
+
+    /**
+     * 查看自助终端应用列表
+     *
+     * @param appPdu
+     * @return
+     */
+    @PostMapping(value = "/app/interlist")
+    Rest<RespData<List<AppPdu>>> list(@RequestBody AppPdu appPdu);
+
+
+    /**
+     * 查看自助终端应用
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/app/interinfo")
+    Rest<AppPdu> info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 删除自助终端应用
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping(value = "/app/delete")
+    Rest<Void> delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 自助终端应用保存更新
+     *
+     * @param appPdu
+     * @return
+     */
+    @PostMapping(value = "/app/save")
+    Rest<RespData<AppPdu>> save(@RequestBody AppPdu appPdu,@RequestHeader("Authorization") String authorization);
+
+
+}
+
+
+@Slf4j
+@Component
+class AppFeignFallbackFactory implements FallbackFactory<IAppFeign> {
+    @Override
+    public IAppFeign create(Throwable t) {
+        return new IAppFeign() {
+            @Override
+            public Rest<RespData<List<AppPdu>>> list(AppPdu appPdu) {
+               return Rest.fail("暂时无法获取自助终端应用列表，请稍后再试!");
+            }
+
+            @Override
+            public Rest<AppPdu> info(Long id) {
+               return Rest.fail("暂时无法获取自助终端应用详细，请稍后再试!");
+            }
+
+            @Override
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除自助终端应用，请稍后再试!");
+            }
+
+            @Override
+            public Rest<RespData<AppPdu>> save(AppPdu appPdu, String authorization) {
+                return Rest.fail("暂时无法保存自助终端应用，请稍后再试!");
+            }
+        };
+    }
+}
+
+
+
+
+
+
+
+

sample-form-manager/db/add.sql

@@ -68,3 +68,29 @@ ALTER TABLE mortals_xhx_device
 
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `resolution`   varchar(64)      COMMENT '分辨率';
+
+
+
+
+-- ----------------------------
+-- 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='应用';

sample-form-manager/src/main/java/com/mortals/xhx/base/framework/config/RedissonConfig.java

-//package com.mortals.xhx.base.framework.config;
-//
-//import lombok.Data;
-//import lombok.extern.slf4j.Slf4j;
-//import org.redisson.Redisson;
-//import org.redisson.api.RedissonClient;
-//import org.redisson.client.codec.Codec;
-//import org.redisson.codec.JsonJacksonCodec;
-//import org.redisson.config.Config;
-//import org.springframework.boot.context.properties.ConfigurationProperties;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * RedissonConfig配置
-// *
-// * @author: zxfei
-// * @date: 2022/8/8 16:02
-// */
-//@Configuration
-//@ConfigurationProperties(prefix = "spring.redis")
-//@Slf4j
-//@Data
-//public class RedissonConfig {
-//
-//    private String host;
-//
-//    private int port;
-//
-//    private String password;
-//
-//    private int database;
-//
-//    @Bean
-//    public RedissonClient redissonClient() {
-//        RedissonClient redissonClient;
-//        Config config = new Config();
-//        String url = "redis://" + host + ":" + port;
-//        // 单节点配置
-//        if("".equalsIgnoreCase(password)) password=null;
-//        config.useSingleServer().setAddress(url).setDatabase(database).setPassword(password);
-//        //使用json序列化方式
-//        Codec codec = new JsonJacksonCodec();
-//        config.setCodec(codec);
-//
-//        // 主从配置
-//        /*config.useMasterSlaveServers()
-//                // 设置redis主节点
-//                .setMasterAddress("redis://192.168.1.120:6379")
-//                // 设置redis从节点
-//                .addSlaveAddress("redis://192.168.1.130:6379", "redis://192.168.1.140:6379");*/
-//        // 哨兵部署方式，sentinel是采用Paxos拜占庭协议，一般sentinel至少3个节点
-//        /*config.useSentinelServers()
-//                .setMasterName("my-sentinel-name")
-//                .addSentinelAddress("redis://192.168.1.120:6379")
-//                .addSentinelAddress("redis://192.168.1.130:6379")
-//                .addSentinelAddress("redis://192.168.1.140:6379");*/
-//        // 集群部署方式，cluster方式至少6个节点，3主3从，3主做sharding，3从用来保证主宕机后可以高可用
-//        /*config.useClusterServers()
-//                // 集群状态扫描间隔时间，单位是毫秒
-//                .setScanInterval(2000)
-//                .addNodeAddress("redis://192.168.1.120:6379")
-//                .addNodeAddress("redis://192.168.1.130:6379")
-//                .addNodeAddress("redis://192.168.1.140:6379")
-//                .addNodeAddress("redis://192.168.1.150:6379")
-//                .addNodeAddress("redis://192.168.1.160:6379")
-//                .addNodeAddress("redis://192.168.1.170:6379");*/
-//        // 云托管部署方式，这种方式主要解决redis提供商为云服务的提供商的redis连接，比如亚马逊云、微软云
-//        /*config.useReplicatedServers()
-//                // 主节点变化扫描间隔时间
-//                .setScanInterval(2000)
-//                .addNodeAddress("redis://192.168.1.120:6379")
-//                .addNodeAddress("redis://192.168.1.130:6379")
-//                .addNodeAddress("redis://192.168.1.140:6379");*/
-//        redissonClient = Redisson.create(config);
-//        return redissonClient;
-//    }
-//}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java

@@ -44,4 +44,11 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar
 	 */
 	Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
 
+	/**
+	 * 通过Key设置参数值 value
+	 * @param key
+	 * @param value
+	 * @return
+	 */
+	void setValueByKey(String key,String value);
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

 package com.mortals.xhx.base.system.param.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IParam;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DataUtil;
@@ -32,6 +34,16 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
         return "ParamEntity.paramKey";
     }
 
+    @Override
+    protected void saveBefore(ParamEntity entity, Context context) throws AppException {
+        //过滤换行符
+        entity.setParamKey(StrUtil.removeAllLineBreaks(entity.getParamKey()));
+        entity.setParamValue(StrUtil.removeAllLineBreaks(entity.getParamValue()));
+        super.saveBefore(entity, context);
+    }
+
+
+
     @Override
     public String getValueByKey(String key) {
         List<ParamEntity> list = this.getCacheList();
@@ -178,4 +190,29 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
         }
 
     }
+
+    @Override
+    public void setValueByKey(String key, String value) {
+        List<ParamEntity> list = this.getCacheList();
+        ParamEntity entity = null;
+        for(ParamEntity paramEntity:list){
+            if(key.equals(paramEntity.getParamKey())){
+                entity = paramEntity;
+                break;
+            }
+        }
+        if(entity!=null){
+            entity.setParamValue(String.valueOf(value));
+            this.update(entity);
+        }else {
+            entity = new ParamEntity();
+            entity.setParamValue(String.valueOf(value));
+            entity.setParamKey(key);
+            entity.setName("key");
+            entity.setCreateTime(new Date());
+            entity.setCreateUserId(1l);
+            entity.setCreateUserName("系统管理员");
+            this.save(entity);
+        }
+    }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -32,4 +32,6 @@ public final class Constant {
 
 	public final static String PARAMS_HOTWORDS_DEFAULT_NUM = "hotwords_default_num";
 
+	public final static String PARAMS_WHITE_APP_LIST = "white_app_list";
+
 }

sample-form-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;
+
+/**
+* 应用列Dao
+* 应用列 DAO接口
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+
+public interface  AppConfigDao extends ICRUDDao<AppConfigEntity,Long>{
+
+
+}

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

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

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

+package com.mortals.xhx.module.app.model;
+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

sample-form-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 lombok.Data;
+
+import java.util.List;
+
+/**
+* 应用列视图对象
+*
+* @author zxfei
+* @date 2025-02-11
+*/
+@Data
+public class AppConfigVo extends BaseEntityLong {
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

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

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

+package com.mortals.xhx.module.app.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+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;
+import org.springframework.stereotype.Service;
+/**
+* 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

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

+package com.mortals.xhx.module.app.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import com.mortals.xhx.module.app.service.AppConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*
+* 应用列
+*
+* @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

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

 package com.mortals.xhx.module.home.web;
 
+import cn.hutool.core.net.url.UrlBuilder;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
@@ -13,17 +15,21 @@ import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
-import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.app.AppPdu;
 import com.mortals.xhx.common.pdu.dept.DeptPdu;
+import com.mortals.xhx.feign.app.IAppFeign;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.dept.IDeptFeign;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.app.model.AppConfigEntity;
+import com.mortals.xhx.module.app.model.AppConfigQuery;
+import com.mortals.xhx.module.app.service.AppConfigService;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.model.BasesetQuery;
 import com.mortals.xhx.module.baseset.service.BasesetService;
@@ -40,18 +46,17 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("home")
+@Slf4j
 public class HomeController extends BaseJsonBodyController {
 
     @Autowired
@@ -63,8 +68,6 @@ public class HomeController extends BaseJsonBodyController {
     @Autowired
     private HotwordService hotwordService;
     @Autowired
-    private ParamService paramService;
-    @Autowired
     private DeviceMatterDatumService deviceMatterDatumService;
     @Autowired
     private ISiteFeign siteFeign;
@@ -74,6 +77,10 @@ public class HomeController extends BaseJsonBodyController {
     private IDeptFeign deptFeign;
     @Autowired
     private ICacheService cacheService;
+    @Autowired
+    private IAppFeign appFeign;
+    @Autowired
+    private AppConfigService appConfigService;
 
 
     @PostMapping({"site/list"})
@@ -301,6 +308,74 @@ public class HomeController extends BaseJsonBodyController {
         return ret;
     }
 
+    /**
+     * 自助服务应用
+     *
+     * @return
+     */
+    @GetMapping({"app/list"})
+    @UnAuth
+    public String appList(Long siteId) {
+        String serverName = request.getHeader("server-name");
+        Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
+
+        log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
+
+        Rest<List<AppPdu>> ret = new Rest();
+        List<AppPdu> collect = new ArrayList<>();
+        int code = VALUE_RESULT_SUCCESS;
 
+        AppConfigQuery query = new AppConfigQuery();
+        query.setSiteId(siteId);
+        query.setOrderColList(Arrays.asList(new OrderCol("order")));
+
+        List<AppConfigEntity> appConfigEntities = appConfigService.find(query);
+        if (!ObjectUtils.isEmpty(appConfigEntities)) {
+            List<Long> AppIdList = appConfigEntities.stream().map(item -> item.getAppId()).collect(Collectors.toList());
+            AppPdu appPdu = new AppPdu();
+            appPdu.setIdList(AppIdList);
+            appPdu.setSize(-1);
+            Rest<RespData<List<AppPdu>>> appRest = appFeign.list(appPdu);
+            String domainUrl = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
+
+            log.info("appRest:" + JSON.toJSONString(appRest));
+            log.info("domainUrl:" + domainUrl);
+            if (appRest.getCode() == YesNoEnum.YES.getValue()) {
+                collect = appRest.getData().getData().stream()
+                        .peek(item -> {
+                            item.setCustUrl(UrlBuilder.ofHttp(domainUrl).addPath(item.getCustUrl()).build());
+                            log.info(item.getCustUrl());
+                            log.info(item.getAppIconPath());
+                        }).collect(Collectors.toList());
+            }
+        } else {
+            String appWhiteStr = GlobalSysInfo.getParamValue(Constant.PARAMS_WHITE_APP_LIST, "中心简介,办事指南,意见建议,通知公告");
+            Set<String> appWhiteSet = StrUtil.split(appWhiteStr, ",").stream().collect(Collectors.toSet());
+            try {
+                AppPdu appPdu = new AppPdu();
+                appPdu.setSiteId(siteId);
+                appPdu.setSize(-1);
+                appPdu.setType(1);
+                Rest<RespData<List<AppPdu>>> appRest = appFeign.list(appPdu);
+                String domainUrl = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
+                log.info("appRest:" + JSON.toJSONString(appRest));
+                log.info("domainUrl:" + domainUrl);
+                if (appRest.getCode() == YesNoEnum.YES.getValue()) {
+                    collect = appRest.getData().getData().stream().filter(f -> appWhiteSet.contains(f.getAppName()))
+                            .peek(item -> {
+                                item.setCustUrl(UrlBuilder.ofHttp(domainUrl).addPath(item.getCustUrl()).build());
+                                log.info(item.getCustUrl());
+                                log.info(item.getAppIconPath());
+                            }).collect(Collectors.toList());
+                }
+            } catch (Exception e) {
+                code = VALUE_RESULT_FAILURE;
+            }
+        }
+        ret.setCode(code);
+        ret.setData(collect);
+        log.info("【应用请求】【响应体】-->{}", JSONObject.toJSONString(ret));
+        return JSONObject.toJSONString(ret);
+    }
 
 }