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() { 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)); 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())); 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)) // 版本 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/**", 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; } ruoyi-system/src/main/java/com/ruoyi/system/service/TRegionService.java
@@ -20,4 +20,12 @@ * @return */ List<List<TRegion>> getRegion(); /** *查询省市管理 * @return */ List<TRegion> getProvinceAndCity(); } 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; } }
