From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java | 70 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
index ead6b5d..3d29201 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
@@ -1,16 +1,24 @@
package com.ruoyi.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.AppVersion;
import com.ruoyi.admin.entity.Region;
+import com.ruoyi.admin.entity.SysUser;
+import com.ruoyi.admin.mapper.AppMapper;
import com.ruoyi.admin.service.RegionService;
+import com.ruoyi.admin.service.SysUserService;
+import com.ruoyi.admin.service.UserService;
+import com.ruoyi.admin.vo.PageDto;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.collections4.Get;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -26,13 +34,47 @@
*/
@RestController
@RequestMapping("/region")
-@Api(value = "后台-首页", tags = {"后台-首页"})
+@Api(value = "后台-版本管理", tags = {"后台-版本管理"})
public class RegionController {
@Resource
private RegionService regionService;
@Resource
private TokenService tokenService;
+ @Resource
+ private AppMapper appMapper;
+ @Resource
+ private SysUserService sysUserService;
+
+ @PostMapping("/version/list")
+ @ApiOperation(value = "列表", tags = {"后台-版本管理"})
+ public R<Page<AppVersion>> versionList(@RequestBody PageDto pageDto) {
+ Page<AppVersion> appVersionPage = appMapper.selectPage(Page.of(pageDto.getPageNum(), pageDto.getPageSize()), new QueryWrapper<AppVersion>().orderByDesc("createTime"));
+ for (AppVersion record : appVersionPage.getRecords()) {
+ SysUser byId = sysUserService.getById(record.getCreateBy());
+ record.setCreateBy(byId.getNickName());
+ }
+ return R.ok(appVersionPage);
+
+ }
+ @Resource
+ private RedisService redisService;
+
+ @PostMapping("/version/add")
+ @ApiOperation(value = "添加", tags = {"后台-版本管理"})
+ public R versionAdd(@RequestBody AppVersion appVersion) {
+ com.ruoyi.system.api.domain.SysUser sysUser = tokenService.getLoginUser().getSysUser();
+ appVersion.setCreateBy(String.valueOf(sysUser.getUserId()));
+ appMapper.insert(appVersion);
+// redisService.setCacheObject("version",appVersion);
+ return R.ok();
+ }
+ @PostMapping("/version/delete/{id}")
+ @ApiOperation(value = "删除", tags = {"后台-版本管理"})
+ public R versionDelete(@PathVariable Integer id) {
+ appMapper.deleteById(id);
+ return R.ok();
+ }
/**
* 收货地址省市二级联动
@@ -40,6 +82,22 @@
@GetMapping("/addressTree")
@ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
public R<List<Region>> addressTree() {
+// LoginUser loginUser = tokenService.getLoginUser();
+// if (null == loginUser) {
+// return R.loginExpire("登录失效！");
+// }
+// List<String> cityCodeList;
+// if (loginUser.getIsFranchisee()) {
+// cityCodeList = loginUser.getCityList();
+// } else {
+// cityCodeList = new ArrayList<>();
+// }
+ return R.ok(regionService.addressTree(null));
+ }
+
+ @GetMapping("/manageaddressTree")
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
+ public R<List<Region>> manageaddressTree() {
LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
@@ -50,7 +108,9 @@
} else {
cityCodeList = new ArrayList<>();
}
- return R.ok(regionService.addressTree(cityCodeList));
+ return R.ok(regionService.addressTree1(cityCodeList));
}
+
+
}
--
Gitblit v1.7.1