Skip to content

P
property-management
Commit 4437c749 by zhangdaiscott
Options

JeecgBoot 2.4.2 积木报表版本发布（微服务启动报错）

parent 74ebac49
Showing with 16 additions and 16 deletions
jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
...@@ -140,7 +140,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -140,7 +140,7 @@ public interface ISysBaseAPI extends CommonAPI {
* 15根据业务类型 busType 及业务 busId 修改消息已读 * 15根据业务类型 busType 及业务 busId 修改消息已读
*/ */
@GetMapping("/sys/api/updateSysAnnounReadFlag") @GetMapping("/sys/api/updateSysAnnounReadFlag")
public void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId")String busId); public void updateSysAnnounReadFlag(@RequestParam("busType") String busType, @RequestParam("busId") String busId);
/** /**
* 16查询表字典 支持过滤数据 * 16查询表字典 支持过滤数据
...@@ -177,7 +177,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -177,7 +177,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryAllUser") @GetMapping("/sys/api/queryAllUser")
public JSONObject queryAllUser(@RequestParam(name="userIds",required=false)String userIds, @RequestParam(name="pageNo",required=false) Integer pageNo,@RequestParam(name="pageSize",required=false) int pageSize); public JSONObject queryAllUser(@RequestParam(name = "userIds", required = false) String userIds, @RequestParam(name = "pageNo", required = false) Integer pageNo, @RequestParam(name = "pageSize", required = false) int pageSize);
/** /**
...@@ -186,7 +186,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -186,7 +186,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryAllRole") @GetMapping("/sys/api/queryAllRole")
public List<ComboModel> queryAllRole(@RequestParam(name = "roleIds",required = false)String[] roleIds); public List<ComboModel> queryAllRole(@RequestParam(name = "roleIds", required = false) String[] roleIds);
/** /**
* 21通过用户账号查询角色Id集合 * 21通过用户账号查询角色Id集合
...@@ -194,7 +194,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -194,7 +194,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/getRoleIdsByUsername") @GetMapping("/sys/api/getRoleIdsByUsername")
public List<String> getRoleIdsByUsername(@RequestParam("username")String username); public List<String> getRoleIdsByUsername(@RequestParam("username") String username);
/** /**
* 22通过部门编号查询部门id * 22通过部门编号查询部门id
...@@ -202,7 +202,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -202,7 +202,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/getDepartIdsByOrgCode") @GetMapping("/sys/api/getDepartIdsByOrgCode")
public String getDepartIdsByOrgCode(@RequestParam("orgCode")String orgCode); public String getDepartIdsByOrgCode(@RequestParam("orgCode") String orgCode);
/** /**
* 23查询所有部门 * 23查询所有部门
...@@ -217,7 +217,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -217,7 +217,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/getParentDepartId") @GetMapping("/sys/api/getParentDepartId")
DictModel getParentDepartId(@RequestParam("departId")String departId); DictModel getParentDepartId(@RequestParam("departId") String departId);
/** /**
* 25根据部门Id获取部门负责人 * 25根据部门Id获取部门负责人
...@@ -233,7 +233,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -233,7 +233,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @param cmd * @param cmd
*/ */
@GetMapping("/sys/api/sendWebSocketMsg") @GetMapping("/sys/api/sendWebSocketMsg")
public void sendWebSocketMsg(@RequestParam("userIds")String[] userIds, @RequestParam("cmd") String cmd); public void sendWebSocketMsg(@RequestParam("userIds") String[] userIds, @RequestParam("cmd") String cmd);
/** /**
* 27根据id获取所有参与用户 * 27根据id获取所有参与用户
...@@ -250,7 +250,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -250,7 +250,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @param userId * @param userId
*/ */
@GetMapping("/sys/api/meetingSignWebsocket") @GetMapping("/sys/api/meetingSignWebsocket")
void meetingSignWebsocket(@RequestParam("userId")String userId); void meetingSignWebsocket(@RequestParam("userId") String userId);
/** /**
* 29根据name获取所有参与用户 * 29根据name获取所有参与用户
...@@ -258,7 +258,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -258,7 +258,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryUserByNames") @GetMapping("/sys/api/queryUserByNames")
List<LoginUser> queryUserByNames(@RequestParam("userNames")String[] userNames); List<LoginUser> queryUserByNames(@RequestParam("userNames") String[] userNames);
/** /**
...@@ -267,7 +267,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -267,7 +267,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/getUserRoleSet") @GetMapping("/sys/api/getUserRoleSet")
Set<String> getUserRoleSet(@RequestParam("username")String username); Set<String> getUserRoleSet(@RequestParam("username") String username);
/** /**
* 31获取用户的权限集合 * 31获取用户的权限集合
...@@ -308,7 +308,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -308,7 +308,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryUserRoles") @GetMapping("/sys/api/queryUserRoles")
Set<String> queryUserRoles(@RequestParam("username")String username); Set<String> queryUserRoles(@RequestParam("username") String username);
/** /**
* 36查询用户权限信息 * 36查询用户权限信息
...@@ -316,7 +316,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -316,7 +316,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryUserAuths") @GetMapping("/sys/api/queryUserAuths")
Set<String> queryUserAuths(@RequestParam("username")String username); Set<String> queryUserAuths(@RequestParam("username") String username);
/** /**
* 37根据 id 查询数据库中存储的 DynamicDataSourceModel * 37根据 id 查询数据库中存储的 DynamicDataSourceModel
...@@ -368,7 +368,7 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -368,7 +368,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @return * @return
*/ */
@GetMapping("/sys/api/queryPermissionDataRule") @GetMapping("/sys/api/queryPermissionDataRule")
List<SysPermissionDataRuleModel> queryPermissionDataRule(@RequestParam("component") String component, @RequestParam("requestPath")String requestPath, @RequestParam("username") String username); List<SysPermissionDataRuleModel> queryPermissionDataRule(@RequestParam("component") String component, @RequestParam("requestPath") String requestPath, @RequestParam("username") String username);
/** /**
* 43查询用户信息 * 43查询用户信息
...@@ -416,5 +416,5 @@ public interface ISysBaseAPI extends CommonAPI { ...@@ -416,5 +416,5 @@ public interface ISysBaseAPI extends CommonAPI {
* @param content * @param content
*/ */
@GetMapping("/sys/api/sendEmailMsg") @GetMapping("/sys/api/sendEmailMsg")
void sendEmailMsg(String email,String title,String content); void sendEmailMsg(@RequestParam("email") String email, @RequestParam("title") String title, @RequestParam("content") String content);
} }
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/SystemAPIController.java
package org.jeecg.modules.api.controller; package org.jeecg.modules.api.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.dto.message.*;
import org.jeecg.common.api.dto.OnlineAuthDTO; import org.jeecg.common.api.dto.OnlineAuthDTO;
import org.jeecg.common.api.dto.message.*;
import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.vo.*; import org.jeecg.common.system.vo.*;
import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.ISysUserService;
...@@ -518,7 +518,7 @@ public class SystemAPIController { ...@@ -518,7 +518,7 @@ public class SystemAPIController {
* @param content * @param content
*/ */
@GetMapping("/sendEmailMsg") @GetMapping("/sendEmailMsg")
public void sendEmailMsg(String email,String title,String content){ public void sendEmailMsg(@RequestParam("email")String email,@RequestParam("title")String title,@RequestParam("content")String content){
this.sysBaseAPI.sendEmailMsg(email,title,content); this.sysBaseAPI.sendEmailMsg(email,title,content);
}; };
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment