rainbowfast/muscipro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
menxipeng
2025-09-21 17:49:23 +08:00
parent 142c00bc9e
commit 0b75730d37
23 changed files with 1320 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/AppVersionController.java Normal file
View File

@@ -0,0 +1,123 @@
package com.ruoyi.web.controller.back;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.AppVersion;
import com.ruoyi.common.core.domain.entity.ChannelEnum;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.IAppVersionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 应用版本更新信息Controller
*
* @author ruoyi
* @date 2025-09-21
*/
@RestController
@RequestMapping("/back/version")
public class AppVersionController extends BaseController
{
@Autowired
private IAppVersionService appVersionService;
/**
* 查询应用版本更新信息列表
*/
@GetMapping("/list")
public TableDataInfo list(AppVersion appVersion)
{
startPage();
List<AppVersion> list = appVersionService.selectAppVersionList(appVersion);
return getDataTable(list);
}
/**
* 导出应用版本更新信息列表
*/
@PostMapping("/export")
public void export(HttpServletResponse response, AppVersion appVersion)
{
List<AppVersion> list = appVersionService.selectAppVersionList(appVersion);
ExcelUtil<AppVersion> util = new ExcelUtil<AppVersion>(AppVersion.class);
util.exportExcel(response, list, "应用版本更新信息数据");
}
/**
* 获取应用版本更新信息详细信息
*/
@PreAuthorize("@ss.hasPermi('system:version:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return success(appVersionService.selectAppVersionById(id));
}
/**
* 新增应用版本更新信息
*/
@PreAuthorize("@ss.hasPermi('system:version:add')")
@Log(title = "应用版本更新信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppVersion appVersion)
{
if (appVersionService.checkVersionByChannel(appVersion)){
return toAjax(appVersionService.insertAppVersion(appVersion));
}
return AjaxResult.error("当前版本code小于或等于最新版本");
}
/**
* 修改应用版本更新信息
*/
@PreAuthorize("@ss.hasPermi('system:version:edit')")
@Log(title = "应用版本更新信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppVersion appVersion)
{
if (appVersionService.checkVersionByChannel(appVersion)){
return toAjax(appVersionService.updateAppVersion(appVersion));
}
return AjaxResult.error("当前版本code小于或等于最新版本");
}
/**
* 删除应用版本更新信息
*/
@PreAuthorize("@ss.hasPermi('system:version:remove')")
@Log(title = "应用版本更新信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(appVersionService.deleteAppVersionByIds(ids));
}
@GetMapping("/getChannel")
public AjaxResult checkVersion() {
ChannelEnum[] channelEnums = ChannelEnum.values();
return AjaxResult.success(channelEnums);
}
// 根据渠道获取当前最新版本
@GetMapping("/getLastVersion")
public AjaxResult getLastVersion(@RequestParam("channel") String channel){
return AjaxResult.success(appVersionService.getLastVersionByChannel(channel));
}
// 检查当前版本是否小于输入版本
@PostMapping("/checkLastVersion")
public AjaxResult checkLastVersion(@RequestBody AppVersion appVersion){
return AjaxResult.success(appVersionService.checkVersionByChannel(appVersion));
}
}

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/NotificationsController.java
View File

@@ -44,6 +44,17 @@ public class NotificationsController extends BaseController
return getDataTable(list);
}
/**
* 获取【请填写功能名称】详细信息
*/
@PreAuthorize("@ss.hasPermi('system:notifications:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(notificationsService.selectNotificationsById(id));
}
/**
* 导出【请填写功能名称】列表
*/

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ShopUserController.java
View File

@@ -88,7 +88,7 @@ public class ShopUserController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody ShopUser shopUser)
{
return toAjax(shopUserService.updateShopUser(shopUser));
return toAjax(shopUserService.updateShopUserId(shopUser));
}
/**

36
ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientVersionController.java Normal file
View File

@@ -0,0 +1,36 @@
package com.ruoyi.web.controller.client;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.AppVersion;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.service.IAppVersionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 应用版本更新信息Controller
*
* @author ruoyi
* @date 2025-09-21
*/
@RestController
@RequestMapping("/client/version")
public class ClientVersionController extends BaseController
{
@Autowired
private IAppVersionService appVersionService;
// 根据渠道获取当前最新版本
@GetMapping("/getLastVersion")
public AjaxResult getLastVersion(@RequestParam("channel") String channel){
return AjaxResult.success(appVersionService.getLastVersionByChannel(channel));
}
}