diff --git a/adc-da-main/target/classes/application-dev.properties b/adc-da-main/target/classes/application-dev.properties index 432f58a..7898e80 100644 --- a/adc-da-main/target/classes/application-dev.properties +++ b/adc-da-main/target/classes/application-dev.properties @@ -61,12 +61,13 @@ swaggerLevel=0 # #picPath=/EPR/file/home/pic/ +# 本地存储文件的磁盘地址 uploadFile=D:\\work\\idea\\changan\\ - +# 本地文件访问的url地址 picPath=/api/home/pic/ -serverIp=http://192.2.10.32:8020/ +serverIp=http://127.0.0.1:7060/ #MAIL_SMTP =smtp.163.com diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailController.java index 36550d1..dae01e0 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailController.java @@ -1,193 +1,193 @@ -package com.adc.da.sys.controller; - - -import com.adc.da.sys.dao.mysql.MailEODao; -import com.adc.da.sys.entity.MailEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.service.iservice.IUserEoService; -import com.adc.da.sys.util.DefaultConfigurer; -import com.adc.da.sys.util.EncryptUtil; -import com.adc.da.sys.util.MailTestUtils; -import com.adc.da.sys.util.SendEmailMessage; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; - - -/** - * @Author sima - * @Date 2022/6/24 13:06 - */ -@RestController -@RequestMapping("/${restPath}/sys/mail") -@Api(tags = {"Sys-发送邮件"}) -@Slf4j -public class MailController { - - @Resource - private MailEODao mailEODao; - @Resource - private IUserEoService userEOService; - - - @Value("${MAIL_SMTP}") - private String mail_smtp; - - @Value("${MAIL_SMTP_PORT}") - private String mail_smtp_port; - - @Value("${MAIL_USERNAME}") - private String mail_username; - - @Value("${MAIL_PASSWORD}") - private String mail_password; - @Value("${MAIL_POP_PORT}") - private String mail_pop_port; - - - @Value("${IPANDPORT}") - private String piAndPort; - - - /** - * 废弃 - * @param mailEO - * @return - */ - /* @ApiOperation("发送邮件") - @PostMapping("/send") - public ResponseMessage send(@RequestBody MailEO mailEO) { - MailUtils sendmail = new MailUtils(); - sendmail.setHost(mail_smtp); - sendmail.setPort(mail_smtp_port); - sendmail.setUserName(mail_username); // 发送邮箱 - sendmail.setPassWord(mail_password); // 发送邮箱密码 - sendmail.setFrom(mail_username);// 发送邮箱 - sendmail.setSubject(mailEO.getSubject()); - sendmail.setContent(mailEO.getContent()); - - String mails = mailEO.getToMail(); - Set set = strToList(mails); - - int i = 0; - for (String mail : set) { - sendmail.setTo(mail); // 目的邮箱 - - if (sendmail.sendMail()) { - mailEO.setSendDate(new Date()); - mailEO.setId(UUID.randomUUID().toString()); - mailEO.setToMail(mail); - mailEODao.insert(mailEO); - i++; - //保存记录 -// return Result.success("成功"); - } - } - if(i>0){ - return Result.success("成功"); - } - return Result.error("发送失败"); - - }*/ - - - - @ApiOperation("发送邮件") - @PostMapping("/send") - public ResponseMessage send(@RequestBody MailEO mailEO) throws Exception { - - MailTestUtils eu = new MailTestUtils(mail_username, mail_password); - SendEmailMessage sem = new SendEmailMessage(); - sem.setFrom(mail_username); - sem.setRecipient(mailEO.getToMail()); - sem.setCopyRecipient(mailEO.getCcMail()); - sem.setSubject(mailEO.getSubject()); - sem.setContent(mailEO.getContent()); - - DefaultConfigurer defaultConfigurer = new DefaultConfigurer(); - defaultConfigurer.setMail_smtp(mail_smtp); - defaultConfigurer.setMail_smtp_port(mail_smtp_port); - defaultConfigurer.setMail_pop_port(mail_pop_port); - try{ - eu.sendMail(defaultConfigurer.getSMTP(), sem); - mailEO.setSendDate(new Date()); - mailEO.setId(UUID.randomUUID().toString().replaceAll("-","")); - mailEO.setToMail(getUserByMail(mailEO.getToMail())); - mailEO.setCcMail(getUserByMail(mailEO.getCcMail())); - mailEODao.insert(mailEO); - System.out.println("发送成功"); - return Result.success("发送成功"); - }catch (Exception e){ - e.printStackTrace(); - log.error("邮件发送失败：",e); - return Result.error("发送失败"); - } - - -// 收邮件 -// eu.receiveMail(defaultConfigurer.getPOP3(), "pop3"); // pop3收信 -// System.out.println("收取完毕"); - -// 使用IMAP收信会抛出 Failed to load IMAP envelope 异常 -//eu.receiveMail(DefaultConfigurer.getIMAP(), "imap"); // imap收信 - - } - - private String getUserByMail(String mails) { - if(null == mails || "".equals(mails)){ - return ""; - } - List mailList = Arrays.asList(mails.split(",")); - List accountList = new ArrayList<>(); - for (int i = 0; i < mailList.size(); i++) { - String mail = mailList.get(i); - String account = mail.substring(0, mail.indexOf("@")); - accountList.add(account); - } -// List userEOList = userEOService.getUserByMail(mailList); - List userEOList = userEOService.getUserByAccount(accountList); - StringBuilder sb = new StringBuilder(); - for (UserEO user:userEOList) { - sb.append(","); - sb.append(user.getUsname()); - sb.append("-"); - sb.append(user.getDepartment()); - sb.append("<"); - sb.append(user.getAccount()); - sb.append("@Any3.com"); - sb.append(">"); - } - return sb.toString().substring(1); - } - - @ApiOperation("发送记录") - @PostMapping("/list") - public ResponseMessage list(Integer pageNo, Integer pageSize) { - pageNo = null == pageNo ? 1 : pageNo; - pageSize = null == pageSize ? 10 : pageSize; - IPage page = new Page(); - page.setCurrent(pageNo); - page.setSize(pageSize); - IPage list = mailEODao.list(page); - List records = list.getRecords(); - DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - for (MailEO eo:records) { - eo.setStrSendDate(sdf.format(eo.getSendDate())); - } - return Result.success(list); - } - - - -} +//package com.adc.da.sys.controller; +// +// +//import com.adc.da.sys.dao.mysql.MailEODao; +//import com.adc.da.sys.entity.MailEO; +//import com.adc.da.sys.entity.UserEO; +//import com.adc.da.sys.service.iservice.IUserEoService; +//import com.adc.da.sys.util.DefaultConfigurer; +//import com.adc.da.sys.util.EncryptUtil; +//import com.adc.da.sys.util.MailTestUtils; +//import com.adc.da.sys.util.SendEmailMessage; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import javax.annotation.Resource; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.web.bind.annotation.*; +// +//import java.text.DateFormat; +//import java.text.SimpleDateFormat; +//import java.util.*; +// +// +///** +// * @Author sima +// * @Date 2022/6/24 13:06 +// */ +//@RestController +//@RequestMapping("/${restPath}/sys/mail") +//@Api(tags = {"Sys-发送邮件"}) +//@Slf4j +//public class MailController { +// +// @Resource +// private MailEODao mailEODao; +// @Resource +// private IUserEoService userEOService; +// +// +// @Value("${MAIL_SMTP}") +// private String mail_smtp; +// +// @Value("${MAIL_SMTP_PORT}") +// private String mail_smtp_port; +// +// @Value("${MAIL_USERNAME}") +// private String mail_username; +// +// @Value("${MAIL_PASSWORD}") +// private String mail_password; +// @Value("${MAIL_POP_PORT}") +// private String mail_pop_port; +// +// +// @Value("${IPANDPORT}") +// private String piAndPort; +// +// +// /** +// * 废弃 +// * @param mailEO +// * @return +// */ +// /* @ApiOperation("发送邮件") +// @PostMapping("/send") +// public ResponseMessage send(@RequestBody MailEO mailEO) { +// MailUtils sendmail = new MailUtils(); +// sendmail.setHost(mail_smtp); +// sendmail.setPort(mail_smtp_port); +// sendmail.setUserName(mail_username); // 发送邮箱 +// sendmail.setPassWord(mail_password); // 发送邮箱密码 +// sendmail.setFrom(mail_username);// 发送邮箱 +// sendmail.setSubject(mailEO.getSubject()); +// sendmail.setContent(mailEO.getContent()); +// +// String mails = mailEO.getToMail(); +// Set set = strToList(mails); +// +// int i = 0; +// for (String mail : set) { +// sendmail.setTo(mail); // 目的邮箱 +// +// if (sendmail.sendMail()) { +// mailEO.setSendDate(new Date()); +// mailEO.setId(UUID.randomUUID().toString()); +// mailEO.setToMail(mail); +// mailEODao.insert(mailEO); +// i++; +// //保存记录 +//// return Result.success("成功"); +// } +// } +// if(i>0){ +// return Result.success("成功"); +// } +// return Result.error("发送失败"); +// +// }*/ +// +// +// +// @ApiOperation("发送邮件") +// @PostMapping("/send") +// public ResponseMessage send(@RequestBody MailEO mailEO) throws Exception { +// +// MailTestUtils eu = new MailTestUtils(mail_username, mail_password); +// SendEmailMessage sem = new SendEmailMessage(); +// sem.setFrom(mail_username); +// sem.setRecipient(mailEO.getToMail()); +// sem.setCopyRecipient(mailEO.getCcMail()); +// sem.setSubject(mailEO.getSubject()); +// sem.setContent(mailEO.getContent()); +// +// DefaultConfigurer defaultConfigurer = new DefaultConfigurer(); +// defaultConfigurer.setMail_smtp(mail_smtp); +// defaultConfigurer.setMail_smtp_port(mail_smtp_port); +// defaultConfigurer.setMail_pop_port(mail_pop_port); +// try{ +// eu.sendMail(defaultConfigurer.getSMTP(), sem); +// mailEO.setSendDate(new Date()); +// mailEO.setId(UUID.randomUUID().toString().replaceAll("-","")); +// mailEO.setToMail(getUserByMail(mailEO.getToMail())); +// mailEO.setCcMail(getUserByMail(mailEO.getCcMail())); +// mailEODao.insert(mailEO); +// System.out.println("发送成功"); +// return Result.success("发送成功"); +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("邮件发送失败：",e); +// return Result.error("发送失败"); +// } +// +// +//// 收邮件 +//// eu.receiveMail(defaultConfigurer.getPOP3(), "pop3"); // pop3收信 +//// System.out.println("收取完毕"); +// +//// 使用IMAP收信会抛出 Failed to load IMAP envelope 异常 +////eu.receiveMail(DefaultConfigurer.getIMAP(), "imap"); // imap收信 +// +// } +// +// private String getUserByMail(String mails) { +// if(null == mails || "".equals(mails)){ +// return ""; +// } +// List mailList = Arrays.asList(mails.split(",")); +// List accountList = new ArrayList<>(); +// for (int i = 0; i < mailList.size(); i++) { +// String mail = mailList.get(i); +// String account = mail.substring(0, mail.indexOf("@")); +// accountList.add(account); +// } +//// List userEOList = userEOService.getUserByMail(mailList); +// List userEOList = userEOService.getUserByAccount(accountList); +// StringBuilder sb = new StringBuilder(); +// for (UserEO user:userEOList) { +// sb.append(","); +// sb.append(user.getUsname()); +// sb.append("-"); +// sb.append(user.getDepartment()); +// sb.append("<"); +// sb.append(user.getAccount()); +// sb.append("@Any3.com"); +// sb.append(">"); +// } +// return sb.toString().substring(1); +// } +// +// @ApiOperation("发送记录") +// @PostMapping("/list") +// public ResponseMessage list(Integer pageNo, Integer pageSize) { +// pageNo = null == pageNo ? 1 : pageNo; +// pageSize = null == pageSize ? 10 : pageSize; +// IPage page = new Page(); +// page.setCurrent(pageNo); +// page.setSize(pageSize); +// IPage list = mailEODao.list(page); +// List records = list.getRecords(); +// DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); +// for (MailEO eo:records) { +// eo.setStrSendDate(sdf.format(eo.getSendDate())); +// } +// return Result.success(list); +// } +// +// +// +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailTestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailTestController.java index c00d623..557a8b6 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailTestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MailTestController.java @@ -1,82 +1,82 @@ -package com.adc.da.sys.controller; - -import com.adc.da.sys.dao.mysql.MailEODao; -import com.adc.da.sys.entity.MailEO; -import com.adc.da.sys.util.DefaultConfigurer; -import com.adc.da.sys.util.MailTestUtils; -import com.adc.da.sys.util.MailUtils; -import com.adc.da.sys.util.SendEmailMessage; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; - - -/** - * @Author sima - * @Date 2022/6/24 13:06 - */ -@RestController -@RequestMapping("/${restPath}/sys/mailtest") -@Api(tags = {"Sys-发送邮件test"}) -@Slf4j -public class MailTestController { - - @Value("${MAIL_USERNAME}") - private String mail_username; - - @Value("${MAIL_PASSWORD}") - private String mail_password; - - @Value("${MAIL_SMTP}") - private String mail_smtp; - - @Value("${MAIL_SMTP_PORT}") - private String mail_smtp_port; - - @Value("${MAIL_POP_PORT}") - private String mail_pop_port; - - /** - * 程序入口点 - * @param - * @throws Exception - */ - @ApiOperation("发送邮件") - @PostMapping("/send") - public ResponseMessage send(@RequestBody MailEO mailEO) throws Exception { - - MailTestUtils eu = new MailTestUtils(mail_username, mail_password); - SendEmailMessage sem = new SendEmailMessage(); - sem.setFrom(mail_username); - sem.setRecipient(mailEO.getToMail()); - sem.setSubject("镇长"); - sem.setText("hello world"); - DefaultConfigurer defaultConfigurer = new DefaultConfigurer(); - defaultConfigurer.setMail_smtp(mail_smtp); - defaultConfigurer.setMail_smtp_port(mail_smtp_port); - defaultConfigurer.setMail_pop_port(mail_pop_port); - eu.sendMail(defaultConfigurer.getSMTP(), sem); - System.out.println("发送成功"); -// 收邮件 -// eu.receiveMail(defaultConfigurer.getPOP3(), "pop3"); // pop3收信 -// System.out.println("收取完毕"); - -// 使用IMAP收信会抛出 Failed to load IMAP envelope 异常 -//eu.receiveMail(DefaultConfigurer.getIMAP(), "imap"); // imap收信 - return Result.success(); - } -} +//package com.adc.da.sys.controller; +// +//import com.adc.da.sys.dao.mysql.MailEODao; +//import com.adc.da.sys.entity.MailEO; +//import com.adc.da.sys.util.DefaultConfigurer; +//import com.adc.da.sys.util.MailTestUtils; +//import com.adc.da.sys.util.MailUtils; +//import com.adc.da.sys.util.SendEmailMessage; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import javax.annotation.Resource; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.text.DateFormat; +//import java.text.SimpleDateFormat; +//import java.util.*; +// +// +///** +// * @Author sima +// * @Date 2022/6/24 13:06 +// */ +//@RestController +//@RequestMapping("/${restPath}/sys/mailtest") +//@Api(tags = {"Sys-发送邮件test"}) +//@Slf4j +//public class MailTestController { +// +// @Value("${MAIL_USERNAME}") +// private String mail_username; +// +// @Value("${MAIL_PASSWORD}") +// private String mail_password; +// +// @Value("${MAIL_SMTP}") +// private String mail_smtp; +// +// @Value("${MAIL_SMTP_PORT}") +// private String mail_smtp_port; +// +// @Value("${MAIL_POP_PORT}") +// private String mail_pop_port; +// +// /** +// * 程序入口点 +// * @param +// * @throws Exception +// */ +// @ApiOperation("发送邮件") +// @PostMapping("/send") +// public ResponseMessage send(@RequestBody MailEO mailEO) throws Exception { +// +// MailTestUtils eu = new MailTestUtils(mail_username, mail_password); +// SendEmailMessage sem = new SendEmailMessage(); +// sem.setFrom(mail_username); +// sem.setRecipient(mailEO.getToMail()); +// sem.setSubject("镇长"); +// sem.setText("hello world"); +// DefaultConfigurer defaultConfigurer = new DefaultConfigurer(); +// defaultConfigurer.setMail_smtp(mail_smtp); +// defaultConfigurer.setMail_smtp_port(mail_smtp_port); +// defaultConfigurer.setMail_pop_port(mail_pop_port); +// eu.sendMail(defaultConfigurer.getSMTP(), sem); +// System.out.println("发送成功"); +//// 收邮件 +//// eu.receiveMail(defaultConfigurer.getPOP3(), "pop3"); // pop3收信 +//// System.out.println("收取完毕"); +// +//// 使用IMAP收信会抛出 Failed to load IMAP envelope 异常 +////eu.receiveMail(DefaultConfigurer.getIMAP(), "imap"); // imap收信 +// return Result.success(); +// } +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java index 32c0cc1..d77da68 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java @@ -249,19 +249,19 @@ public class RoleEOController extends BaseController { return Result.success(roleVO); } - @ApiOperation(value = "配置角色首页|RoleEO|") - @PostMapping("/saveRoleHome") - public ResponseMessage saveRoleHome(@RequestBody RoleVO roleVO) { - roleEOService.saveRoleHome(beanMapper.map(roleVO, RoleEO.class)); - return Result.success(); - } - - @ApiOperation(value = "得到角色首页|RoleEO|") - @GetMapping("/getRoleHome") - public ResponseMessage getRoleHome(String roleId) throws Exception { - List homeList = roleEOService.getHomeMenu(roleId); - return Result.success(homeList); - } +// @ApiOperation(value = "配置角色首页|RoleEO|") +// @PostMapping("/saveRoleHome") +// public ResponseMessage saveRoleHome(@RequestBody RoleVO roleVO) { +// roleEOService.saveRoleHome(beanMapper.map(roleVO, RoleEO.class)); +// return Result.success(); +// } +// +// @ApiOperation(value = "得到角色权限|RoleEO|") +// @GetMapping("/getRoleMenu") +// public ResponseMessage getRoleMenu(String roleId) throws Exception { +// List homeList = roleEOService.getRoleMenu(roleId); +// return Result.success(homeList); +// } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 7de7015..b87de1b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -66,18 +66,18 @@ public class UserEOController extends BaseController { // * // * @see dozer // */ - - @Value("${MAIL_SMTP}") - private String mail_smtp; - - @Value("${MAIL_SMTP_PORT}") - private String mail_smtp_port; - - @Value("${MAIL_USERNAME}") - private String mail_username; - - @Value("${MAIL_PASSWORD}") - private String mail_password; +// +// @Value("${MAIL_SMTP}") +// private String mail_smtp; +// +// @Value("${MAIL_SMTP_PORT}") +// private String mail_smtp_port; +// +// @Value("${MAIL_USERNAME}") +// private String mail_username; +// +// @Value("${MAIL_PASSWORD}") +// private String mail_password; @Value("${isPassEncrypted}") private boolean isPassEncrypted; @@ -98,7 +98,7 @@ public class UserEOController extends BaseController { UserEO eo = gson.fromJson(element, UserEO.class); // UserEO eo=new UserEO(); // BeanUtils.copyProperties(vo,eo); - eo.setPassword("EI$XIL@vdc9ptev7"); + eo.setPassword("HZWLsoft.com123"); if (StringUtils.isBlank(eo.getAccount())) { return Result.error("用户名不能为空！"); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmMenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmMenuEOController.java index ced392c..8f7dc33 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmMenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmMenuEOController.java @@ -1,70 +1,70 @@ -package com.adc.da.sys.controller.ddm; - -import com.adc.da.base.page.BasePage; -import com.adc.da.base.web.BaseController; -import com.adc.da.sys.entity.MenuEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.service.MenuEOService; -import com.adc.da.sys.service.iservice.IUserEoService; -import com.adc.da.sys.util.EncryptUtil; -import com.adc.da.sys.vo.ddm.DdmMenuListVO; -import com.adc.da.sys.vo.ddm.DdmMenuVO; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/${portalPath}") -@Api(tags = {"ddm-菜单类接口"}) -public class DdmMenuEOController extends BaseController { +//package com.adc.da.sys.controller.ddm; // - @Resource - private MenuEOService menuEOService; - - /** - * 日志 - */ - private static final Logger logger = LoggerFactory.getLogger(DdmMenuEOController.class); - - @ApiOperation("查询菜单") - @PostMapping("/model/list.do") - public DdmResponseMessage list( ){ - try { - - List menuEOS = menuEOService.findAll(); - List ddmMenuListVOList = new ArrayList<>(); - menuEOS.forEach(menuEO -> { - DdmMenuListVO ddmMenuListVO = new DdmMenuListVO(); - ddmMenuListVO.setModelId(menuEO.getId()); - ddmMenuListVO.setModelName(menuEO.getName()); - ddmMenuListVO.setParentModelCode(menuEO.getParentId()); - ddmMenuListVOList.add(ddmMenuListVO); - }); - HashMap dataMap =new HashMap<>(); - dataMap.put("modelList",ddmMenuListVOList); - return DdmResult.success(dataMap) ; - - } catch (Exception e) { - logger.error("查询菜单", e); - return DdmResult.error("查询菜单:" + e.getMessage()); - } - } - - -} +//import com.adc.da.base.page.BasePage; +//import com.adc.da.base.web.BaseController; +//import com.adc.da.sys.entity.MenuEO; +//import com.adc.da.sys.entity.UserEO; +//import com.adc.da.sys.service.MenuEOService; +//import com.adc.da.sys.service.iservice.IUserEoService; +//import com.adc.da.sys.util.EncryptUtil; +//import com.adc.da.sys.vo.ddm.DdmMenuListVO; +//import com.adc.da.sys.vo.ddm.DdmMenuVO; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.adc.da.util.utils.StringUtils; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import javax.annotation.Resource; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//@RestController +//@RequestMapping("/${portalPath}") +//@Api(tags = {"ddm-菜单类接口"}) +//public class DdmMenuEOController extends BaseController { +//// +// @Resource +// private MenuEOService menuEOService; +// +// /** +// * 日志 +// */ +// private static final Logger logger = LoggerFactory.getLogger(DdmMenuEOController.class); +// +// @ApiOperation("查询菜单") +// @PostMapping("/model/list.do") +// public DdmResponseMessage list( ){ +// try { +// +// List menuEOS = menuEOService.findAll(); +// List ddmMenuListVOList = new ArrayList<>(); +// menuEOS.forEach(menuEO -> { +// DdmMenuListVO ddmMenuListVO = new DdmMenuListVO(); +// ddmMenuListVO.setModelId(menuEO.getId()); +// ddmMenuListVO.setModelName(menuEO.getName()); +// ddmMenuListVO.setParentModelCode(menuEO.getParentId()); +// ddmMenuListVOList.add(ddmMenuListVO); +// }); +// HashMap dataMap =new HashMap<>(); +// dataMap.put("modelList",ddmMenuListVOList); +// return DdmResult.success(dataMap) ; +// +// } catch (Exception e) { +// logger.error("查询菜单", e); +// return DdmResult.error("查询菜单:" + e.getMessage()); +// } +// } +// +// +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResponseMessage.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResponseMessage.java index 92b0148..e41642d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResponseMessage.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResponseMessage.java @@ -1,47 +1,47 @@ -package com.adc.da.sys.controller.ddm; - - -public class DdmResponseMessage { - private String resCode; - private String resMsg; - private T data; - - public DdmResponseMessage() { - } - - public DdmResponseMessage(String respCode, String message,T data) { - this.resCode = respCode; - this.resMsg = message; - this.data=data; - } - - public DdmResponseMessage(String respCode, String message) { - this.resCode = respCode; - this.resMsg = message; - } - - public String getResCode() { - return resCode; - } - - public void setResCode(String resCode) { - this.resCode = resCode; - } - - public String getResMsg() { - return resMsg; - } - - public void setResMsg(String resMsg) { - this.resMsg = resMsg; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } -} - +//package com.adc.da.sys.controller.ddm; +// +// +//public class DdmResponseMessage { +// private String resCode; +// private String resMsg; +// private T data; +// +// public DdmResponseMessage() { +// } +// +// public DdmResponseMessage(String respCode, String message,T data) { +// this.resCode = respCode; +// this.resMsg = message; +// this.data=data; +// } +// +// public DdmResponseMessage(String respCode, String message) { +// this.resCode = respCode; +// this.resMsg = message; +// } +// +// public String getResCode() { +// return resCode; +// } +// +// public void setResCode(String resCode) { +// this.resCode = resCode; +// } +// +// public String getResMsg() { +// return resMsg; +// } +// +// public void setResMsg(String resMsg) { +// this.resMsg = resMsg; +// } +// +// public T getData() { +// return data; +// } +// +// public void setData(T data) { +// this.data = data; +// } +//} +// diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResult.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResult.java index 809236d..8b01e14 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResult.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmResult.java @@ -1,36 +1,36 @@ -package com.adc.da.sys.controller.ddm; - -public class DdmResult { - public DdmResult() { - } - - - public static DdmResponseMessage success(String code, T t) { - return new DdmResponseMessage(code, "success", t); - } - - public static DdmResponseMessage success( T t) { - return success("0","success", t); - } - - public static DdmResponseMessage success() { - return success("0","success"); - } - - public static DdmResponseMessage success(String code, String message) { - return new DdmResponseMessage(code, message); - } - - public static DdmResponseMessage success(String code, String message, T t) { - return new DdmResponseMessage(code, message, t); - } - - - public static DdmResponseMessage error(String message) { - return new DdmResponseMessage("1", message); - } - - - - -} +//package com.adc.da.sys.controller.ddm; +// +//public class DdmResult { +// public DdmResult() { +// } +// +// +// public static DdmResponseMessage success(String code, T t) { +// return new DdmResponseMessage(code, "success", t); +// } +// +// public static DdmResponseMessage success( T t) { +// return success("0","success", t); +// } +// +// public static DdmResponseMessage success() { +// return success("0","success"); +// } +// +// public static DdmResponseMessage success(String code, String message) { +// return new DdmResponseMessage(code, message); +// } +// +// public static DdmResponseMessage success(String code, String message, T t) { +// return new DdmResponseMessage(code, message, t); +// } +// +// +// public static DdmResponseMessage error(String message) { +// return new DdmResponseMessage("1", message); +// } +// +// +// +// +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmRoleEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmRoleEOController.java index 7234a1b..3b3ab87 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmRoleEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmRoleEOController.java @@ -1,327 +1,327 @@ -package com.adc.da.sys.controller.ddm; - -import com.adc.da.base.page.Pager; -import com.adc.da.base.web.BaseController; -import com.adc.da.sys.constant.IsBelongEnum; -import com.adc.da.sys.dao.mysql.RoleEODao; -import com.adc.da.sys.dao.mysql.UserEODao; -import com.adc.da.sys.entity.RoleEO; -import com.adc.da.sys.entity.RoleMenuEO; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.entity.UserRoleEO; -import com.adc.da.sys.page.RoleEOPage; -import com.adc.da.sys.page.RoleMenuEOPage; -import com.adc.da.sys.service.MenuEOService; -import com.adc.da.sys.service.RoleEOService; -import com.adc.da.sys.util.EncryptUtil; -import com.adc.da.sys.vo.MenuVO; -import com.adc.da.sys.vo.RoleVO; -import com.adc.da.sys.vo.UserRoleVO; -import com.adc.da.sys.vo.ddm.*; -import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.http.PageInfo; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.adc.da.util.utils.BeanMapper; -import com.adc.da.util.utils.CollectionUtils; -import com.adc.da.util.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.shiro.crypto.hash.Hash; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -/** - * 角色管理模块相关接口. - * 1.分页查询 - * 2.角色详情 - * 3.角色列表 - * 4.新增角色 - * 5.修改角色 - * 6.删除角色 - * 7.配置角色菜单 - * date 2018/08/15 - * - * @author comments created by Lee Kwanho - * @see RoleEOService - * @see RoleEO - * @see RoleVO - * @see RoleEOPage - * @see RoleEODao - * @see mybatis.mapper.sys - */ -@RestController -@RequestMapping("/${portalPath}") -@Api(tags = {"ddm-角色类接口"}) -public class DdmRoleEOController extends BaseController { - - /** - * 日志 - */ - private static final Logger logger = LoggerFactory.getLogger(DdmRoleEOController.class); - - /** - * 角色相关Service - */ - @Resource - private RoleEOService roleEOService; - - @Resource - private RoleEODao roleEODao; - - @Resource - private UserEODao userEODao; - - - /** - * dozer相关，EO间VO转换 - */ - @Resource - private BeanMapper beanMapper; - - - @ApiOperation(value = "|查询角色") - @GetMapping("/role/list.do") -// @RequiresPermissions("sys:role:list") - public DdmResponseMessage>> list() { - List roleEOList = roleEOService.findAll(); - List ddmRoleVOList = new ArrayList<>(); - for (RoleEO roleEO : roleEOList) { - DdmRoleVO ddmRoleVO = new DdmRoleVO(roleEO); - ddmRoleVOList.add(ddmRoleVO); - } - HashMap> dataMap = new HashMap<>(); - dataMap.put("roles",ddmRoleVOList); - return DdmResult.success(dataMap); - } - - - @ApiOperation(value = "|角色创建") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE, value = "/role/save.do") -// @RequiresPermissions("sys:role:save") - public DdmResponseMessage create(@RequestBody DdmRoleCreateVO ddmRoleCreateVO) { - if (null == ddmRoleCreateVO || StringUtils.isEmpty(ddmRoleCreateVO.getRoleName())) { - return DdmResult.error("角色名称不能为空"); - } - try { - RoleEO roleEO = new RoleEO(); - roleEO.setName(ddmRoleCreateVO.getRoleName()); - roleEO.setRemarks(ddmRoleCreateVO.getRoleDesc()); - roleEO = roleEOService.save(roleEO); - } catch (Exception e) { - logger.error("角色创建失败:", e); - return DdmResult.error("角色创建失败:"+e.getMessage()); - } - return DdmResult.success(); - } - - @ApiOperation(value = "角色修改") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE, value = "/role/update.do") -// @RequiresPermissions("sys:role:update") - public DdmResponseMessage update(@RequestBody DdmRoleVO ddmRoleVO) { - if (null == ddmRoleVO || StringUtils.isEmpty(ddmRoleVO.getRoleName()) || StringUtils.isEmpty(ddmRoleVO.getRoleId())) { - return DdmResult.error("角色ID和角色名称不能为空"); - } - try { - RoleEO roleEO = new RoleEO(); - roleEO.setId(ddmRoleVO.getRoleId()); - roleEO.setRemarks(ddmRoleVO.getRoleDesc()); - roleEO.setName(ddmRoleVO.getRoleName()); - roleEOService.updateByPrimaryKeySelective(roleEO); - return DdmResult.success(); - } catch (Exception e) { - logger.error("角色修改失败:", e); - return DdmResult.error("角色修改失败:"+e.getMessage()); - } - - } - - /** - * 删除角色，逻辑删除，若角色有对应用户则不能删除 - */ - //todo - @ApiOperation(value = "|角色删除") - @PostMapping("/role/delete.do") -// @RequiresPermissions("sys:role:delete") - public DdmResponseMessage delete(@RequestBody HashMap query) { - - if (CollectionUtils.isEmpty(query) || StringUtils.isEmpty(query.get("roleCode"))) { - return DdmResult.error("角色ID不能为空"); - } - String roleId = query.get("roleCode"); - try { - RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId); - if ("管理员".equals(roleEO.getName())) { - return DdmResult.error("管理员角色不能删除"); - } - List list = roleEOService.getUserRoleListByRoleId(roleId); - // 如果角色有对应用户，则不允许删除 - if (CollectionUtils.isNotEmpty(list)) { - return DdmResult.error("该角色有对应用户，不能删除"); - } - roleEOService.delete(roleId); - } catch (Exception e) { - logger.error("删除角色失败:", e); - return DdmResult.error("删除角色失败:"+e.getMessage()); - } - return DdmResult.success(); - } - - @ApiOperation(value = "查询角色用户") - @PostMapping("/role/queryRoleUser.do") - public DdmResponseMessage getRoleUsers(@RequestBody DdmRoleUserQuery query) { - List list; - if (null == query.getPageSize()) { - query.setPageSize(10000); - } - try { - PageInfo userInfoPage = roleEOService.getUserInfoPageByRoleId(query); - List ddmUserVOList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(userInfoPage.getList())) { - userInfoPage.getList().forEach(userRoleVO -> { - DdmUserVO ddmUserVO = new DdmUserVO(); - ddmUserVO.setUserId(userRoleVO.getUserId()); - ddmUserVO.setUserAccount(userRoleVO.getAccount()); - ddmUserVO.setUserName(userRoleVO.getUsname()); - ddmUserVOList.add(ddmUserVO); - }); - } - HashMap resultMap = new HashMap<>(); - resultMap.put("recordCount", userInfoPage.getCount()); - resultMap.put("recordPages", userInfoPage.getPageCount()); - resultMap.put("userList", ddmUserVOList); - return DdmResult.success(resultMap); - - } catch (Exception e) { - logger.error("查询角色用户失败", e); - return DdmResult.error("查询角色用户失败:" + e.getMessage()); - } - } - - @ApiOperation(value = "角色添加用户") - @PostMapping("/role/roleAddUser.do") - public DdmResponseMessage saveRoleUsers(@RequestBody DdmUserRoleAdd ddmUserRoleAdd) { - if (null==ddmUserRoleAdd){ - return DdmResult.error("角色添加用户失败:" + "参数不能为空"); - } - List userRoles = ddmUserRoleAdd.getUserRoles(); - try { - userRoles.forEach(ddmUserRoleVO -> { - //传参由用户id变成了用户账号，根绝用户id 找出account - UserEO ddmUser = userEODao.getDdmUserEOByAccountNotDeleted(ddmUserRoleVO.getUserId()); - if (null==ddmUser){ - throw new AdcDaBaseException("角色添加用户失败:" + "用户"+ddmUserRoleVO.getUserId()+"不存在"); - } - UserRoleEO userRoleEO = new UserRoleEO(); - userRoleEO.setRoleId(ddmUserRoleVO.getRoleId()); - userRoleEO.setUserId(ddmUser.getUsid()); - roleEOService.saveRoleUser(userRoleEO); - }); - } catch (Exception e) { - logger.error("角色添加用户失败", e); - return DdmResult.error("角色添加用户失败:" + e.getMessage()); - } - return DdmResult.success(); - } - - @ApiOperation(value = "角色删除用户") - @PostMapping("/role/roleDelUser.do") - public DdmResponseMessage deleteRoleUsers(@RequestBody DdmUserRolesDeleteVO ddmUserRolesDeleteVO) { - try { - if (null == ddmUserRolesDeleteVO || null == ddmUserRolesDeleteVO.getUserRoles()) { - return DdmResult.error("参数不能为空"); - } - List userRoles = ddmUserRolesDeleteVO.getUserRoles(); - - List userRoleEOList = new ArrayList<>(); - userRoles.forEach(ddmUserRoleVO -> { - //传参由用户id变成了用户账号，根绝用户id 找出account - UserEO ddmUser = userEODao.getDdmUserEOByAccountNotDeleted(ddmUserRoleVO.getUserId()); - if (null==ddmUser){ - throw new AdcDaBaseException("角色删除用户失败:" + "用户"+ddmUserRoleVO.getUserId()+"不存在"); - } - UserRoleEO userRoleEO = new UserRoleEO(); - userRoleEO.setUserId(ddmUser.getUsid()); - userRoleEO.setRoleId(ddmUserRoleVO.getRoleId()); - userRoleEOList.add(userRoleEO); - }); - roleEOService.deleteRoleUsers(userRoleEOList); - } catch (Exception e) { - logger.error("角色删除用户失败", e); - return DdmResult.error("角色删除用户失败:" + e.getMessage()); - } - return DdmResult.success(); - } - - - @ApiOperation(value = "查询角色菜单") - @PostMapping("/role/queryRoleModel.do") - public DdmResponseMessage getRoleMenus(@RequestBody HashMap queryMap) { - try { - if (CollectionUtils.isEmpty(queryMap) || StringUtils.isEmpty(queryMap.get("roleId"))) { - return DdmResult.error("参数不能为空"); - } - String roleId = queryMap.get("roleId"); - List roleMenuEOList = roleEOService.getRoleMenuInfoList(roleId); - HashMap dataMap = new HashMap<>(); - dataMap.put("modelList", roleMenuEOList); - return DdmResult.success(dataMap); - - } catch (Exception e) { - logger.error("查询角色菜单失败", e); - return DdmResult.error("查询角色菜单失败:" + e.getMessage()); - } - - } - - @ApiOperation(value = "角色添加菜单") - @PostMapping("/role/roleAddModel.do") - public DdmResponseMessage addRoleMenus(@RequestBody DdmRoleMenuCreate ddmRoleMenuCreate) { - if (null==ddmRoleMenuCreate ||CollectionUtils.isEmpty( ddmRoleMenuCreate.getRoleModels())) { - return DdmResult.error("参数不能为空"); - } - try { - List roleModels = ddmRoleMenuCreate.getRoleModels(); - roleEOService.saveRoleMenuByDdm(roleModels); - return DdmResult.success(); - - } catch (Exception e) { - logger.error("角色添加菜单失败", e); - return DdmResult.error("角色添加菜单失败:" + e.getMessage()); - } - - } - - @ApiOperation(value = "角色删除菜单") - @PostMapping("/role/roleDelModel.do") - public DdmResponseMessage deleteRoleMenus(@RequestBody DdmRoleMenuDelete ddmRoleMenuDelete) { - try { - if (null==ddmRoleMenuDelete ||CollectionUtils.isEmpty( ddmRoleMenuDelete.getRoleModels())) { - return DdmResult.error("参数不能为空"); - } - List roleModels = ddmRoleMenuDelete.getRoleModels(); - for (DdmRoleMenuCreateVO ddmRoleMenuCreateVO : roleModels) { - /*新增角色关联*/ - roleEODao.deleteRoleMenu(ddmRoleMenuCreateVO.getRoleId(), ddmRoleMenuCreateVO.getModelId()); - } - return DdmResult.success(); - - } catch (Exception e) { - logger.error("角色删除菜单失败", e); - return DdmResult.error("角色删除菜单失败:" + e.getMessage()); - } - - } -} - +//package com.adc.da.sys.controller.ddm; +// +//import com.adc.da.base.page.Pager; +//import com.adc.da.base.web.BaseController; +//import com.adc.da.sys.constant.IsBelongEnum; +//import com.adc.da.sys.dao.mysql.RoleEODao; +//import com.adc.da.sys.dao.mysql.UserEODao; +//import com.adc.da.sys.entity.RoleEO; +//import com.adc.da.sys.entity.RoleMenuEO; +//import com.adc.da.sys.entity.UserEO; +//import com.adc.da.sys.entity.UserRoleEO; +//import com.adc.da.sys.page.RoleEOPage; +//import com.adc.da.sys.page.RoleMenuEOPage; +//import com.adc.da.sys.service.MenuEOService; +//import com.adc.da.sys.service.RoleEOService; +//import com.adc.da.sys.util.EncryptUtil; +//import com.adc.da.sys.vo.MenuVO; +//import com.adc.da.sys.vo.RoleVO; +//import com.adc.da.sys.vo.UserRoleVO; +//import com.adc.da.sys.vo.ddm.*; +//import com.adc.da.util.exception.AdcDaBaseException; +//import com.adc.da.util.http.PageInfo; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.adc.da.util.utils.BeanMapper; +//import com.adc.da.util.utils.CollectionUtils; +//import com.adc.da.util.utils.StringUtils; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.apache.shiro.crypto.hash.Hash; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import javax.annotation.Resource; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +// +//import javax.validation.constraints.NotBlank; +//import javax.validation.constraints.NotNull; +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +// +//import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; +// +///** +// * 角色管理模块相关接口. +// * 1.分页查询 +// * 2.角色详情 +// * 3.角色列表 +// * 4.新增角色 +// * 5.修改角色 +// * 6.删除角色 +// * 7.配置角色菜单 +// * date 2018/08/15 +// * +// * @author comments created by Lee Kwanho +// * @see RoleEOService +// * @see RoleEO +// * @see RoleVO +// * @see RoleEOPage +// * @see RoleEODao +// * @see mybatis.mapper.sys +// */ +//@RestController +//@RequestMapping("/${portalPath}") +//@Api(tags = {"ddm-角色类接口"}) +//public class DdmRoleEOController extends BaseController { +// +// /** +// * 日志 +// */ +// private static final Logger logger = LoggerFactory.getLogger(DdmRoleEOController.class); +// +// /** +// * 角色相关Service +// */ +// @Resource +// private RoleEOService roleEOService; +// +// @Resource +// private RoleEODao roleEODao; +// +// @Resource +// private UserEODao userEODao; +// +// +// /** +// * dozer相关，EO间VO转换 +// */ +// @Resource +// private BeanMapper beanMapper; +// +// +// @ApiOperation(value = "|查询角色") +// @GetMapping("/role/list.do") +//// @RequiresPermissions("sys:role:list") +// public DdmResponseMessage>> list() { +// List roleEOList = roleEOService.findAll(); +// List ddmRoleVOList = new ArrayList<>(); +// for (RoleEO roleEO : roleEOList) { +// DdmRoleVO ddmRoleVO = new DdmRoleVO(roleEO); +// ddmRoleVOList.add(ddmRoleVO); +// } +// HashMap> dataMap = new HashMap<>(); +// dataMap.put("roles",ddmRoleVOList); +// return DdmResult.success(dataMap); +// } +// +// +// @ApiOperation(value = "|角色创建") +// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE, value = "/role/save.do") +//// @RequiresPermissions("sys:role:save") +// public DdmResponseMessage create(@RequestBody DdmRoleCreateVO ddmRoleCreateVO) { +// if (null == ddmRoleCreateVO || StringUtils.isEmpty(ddmRoleCreateVO.getRoleName())) { +// return DdmResult.error("角色名称不能为空"); +// } +// try { +// RoleEO roleEO = new RoleEO(); +// roleEO.setName(ddmRoleCreateVO.getRoleName()); +// roleEO.setRemarks(ddmRoleCreateVO.getRoleDesc()); +// roleEO = roleEOService.save(roleEO); +// } catch (Exception e) { +// logger.error("角色创建失败:", e); +// return DdmResult.error("角色创建失败:"+e.getMessage()); +// } +// return DdmResult.success(); +// } +// +// @ApiOperation(value = "角色修改") +// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE, value = "/role/update.do") +//// @RequiresPermissions("sys:role:update") +// public DdmResponseMessage update(@RequestBody DdmRoleVO ddmRoleVO) { +// if (null == ddmRoleVO || StringUtils.isEmpty(ddmRoleVO.getRoleName()) || StringUtils.isEmpty(ddmRoleVO.getRoleId())) { +// return DdmResult.error("角色ID和角色名称不能为空"); +// } +// try { +// RoleEO roleEO = new RoleEO(); +// roleEO.setId(ddmRoleVO.getRoleId()); +// roleEO.setRemarks(ddmRoleVO.getRoleDesc()); +// roleEO.setName(ddmRoleVO.getRoleName()); +// roleEOService.updateByPrimaryKeySelective(roleEO); +// return DdmResult.success(); +// } catch (Exception e) { +// logger.error("角色修改失败:", e); +// return DdmResult.error("角色修改失败:"+e.getMessage()); +// } +// +// } +// +// /** +// * 删除角色，逻辑删除，若角色有对应用户则不能删除 +// */ +// //todo +// @ApiOperation(value = "|角色删除") +// @PostMapping("/role/delete.do") +//// @RequiresPermissions("sys:role:delete") +// public DdmResponseMessage delete(@RequestBody HashMap query) { +// +// if (CollectionUtils.isEmpty(query) || StringUtils.isEmpty(query.get("roleCode"))) { +// return DdmResult.error("角色ID不能为空"); +// } +// String roleId = query.get("roleCode"); +// try { +// RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId); +// if ("管理员".equals(roleEO.getName())) { +// return DdmResult.error("管理员角色不能删除"); +// } +// List list = roleEOService.getUserRoleListByRoleId(roleId); +// // 如果角色有对应用户，则不允许删除 +// if (CollectionUtils.isNotEmpty(list)) { +// return DdmResult.error("该角色有对应用户，不能删除"); +// } +// roleEOService.delete(roleId); +// } catch (Exception e) { +// logger.error("删除角色失败:", e); +// return DdmResult.error("删除角色失败:"+e.getMessage()); +// } +// return DdmResult.success(); +// } +// +// @ApiOperation(value = "查询角色用户") +// @PostMapping("/role/queryRoleUser.do") +// public DdmResponseMessage getRoleUsers(@RequestBody DdmRoleUserQuery query) { +// List list; +// if (null == query.getPageSize()) { +// query.setPageSize(10000); +// } +// try { +// PageInfo userInfoPage = roleEOService.getUserInfoPageByRoleId(query); +// List ddmUserVOList = new ArrayList<>(); +// if (CollectionUtils.isNotEmpty(userInfoPage.getList())) { +// userInfoPage.getList().forEach(userRoleVO -> { +// DdmUserVO ddmUserVO = new DdmUserVO(); +// ddmUserVO.setUserId(userRoleVO.getUserId()); +// ddmUserVO.setUserAccount(userRoleVO.getAccount()); +// ddmUserVO.setUserName(userRoleVO.getUsname()); +// ddmUserVOList.add(ddmUserVO); +// }); +// } +// HashMap resultMap = new HashMap<>(); +// resultMap.put("recordCount", userInfoPage.getCount()); +// resultMap.put("recordPages", userInfoPage.getPageCount()); +// resultMap.put("userList", ddmUserVOList); +// return DdmResult.success(resultMap); +// +// } catch (Exception e) { +// logger.error("查询角色用户失败", e); +// return DdmResult.error("查询角色用户失败:" + e.getMessage()); +// } +// } +// +// @ApiOperation(value = "角色添加用户") +// @PostMapping("/role/roleAddUser.do") +// public DdmResponseMessage saveRoleUsers(@RequestBody DdmUserRoleAdd ddmUserRoleAdd) { +// if (null==ddmUserRoleAdd){ +// return DdmResult.error("角色添加用户失败:" + "参数不能为空"); +// } +// List userRoles = ddmUserRoleAdd.getUserRoles(); +// try { +// userRoles.forEach(ddmUserRoleVO -> { +// //传参由用户id变成了用户账号，根绝用户id 找出account +// UserEO ddmUser = userEODao.getDdmUserEOByAccountNotDeleted(ddmUserRoleVO.getUserId()); +// if (null==ddmUser){ +// throw new AdcDaBaseException("角色添加用户失败:" + "用户"+ddmUserRoleVO.getUserId()+"不存在"); +// } +// UserRoleEO userRoleEO = new UserRoleEO(); +// userRoleEO.setRoleId(ddmUserRoleVO.getRoleId()); +// userRoleEO.setUserId(ddmUser.getUsid()); +// roleEOService.saveRoleUser(userRoleEO); +// }); +// } catch (Exception e) { +// logger.error("角色添加用户失败", e); +// return DdmResult.error("角色添加用户失败:" + e.getMessage()); +// } +// return DdmResult.success(); +// } +// +// @ApiOperation(value = "角色删除用户") +// @PostMapping("/role/roleDelUser.do") +// public DdmResponseMessage deleteRoleUsers(@RequestBody DdmUserRolesDeleteVO ddmUserRolesDeleteVO) { +// try { +// if (null == ddmUserRolesDeleteVO || null == ddmUserRolesDeleteVO.getUserRoles()) { +// return DdmResult.error("参数不能为空"); +// } +// List userRoles = ddmUserRolesDeleteVO.getUserRoles(); +// +// List userRoleEOList = new ArrayList<>(); +// userRoles.forEach(ddmUserRoleVO -> { +// //传参由用户id变成了用户账号，根绝用户id 找出account +// UserEO ddmUser = userEODao.getDdmUserEOByAccountNotDeleted(ddmUserRoleVO.getUserId()); +// if (null==ddmUser){ +// throw new AdcDaBaseException("角色删除用户失败:" + "用户"+ddmUserRoleVO.getUserId()+"不存在"); +// } +// UserRoleEO userRoleEO = new UserRoleEO(); +// userRoleEO.setUserId(ddmUser.getUsid()); +// userRoleEO.setRoleId(ddmUserRoleVO.getRoleId()); +// userRoleEOList.add(userRoleEO); +// }); +// roleEOService.deleteRoleUsers(userRoleEOList); +// } catch (Exception e) { +// logger.error("角色删除用户失败", e); +// return DdmResult.error("角色删除用户失败:" + e.getMessage()); +// } +// return DdmResult.success(); +// } +// +// +// @ApiOperation(value = "查询角色菜单") +// @PostMapping("/role/queryRoleModel.do") +// public DdmResponseMessage getRoleMenus(@RequestBody HashMap queryMap) { +// try { +// if (CollectionUtils.isEmpty(queryMap) || StringUtils.isEmpty(queryMap.get("roleId"))) { +// return DdmResult.error("参数不能为空"); +// } +// String roleId = queryMap.get("roleId"); +// List roleMenuEOList = roleEOService.getRoleMenuInfoList(roleId); +// HashMap dataMap = new HashMap<>(); +// dataMap.put("modelList", roleMenuEOList); +// return DdmResult.success(dataMap); +// +// } catch (Exception e) { +// logger.error("查询角色菜单失败", e); +// return DdmResult.error("查询角色菜单失败:" + e.getMessage()); +// } +// +// } +// +// @ApiOperation(value = "角色添加菜单") +// @PostMapping("/role/roleAddModel.do") +// public DdmResponseMessage addRoleMenus(@RequestBody DdmRoleMenuCreate ddmRoleMenuCreate) { +// if (null==ddmRoleMenuCreate ||CollectionUtils.isEmpty( ddmRoleMenuCreate.getRoleModels())) { +// return DdmResult.error("参数不能为空"); +// } +// try { +// List roleModels = ddmRoleMenuCreate.getRoleModels(); +// roleEOService.saveRoleMenuByDdm(roleModels); +// return DdmResult.success(); +// +// } catch (Exception e) { +// logger.error("角色添加菜单失败", e); +// return DdmResult.error("角色添加菜单失败:" + e.getMessage()); +// } +// +// } +// +// @ApiOperation(value = "角色删除菜单") +// @PostMapping("/role/roleDelModel.do") +// public DdmResponseMessage deleteRoleMenus(@RequestBody DdmRoleMenuDelete ddmRoleMenuDelete) { +// try { +// if (null==ddmRoleMenuDelete ||CollectionUtils.isEmpty( ddmRoleMenuDelete.getRoleModels())) { +// return DdmResult.error("参数不能为空"); +// } +// List roleModels = ddmRoleMenuDelete.getRoleModels(); +// for (DdmRoleMenuCreateVO ddmRoleMenuCreateVO : roleModels) { +// /*新增角色关联*/ +// roleEODao.deleteRoleMenu(ddmRoleMenuCreateVO.getRoleId(), ddmRoleMenuCreateVO.getModelId()); +// } +// return DdmResult.success(); +// +// } catch (Exception e) { +// logger.error("角色删除菜单失败", e); +// return DdmResult.error("角色删除菜单失败:" + e.getMessage()); +// } +// +// } +//} +// diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmUserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmUserEOController.java index d9f31fd..65507d8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmUserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/ddm/DdmUserEOController.java @@ -1,71 +1,71 @@ -package com.adc.da.sys.controller.ddm; - -import com.adc.da.base.web.BaseController; -import com.adc.da.sys.entity.UserEO; -import com.adc.da.sys.service.iservice.IUserEoService; -import com.adc.da.sys.util.EncryptUtil; -import com.adc.da.sys.util.RSAUtil; -import com.adc.da.sys.vo.UserRoleVO; -import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; -import com.adc.da.util.http.PageInfo; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.adc.da.util.utils.StringUtils; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.binary.Base64; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import javax.annotation.Resource; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/${portalPath}") -@Api(tags = {"ddm-用户类接口"}) -@Slf4j -public class DdmUserEOController extends BaseController { +//package com.adc.da.sys.controller.ddm; // - @Resource - private IUserEoService userEOService; - - /** - * 日志 - */ - private static final Logger logger = LoggerFactory.getLogger(DdmUserEOController.class); - - @ApiOperation("查询用户") - @PostMapping("/user/list.do") - public DdmResponseMessage list(@RequestBody DdmUserQueryVO userQueryVO){ - try { - if (null==userQueryVO.getPageSize()){ - userQueryVO.setPageSize(100000); - } - PageInfo userPage = userEOService.getUserPage(userQueryVO); - HashMap resultMap = new HashMap<>(); - resultMap.put("recordCount", userPage.getCount()); - resultMap.put("recordPages", userPage.getPageCount()); - resultMap.put("userList", userPage.getList()); - return DdmResult.success(resultMap); - - } catch (Exception e) { - logger.error("查询角色用户失败", e); - return DdmResult.error("查询角色用户失败:" + e.getMessage()); - } - } - -} +//import com.adc.da.base.web.BaseController; +//import com.adc.da.sys.entity.UserEO; +//import com.adc.da.sys.service.iservice.IUserEoService; +//import com.adc.da.sys.util.EncryptUtil; +//import com.adc.da.sys.util.RSAUtil; +//import com.adc.da.sys.vo.UserRoleVO; +//import com.adc.da.sys.vo.UserVO; +//import com.adc.da.sys.vo.ddm.DdmUserQueryVO; +//import com.adc.da.sys.vo.ddm.DdmUserVO; +//import com.adc.da.util.http.PageInfo; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.adc.da.util.utils.StringUtils; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.google.gson.Gson; +//import com.google.gson.JsonElement; +//import com.google.gson.JsonParser; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.apache.commons.codec.binary.Base64; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import javax.annotation.Resource; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.transaction.annotation.Transactional; +//import org.springframework.web.bind.annotation.*; +// +//import java.nio.charset.StandardCharsets; +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//@RestController +//@RequestMapping("/${portalPath}") +//@Api(tags = {"ddm-用户类接口"}) +//@Slf4j +//public class DdmUserEOController extends BaseController { +//// +// @Resource +// private IUserEoService userEOService; +// +// /** +// * 日志 +// */ +// private static final Logger logger = LoggerFactory.getLogger(DdmUserEOController.class); +// +// @ApiOperation("查询用户") +// @PostMapping("/user/list.do") +// public DdmResponseMessage list(@RequestBody DdmUserQueryVO userQueryVO){ +// try { +// if (null==userQueryVO.getPageSize()){ +// userQueryVO.setPageSize(100000); +// } +// PageInfo userPage = userEOService.getUserPage(userQueryVO); +// HashMap resultMap = new HashMap<>(); +// resultMap.put("recordCount", userPage.getCount()); +// resultMap.put("recordPages", userPage.getPageCount()); +// resultMap.put("userList", userPage.getList()); +// return DdmResult.success(resultMap); +// +// } catch (Exception e) { +// logger.error("查询角色用户失败", e); +// return DdmResult.error("查询角色用户失败:" + e.getMessage()); +// } +// } +// +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleHomeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleHomeEODao.java index 5b65d8b..8a88181 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleHomeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleHomeEODao.java @@ -1,26 +1,26 @@ -package com.adc.da.sys.dao.mysql; - -import com.adc.da.base.dao.BaseDao; -import com.adc.da.sys.entity.MenuEO; -import com.adc.da.sys.entity.RoleHomeEO; -import com.adc.da.sys.entity.RoleMenuEO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能：TR_ROLE_MENU RoleMenuEODao
- * 作者：code generator
- * 日期： 2019-09-02
- * 版权所有：版权归北京卡达克数据技术中心所有。
- */ -public interface RoleHomeEODao extends BaseMapper { - - void insertRoleHomeBatch(@Param("rhList")List list); - - List getHomeListByRoleId(@Param("roleId")String roleId); - -} +//package com.adc.da.sys.dao.mysql; +// +//import com.adc.da.base.dao.BaseDao; +//import com.adc.da.sys.entity.MenuEO; +//import com.adc.da.sys.entity.RoleHomeEO; +//import com.adc.da.sys.entity.RoleMenuEO; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import org.apache.ibatis.annotations.Param; +// +//import java.util.List; +// +///** +// * +// *
+// * 功能：TR_ROLE_MENU RoleMenuEODao
+// * 作者：code generator
+// * 日期： 2019-09-02
+// * 版权所有：版权归北京卡达克数据技术中心所有。
+// */ +//public interface RoleHomeEODao extends BaseMapper { +// +// void insertRoleHomeBatch(@Param("rhList")List list); +// +// List getHomeListByRoleId(@Param("roleId")String roleId); +// +//} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java index 399a130..8d63363 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java @@ -60,8 +60,8 @@ public class RoleEOService extends BaseService { return dao; } - @Resource - private RoleHomeEODao roleHomeEODao; +// @Resource +// private RoleHomeEODao roleHomeEODao; @Resource private RoleMenuEODao roleMenuEODao; @@ -259,83 +259,88 @@ public class RoleEOService extends BaseService { return dao.getRoleByCode(roleCode); } - @Transactional(rollbackFor = Exception.class) - public void saveRoleHome(RoleEO roleEO) { - if (roleEO.getMenuEOIdList() == null || roleEO.getMenuEOIdList().size() == 0) { - //将首页展示默认调整成角色菜单 - roleHomeEODao.delete(new QueryWrapper().eq("ROLEID", roleEO.getId())); - List roleMenuList = roleMenuEODao.getRoleMenuList(roleEO.getId()); - roleHomeEODao.insertRoleHomeBatch(roleMenuList); - } else { - roleHomeEODao.delete(new QueryWrapper().eq("ROLEID", roleEO.getId())); - List rmList = new ArrayList<>(); - roleEO.getMenuEOIdList().forEach(c -> { - RoleMenuEO roleMenuEO = new RoleMenuEO(); - roleMenuEO.setRoleId(roleEO.getId()); - roleMenuEO.setMenuId(c); - rmList.add(roleMenuEO); - }); +// @Transactional(rollbackFor = Exception.class) +// public void saveRoleHome(RoleEO roleEO) { +// if (roleEO.getMenuEOIdList() == null || roleEO.getMenuEOIdList().size() == 0) { +// //将首页展示默认调整成角色菜单 +// roleHomeEODao.delete(new QueryWrapper().eq("ROLEID", roleEO.getId())); +// List roleMenuList = roleMenuEODao.getRoleMenuList(roleEO.getId()); +// roleHomeEODao.insertRoleHomeBatch(roleMenuList); +// } else { +// roleHomeEODao.delete(new QueryWrapper().eq("ROLEID", roleEO.getId())); +// List rmList = new ArrayList<>(); +// roleEO.getMenuEOIdList().forEach(c -> { +// RoleMenuEO roleMenuEO = new RoleMenuEO(); +// roleMenuEO.setRoleId(roleEO.getId()); +// roleMenuEO.setMenuId(c); +// rmList.add(roleMenuEO); +// }); +// +// roleHomeEODao.insertRoleHomeBatch(rmList); +// } +// } - roleHomeEODao.insertRoleHomeBatch(rmList); - } - } - - public List getHomeMenu(String roleId) throws Exception { - if (StringUtils.isEmpty(roleId)) { - return new ArrayList(); - } - List homeMenuList = roleHomeEODao.getHomeListByRoleId(roleId); - List roleMenuList=menuEODao.listMenuEOByRoleId(roleId); - - List idList = roleMenuList.stream().map(MenuEO::getId).collect(Collectors.toList()); - //已分配好的菜单权限为基础，`找出其中的配置首页 - - RoleEO roleEO = selectByPrimaryKey(roleId); - List allList; - if ("管理员".equals(roleEO.getName())) { - //管理员返回所有菜单权限 - allList = beanMapper.mapList(menuEODao.findAll(), MenuVO.class); - allList.forEach(c -> { - c.setBelong(1); - }); - } else { - allList = beanMapper.mapList(homeMenuList, MenuVO.class); - allList.forEach(c -> { - if (idList.contains(c.getId())) { - c.setBelong(1); - } else { - c.setBelong(0); - } - - }); - } - return allList; - } +// public List getRoleMenu(String roleId) throws Exception { +// if (StringUtils.isEmpty(roleId)) { +// return new ArrayList(); +// } +//// List homeMenuList = roleHomeEODao.getHomeListByRoleId(roleId); +// +// +//// +// //已分配好的菜单权限为基础，`找出其中的配置首页 +// +// RoleEO roleEO = selectByPrimaryKey(roleId); +// +// +// List allList; +// if ("管理员".equals(roleEO.getName())) { +// //管理员返回所有菜单权限 +// allList = beanMapper.mapList(menuEODao.findAll(), MenuVO.class); +// allList.forEach(c -> { +// c.setBelong(1); +// }); +// } else { +// List roleMenuList=menuEODao.listMenuEOByRoleId(roleId); +// List idList = roleMenuList.stream().map(MenuEO::getId).collect(Collectors.toList()); +// +// allList = beanMapper.mapList(roleMenuList, MenuVO.class); +// allList.forEach(c -> { +// if (idList.contains(c.getId())) { +// c.setBelong(1); +// } else { +// c.setBelong(0); +// } +// +// }); +// } +// return allList; +// } //角色添加用户 - public int saveRoleUser(UserRoleEO userRoleEO) { - QueryWrapper queryWrapper1 = new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()).eq("ROLE_ID", userRoleEO.getRoleId()); - List userRoleEOS1 = userRoleEODao.selectList(queryWrapper1); - if (userRoleEOS1.size() > 0) { - throw new AdcDaBaseException("此角色下该用户已存在，请不要重复添加"); - } - //因为系统用户角色1对一 ，所以删除原先角色 - QueryWrapper queryWrapper2 = new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()); - userRoleEODao.delete(queryWrapper2); - - return userRoleEODao.insert(userRoleEO); - } - - //角色删除用户 - public int deleteRoleUsers(List userRoleEOList) { - int i = 0; - for (UserRoleEO userRoleEO : userRoleEOList) { - userRoleEODao.delete(new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()).eq("ROLE_ID", userRoleEO.getRoleId())); - } - return i; - } - - public List getRoleMenuInfoList(@Param("roleId") String roleId) { - return roleMenuEODao.getRoleMenuInfoList(roleId); - } +// public int saveRoleUser(UserRoleEO userRoleEO) { +// QueryWrapper queryWrapper1 = new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()).eq("ROLE_ID", userRoleEO.getRoleId()); +// List userRoleEOS1 = userRoleEODao.selectList(queryWrapper1); +// if (userRoleEOS1.size() > 0) { +// throw new AdcDaBaseException("此角色下该用户已存在，请不要重复添加"); +// } +// //因为系统用户角色1对一 ，所以删除原先角色 +// QueryWrapper queryWrapper2 = new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()); +// userRoleEODao.delete(queryWrapper2); +// +// return userRoleEODao.insert(userRoleEO); +// } +// +// //角色删除用户 +// public int deleteRoleUsers(List userRoleEOList) { +// int i = 0; +// for (UserRoleEO userRoleEO : userRoleEOList) { +// userRoleEODao.delete(new QueryWrapper().eq("USER_ID", userRoleEO.getUserId()).eq("ROLE_ID", userRoleEO.getRoleId())); +// } +// return i; +// } +// +// public List getRoleMenuInfoList(@Param("roleId") String roleId) { +// return roleMenuEODao.getRoleMenuInfoList(roleId); +// } } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/util/CompressUtil.java b/adc-da-sys/src/main/java/com/adc/da/sys/util/CompressUtil.java index 2829e5c..83e342e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/util/CompressUtil.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/util/CompressUtil.java @@ -18,16 +18,6 @@ public class CompressUtil { if (!file.exists()) { throw new Exception("路径 " + path + " 不存在文件，无法进行压缩..."); } - // 用于存放压缩文件的文件夹 -// String generateFile = file.getParent() + File.separator + "CompressFile"; -// File compress = new File(generateFile); -// // 如果文件夹不存在，进行创建 -// if (!compress.exists()) { -// compress.mkdirs(); -// } -// -// // 目的压缩文件 -// String generateFileName = compress.getAbsolutePath() + File.separator + "AAA" + file.getName() + "." + format; String generateFileName="/Users/sxh/test.rar"; diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ModuleVo.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ModuleVo.java index a60233b..b017367 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/ModuleVo.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/ModuleVo.java @@ -1,23 +1,23 @@ -package com.adc.da.sys.vo; - -public class ModuleVo{ - private String id; - - private String moduleName; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getModuleName() { - return moduleName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } -} \ No newline at end of file +//package com.adc.da.sys.vo; +// +//public class ModuleVo{ +// private String id; +// +// private String moduleName; +// +// public String getId() { +// return id; +// } +// +// public void setId(String id) { +// this.id = id; +// } +// +// public String getModuleName() { +// return moduleName; +// } +// +// public void setModuleName(String moduleName) { +// this.moduleName = moduleName; +// } +//} \ No newline at end of file diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml index 59385e0..2d27acd 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml @@ -31,13 +31,13 @@ - + + + + + + + + + diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/MailController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/MailController.class deleted file mode 100644 index 7977f26..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/MailController.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/MailTestController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/MailTestController.class deleted file mode 100644 index 199cfa5..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/MailTestController.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/RoleEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/RoleEOController.class index 0690a5d..7410537 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/RoleEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/RoleEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 35eb9e8..42ec079 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmMenuEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmMenuEOController.class deleted file mode 100644 index 500e8bb..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmMenuEOController.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResponseMessage.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResponseMessage.class deleted file mode 100644 index c1c4b57..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResponseMessage.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResult.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResult.class deleted file mode 100644 index d20552b..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResult.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmRoleEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmRoleEOController.class deleted file mode 100644 index 265e6c3..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmRoleEOController.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmUserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmUserEOController.class deleted file mode 100644 index 43c42ab..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmUserEOController.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/MenuEODao.class b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/MenuEODao.class index 6824e69..3b6cbf5 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/MenuEODao.class and b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/MenuEODao.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/RoleHomeEODao.class b/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/RoleHomeEODao.class deleted file mode 100644 index dd5009f..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/RoleHomeEODao.class and /dev/null differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class index 0653e65..761c80f 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class and b/adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/util/CompressUtil.class b/adc-da-sys/target/classes/com/adc/da/sys/util/CompressUtil.class index b8bfd38..4e29772 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/util/CompressUtil.class and b/adc-da-sys/target/classes/com/adc/da/sys/util/CompressUtil.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/vo/ModuleVo.class b/adc-da-sys/target/classes/com/adc/da/sys/vo/ModuleVo.class deleted file mode 100644 index 09357f4..0000000 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/vo/ModuleVo.class and /dev/null differ diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MailEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MailEOMapper.xml deleted file mode 100644 index 2fb2d74..0000000 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MailEOMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - insert into ts_mail(id - ,to_mail - ,cc_mail - ,subject - ,content - ,send_date) - values (#{id},#{toMail},#{ccMail}, #{subject}, #{content}, #{sendDate}) - - - - - diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml index 46e2c20..01b556e 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml @@ -285,41 +285,12 @@ SELECT FROM TS_MENU M LEFT JOIN TR_ROLE_MENU RM ON M.ID = RM.MENU_ID where RM.ROLE_ID = #{roleId} - - - - - - - - - - - - - - - - - - - - diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml index 59385e0..2d27acd 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/RoleHomeEOMapper.xml @@ -31,13 +31,13 @@ - + + + + + + + + +