From 977c374bd0f0e9300d1870eb6f6162e5ce8bc1ae Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Wed, 17 Jan 2024 20:10:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=BD=93=E5=89=8D=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/config/MybatisPlusConfig.java | 3 ++- .../core/socketio/config/SocketIOConfig.java | 10 +++++----- .../common/system/controller/MenuController.java | 16 ++++++++++++++++ .../common/system/controller/RoleController.java | 2 ++ .../system/controller/VersionController.java | 4 ++-- .../com/gxwebsoft/common/system/entity/Role.java | 3 +++ .../gxwebsoft/common/system/entity/Version.java | 2 +- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index 568e756..23477b4 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -58,7 +58,8 @@ public class MybatisPlusConfig { "sys_dictionary_data", "sys_user_oauth", "sys_email_record", - "sys_plug" + "sys_plug", + "sys_version" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java index d79884f..3fe7fd0 100644 --- a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java @@ -73,10 +73,10 @@ public class SocketIOConfig implements InitializingBean { config.setKeyStorePassword("123456"); // 设置证书密码 // 启动socket服务 -// SocketIOServer server = new SocketIOServer(config); -// server.addListeners(socketIOHandler); -// server.start(); -// ClientCache.setSocketIOServer(server); -// logger.debug("Netty SocketIO启动：{}:{}",host,port); + SocketIOServer server = new SocketIOServer(config); + server.addListeners(socketIOHandler); + server.start(); + ClientCache.setSocketIOServer(server); + logger.debug("Netty SocketIO启动：{}:{}",host,port); } } diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java index ea7c62a..9403b7d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java @@ -1,15 +1,20 @@ package com.gxwebsoft.common.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.entity.Menu; +import com.gxwebsoft.common.system.entity.Version; import com.gxwebsoft.common.system.param.MenuParam; +import com.gxwebsoft.common.system.param.VersionParam; import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.MenuService; +import com.gxwebsoft.common.system.service.VersionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -29,6 +34,8 @@ public class MenuController extends BaseController { private MenuService menuService; @Resource private CompanyService companyService; + @Resource + private VersionService versionService; @PreAuthorize("hasAuthority('sys:menu:list')") @OperationLog @@ -136,7 +143,16 @@ public class MenuController extends BaseController { Company company = new Company(); company.setCompanyId(companyId); company.setPlanId(param.getTenantId()); + VersionParam versionParam = new VersionParam(); + versionParam.setLimit(1L); + final PageResult result = versionService.pageRel(versionParam); + if (!CollectionUtils.isEmpty(result.getList())) { + Version version = result.getList().get(0); + company.setVersionName(version.getVersionName()); + company.setVersionCode(version.getVersionCode()); + } companyService.updateById(company); + return success("安装成功"); } return fail("安装失败"); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java b/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java index 57eecb3..bded101 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/RoleController.java @@ -38,6 +38,7 @@ public class RoleController extends BaseController { @GetMapping("/page") public ApiResult> page(RoleParam param) { PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc"); return success(roleService.page(page, page.getWrapper())); } @@ -47,6 +48,7 @@ public class RoleController extends BaseController { @GetMapping() public ApiResult> list(RoleParam param) { PageParam page = new PageParam<>(param); + page.setDefaultOrder("sort_number asc"); return success(roleService.list(page.getOrderWrapper())); } diff --git a/src/main/java/com/gxwebsoft/common/system/controller/VersionController.java b/src/main/java/com/gxwebsoft/common/system/controller/VersionController.java index e693d31..52966fd 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/VersionController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/VersionController.java @@ -76,9 +76,9 @@ public class VersionController extends BaseController { version.setUserId(loginUser.getUserId()); } if (versionService.save(version)) { - return success("添加成功"); + return success("发布成功"); } - return fail("添加失败"); + return fail("发布失败"); } @PreAuthorize("hasAuthority('sys:version:save')") diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Role.java b/src/main/java/com/gxwebsoft/common/system/entity/Role.java index 7fd8598..9eb3bfd 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Role.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Role.java @@ -33,6 +33,9 @@ public class Role implements Serializable { @ApiModelProperty("备注") private String comments; + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + @ApiModelProperty("是否删除, 0否, 1是") @TableLogic private Integer deleted; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Version.java b/src/main/java/com/gxwebsoft/common/system/entity/Version.java index 7b87722..0e9bf86 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Version.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Version.java @@ -34,7 +34,7 @@ public class Version implements Serializable { private String versionName; @ApiModelProperty(value = "版本号") - private Integer versionCode; + private String versionCode; @ApiModelProperty(value = "下载链接") private String vueDownloadUrl;