From cb1312ac795aa531cc2bb497d1e2112b4fd67b60 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Mon, 5 Sep 2022 15:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/classes/application-dev.properties | 5 +- .../adc/da/sys/controller/MailController.java | 386 +++++------ .../da/sys/controller/MailTestController.java | 164 ++--- .../da/sys/controller/RoleEOController.java | 26 +- .../da/sys/controller/UserEOController.java | 26 +- .../controller/ddm/DdmMenuEOController.java | 138 ++-- .../controller/ddm/DdmResponseMessage.java | 94 +-- .../adc/da/sys/controller/ddm/DdmResult.java | 72 +- .../controller/ddm/DdmRoleEOController.java | 654 +++++++++--------- .../controller/ddm/DdmUserEOController.java | 140 ++-- .../adc/da/sys/dao/mysql/RoleHomeEODao.java | 52 +- .../com/adc/da/sys/service/RoleEOService.java | 161 ++--- .../com/adc/da/sys/util/CompressUtil.java | 10 - .../main/java/com/adc/da/sys/vo/ModuleVo.java | 46 +- .../mapper/sys/mysql/RoleHomeEOMapper.xml | 18 +- .../da/sys/controller/MailController.class | Bin 7541 -> 0 bytes .../sys/controller/MailTestController.class | Bin 2929 -> 0 bytes .../da/sys/controller/RoleEOController.class | Bin 8505 -> 8238 bytes .../da/sys/controller/UserEOController.class | Bin 12894 -> 12659 bytes .../controller/ddm/DdmMenuEOController.class | Bin 3875 -> 0 bytes .../controller/ddm/DdmResponseMessage.class | Bin 1902 -> 0 bytes .../adc/da/sys/controller/ddm/DdmResult.class | Bin 2257 -> 0 bytes .../controller/ddm/DdmRoleEOController.class | Bin 14720 -> 0 bytes .../controller/ddm/DdmUserEOController.class | Bin 3318 -> 0 bytes .../com/adc/da/sys/dao/mysql/MenuEODao.class | Bin 1729 -> 1466 bytes .../adc/da/sys/dao/mysql/RoleHomeEODao.class | Bin 766 -> 0 bytes .../adc/da/sys/service/RoleEOService.class | Bin 14068 -> 10819 bytes .../com/adc/da/sys/util/CompressUtil.class | Bin 4749 -> 4749 bytes .../classes/com/adc/da/sys/vo/ModuleVo.class | Bin 770 -> 0 bytes .../mybatis/mapper/sys/mysql/MailEOMapper.xml | 18 - .../mybatis/mapper/sys/mysql/MenuEOMapper.xml | 38 - .../mapper/sys/mysql/RoleHomeEOMapper.xml | 18 +- 32 files changed, 1003 insertions(+), 1063 deletions(-) delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/MailController.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/MailTestController.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmMenuEOController.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResponseMessage.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmResult.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmRoleEOController.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/controller/ddm/DdmUserEOController.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/RoleHomeEODao.class delete mode 100644 adc-da-sys/target/classes/com/adc/da/sys/vo/ModuleVo.class delete mode 100644 adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MailEOMapper.xml 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 7977f2692c58c9cbca2f85f62aed4558c635712a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7541 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 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 0690a5d2845206b7711fbc17a29b5e0e7cfa81ba..7410537b8aa4daf8dd4bc1ad9d7ea13cf59fd270 100644 GIT binary patch delta 2454 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 F$^Rr!#oYh^ 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 35eb9e86500051013362b324fcef27ebd3809fed..42ec079feb8c55883a96e5a4f81efe7dc4839dc7 100644 GIT binary patch delta 3156 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 LJ9<<~$>{MrD>m5T 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 500e8bb70d5f52a1f57dfa298c9d1dd499cc2f53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3875 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 B8%qEH 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 43c42abd9e8e70a1ce19112d1f2f3f6ce6a921e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3318 zcmbVO>su6682=q^vn=CzX5E;_hCGb zLt*rxzZl~Dk6|3f5xE>FM=g$4;0+v8a6F6<4ux8N5y7aWQc~PfkPhP%Y^mcYa0QB!Rze^Wwd{oEB!{++ zXi+PXFzgnA1sTV%J9_#Jd(4a(0-K^SYgE(YF)glZ&ZMJpTkdG)Bckhw)UbRF9yvMNuP{yz)2YOl>^2G{`(7!Z&H@XeS(G$|mkc@FJ zX@S*2{fuiSwPDvyYjU$IHDpn^+%}v{((TsM0##o0G*527?hKPj3BhxgW_OZ$Dxq~u z#Ei6zH}@)}DIcuBx}Y_g%=w)XsE%5}xK5@Y#kMVYLLuJP;C7(_25c8Wy;A5#YXE=0 zYn!P=OMufeIAX+HPj^ATtH(~#aWC2I1cAlfhC6J6o6(@Cfz657%e@`03%b-ydAKBd{&o8EJ`QNS-=w*(bGeV^AA3 zQ}MuoTCe5E)TAX~HjgI5t;rHY>Ixk3*!G?7wwQN6laSr!;P1$M6Hd{7NuQba>7TEFB zp<*Anvk>UO|55cEpAGavt?o?PvRysdtGmNz1y(&F;WSm^>Is%b75ly^o8*T#?>)GD z{r;7oRn((FK}N+G#uZGcn8axnXYihi7g49+tcv&Xfk35ncuw!Jy=)_9+3|LZ6Hmd1 zDn7zF6(8f1+?MQQN5!W&=l6Y-#i8OnK2vZ(#YKEhSl-EVdsoGJtYPG{g*o%v)tQU8 zvdHiMa&zYPbp>CjxP&hSYG$>wozs>vlW{pkmp@KUWuyM%89Hs_7{ z!daFrkl8FMxTfM;e5c|CiFQrkfX9@cKwUtna75&0RYk&ZW$^mV)2zUy^$me}(3NtH z>~)n*iWfScDWG^w-7~~7R^K(hT7?rlyt;m#v*o?hoClT7{iM5(NhfF-qwH|s_biu4 z;ZSA$)&_tS3b3+h*DFF^iE| zZEIXUBwA$h%Q)7JR9v8G9<5-I=5!ss4>LIaWiPN~PC9&>OqgqB={(1MfoF2OCg1T+ zJ?2{WB;OD+UH;Q*ZP1(cr0zI;#N=zXu%B!BWCe<`LiRSPA~_DhyOneqzw7v2A*Yll zCFB?-cLP@%zk=V=4R;`Jk|;tW|D_Trw2}X6RscG#bg%$>& zl~`ZpY8N`No6>vmI@&ORcF(V^D5YF8Hsd9FUB@78;q$+kGHbC7FOx^le6J<7ooDkw zL~b?rvYI<{nl039<(`6~$_a&LcX3fFs0A+#HI&><{ns4AXp_VV2!~MiN+p?u4iX`B z=2Fu{p8QotYNzqspIGgGt7Mvl=XTfwSx>diG{2AhBJ4+(_dVd5ea>?Th~_MI;~?oC H&wB5F>(<4A 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 6824e690208b325058a8c78be0a7989ec1fd0099..3b6cbf5bc53f45499287f9468728a75573d033e0 100644 GIT binary patch delta 153 zcmX@eyNg@+)W2Q(7#J8#7gj10m+ZEQfy Y#Go>{fK8N9b#fb<5vLl1I#^5t0FfUPQvd(} delta 323 zcmdnReUMl9)W2Q(7#J8#7>w8%^w}8<*cl8r3cE5Xh~#7zm-wdUmAd*nRf1^0#N1Ry z298`Pb8;9{lrVo(F44hB{fadZ6g&|VvKq(Cd nO@x)ga49VYaUh$A5n-+{P_Z`99Ju=?ceAQ->M-bnZP5b&-^w+L 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 dd5009f810eba77e51a0f9571795d4845b252299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 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 Cb$cHG literal 14068 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 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 b8bfd383c1034db5e6229dfc4816d6872ccc6d95..4e29772a67cb8e6b4654f03e78e4fe2881a5818b 100644 GIT binary patch delta 341 zcmWNNO(?^07{@=qDa)*R%bF0?*J7=`SW6*fUK-^_k=Gs6 z|KLDQb9a!GIFL9vI4HTub9$cV`+0i4&+{a-gmxY<67+v z%2|U^8qCyTr=Ct4=%JB-#0X8qXl9WXwrORDHg;*}j1Devafw^EnhOl^J`D7e#Q-@B z;=m)rymaFeH?NRkQAb$8&laQXF~$kwq?kZwk~CA?66B5$4@7w+%#)bENdCq&@67Ni z{7d+^Xg|V#h5r#%il8!D38`!;EQD1q5miV`*@)}c7N4Pdo(vW+$q_>=vB5G|ta8H| p_pI|Q$}5|EkW6;vrAzmv`+!Uiv2jWAgxo9OtVR?@n6g3G=VqPP&7ovs?c}ZO5rSTUB za+r5^=#08M)gmQ_iXaa l7O!mc!A`U$EuMQM-Nz&n!@?QaoRGsQR?+F;JnBsE{0ANHQPKba 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 09357f418992d2e5f0de71135e8d9deba6a4fef5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 zcmZ{i+e*Vg5QhIvn;v3nZMF3*c-K}iH{L1U2!c?nQ0e_PS!$$BAWaLtm4YI8;REu*8ltf!QTWZ1FR;y5S^p)v2$^OP?tFdKNZ{ux#Xzw^2Y|VB>#wYJZRK zqJN{@7`vRY$-x`^*d$r854{PYd($p3a_EK5ww@sFlVdh*E=guk;@X}az#__wD258{ z@8Sm-cXP$X)Z!|ZNu-O96E;e<_8wt;OIyr?wI&6%d_9SCAMzSa--o}6dnO+Soj@&> hDKpPhNoA_1GiBzPYGkVa!=z{X#Z*X`R%s2ay#ou5cGUm? 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 @@ - + + + + + + + + +