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

代码优化，删除UserAdjoint次要功能

Browse Source
This commit is contained in:
shimingxy
2024-04-20 11:48:15 +08:00
parent 8e1a09566a
commit 38c09792c0
16 changed files with 31 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java
View File

@@ -22,7 +22,6 @@ import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Localization;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.UserInfoAdjoint;
import org.dromara.maxkey.persistence.repository.LocalizationRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,15 +73,15 @@ public class LocalizationController {
if(StringUtils.isBlank(localization.getId())){
localization.setId(localization.generateId());
if(localizationRepository.insert(localization)) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
return new Message<Localization>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
return new Message<Localization>(Message.FAIL).buildResponse();
}
}else {
if(localizationRepository.update(localization)) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
return new Message<Localization>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
return new Message<Localization>(Message.FAIL).buildResponse();
}
}
}

152
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/UserAdjointController.java
View File

@@ -1,152 +0,0 @@
/*
* Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.maxkey.web.idm.contorller;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.UserInfoAdjoint;
import org.dromara.maxkey.persistence.service.UserInfoAdjointService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
@Controller
@RequestMapping(value={"/useradjoint"})
public class UserAdjointController {
final static Logger logger = LoggerFactory.getLogger(UserAdjointController.class);
@Autowired
UserInfoAdjointService userInfoAdjointService;
@RequestMapping(value={"/list/{userId}"})
public ModelAndView userinfoAdjointList(@PathVariable("userId") String userId){
ModelAndView modelAndView=new ModelAndView("/userinfo/userinfoAdjointList");
modelAndView.addObject("userId", userId);
return modelAndView;
}
@RequestMapping(value = { "/grid" })
@ResponseBody
public JpaPageResults<UserInfoAdjoint> queryDataGrid(
@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
@CurrentUser UserInfo currentUser){
logger.debug("userInfoAdjoint {}" , userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
return userInfoAdjointService.fetchPageResults(userInfoAdjoint);
}
@RequestMapping(value = { "/forwardAdd/{userId}" })
public ModelAndView forwardAdd(@PathVariable("userId") String userId) {
ModelAndView modelAndView=new ModelAndView("/userinfo/userinfoAdjointAdd");
modelAndView.addObject("userId", userId);
return modelAndView;
}
@RequestMapping(value = { "/forwardUpdate/{id}" })
public ModelAndView forwardUpdate(@PathVariable("id") String id) {
ModelAndView modelAndView=new ModelAndView("/userinfo/userinfoAdjointUpdate");
UserInfoAdjoint userInfoAdjoint=userInfoAdjointService.get(id);
modelAndView.addObject("model",userInfoAdjoint);
return modelAndView;
}
@ResponseBody
@RequestMapping(value={"/add"})
public ResponseEntity<?> insert(
@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
if (userInfoAdjointService.insert(userInfoAdjoint)) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
}
}
/**
* 查询
* @param group
* @return
*/
@ResponseBody
@RequestMapping(value={"/query"})
public ResponseEntity<?> query(
@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
@CurrentUser UserInfo currentUser) {
logger.debug("-query : {} " , userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
if (userInfoAdjointService.query(userInfoAdjoint)!=null) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
}
}
/**
* 修改
* @param group
* @return
*/
@ResponseBody
@RequestMapping(value={"/update"})
public ResponseEntity<?> update(
@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint,
@CurrentUser UserInfo currentUser) {
logger.debug("-update userInfoAdjoint : {}" , userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
if (userInfoAdjointService.update(userInfoAdjoint)) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
}
}
@ResponseBody
@RequestMapping(value={"/delete"})
public ResponseEntity<?> delete(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) {
logger.debug("-delete group : {}" , userInfoAdjoint);
if (userInfoAdjointService.deleteBatch(userInfoAdjoint.getId())) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfoAdjoint>(Message.FAIL).buildResponse();
}
}
}