From 79fcd7a7c79c6929032c5c30111c6a8adde8fee1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 23 七月 2025 09:21:11 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java | 8 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/YcRevenueExpenditureTypeController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/TRegion.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRegionController.java | 6 +++
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 4 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 31 +++------------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRegionServiceImpl.java | 11 +++++
8 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRegionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRegionController.java
index c0469dc..865257c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRegionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRegionController.java
@@ -42,6 +42,12 @@
return R.ok(regionService.getRegion());
}
+ @ApiOperation(value = "查询省市管理二级")
+ @GetMapping(value = "/getProvinceAndCity")
+ public R<List<TRegion>> getProvinceAndCity() {
+ return R.ok(regionService.getProvinceAndCity());
+ }
+
@ApiOperation(value = "查询省")
@PostMapping(value = "/getProvince")
public R<List<TRegion>> getProvince() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/YcRevenueExpenditureTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/YcRevenueExpenditureTypeController.java
index ec4a126..7c945d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/YcRevenueExpenditureTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/YcRevenueExpenditureTypeController.java
@@ -116,7 +116,7 @@
@ApiOperation( value = "删除收支类型")
@Log(title = "收支类型-删除", businessType = BusinessType.DELETE)
@DeleteMapping(value = "/deleteById")
- public R<Boolean> deleteById(@RequestParam("id") Long id) {
+ public R<Boolean> deleteById(@RequestParam("id") Integer id) {
// 查询分类是否在财务管理里面存在
long count = ycFinancialManagementService.count(Wrappers.lambdaQuery(YcFinancialManagement.class)
.eq(YcFinancialManagement::getTypeId, id));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index d011a75..30169de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
@@ -149,10 +148,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:add')")
@ApiOperation(value = "新增用户管理",response = SysUser.class)
@Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
- @PostMapping("/api/system/user/add")
- public R<String> add(@RequestBody String param)
+ @PostMapping("/system/user/add")
+ public R<String> add(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -176,10 +174,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@ApiOperation(value = "修改用户管理")
@Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/edit")
- public R edit(@RequestBody String param)
+ @PostMapping("/system/user/edit")
+ public R edit(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
@@ -198,21 +195,6 @@
}
user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
return R.ok(userService.updateUser(user));
- }
-
- /**
- * 修改用户签名
- */
- // @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @ApiOperation(value = "修改用户签名")
- @Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/editSignPicture")
- public R editSignPicture(@RequestBody String param)
- {
- Long userId = tokenService.getLoginUser().getUserId();
- SysUser user = JSON.parseObject(param,SysUser.class);
- user.setUserId(userId);
- return R.ok(userService.editSignPicture(user));
}
/**
@@ -242,10 +224,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@ApiOperation(value = "重置密码")
@Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/resetPwd")
- public AjaxResult resetPwd(@RequestBody String param)
+ @PostMapping("/system/user/resetPwd")
+ public AjaxResult resetPwd(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 040116a..9cb9bfe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -113,9 +113,9 @@
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
- .title("标题：乐山实验室管理系统_接口文档")
+ .title("标题：易仓财务管理系统_接口文档")
// 描述
- .description("乐山实验室接口文档")
+ .description("易仓财务管理接口文档")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
// 版本
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index eccbdb4..4d14887 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -113,7 +113,7 @@
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
.antMatchers("/getPrivacyAgreement/{agreementType}",
"/applet/queryProtocolConfigByType","/applet/login",
- "/api/login","/applet/queryProtocolConfigByType",
+ "/login","/applet/queryProtocolConfigByType",
"/register","/applet/getCode","/applet/loginCode",
"/applet/changepwd", "/captchaImage","/getCode","/loginCode",
"/operations/getBySingleNum/**",
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TRegion.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TRegion.java
index 0e7435f..202fd39 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TRegion.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TRegion.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.List;
/**
* <p>
@@ -54,4 +55,6 @@
@TableField("initial")
private String initial;
+ @TableField(exist = false)
+ private List<TRegion> children;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java
index 337b545..c93083a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java
@@ -20,4 +20,12 @@
* @return
*/
List<List<TRegion>> getRegion();
+
+ /**
+ *查询省市管理
+ * @return
+ */
+ List<TRegion> getProvinceAndCity();
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRegionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRegionServiceImpl.java
index 3eccca0..21d4fe9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRegionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRegionServiceImpl.java
@@ -36,4 +36,15 @@
}
return result;
}
+
+ @Override
+ public List<TRegion> getProvinceAndCity() {
+ List<TRegion> tRegions = this.baseMapper.selectList(Wrappers.lambdaQuery(TRegion.class));
+ List<TRegion> parent = this.baseMapper.selectList(Wrappers.lambdaQuery(TRegion.class)
+ .eq(TRegion::getParentId, 0));
+ for (TRegion tRegion : parent) {
+ tRegion.setChildren(tRegions.stream().filter(e -> e.getParentId().equals(tRegion.getId())).collect(Collectors.toList()));
+ }
+ return parent;
+ }
}
--
Gitblit v1.7.1