LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步器增加属性映射管理

Browse Source
This commit is contained in:
llh
2024-09-24 18:38:15 +08:00
parent e3b9fdb201 a3dbbf674a
commit e5a2210d90
711 changed files with 17530 additions and 5086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java
View File

@@ -17,11 +17,9 @@
package org.dromara.maxkey.web.apis.identity.rest;
import java.io.IOException;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.Organizations;
import org.dromara.maxkey.entity.idm.Organizations;
import org.dromara.maxkey.persistence.service.OrganizationsService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
@@ -29,8 +27,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -39,13 +35,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.UriComponentsBuilder;
@Controller
@RestController
@RequestMapping(value={"/api/idm/Organization"})
public class RestOrganizationController {
static final Logger _logger = LoggerFactory.getLogger(RestOrganizationController.class);
@@ -53,20 +48,17 @@ public class RestOrganizationController {
@Autowired
OrganizationsService organizationsService;
@ResponseBody
@GetMapping(value = "/{id}")
public Organizations getUser(@PathVariable String id,
@RequestParam(required = false) String attributes) {
_logger.debug("Organizations id {} , attributes {}", id , attributes);
Organizations org = organizationsService.get(id);
return org;
return organizationsService.get(id);
}
@ResponseBody
@PostMapping
public Organizations create(@RequestBody Organizations org,
@RequestParam(required = false) String attributes,
UriComponentsBuilder builder) throws IOException {
UriComponentsBuilder builder) {
_logger.debug("Organizations content {} , attributes {}", org , attributes);
Organizations loadOrg = organizationsService.get(org.getId());
if(loadOrg == null) {
@@ -77,12 +69,10 @@ public class RestOrganizationController {
return org;
}
@ResponseBody
@PutMapping(value = "/{id}")
public Organizations replace(@PathVariable String id,
@RequestBody Organizations org,
@RequestParam(required = false) String attributes)
throws IOException {
@RequestParam(required = false) String attributes) {
_logger.debug("Organizations id {} , content {} , attributes {}", id , org , attributes);
Organizations loadOrg = organizationsService.get(id);
if(loadOrg == null) {
@@ -98,19 +88,17 @@ public class RestOrganizationController {
@ResponseStatus(HttpStatus.OK)
public void delete(@PathVariable final String id) {
_logger.debug("Organizations id {} ", id );
organizationsService.remove(id);
organizationsService.delete(id);
}
@GetMapping(value = { "/.search" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public ResponseEntity<?> search(@ModelAttribute Organizations org) {
public Message<JpaPageResults<Organizations>> search(@ModelAttribute Organizations org) {
if(StringUtils.isBlank(org.getInstId())){
org.setInstId("1");
}
_logger.debug("Organizations {}" , org);
return new Message<JpaPageResults<Organizations>>(
organizationsService.fetchPageResults(org)).buildResponse();
return new Message<>(organizationsService.fetchPageResults(org));
}

28
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java
View File

@@ -17,11 +17,9 @@
package org.dromara.maxkey.web.apis.identity.rest;
import java.io.IOException;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.idm.UserInfo;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
@@ -30,8 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -41,11 +37,11 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.util.UriComponentsBuilder;
@Controller
@RestController
@RequestMapping(value={"/api/idm/Users"})
public class RestUserInfoController {
@@ -53,10 +49,9 @@ public class RestUserInfoController {
@Autowired
@Qualifier("userInfoService")
private UserInfoService userInfoService;
UserInfoService userInfoService;
@GetMapping(value = "/{id}")
@ResponseBody
public UserInfo getUser(
@PathVariable String id,
@RequestParam(required = false) String attributes) {
@@ -67,10 +62,9 @@ public class RestUserInfoController {
}
@PostMapping
@ResponseBody
public UserInfo create(@RequestBody UserInfo userInfo,
@RequestParam(required = false) String attributes,
UriComponentsBuilder builder) throws IOException {
UriComponentsBuilder builder) {
_logger.debug("UserInfo content {} , attributes {}", userInfo , attributes);
UserInfo loadUserInfo = userInfoService.findByUsername(userInfo.getUsername());
if(loadUserInfo != null) {
@@ -82,11 +76,9 @@ public class RestUserInfoController {
}
@PutMapping(value = "/{id}")
@ResponseBody
public UserInfo replace(@PathVariable String id,
@RequestBody UserInfo userInfo,
@RequestParam(required = false) String attributes)
throws IOException {
@RequestParam(required = false) String attributes) {
_logger.debug("UserInfo content {} , attributes {}", userInfo , attributes);
UserInfo loadUserInfo = userInfoService.findByUsername(userInfo.getUsername());
if(loadUserInfo != null) {
@@ -101,18 +93,16 @@ public class RestUserInfoController {
@ResponseStatus(HttpStatus.OK)
public void delete(@PathVariable final String id) {
_logger.debug("UserInfo id {} ", id );
userInfoService.logicDelete(id);
userInfoService.delete(id);
}
@GetMapping(value = { "/.search" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public ResponseEntity<?> search(@ModelAttribute UserInfo userInfo) {
public Message<JpaPageResults<UserInfo>> search(@ModelAttribute UserInfo userInfo) {
_logger.debug("UserInfo {}",userInfo);
if(StringUtils.isBlank(userInfo.getInstId())){
userInfo.setInstId("1");
}
return new Message<JpaPageResults<UserInfo>>(
userInfoService.fetchPageResults(userInfo)).buildResponse();
return new Message<>(userInfoService.fetchPageResults(userInfo));
}
}

4
maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserPasswordController.java
View File

@@ -20,7 +20,7 @@ package org.dromara.maxkey.web.apis.identity.rest;
import java.io.IOException;
import org.dromara.maxkey.entity.ChangePassword;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.idm.UserInfo;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public class RestUserPasswordController {
@Autowired
@Qualifier("userInfoService")
private UserInfoService userInfoService;
UserInfoService userInfoService;
@PostMapping(value = "/changePassword")