From 60a78b7341c8a3311a31d4c400f775d93d0e7610 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Sat, 23 Jan 2021 15:54:33 +0800 Subject: [PATCH] 11 --- hchyun-ui/src/api/test/results.js | 53 +++ hchyun-ui/src/components/FileUpload/index.vue | 179 +++++++++ .../src/components/ImageUpload/index.vue | 100 +++++ hchyun-ui/src/views/test/results/index.vue | 287 ++++++++++++++ hchyun-ui/src/views/test/stu/index.vue | 349 ++++++++++-------- .../java/com/hchyun/HchYunApplication.java | 12 +- .../controller/common/CaptchaController.java | 31 +- .../controller/common/CommonController.java | 51 +-- .../controller/monitor/ServerController.java | 8 +- .../monitor/SysLogininforController.java | 24 +- .../monitor/SysOperlogController.java | 22 +- .../monitor/SysUserOnlineController.java | 41 +- .../controller/system/RegularController.java | 16 +- .../system/SysConfigController.java | 46 +-- .../controller/system/SysDeptController.java | 68 ++-- .../system/SysDictDataController.java | 35 +- .../system/SysDictTypeController.java | 46 +-- .../controller/system/SysLoginController.java | 27 +- .../controller/system/SysMenuController.java | 65 ++-- .../system/SysNoticeController.java | 27 +- .../controller/system/SysPostController.java | 51 +-- .../system/SysProfileController.java | 48 +-- .../controller/system/SysRoleController.java | 71 ++-- .../controller/system/SysUserController.java | 81 ++-- .../controller/tool/SwaggerController.java | 8 +- .../web/controller/tool/TestController.java | 90 ++--- .../hchyun/web/core/config/SwaggerConfig.java | 5 +- .../src/main/resources/application.yml | 2 +- .../core/controller/BaseController.java | 35 +- .../framework/config/ResourcesConfig.java | 16 +- .../resources/vm/java/serviceImpl.java.vm | 2 +- .../test/controller/ResultsController.java | 186 ++++++++++ .../hchyun/test/controller/StuController.java | 2 +- .../java/com/hchyun/test/dao/ResultsDao.java | 61 +++ .../main/java/com/hchyun/test/dao/StuDao.java | 4 +- .../java/com/hchyun/test/entity/Results.java | 48 ++- .../main/java/com/hchyun/test/entity/Stu.java | 2 +- .../hchyun/test/service/ResultsService.java | 63 ++++ .../com/hchyun/test/service/StuService.java | 2 +- .../test/service/impl/ResultsServiceImpl.java | 153 ++++++++ .../test/service/impl/StuServiceImpl.java | 109 +++--- .../resources/mapper/test/ResultsMapper.xml | 68 ++++ .../main/resources/mapper/test/StuMapper.xml | 46 +-- 43 files changed, 1819 insertions(+), 821 deletions(-) create mode 100644 hchyun-ui/src/api/test/results.js create mode 100644 hchyun-ui/src/components/FileUpload/index.vue create mode 100644 hchyun-ui/src/components/ImageUpload/index.vue create mode 100644 hchyun-ui/src/views/test/results/index.vue create mode 100644 hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/ResultsController.java create mode 100644 hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/ResultsDao.java create mode 100644 hchyun/hchyun-test/src/main/java/com/hchyun/test/service/ResultsService.java create mode 100644 hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/ResultsServiceImpl.java create mode 100644 hchyun/hchyun-test/src/main/resources/mapper/test/ResultsMapper.xml diff --git a/hchyun-ui/src/api/test/results.js b/hchyun-ui/src/api/test/results.js new file mode 100644 index 0000000..2f86acd --- /dev/null +++ b/hchyun-ui/src/api/test/results.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询成绩列表 +export function listResults(query) { + return request({ + url: '/test/results/list', + method: 'get', + params: query + }) +} + +// 查询成绩详细 +export function getResults(id) { + return request({ + url: '/test/results/' + id, + method: 'get' + }) +} + +// 新增成绩 +export function addResults(data) { + return request({ + url: '/test/results', + method: 'post', + data: data + }) +} + +// 修改成绩 +export function updateResults(data) { + return request({ + url: '/test/results', + method: 'put', + data: data + }) +} + +// 删除成绩 +export function delResults(id) { + return request({ + url: '/test/results/' + id, + method: 'delete' + }) +} + +// 导出成绩 +export function exportResults(query) { + return request({ + url: '/test/results/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/hchyun-ui/src/components/FileUpload/index.vue b/hchyun-ui/src/components/FileUpload/index.vue new file mode 100644 index 0000000..69942aa --- /dev/null +++ b/hchyun-ui/src/components/FileUpload/index.vue @@ -0,0 +1,179 @@ + + + + + \ No newline at end of file diff --git a/hchyun-ui/src/components/ImageUpload/index.vue b/hchyun-ui/src/components/ImageUpload/index.vue new file mode 100644 index 0000000..8996329 --- /dev/null +++ b/hchyun-ui/src/components/ImageUpload/index.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/hchyun-ui/src/views/test/results/index.vue b/hchyun-ui/src/views/test/results/index.vue new file mode 100644 index 0000000..6b44179 --- /dev/null +++ b/hchyun-ui/src/views/test/results/index.vue @@ -0,0 +1,287 @@ + + + diff --git a/hchyun-ui/src/views/test/stu/index.vue b/hchyun-ui/src/views/test/stu/index.vue index 29a0285..75f8408 100644 --- a/hchyun-ui/src/views/test/stu/index.vue +++ b/hchyun-ui/src/views/test/stu/index.vue @@ -122,7 +122,7 @@ - + + + + + + +
@@ -171,143 +181,152 @@ diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/HchYunApplication.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/HchYunApplication.java index 342daa4..683a550 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/HchYunApplication.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/HchYunApplication.java @@ -3,17 +3,17 @@ package com.hchyun; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * 启动程序 - * + * * @author hchyun */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class HchYunApplication -{ - public static void main(String[] args) - { +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +//@EnableSwagger2 +public class HchYunApplication { + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(HchYunApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 宏驰云启动成功 ლ(´ڡ`ლ)ﾞ \n"); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java index 0d80fce..3f8d593 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java @@ -6,6 +6,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.FastByteArrayOutputStream; @@ -20,12 +21,11 @@ import com.hchyun.common.utils.uuid.IdUtils; /** * 验证码操作处理 - * + * * @author hchyun */ @RestController -public class CaptchaController -{ +public class CaptchaController { @Resource(name = "captchaProducer") private Producer captchaProducer; @@ -34,7 +34,7 @@ public class CaptchaController @Autowired private RedisCache redisCache; - + // 验证码类型 @Value("${hchyun.captchaType}") private String captchaType; @@ -43,8 +43,7 @@ public class CaptchaController * 生成验证码 */ @GetMapping("/captchaImage") - public AjaxResult getCode(HttpServletResponse response) throws IOException - { + public AjaxResult getCode(HttpServletResponse response) throws IOException { // 保存验证码信息 String uuid = IdUtils.simpleUUID(); String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; @@ -53,15 +52,12 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - if ("math".equals(captchaType)) - { + if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); capStr = capText.substring(0, capText.lastIndexOf("@")); code = capText.substring(capText.lastIndexOf("@") + 1); image = captchaProducerMath.createImage(capStr); - } - else if ("char".equals(captchaType)) - { + } else if ("char".equals(captchaType)) { capStr = code = captchaProducer.createText(); image = captchaProducer.createImage(capStr); } @@ -69,18 +65,15 @@ public class CaptchaController redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); // 转换流信息写出 FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { - ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { + try { + ImageIO.write(image, "jpg" , os); + } catch (IOException e) { return AjaxResult.error(e.getMessage()); } AjaxResult ajax = AjaxResult.success(); - ajax.put("uuid", uuid); - ajax.put("img", Base64.encode(os.toByteArray())); + ajax.put("uuid" , uuid); + ajax.put("img" , Base64.encode(os.toByteArray())); return ajax; } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java index 0fb8f64..234a6c5 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java @@ -2,6 +2,7 @@ package com.hchyun.web.controller.common; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,12 +20,11 @@ import com.hchyun.framework.config.ServerConfig; /** * 通用请求处理 - * + * * @author hchyun */ @RestController -public class CommonController -{ +public class CommonController { private static final Logger log = LoggerFactory.getLogger(CommonController.class); @Autowired @@ -32,35 +32,29 @@ public class CommonController /** * 通用下载请求 - * + * * @param fileName 文件名称 - * @param delete 是否删除 + * @param delete 是否删除 */ @GetMapping("common/download") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { - try - { - if (!FileUtils.isValidFilename(fileName)) - { - throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { + try { + if (!FileUtils.isValidFilename(fileName)) { + throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 " , fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); String filePath = HchYunConfig.getDownloadPath() + fileName; response.setCharacterEncoding("utf-8"); response.setContentType("multipart/form-data"); - response.setHeader("Content-Disposition", + response.setHeader("Content-Disposition" , "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName)); FileUtils.writeBytes(filePath, response.getOutputStream()); - if (delete) - { + if (delete) { FileUtils.deleteFile(filePath); } - } - catch (Exception e) - { - log.error("下载文件失败", e); + } catch (Exception e) { + log.error("下载文件失败" , e); } } @@ -68,22 +62,18 @@ public class CommonController * 通用上传请求 */ @PostMapping("/common/upload") - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { + public AjaxResult uploadFile(MultipartFile file) throws Exception { + try { // 上传文件路径 String filePath = HchYunConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); - ajax.put("fileName", fileName); - ajax.put("url", url); + ajax.put("fileName" , fileName); + ajax.put("url" , url); return ajax; - } - catch (Exception e) - { + } catch (Exception e) { return AjaxResult.error(e.getMessage()); } } @@ -92,8 +82,7 @@ public class CommonController * 本地资源通用下载 */ @GetMapping("/common/download/resource") - public void resourceDownload(String name, HttpServletRequest request, HttpServletResponse response) throws Exception - { + public void resourceDownload(String name, HttpServletRequest request, HttpServletResponse response) throws Exception { // 本地资源路径 String localPath = HchYunConfig.getProfile(); // 数据库资源地址 @@ -102,7 +91,7 @@ public class CommonController String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); response.setCharacterEncoding("utf-8"); response.setContentType("multipart/form-data"); - response.setHeader("Content-Disposition", + response.setHeader("Content-Disposition" , "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName)); FileUtils.writeBytes(downloadPath, response.getOutputStream()); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java index 54fb332..39f5cf3 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java @@ -10,17 +10,15 @@ import com.hchyun.framework.web.domain.Server; /** * 服务器监控 - * + * * @author hchyun */ @RestController @RequestMapping("/monitor/server") -public class ServerController extends BaseController -{ +public class ServerController extends BaseController { @PreAuthorize("@ss.hasPermi('monitor:server:list')") @GetMapping() - public AjaxResult getInfo() throws Exception - { + public AjaxResult getInfo() throws Exception { Server server = new Server(); server.copyTo(); return AjaxResult.success(server); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java index 3cdba78..86a6db0 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.monitor; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -19,48 +20,43 @@ import com.hchyun.system.service.ISysLogininforService; /** * 系统访问记录 - * + * * @author hchyun */ @RestController @RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController -{ +public class SysLogininforController extends BaseController { @Autowired private ISysLogininforService logininforService; @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") @GetMapping("/list") - public TableDataInfo list(SysLogininfor logininfor) - { + public TableDataInfo list(SysLogininfor logininfor) { startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); } - @Log(title = "登录日志", businessType = BusinessType.EXPORT) + @Log(title = "登录日志" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") @GetMapping("/export") - public AjaxResult export(SysLogininfor logininfor) - { + public AjaxResult export(SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(SysLogininfor.class); return util.exportExcel(list, "登录日志"); } @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登录日志", businessType = BusinessType.DELETE) + @Log(title = "登录日志" , businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public AjaxResult remove(@PathVariable Long[] infoIds) - { + public AjaxResult remove(@PathVariable Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") - @Log(title = "登录日志", businessType = BusinessType.CLEAN) + @Log(title = "登录日志" , businessType = BusinessType.CLEAN) @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { logininforService.cleanLogininfor(); return AjaxResult.success(); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java index 2033766..6f55ad2 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.monitor; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -19,30 +20,27 @@ import com.hchyun.system.service.ISysOperLogService; /** * 操作日志记录 - * + * * @author hchyun */ @RestController @RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController -{ +public class SysOperlogController extends BaseController { @Autowired private ISysOperLogService operLogService; @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") @GetMapping("/list") - public TableDataInfo list(SysOperLog operLog) - { + public TableDataInfo list(SysOperLog operLog) { startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); } - @Log(title = "操作日志", businessType = BusinessType.EXPORT) + @Log(title = "操作日志" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") @GetMapping("/export") - public AjaxResult export(SysOperLog operLog) - { + public AjaxResult export(SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); ExcelUtil util = new ExcelUtil(SysOperLog.class); return util.exportExcel(list, "操作日志"); @@ -50,16 +48,14 @@ public class SysOperlogController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/{operIds}") - public AjaxResult remove(@PathVariable Long[] operIds) - { + public AjaxResult remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } - @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @Log(title = "操作日志" , businessType = BusinessType.CLEAN) @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") @DeleteMapping("/clean") - public AjaxResult clean() - { + public AjaxResult clean() { operLogService.cleanOperLog(); return AjaxResult.success(); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java index 1a0fba2..35c5bcc 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -25,13 +26,12 @@ import com.hchyun.system.service.ISysUserOnlineService; /** * 在线用户监控 - * + * * @author hchyun */ @RestController @RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController -{ +public class SysUserOnlineController extends BaseController { @Autowired private ISysUserOnlineService userOnlineService; @@ -40,36 +40,24 @@ public class SysUserOnlineController extends BaseController @PreAuthorize("@ss.hasPermi('monitor:online:list')") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) - { + public TableDataInfo list(String ipaddr, String userName) { Collection keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); - for (String key : keys) - { + for (String key : keys) { LoginUser user = redisCache.getCacheObject(key); - if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) - { + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); } - } - else if (StringUtils.isNotEmpty(ipaddr)) - { - if (StringUtils.equals(ipaddr, user.getIpaddr())) - { + } else if (StringUtils.isNotEmpty(ipaddr)) { + if (StringUtils.equals(ipaddr, user.getIpaddr())) { userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); } - } - else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) - { - if (StringUtils.equals(userName, user.getUsername())) - { + } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) { + if (StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); } - } - else - { + } else { userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); } } @@ -82,10 +70,9 @@ public class SysUserOnlineController extends BaseController * 强退用户 */ @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") - @Log(title = "在线用户", businessType = BusinessType.FORCE) + @Log(title = "在线用户" , businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public AjaxResult forceLogout(@PathVariable String tokenId) - { + public AjaxResult forceLogout(@PathVariable String tokenId) { redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); return AjaxResult.success(); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java index bac2daa..5803c0a 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java @@ -70,7 +70,7 @@ public class RegularController extends HcyBaseController { * @return */ @PreAuthorize("@ss.hasPermi('system:regular:export')") - @Log(title = "校验规则", businessType = BusinessType.EXPORT) + @Log(title = "校验规则" , businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(Regular regular) { try { @@ -116,7 +116,7 @@ public class RegularController extends HcyBaseController { * @return */ @PreAuthorize("@ss.hasPermi('system:regular:add')") - @Log(title = "校验规则", businessType = BusinessType.INSERT) + @Log(title = "校验规则" , businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Regular regular) { try { @@ -129,7 +129,7 @@ public class RegularController extends HcyBaseController { if (regular.getEnable() == null || regular.getEnable() < 0) { return AjaxResult.error("是否启用不能为空!"); } - if (!verifyRegular(regular)){ + if (!verifyRegular(regular)) { return AjaxResult.error("正则表达式校验不通过!"); } ServerResult serverResult = regularService.insertRegular(regular); @@ -151,7 +151,7 @@ public class RegularController extends HcyBaseController { * @return */ @PreAuthorize("@ss.hasPermi('system:regular:edit')") - @Log(title = "校验规则", businessType = BusinessType.UPDATE) + @Log(title = "校验规则" , businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Regular regular) { try { @@ -164,7 +164,7 @@ public class RegularController extends HcyBaseController { if (regular.getEnable() == null || regular.getEnable() < 0) { return AjaxResult.error("是否启用不能为空!"); } - if (!verifyRegular(regular)){ + if (!verifyRegular(regular)) { return AjaxResult.error("正则表达式校验不通过!"); } ServerResult serverResult = regularService.updateRegular(regular); @@ -186,7 +186,7 @@ public class RegularController extends HcyBaseController { * @return */ @PreAuthorize("@ss.hasPermi('system:regular:remove')") - @Log(title = "校验规则", businessType = BusinessType.DELETE) + @Log(title = "校验规则" , businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { try { @@ -205,7 +205,7 @@ public class RegularController extends HcyBaseController { } } - public boolean verifyRegular(Regular regular){ - return Pattern.matches(regular.getRegular(),regular.getValidation()); + public boolean verifyRegular(Regular regular) { + return Pattern.matches(regular.getRegular(), regular.getValidation()); } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java index ff9bdf0..56424d1 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -26,13 +27,12 @@ import com.hchyun.system.service.ISysConfigService; /** * 参数配置 信息操作处理 - * + * * @author hchyun */ @RestController @RequestMapping("/system/config") -public class SysConfigController extends BaseController -{ +public class SysConfigController extends BaseController { @Autowired private ISysConfigService configService; @@ -41,18 +41,16 @@ public class SysConfigController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") - public TableDataInfo list(SysConfig config) - { + public TableDataInfo list(SysConfig config) { startPage(); List list = configService.selectConfigList(config); return getDataTable(list); } - @Log(title = "参数管理", businessType = BusinessType.EXPORT) + @Log(title = "参数管理" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:config:export')") @GetMapping("/export") - public AjaxResult export(SysConfig config) - { + public AjaxResult export(SysConfig config) { List list = configService.selectConfigList(config); ExcelUtil util = new ExcelUtil(SysConfig.class); return util.exportExcel(list, "参数数据"); @@ -63,8 +61,7 @@ public class SysConfigController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:config:query')") @GetMapping(value = "/{configId}") - public AjaxResult getInfo(@PathVariable Long configId) - { + public AjaxResult getInfo(@PathVariable Long configId) { return AjaxResult.success(configService.selectConfigById(configId)); } @@ -72,8 +69,7 @@ public class SysConfigController extends BaseController * 根据参数键名查询参数值 */ @GetMapping(value = "/configKey/{configKey}") - public AjaxResult getConfigKey(@PathVariable String configKey) - { + public AjaxResult getConfigKey(@PathVariable String configKey) { return AjaxResult.success(configService.selectConfigByKey(configKey)); } @@ -81,13 +77,11 @@ public class SysConfigController extends BaseController * 新增参数配置 */ @PreAuthorize("@ss.hasPermi('system:config:add')") - @Log(title = "参数管理", businessType = BusinessType.INSERT) + @Log(title = "参数管理" , businessType = BusinessType.INSERT) @PostMapping @RepeatSubmit - public AjaxResult add(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult add(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setCreateBy(SecurityUtils.getUserId()); @@ -98,12 +92,10 @@ public class SysConfigController extends BaseController * 修改参数配置 */ @PreAuthorize("@ss.hasPermi('system:config:edit')") - @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @Log(title = "参数管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysConfig config) - { - if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult edit(@Validated @RequestBody SysConfig config) { + if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setUpdateBy(SecurityUtils.getUserId()); @@ -114,10 +106,9 @@ public class SysConfigController extends BaseController * 删除参数配置 */ @PreAuthorize("@ss.hasPermi('system:config:remove')") - @Log(title = "参数管理", businessType = BusinessType.DELETE) + @Log(title = "参数管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public AjaxResult remove(@PathVariable Long[] configIds) - { + public AjaxResult remove(@PathVariable Long[] configIds) { return toAjax(configService.deleteConfigByIds(configIds)); } @@ -125,10 +116,9 @@ public class SysConfigController extends BaseController * 清空缓存 */ @PreAuthorize("@ss.hasPermi('system:config:remove')") - @Log(title = "参数管理", businessType = BusinessType.CLEAN) + @Log(title = "参数管理" , businessType = BusinessType.CLEAN) @DeleteMapping("/clearCache") - public AjaxResult clearCache() - { + public AjaxResult clearCache() { configService.clearCache(); return AjaxResult.success(); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java index 7d82f44..29c3e82 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java @@ -2,6 +2,7 @@ package com.hchyun.web.controller.system; import java.util.Iterator; import java.util.List; + import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -26,13 +27,12 @@ import com.hchyun.system.service.ISysDeptService; /** * 部门信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/dept") -public class SysDeptController extends BaseController -{ +public class SysDeptController extends BaseController { @Autowired private ISysDeptService deptService; @@ -41,8 +41,7 @@ public class SysDeptController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list") - public AjaxResult list(SysDept dept) - { + public AjaxResult list(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(depts); } @@ -52,16 +51,13 @@ public class SysDeptController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dept:list')") @GetMapping("/list/exclude/{deptId}") - public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) - { + public AjaxResult excludeChild(@PathVariable(value = "deptId" , required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDept()); Iterator it = depts.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { SysDept d = (SysDept) it.next(); if (d.getDeptId().intValue() == deptId - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) - { + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) { it.remove(); } } @@ -73,8 +69,7 @@ public class SysDeptController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dept:query')") @GetMapping(value = "/{deptId}") - public AjaxResult getInfo(@PathVariable Long deptId) - { + public AjaxResult getInfo(@PathVariable Long deptId) { return AjaxResult.success(deptService.selectDeptById(deptId)); } @@ -82,8 +77,7 @@ public class SysDeptController extends BaseController * 获取部门下拉树列表 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysDept dept) - { + public AjaxResult treeselect(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); } @@ -92,12 +86,11 @@ public class SysDeptController extends BaseController * 加载对应角色部门列表树 */ @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) - { + public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) { List depts = deptService.selectDeptList(new SysDept()); AjaxResult ajax = AjaxResult.success(); - ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); - ajax.put("depts", deptService.buildDeptTreeSelect(depts)); + ajax.put("checkedKeys" , deptService.selectDeptListByRoleId(roleId)); + ajax.put("depts" , deptService.buildDeptTreeSelect(depts)); return ajax; } @@ -105,12 +98,10 @@ public class SysDeptController extends BaseController * 新增部门 */ @PreAuthorize("@ss.hasPermi('system:dept:add')") - @Log(title = "部门管理", businessType = BusinessType.INSERT) + @Log(title = "部门管理" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult add(@Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } dept.setCreateBy(SecurityUtils.getUserId()); @@ -121,21 +112,15 @@ public class SysDeptController extends BaseController * 修改部门 */ @PreAuthorize("@ss.hasPermi('system:dept:edit')") - @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @Log(title = "部门管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDept dept) - { - if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult edit(@Validated @RequestBody SysDept dept) { + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); - } - else if (dept.getParentId().equals(dept.getDeptId())) - { + } else if (dept.getParentId().equals(dept.getDeptId())) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); - } - else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) - { + } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) + && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) { return AjaxResult.error("该部门包含未停用的子部门！"); } dept.setUpdateBy(SecurityUtils.getUserId()); @@ -146,16 +131,13 @@ public class SysDeptController extends BaseController * 删除部门 */ @PreAuthorize("@ss.hasPermi('system:dept:remove')") - @Log(title = "部门管理", businessType = BusinessType.DELETE) + @Log(title = "部门管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public AjaxResult remove(@PathVariable Long deptId) - { - if (deptService.hasChildByDeptId(deptId)) - { + public AjaxResult remove(@PathVariable Long deptId) { + if (deptService.hasChildByDeptId(deptId)) { return AjaxResult.error("存在下级部门,不允许删除"); } - if (deptService.checkDeptExistUser(deptId)) - { + if (deptService.checkDeptExistUser(deptId)) { return AjaxResult.error("部门存在用户,不允许删除"); } return toAjax(deptService.deleteDeptById(deptId)); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java index 038e09e..8df0102 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,13 +26,12 @@ import com.hchyun.system.service.ISysDictTypeService; /** * 数据字典信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController -{ +public class SysDictDataController extends BaseController { @Autowired private ISysDictDataService dictDataService; @@ -40,18 +40,16 @@ public class SysDictDataController extends BaseController @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public TableDataInfo list(SysDictData dictData) - { + public TableDataInfo list(SysDictData dictData) { startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); } - @Log(title = "字典数据", businessType = BusinessType.EXPORT) + @Log(title = "字典数据" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @GetMapping("/export") - public AjaxResult export(SysDictData dictData) - { + public AjaxResult export(SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); ExcelUtil util = new ExcelUtil(SysDictData.class); return util.exportExcel(list, "字典数据"); @@ -62,8 +60,7 @@ public class SysDictDataController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictCode}") - public AjaxResult getInfo(@PathVariable Long dictCode) - { + public AjaxResult getInfo(@PathVariable Long dictCode) { return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); } @@ -71,8 +68,7 @@ public class SysDictDataController extends BaseController * 根据字典类型查询字典数据信息 */ @GetMapping(value = "/type/{dictType}") - public AjaxResult dictType(@PathVariable String dictType) - { + public AjaxResult dictType(@PathVariable String dictType) { return AjaxResult.success(dictTypeService.selectDictDataByType(dictType)); } @@ -80,10 +76,9 @@ public class SysDictDataController extends BaseController * 新增字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典数据", businessType = BusinessType.INSERT) + @Log(title = "字典数据" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictData dict) - { + public AjaxResult add(@Validated @RequestBody SysDictData dict) { dict.setCreateBy(SecurityUtils.getUserId()); return toAjax(dictDataService.insertDictData(dict)); } @@ -92,10 +87,9 @@ public class SysDictDataController extends BaseController * 修改保存字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @Log(title = "字典数据" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictData dict) - { + public AjaxResult edit(@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(SecurityUtils.getUserId()); return toAjax(dictDataService.updateDictData(dict)); } @@ -104,10 +98,9 @@ public class SysDictDataController extends BaseController * 删除字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) + @Log(title = "字典类型" , businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public AjaxResult remove(@PathVariable Long[] dictCodes) - { + public AjaxResult remove(@PathVariable Long[] dictCodes) { return toAjax(dictDataService.deleteDictDataByIds(dictCodes)); } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java index c450855..9f494eb 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,30 +26,27 @@ import com.hchyun.system.service.ISysDictTypeService; /** * 数据字典信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController -{ +public class SysDictTypeController extends BaseController { @Autowired private ISysDictTypeService dictTypeService; @PreAuthorize("@ss.hasPermi('system:dict:list')") @GetMapping("/list") - public TableDataInfo list(SysDictType dictType) - { + public TableDataInfo list(SysDictType dictType) { startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); } - @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @Log(title = "字典类型" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:dict:export')") @GetMapping("/export") - public AjaxResult export(SysDictType dictType) - { + public AjaxResult export(SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil util = new ExcelUtil(SysDictType.class); return util.exportExcel(list, "字典类型"); @@ -59,8 +57,7 @@ public class SysDictTypeController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:dict:query')") @GetMapping(value = "/{dictId}") - public AjaxResult getInfo(@PathVariable Long dictId) - { + public AjaxResult getInfo(@PathVariable Long dictId) { return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); } @@ -68,12 +65,10 @@ public class SysDictTypeController extends BaseController * 新增字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:add')") - @Log(title = "字典类型", businessType = BusinessType.INSERT) + @Log(title = "字典类型" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult add(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } dict.setCreateBy(SecurityUtils.getUserId()); @@ -84,12 +79,10 @@ public class SysDictTypeController extends BaseController * 修改字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:edit')") - @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @Log(title = "字典类型" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysDictType dict) - { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult edit(@Validated @RequestBody SysDictType dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } dict.setUpdateBy(SecurityUtils.getUserId()); @@ -100,10 +93,9 @@ public class SysDictTypeController extends BaseController * 删除字典类型 */ @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.DELETE) + @Log(title = "字典类型" , businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public AjaxResult remove(@PathVariable Long[] dictIds) - { + public AjaxResult remove(@PathVariable Long[] dictIds) { return toAjax(dictTypeService.deleteDictTypeByIds(dictIds)); } @@ -111,10 +103,9 @@ public class SysDictTypeController extends BaseController * 清空缓存 */ @PreAuthorize("@ss.hasPermi('system:dict:remove')") - @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @Log(title = "字典类型" , businessType = BusinessType.CLEAN) @DeleteMapping("/clearCache") - public AjaxResult clearCache() - { + public AjaxResult clearCache() { dictTypeService.clearCache(); return AjaxResult.success(); } @@ -123,8 +114,7 @@ public class SysDictTypeController extends BaseController * 获取字典选择框列表 */ @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); return AjaxResult.success(dictTypes); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java index dd3bae4..07fca91 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java @@ -2,6 +2,7 @@ package com.hchyun.web.controller.system; import java.util.List; import java.util.Set; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -21,12 +22,11 @@ import com.hchyun.system.service.ISysMenuService; /** * 登录验证 - * + * * @author hchyun */ @RestController -public class SysLoginController -{ +public class SysLoginController { @Autowired private SysLoginService loginService; @@ -41,13 +41,12 @@ public class SysLoginController /** * 登录方法 - * + * * @param loginBody 登录信息 * @return 结果 */ @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) - { + public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -58,12 +57,11 @@ public class SysLoginController /** * 获取用户信息 - * + * * @return 用户信息 */ @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); SysUser user = loginUser.getUser(); // 角色集合 @@ -71,20 +69,19 @@ public class SysLoginController // 权限集合 Set permissions = permissionService.getMenuPermission(user); AjaxResult ajax = AjaxResult.success(); - ajax.put("user", user); - ajax.put("roles", roles); - ajax.put("permissions", permissions); + ajax.put("user" , user); + ajax.put("roles" , roles); + ajax.put("permissions" , permissions); return ajax; } /** * 获取路由信息 - * + * * @return 路由信息 */ @GetMapping("getRouters") - public AjaxResult getRouters() - { + public AjaxResult getRouters() { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); // 用户信息 SysUser user = loginUser.getUser(); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java index ab6f282..70e3d00 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -28,13 +29,12 @@ import com.hchyun.system.service.ISysMenuService; /** * 菜单信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/menu") -public class SysMenuController extends BaseController -{ +public class SysMenuController extends BaseController { @Autowired private ISysMenuService menuService; @@ -46,8 +46,7 @@ public class SysMenuController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:menu:list')") @GetMapping("/list") - public AjaxResult list(SysMenu menu) - { + public AjaxResult list(SysMenu menu) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); Long userId = loginUser.getUser().getUserId(); List menus = menuService.selectMenuList(menu, userId); @@ -59,8 +58,7 @@ public class SysMenuController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:menu:query')") @GetMapping(value = "/{menuId}") - public AjaxResult getInfo(@PathVariable Long menuId) - { + public AjaxResult getInfo(@PathVariable Long menuId) { return AjaxResult.success(menuService.selectMenuById(menuId)); } @@ -68,8 +66,7 @@ public class SysMenuController extends BaseController * 获取菜单下拉树列表 */ @GetMapping("/treeselect") - public AjaxResult treeselect(SysMenu menu) - { + public AjaxResult treeselect(SysMenu menu) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); Long userId = loginUser.getUser().getUserId(); List menus = menuService.selectMenuList(menu, userId); @@ -80,13 +77,12 @@ public class SysMenuController extends BaseController * 加载对应角色菜单列表树 */ @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) - { + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); List menus = menuService.selectMenuList(loginUser.getUser().getUserId()); AjaxResult ajax = AjaxResult.success(); - ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); - ajax.put("menus", menuService.buildMenuTreeSelect(menus)); + ajax.put("checkedKeys" , menuService.selectMenuListByRoleId(roleId)); + ajax.put("menus" , menuService.buildMenuTreeSelect(menus)); return ajax; } @@ -94,17 +90,13 @@ public class SysMenuController extends BaseController * 新增菜单 */ @PreAuthorize("@ss.hasPermi('system:menu:add')") - @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @Log(title = "菜单管理" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult add(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) - && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) + && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) { return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); } menu.setCreateBy(SecurityUtils.getUserId()); @@ -115,21 +107,15 @@ public class SysMenuController extends BaseController * 修改菜单 */ @PreAuthorize("@ss.hasPermi('system:menu:edit')") - @Log(title = "菜单管理", businessType = BusinessType.UPDATE) + @Log(title = "菜单管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysMenu menu) - { - if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult edit(@Validated @RequestBody SysMenu menu) { + if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); - } - else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) - && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) - { + } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) + && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) { return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); - } - else if (menu.getMenuId().equals(menu.getParentId())) - { + } else if (menu.getMenuId().equals(menu.getParentId())) { return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); } menu.setUpdateBy(SecurityUtils.getUserId()); @@ -140,16 +126,13 @@ public class SysMenuController extends BaseController * 删除菜单 */ @PreAuthorize("@ss.hasPermi('system:menu:remove')") - @Log(title = "菜单管理", businessType = BusinessType.DELETE) + @Log(title = "菜单管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") - public AjaxResult remove(@PathVariable("menuId") Long menuId) - { - if (menuService.hasChildByMenuId(menuId)) - { + public AjaxResult remove(@PathVariable("menuId") Long menuId) { + if (menuService.hasChildByMenuId(menuId)) { return AjaxResult.error("存在子菜单,不允许删除"); } - if (menuService.checkMenuExistRole(menuId)) - { + if (menuService.checkMenuExistRole(menuId)) { return AjaxResult.error("菜单已分配,不允许删除"); } return toAjax(menuService.deleteMenuById(menuId)); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java index 608d941..a4601a7 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -23,13 +24,12 @@ import com.hchyun.system.service.ISysNoticeService; /** * 公告 信息操作处理 - * + * * @author hchyun */ @RestController @RequestMapping("/system/notice") -public class SysNoticeController extends BaseController -{ +public class SysNoticeController extends BaseController { @Autowired private ISysNoticeService noticeService; @@ -38,8 +38,7 @@ public class SysNoticeController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:notice:list')") @GetMapping("/list") - public TableDataInfo list(SysNotice notice) - { + public TableDataInfo list(SysNotice notice) { startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); @@ -50,8 +49,7 @@ public class SysNoticeController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:notice:query')") @GetMapping(value = "/{noticeId}") - public AjaxResult getInfo(@PathVariable Long noticeId) - { + public AjaxResult getInfo(@PathVariable Long noticeId) { return AjaxResult.success(noticeService.selectNoticeById(noticeId)); } @@ -59,10 +57,9 @@ public class SysNoticeController extends BaseController * 新增通知公告 */ @PreAuthorize("@ss.hasPermi('system:notice:add')") - @Log(title = "通知公告", businessType = BusinessType.INSERT) + @Log(title = "通知公告" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysNotice notice) - { + public AjaxResult add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(SecurityUtils.getUserId()); return toAjax(noticeService.insertNotice(notice)); } @@ -71,10 +68,9 @@ public class SysNoticeController extends BaseController * 修改通知公告 */ @PreAuthorize("@ss.hasPermi('system:notice:edit')") - @Log(title = "通知公告", businessType = BusinessType.UPDATE) + @Log(title = "通知公告" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysNotice notice) - { + public AjaxResult edit(@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(SecurityUtils.getUserId()); return toAjax(noticeService.updateNotice(notice)); } @@ -83,10 +79,9 @@ public class SysNoticeController extends BaseController * 删除通知公告 */ @PreAuthorize("@ss.hasPermi('system:notice:remove')") - @Log(title = "通知公告", businessType = BusinessType.DELETE) + @Log(title = "通知公告" , businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public AjaxResult remove(@PathVariable Long[] noticeIds) - { + public AjaxResult remove(@PathVariable Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java index f35446b..9a59620 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -25,13 +26,12 @@ import com.hchyun.system.service.ISysPostService; /** * 岗位信息操作处理 - * + * * @author hchyun */ @RestController @RequestMapping("/system/post") -public class SysPostController extends BaseController -{ +public class SysPostController extends BaseController { @Autowired private ISysPostService postService; @@ -40,18 +40,16 @@ public class SysPostController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:post:list')") @GetMapping("/list") - public TableDataInfo list(SysPost post) - { + public TableDataInfo list(SysPost post) { startPage(); List list = postService.selectPostList(post); return getDataTable(list); } - - @Log(title = "岗位管理", businessType = BusinessType.EXPORT) + + @Log(title = "岗位管理" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:post:export')") @GetMapping("/export") - public AjaxResult export(SysPost post) - { + public AjaxResult export(SysPost post) { List list = postService.selectPostList(post); ExcelUtil util = new ExcelUtil(SysPost.class); return util.exportExcel(list, "岗位数据"); @@ -62,8 +60,7 @@ public class SysPostController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:post:query')") @GetMapping(value = "/{postId}") - public AjaxResult getInfo(@PathVariable Long postId) - { + public AjaxResult getInfo(@PathVariable Long postId) { return AjaxResult.success(postService.selectPostById(postId)); } @@ -71,16 +68,12 @@ public class SysPostController extends BaseController * 新增岗位 */ @PreAuthorize("@ss.hasPermi('system:post:add')") - @Log(title = "岗位管理", businessType = BusinessType.INSERT) + @Log(title = "岗位管理" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult add(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } post.setCreateBy(SecurityUtils.getUserId()); @@ -91,16 +84,12 @@ public class SysPostController extends BaseController * 修改岗位 */ @PreAuthorize("@ss.hasPermi('system:post:edit')") - @Log(title = "岗位管理", businessType = BusinessType.UPDATE) + @Log(title = "岗位管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysPost post) - { - if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult edit(@Validated @RequestBody SysPost post) { + if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } post.setUpdateBy(SecurityUtils.getUserId()); @@ -111,10 +100,9 @@ public class SysPostController extends BaseController * 删除岗位 */ @PreAuthorize("@ss.hasPermi('system:post:remove')") - @Log(title = "岗位管理", businessType = BusinessType.DELETE) + @Log(title = "岗位管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public AjaxResult remove(@PathVariable Long[] postIds) - { + public AjaxResult remove(@PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -122,8 +110,7 @@ public class SysPostController extends BaseController * 获取岗位选择框列表 */ @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { List posts = postService.selectPostAll(); return AjaxResult.success(posts); } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java index c7cb6a9..59d8385 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.io.IOException; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -25,13 +26,12 @@ import com.hchyun.system.service.ISysUserService; /** * 个人信息 业务处理 - * + * * @author hchyun */ @RestController @RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController -{ +public class SysProfileController extends BaseController { @Autowired private ISysUserService userService; @@ -42,25 +42,22 @@ public class SysProfileController extends BaseController * 个人信息 */ @GetMapping - public AjaxResult profile() - { + public AjaxResult profile() { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); SysUser user = loginUser.getUser(); AjaxResult ajax = AjaxResult.success(user); - ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); - ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); + ajax.put("roleGroup" , userService.selectUserRoleGroup(loginUser.getUsername())); + ajax.put("postGroup" , userService.selectUserPostGroup(loginUser.getUsername())); return ajax; } /** * 修改用户 */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @Log(title = "个人信息" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult updateProfile(@RequestBody SysUser user) - { - if (userService.updateUserProfile(user) > 0) - { + public AjaxResult updateProfile(@RequestBody SysUser user) { + if (userService.updateUserProfile(user) > 0) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); // 更新缓存用户信息 loginUser.getUser().setNickName(user.getNickName()); @@ -76,23 +73,19 @@ public class SysProfileController extends BaseController /** * 重置密码 */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @Log(title = "个人信息" , businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public AjaxResult updatePwd(String oldPassword, String newPassword) - { + public AjaxResult updatePwd(String oldPassword, String newPassword) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); String userName = loginUser.getUsername(); String password = loginUser.getPassword(); - if (!SecurityUtils.matchesPassword(oldPassword, password)) - { + if (!SecurityUtils.matchesPassword(oldPassword, password)) { return AjaxResult.error("修改密码失败，旧密码错误"); } - if (SecurityUtils.matchesPassword(newPassword, password)) - { + if (SecurityUtils.matchesPassword(newPassword, password)) { return AjaxResult.error("新密码不能与旧密码相同"); } - if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) - { + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) { // 更新缓存用户密码 loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); tokenService.setLoginUser(loginUser); @@ -104,18 +97,15 @@ public class SysProfileController extends BaseController /** * 头像上传 */ - @Log(title = "用户头像", businessType = BusinessType.UPDATE) + @Log(title = "用户头像" , businessType = BusinessType.UPDATE) @PostMapping("/avatar") - public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException - { - if (!file.isEmpty()) - { + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException { + if (!file.isEmpty()) { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); String avatar = FileUploadUtils.upload(HchYunConfig.getAvatarPath(), file); - if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) - { + if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); - ajax.put("imgUrl", avatar); + ajax.put("imgUrl" , avatar); // 更新缓存用户头像 loginUser.getUser().setAvatar(avatar); tokenService.setLoginUser(loginUser); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java index 73ae04e..4e5f99d 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java @@ -1,6 +1,7 @@ package com.hchyun.web.controller.system; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -31,39 +32,36 @@ import com.hchyun.system.service.ISysUserService; /** * 角色信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/role") -public class SysRoleController extends BaseController -{ +public class SysRoleController extends BaseController { @Autowired private ISysRoleService roleService; @Autowired private TokenService tokenService; - + @Autowired private SysPermissionService permissionService; - + @Autowired private ISysUserService userService; @PreAuthorize("@ss.hasPermi('system:role:list')") @GetMapping("/list") - public TableDataInfo list(SysRole role) - { + public TableDataInfo list(SysRole role) { startPage(); List list = roleService.selectRoleList(role); return getDataTable(list); } - @Log(title = "角色管理", businessType = BusinessType.EXPORT) + @Log(title = "角色管理" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:role:export')") @GetMapping("/export") - public AjaxResult export(SysRole role) - { + public AjaxResult export(SysRole role) { List list = roleService.selectRoleList(role); ExcelUtil util = new ExcelUtil(SysRole.class); return util.exportExcel(list, "角色数据"); @@ -74,8 +72,7 @@ public class SysRoleController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping(value = "/{roleId}") - public AjaxResult getInfo(@PathVariable Long roleId) - { + public AjaxResult getInfo(@PathVariable Long roleId) { return AjaxResult.success(roleService.selectRoleById(roleId)); } @@ -83,16 +80,12 @@ public class SysRoleController extends BaseController * 新增角色 */ @PreAuthorize("@ss.hasPermi('system:role:add')") - @Log(title = "角色管理", businessType = BusinessType.INSERT) + @Log(title = "角色管理" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysRole role) - { - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + public AjaxResult add(@Validated @RequestBody SysRole role) { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setCreateBy(SecurityUtils.getUserId()); @@ -104,27 +97,21 @@ public class SysRoleController extends BaseController * 修改保存角色 */ @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @Log(title = "角色管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysRole role) - { + public AjaxResult edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); - if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setUpdateBy(SecurityUtils.getUserId()); - - if (roleService.updateRole(role) > 0) - { + + if (roleService.updateRole(role) > 0) { // 更新缓存用户权限 LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); - if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) - { + if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) { loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); tokenService.setLoginUser(loginUser); @@ -138,10 +125,9 @@ public class SysRoleController extends BaseController * 修改保存数据权限 */ @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @Log(title = "角色管理" , businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public AjaxResult dataScope(@RequestBody SysRole role) - { + public AjaxResult dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); return toAjax(roleService.authDataScope(role)); } @@ -150,10 +136,9 @@ public class SysRoleController extends BaseController * 状态修改 */ @PreAuthorize("@ss.hasPermi('system:role:edit')") - @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @Log(title = "角色管理" , businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysRole role) - { + public AjaxResult changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); role.setUpdateBy(SecurityUtils.getUserId()); return toAjax(roleService.updateRoleStatus(role)); @@ -163,10 +148,9 @@ public class SysRoleController extends BaseController * 删除角色 */ @PreAuthorize("@ss.hasPermi('system:role:remove')") - @Log(title = "角色管理", businessType = BusinessType.DELETE) + @Log(title = "角色管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public AjaxResult remove(@PathVariable Long[] roleIds) - { + public AjaxResult remove(@PathVariable Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } @@ -175,8 +159,7 @@ public class SysRoleController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:role:query')") @GetMapping("/optionselect") - public AjaxResult optionselect() - { + public AjaxResult optionselect() { return AjaxResult.success(roleService.selectRoleAll()); } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java index ffaa555..ab1f545 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java @@ -2,6 +2,7 @@ package com.hchyun.web.controller.system; import java.util.List; import java.util.stream.Collectors; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -34,13 +35,12 @@ import com.hchyun.system.service.ISysUserService; /** * 用户信息 - * + * * @author hchyun */ @RestController @RequestMapping("/system/user") -public class SysUserController extends BaseController -{ +public class SysUserController extends BaseController { @Autowired private ISysUserService userService; @@ -58,28 +58,25 @@ public class SysUserController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") - public TableDataInfo list(SysUser user) - { + public TableDataInfo list(SysUser user) { startPage(); List list = userService.selectUserList(user); return getDataTable(list); } - @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @Log(title = "用户管理" , businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @GetMapping("/export") - public AjaxResult export(SysUser user) - { + public AjaxResult export(SysUser user) { List list = userService.selectUserList(user); ExcelUtil util = new ExcelUtil(SysUser.class); return util.exportExcel(list, "用户数据"); } - @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @Log(title = "用户管理" , businessType = BusinessType.IMPORT) @PreAuthorize("@ss.hasPermi('system:user:import')") @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(SysUser.class); List userList = util.importExcel(file.getInputStream()); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); @@ -89,8 +86,7 @@ public class SysUserController extends BaseController } @GetMapping("/importTemplate") - public AjaxResult importTemplate() - { + public AjaxResult importTemplate() { ExcelUtil util = new ExcelUtil(SysUser.class); return util.importTemplateExcel("用户数据"); } @@ -99,18 +95,16 @@ public class SysUserController extends BaseController * 根据用户编号获取详细信息 */ @PreAuthorize("@ss.hasPermi('system:user:query')") - @GetMapping(value = { "/", "/{userId}" }) - public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) - { + @GetMapping(value = {"/" , "/{userId}"}) + public AjaxResult getInfo(@PathVariable(value = "userId" , required = false) Long userId) { AjaxResult ajax = AjaxResult.success(); List roles = roleService.selectRoleAll(); - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); - ajax.put("posts", postService.selectPostAll()); - if (StringUtils.isNotNull(userId)) - { + ajax.put("roles" , SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + ajax.put("posts" , postService.selectPostAll()); + if (StringUtils.isNotNull(userId)) { ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId)); - ajax.put("postIds", postService.selectPostListByUserId(userId)); - ajax.put("roleIds", roleService.selectRoleListByUserId(userId)); + ajax.put("postIds" , postService.selectPostListByUserId(userId)); + ajax.put("roleIds" , roleService.selectRoleListByUserId(userId)); } return ajax; } @@ -119,20 +113,14 @@ public class SysUserController extends BaseController * 新增用户 */ @PreAuthorize("@ss.hasPermi('system:user:add')") - @Log(title = "用户管理", businessType = BusinessType.INSERT) + @Log(title = "用户管理" , businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) - { - if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) - { + public AjaxResult add(@Validated @RequestBody SysUser user) { + if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } user.setCreateBy(SecurityUtils.getUserId()); @@ -144,17 +132,13 @@ public class SysUserController extends BaseController * 修改用户 */ @PreAuthorize("@ss.hasPermi('system:user:edit')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @Log(title = "用户管理" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysUser user) - { + public AjaxResult edit(@Validated @RequestBody SysUser user) { userService.checkUserAllowed(user); - if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + } else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } user.setUpdateBy(SecurityUtils.getUserId()); @@ -165,10 +149,9 @@ public class SysUserController extends BaseController * 删除用户 */ @PreAuthorize("@ss.hasPermi('system:user:remove')") - @Log(title = "用户管理", businessType = BusinessType.DELETE) + @Log(title = "用户管理" , businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public AjaxResult remove(@PathVariable Long[] userIds) - { + public AjaxResult remove(@PathVariable Long[] userIds) { return toAjax(userService.deleteUserByIds(userIds)); } @@ -176,10 +159,9 @@ public class SysUserController extends BaseController * 重置密码 */ @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @Log(title = "用户管理" , businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) - { + public AjaxResult resetPwd(@RequestBody SysUser user) { userService.checkUserAllowed(user); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setUpdateBy(SecurityUtils.getUserId()); @@ -190,10 +172,9 @@ public class SysUserController extends BaseController * 状态修改 */ @PreAuthorize("@ss.hasPermi('system:user:edit')") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @Log(title = "用户管理" , businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) - { + public AjaxResult changeStatus(@RequestBody SysUser user) { userService.checkUserAllowed(user); user.setUpdateBy(SecurityUtils.getUserId()); return toAjax(userService.updateUserStatus(user)); diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/SwaggerController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/SwaggerController.java index b4a44e0..23c9547 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/SwaggerController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/SwaggerController.java @@ -8,17 +8,15 @@ import com.hchyun.common.core.controller.BaseController; /** * swagger 接口 - * + * * @author hchyun */ @Controller @RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController -{ +public class SwaggerController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:swagger:view')") @GetMapping() - public String index() - { + public String index() { return redirect("/swagger-ui.html"); } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java index 614460e..8185712 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -22,66 +23,56 @@ import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 - * + * * @author hchyun */ @Api("用户信息管理") @RestController @RequestMapping("/test/user") -public class TestController extends BaseController -{ +public class TestController extends BaseController { private final static Map users = new LinkedHashMap(); + { - users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); - users.put(2, new UserEntity(2, "ry", "admin123", "15666666666")); + users.put(1, new UserEntity(1, "admin" , "admin123" , "15888888888")); + users.put(2, new UserEntity(2, "ry" , "admin123" , "15666666666")); } @ApiOperation("获取用户列表") @GetMapping("/list") - public AjaxResult userList() - { + public AjaxResult userList() { List userList = new ArrayList(users.values()); return AjaxResult.success(userList); } @ApiOperation("获取用户详细") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path") + @ApiImplicitParam(name = "userId" , value = "用户ID" , required = true, dataType = "int" , paramType = "path") @GetMapping("/{userId}") - public AjaxResult getUser(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { + public AjaxResult getUser(@PathVariable Integer userId) { + if (!users.isEmpty() && users.containsKey(userId)) { return AjaxResult.success(users.get(userId)); - } - else - { + } else { return AjaxResult.error("用户不存在"); } } @ApiOperation("新增用户") - @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity") + @ApiImplicitParam(name = "userEntity" , value = "新增用户信息" , dataType = "UserEntity") @PostMapping("/save") - public AjaxResult save(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { + public AjaxResult save(UserEntity user) { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return AjaxResult.error("用户ID不能为空"); } return AjaxResult.success(users.put(user.getUserId(), user)); } @ApiOperation("更新用户") - @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity") + @ApiImplicitParam(name = "userEntity" , value = "新增用户信息" , dataType = "UserEntity") @PutMapping("/update") - public AjaxResult update(UserEntity user) - { - if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) - { + public AjaxResult update(UserEntity user) { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) { return AjaxResult.error("用户ID不能为空"); } - if (users.isEmpty() || !users.containsKey(user.getUserId())) - { + if (users.isEmpty() || !users.containsKey(user.getUserId())) { return AjaxResult.error("用户不存在"); } users.remove(user.getUserId()); @@ -89,25 +80,20 @@ public class TestController extends BaseController } @ApiOperation("删除用户信息") - @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path") + @ApiImplicitParam(name = "userId" , value = "用户ID" , required = true, dataType = "int" , paramType = "path") @DeleteMapping("/{userId}") - public AjaxResult delete(@PathVariable Integer userId) - { - if (!users.isEmpty() && users.containsKey(userId)) - { + public AjaxResult delete(@PathVariable Integer userId) { + if (!users.isEmpty() && users.containsKey(userId)) { users.remove(userId); return AjaxResult.success(); - } - else - { + } else { return AjaxResult.error("用户不存在"); } } } @ApiModel("用户实体") -class UserEntity -{ +class UserEntity { @ApiModelProperty("用户ID") private Integer userId; @@ -120,56 +106,46 @@ class UserEntity @ApiModelProperty("用户手机") private String mobile; - public UserEntity() - { + public UserEntity() { } - public UserEntity(Integer userId, String username, String password, String mobile) - { + public UserEntity(Integer userId, String username, String password, String mobile) { this.userId = userId; this.username = username; this.password = password; this.mobile = mobile; } - public Integer getUserId() - { + public Integer getUserId() { return userId; } - public void setUserId(Integer userId) - { + public void setUserId(Integer userId) { this.userId = userId; } - public String getUsername() - { + public String getUsername() { return username; } - public void setUsername(String username) - { + public void setUsername(String username) { this.username = username; } - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getMobile() - { + public String getMobile() { return mobile; } - public void setMobile(String mobile) - { + public void setMobile(String mobile) { this.mobile = mobile; } } diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/core/config/SwaggerConfig.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/core/config/SwaggerConfig.java index cc43ac8..ee9a12b 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/core/config/SwaggerConfig.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/core/config/SwaggerConfig.java @@ -56,10 +56,11 @@ public class SwaggerConfig // 设置哪些接口暴露给Swagger展示 .select() // 扫描所有有注解的api，用这种方式更灵活 - .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) +// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 // .apis(RequestHandlerSelectors.basePackage("com.hchyun.project.tool.swagger")) - // 扫描所有 .apis(RequestHandlerSelectors.any()) + // 扫描所有 + .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() /* 设置安全模式，swagger可以设置访问token */ diff --git a/hchyun/hchyun-admin/src/main/resources/application.yml b/hchyun/hchyun-admin/src/main/resources/application.yml index 1220ecb..c245e2a 100644 --- a/hchyun/hchyun-admin/src/main/resources/application.yml +++ b/hchyun/hchyun-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ hchyun: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/hchyun/uploadPath，Linux配置 /home/hchyun/uploadPath） - profile: /home/hchyun/uploadPath + profile: F:/hchyun/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java index 0817bfa..c5a6d0f 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java @@ -3,6 +3,7 @@ package com.hchyun.common.core.controller; import java.beans.PropertyEditorSupport; import java.util.Date; import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -20,25 +21,21 @@ import com.hchyun.common.utils.sql.SqlUtil; /** * web层通用数据处理 - * + * * @author hchyun */ -public class BaseController -{ +public class BaseController { protected final Logger logger = LoggerFactory.getLogger(BaseController.class); /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 */ @InitBinder - public void initBinder(WebDataBinder binder) - { + public void initBinder(WebDataBinder binder) { // Date 类型转换 - binder.registerCustomEditor(Date.class, new PropertyEditorSupport() - { + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() { @Override - public void setAsText(String text) - { + public void setAsText(String text) { setValue(DateUtils.parseDate(text)); } }); @@ -47,13 +44,11 @@ public class BaseController /** * 设置请求分页数据 */ - protected void startPage() - { + protected void startPage() { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) - { + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); PageHelper.startPage(pageNum, pageSize, orderBy); } @@ -62,9 +57,8 @@ public class BaseController /** * 响应请求分页数据 */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TableDataInfo getDataTable(List list) - { + @SuppressWarnings({"rawtypes", "unchecked"}) + protected TableDataInfo getDataTable(List list) { TableDataInfo rspData = new TableDataInfo(); rspData.setCode(HttpStatus.SUCCESS); rspData.setMsg("查询成功"); @@ -75,20 +69,19 @@ public class BaseController /** * 响应返回结果 - * + * * @param rows 影响行数 * @return 操作结果 */ - protected AjaxResult toAjax(int rows) - { + protected AjaxResult toAjax(int rows) { return rows > 0 ? AjaxResult.success() : AjaxResult.error(); } /** * 页面跳转 */ - public String redirect(String url) - { + public String redirect(String url) { + System.out.println(StringUtils.format("redirect:{}", url)); return StringUtils.format("redirect:{}", url); } } diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ResourcesConfig.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ResourcesConfig.java index 489a4e4..90afbbf 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ResourcesConfig.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ResourcesConfig.java @@ -15,18 +15,16 @@ import com.hchyun.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 - * + * * @author hchyun */ @Configuration -public class ResourcesConfig implements WebMvcConfigurer -{ +public class ResourcesConfig implements WebMvcConfigurer { @Autowired private RepeatSubmitInterceptor repeatSubmitInterceptor; @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) - { + public void addResourceHandlers(ResourceHandlerRegistry registry) { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + HchYunConfig.getProfile() + "/"); @@ -39,8 +37,7 @@ public class ResourcesConfig implements WebMvcConfigurer * 自定义拦截规则 */ @Override - public void addInterceptors(InterceptorRegistry registry) - { + public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**"); } @@ -48,8 +45,7 @@ public class ResourcesConfig implements WebMvcConfigurer * 跨域配置 */ @Bean - public CorsFilter corsFilter() - { + public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); @@ -60,7 +56,7 @@ public class ResourcesConfig implements WebMvcConfigurer // 设置访问源请求方法 config.addAllowedMethod("*"); // 对接口配置跨域设置 - source.registerCorsConfiguration("/**", config); + source.registerCorsConfiguration("/**" , config); return new CorsFilter(source); } } \ No newline at end of file diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm index 56494e9..3eec92e 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -49,7 +49,7 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { public ServerResult<${ClassName}> select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) { try { ${ClassName} ${className} = ${className}Dao.select${ClassName}ById(${pkColumn.javaField}); - if (stu != null){ + if (${className} != null){ return new ServerResult<${ClassName}>(true,${className}); }else { return new ServerResult<${ClassName}>(false, ReturnConstants.RESULT_EMPTY); diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/ResultsController.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/ResultsController.java new file mode 100644 index 0000000..ed02fe5 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/ResultsController.java @@ -0,0 +1,186 @@ +package com.hchyun.test.controller; + +import java.io.Serializable; +import java.util.List; +import java.util.regex.Pattern; + + +import com.hchyun.common.constant.ReturnConstants; +import com.hchyun.common.core.controller.HcyBaseController; +import com.hchyun.common.utils.ServerResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hchyun.common.annotation.Log; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.enums.BusinessType; +import com.hchyun.test.entity.Results; +import com.hchyun.test.service.ResultsService; +import com.hchyun.common.utils.poi.ExcelUtil; +import com.hchyun.common.core.page.TableDataInfo; + +/** + * 成绩Controller + * + * @author hchyun + * @date 2021-01-23 + */ +@RestController +@RequestMapping("/test/results") +public class ResultsController extends HcyBaseController { + protected final Logger logger = LoggerFactory.getLogger(ResultsController.class); + + @Autowired + private ResultsService resultsService; + + /** + * 查询成绩列表 + */ + @PreAuthorize("@ss.hasPermi('test:results:list')") + @GetMapping("/list") + public Serializable list(Results results) { + try { + startPage(); + ServerResult> serverResult = resultsService.selectResultsList(results); + if (serverResult.isStart()) { + return getDataTable(serverResult.getData()); + } else { + return AjaxResult.info(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + /** + * 导出成绩列表 + */ + @PreAuthorize("@ss.hasPermi('test:results:export')") + @Log(title = "成绩", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(Results results) { + try { + ServerResult> serverResult = resultsService.selectResultsList(results); + ExcelUtil util = new ExcelUtil(Results. class); + if (serverResult.isStart()) { + return util.exportExcel(serverResult.getData(), "results"); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + /** + * 获取成绩详细信息 + */ + @PreAuthorize("@ss.hasPermi('test:results:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + try { + ServerResult serverResult = resultsService.selectResultsById(id); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData()); + } else { + return AjaxResult.info(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + /** + * 新增成绩 + */ + @PreAuthorize("@ss.hasPermi('test:results:add')") + @Log(title = "成绩", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Results results) { + if (results.getJava() == null || results.getJava()<0) { + return AjaxResult.error("java成绩不能为空!"); + } + if (results.getImages() == null || results.getImages().equals("")) { + return AjaxResult.error("图片路径不能为空!"); + } + if (results.getFile() == null || results.getFile().equals("")) { + return AjaxResult.error("文件路径不能为空!"); + } + try { + ServerResult serverResult = resultsService.insertResults(results); + if (serverResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + /** + * 修改成绩 + */ + @PreAuthorize("@ss.hasPermi('test:results:edit')") + @Log(title = "成绩", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Results results) { + try { + + if (results.getJava() == null || results.getJava()<0) { + return AjaxResult.error("java成绩不能为空!"); + } + if (results.getImages() == null || results.getImages().equals("")) { + return AjaxResult.error("图片路径不能为空!"); + } + if (results.getFile() == null || results.getFile().equals("")) { + return AjaxResult.error("文件路径不能为空!"); + } + ServerResult serverResult = resultsService.updateResults(results); + if (serverResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + /** + * 删除成绩 + */ + @PreAuthorize("@ss.hasPermi('test:results:remove')") + @Log(title = "成绩", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + try { + if (ids.length<0){ + return AjaxResult.error("id不能为空!"); + } + ServerResult serverResult = resultsService.deleteResultsByIds(ids); + if (serverResult.isStart()) { + return AjaxResult.success(); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } +} diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java index 2479ce0..558264d 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/controller/StuController.java @@ -32,7 +32,7 @@ import com.hchyun.common.core.page.TableDataInfo; * 学生Controller * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ @RestController @RequestMapping("/test/stu") diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/ResultsDao.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/ResultsDao.java new file mode 100644 index 0000000..b1f9726 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/ResultsDao.java @@ -0,0 +1,61 @@ +package com.hchyun.test.dao; + +import java.util.List; +import com.hchyun.test.entity.Results; + +/** + * 成绩Mapper接口 + * + * @author hchyun + * @date 2021-01-23 + */ +public interface ResultsDao +{ + /** + * 查询成绩 + * + * @param id 成绩ID + * @return 成绩 + */ + Results selectResultsById(Long id); + + /** + * 查询成绩列表 + * + * @param results 成绩 + * @return 成绩集合 + */ + List selectResultsList(Results results); + + /** + * 新增成绩 + * + * @param results 成绩 + * @return 结果 + */ + int insertResults(Results results); + + /** + * 修改成绩 + * + * @param results 成绩 + * @return 结果 + */ + int updateResults(Results results); + + /** + * 删除成绩 + * + * @param id 成绩ID + * @return 结果 + */ + int deleteResultsById(Long id); + + /** + * 批量删除成绩 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteResultsByIds(Long[] ids); +} diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/StuDao.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/StuDao.java index 0b74794..a822be0 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/StuDao.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/dao/StuDao.java @@ -8,7 +8,7 @@ import com.hchyun.test.entity.Results; * 学生Mapper接口 * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ public interface StuDao { @@ -66,7 +66,7 @@ public interface StuDao * @param customerIds 需要删除的数据ID * @return 结果 */ - int deleteResultsByIds(Long[] ids); + int deleteResultsBySIds(Long[] ids); /** * 批量新增成绩 diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java index 9428cae..c971385 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java @@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * 成绩对象 sys_results * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ public class Results extends BaseEntity { @@ -26,6 +26,14 @@ public class Results extends BaseEntity @Excel(name = "java成绩") private Long java; + /** 图片路径 */ + @Excel(name = "图片路径") + private String images; + + /** 文件路径 */ + @Excel(name = "文件路径") + private String file; + public void setId(Long id) { this.id = id; @@ -35,16 +43,16 @@ public class Results extends BaseEntity { return id; } - public void setSId(Long sId) - { + + public Long getsId() { + return sId; + } + + public void setsId(Long sId) { this.sId = sId; } - public Long getSId() - { - return sId; - } - public void setJava(Long java) + public void setJava(Long java) { this.java = java; } @@ -53,13 +61,33 @@ public class Results extends BaseEntity { return java; } + public void setImages(String images) + { + this.images = images; + } + + public String getImages() + { + return images; + } + public void setFile(String file) + { + this.file = file; + } + + public String getFile() + { + return file; + } @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) - .append("sId", getSId()) + .append("sId", getsId()) .append("java", getJava()) + .append("images", getImages()) + .append("file", getFile()) .toString(); } } diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java index 08aa719..d6d3b6a 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * 学生对象 sys_stu * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ public class Stu extends BaseEntity { diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/ResultsService.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/ResultsService.java new file mode 100644 index 0000000..6e1a69b --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/ResultsService.java @@ -0,0 +1,63 @@ +package com.hchyun.test.service; + +import java.util.List; + +import com.hchyun.common.utils.ServerResult; +import com.hchyun.test.entity.Results; + +/** + * 成绩Service接口 + * + * @author hchyun + * @date 2021-01-23 + */ +public interface ResultsService +{ + /** + * 查询成绩 + * + * @param id 成绩ID + * @return 成绩 + */ + ServerResult selectResultsById(Long id); + + /** + * 查询成绩列表 + * + * @param results 成绩 + * @return 成绩集合 + */ + ServerResult> selectResultsList(Results results); + + /** + * 新增成绩 + * + * @param results 成绩 + * @return 结果 + */ + ServerResult insertResults(Results results); + + /** + * 修改成绩 + * + * @param results 成绩 + * @return 结果 + */ + ServerResult updateResults(Results results); + + /** + * 批量删除成绩 + * + * @param ids 需要删除的成绩ID + * @return 结果 + */ + ServerResult deleteResultsByIds(Long[] ids); + + /** + * 删除成绩信息 + * + * @param id 成绩ID + * @return 结果 + */ + ServerResult deleteResultsById(Long id); +} diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/StuService.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/StuService.java index 1a53e52..6814929 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/StuService.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/StuService.java @@ -9,7 +9,7 @@ import com.hchyun.test.entity.Stu; * 学生Service接口 * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ public interface StuService { diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/ResultsServiceImpl.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/ResultsServiceImpl.java new file mode 100644 index 0000000..7308374 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/ResultsServiceImpl.java @@ -0,0 +1,153 @@ +package com.hchyun.test.service.impl; + +import java.util.List; + +import com.hchyun.common.constant.ReturnConstants; +import com.hchyun.common.utils.ServerResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hchyun.test.dao.ResultsDao; +import com.hchyun.test.entity.Results; +import com.hchyun.test.service.ResultsService; + +/** + * 成绩Service业务层处理 + * + * @author hchyun + * @date 2021-01-23 + */ +@Service +public class ResultsServiceImpl implements ResultsService { + private Logger logger = LoggerFactory.getLogger(ResultsServiceImpl.class); + + @Autowired + private ResultsDao resultsDao; + + /** + * 查询成绩 + * + * @param id 成绩ID + * @return 成绩 + */ + @Override + public ServerResult selectResultsById(Long id) { + try { + Results results = resultsDao.selectResultsById(id); + if (results != null){ + return new ServerResult(true,results); + }else { + return new ServerResult(false, ReturnConstants.RESULT_EMPTY); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult(false,ReturnConstants.DB_EX); + } + } + + /** + * 查询成绩列表 + * + * @param results 成绩 + * @return 成绩 + */ + @Override + public ServerResult> selectResultsList(Results results) { + try { + List resultsList = resultsDao.selectResultsList(results); + if (resultsList.size()>0){ + return new ServerResult>(true,resultsList); + }else { + return new ServerResult>(false,ReturnConstants.RESULT_EMPTY); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult>(false,ReturnConstants.DB_EX); + } + } + + /** + * 新增成绩 + * + * @param results 成绩 + * @return 结果 + */ + @Override + public ServerResult insertResults(Results results) { + try { + Integer renewal = resultsDao.insertResults(results); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult(false,ReturnConstants.DB_EX); + } + } + + /** + * 修改成绩 + * + * @param results 成绩 + * @return 结果 + */ + @Override + public ServerResult updateResults(Results results) { + try { + Integer renewal = resultsDao.updateResults(results); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult(false,ReturnConstants.DB_EX); + } + } + + /** + * 批量删除成绩 + * + * @param ids 需要删除的成绩ID + * @return 结果 + */ + @Override + public ServerResult deleteResultsByIds(Long[] ids) { + try { + Integer renewal = resultsDao.deleteResultsByIds(ids); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult(false,ReturnConstants.DB_EX); + } + } + + /** + * 删除成绩信息 + * + * @param id 成绩ID + * @return 结果 + */ + @Override + public ServerResult deleteResultsById(Long id) { + try { + Integer renewal = resultsDao.deleteResultsById(id); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); + } + }catch (RuntimeException e){ + logger.error(e.getMessage()); + return new ServerResult(false,ReturnConstants.DB_EX); + } + } +} diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java index 774cf87..d504ec6 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/service/impl/StuServiceImpl.java @@ -5,12 +5,13 @@ import java.util.List; import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.utils.DateUtils; import com.hchyun.common.utils.SecurityUtils; +import com.hchyun.common.utils.DateUtils; +import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.ServerResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.ArrayList; import com.hchyun.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; @@ -21,9 +22,9 @@ import com.hchyun.test.service.StuService; /** * 学生Service业务层处理 - * + * * @author hchyun - * @date 2021-01-22 + * @date 2021-01-23 */ @Service public class StuServiceImpl implements StuService { @@ -34,7 +35,7 @@ public class StuServiceImpl implements StuService { /** * 查询学生 - * + * * @param id 学生ID * @return 学生 */ @@ -42,20 +43,20 @@ public class StuServiceImpl implements StuService { public ServerResult selectStuById(Long id) { try { Stu stu = stuDao.selectStuById(id); - if (stu != null) { - return new ServerResult(true, stu); - } else { + if (stu != null){ + return new ServerResult(true,stu); + }else { return new ServerResult(false, ReturnConstants.RESULT_EMPTY); } - } catch (RuntimeException e) { + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult(false, ReturnConstants.DB_EX); + return new ServerResult(false,ReturnConstants.DB_EX); } } /** * 查询学生列表 - * + * * @param stu 学生 * @return 学生 */ @@ -63,20 +64,20 @@ public class StuServiceImpl implements StuService { public ServerResult> selectStuList(Stu stu) { try { List stuList = stuDao.selectStuList(stu); - if (stuList.size() > 0) { - return new ServerResult>(true, stuList); - } else { - return new ServerResult>(false, ReturnConstants.RESULT_EMPTY); + if (stuList.size()>0){ + return new ServerResult>(true,stuList); + }else { + return new ServerResult>(false,ReturnConstants.RESULT_EMPTY); } - } catch (RuntimeException e) { + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult>(false, ReturnConstants.DB_EX); + return new ServerResult>(false,ReturnConstants.DB_EX); } } /** * 新增学生 - * + * * @param stu 学生 * @return 结果 */ @@ -86,22 +87,24 @@ public class StuServiceImpl implements StuService { try { stu.setCreateTime(DateUtils.getNowDate()); stu.setCreateBy(SecurityUtils.getUserId()); - int rows = stuDao.insertStu(stu); - insertResults(stu); - if (rows > 0) { - return new ServerResult(true, rows); - } else { - return new ServerResult(false, ReturnConstants.SYS_FAILL); + int renewal = stuDao.insertStu(stu); + if (insertResults(stu)){ + return new ServerResult(false,ReturnConstants.DB_EX); } - } catch (RuntimeException e) { + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); + } + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult(false, ReturnConstants.DB_EX); + return new ServerResult(false,ReturnConstants.DB_EX); } } /** * 修改学生 - * + * * @param stu 学生 * @return 结果 */ @@ -116,20 +119,20 @@ public class StuServiceImpl implements StuService { return new ServerResult(false,ReturnConstants.DB_EX); } Integer renewal = stuDao.updateStu(stu); - if (renewal > 0) { - return new ServerResult(true, renewal); - } else { - return new ServerResult(false, ReturnConstants.SYS_FAILL); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); } - } catch (RuntimeException e) { + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult(false, ReturnConstants.DB_EX); + return new ServerResult(false,ReturnConstants.DB_EX); } } /** * 批量删除学生 - * + * * @param ids 需要删除的学生ID * @return 结果 */ @@ -137,46 +140,46 @@ public class StuServiceImpl implements StuService { @Override public ServerResult deleteStuByIds(Long[] ids) { try { - //todo 批量删除子表数据 - stuDao.deleteResultsByIds(ids); + //批量删除子表数据 + stuDao.deleteResultsBySIds(ids); Integer renewal = stuDao.deleteStuByIds(ids); - if (renewal > 0) { - return new ServerResult(true, renewal); - } else { - return new ServerResult(false, ReturnConstants.SYS_FAILL); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); } - } catch (RuntimeException e) { + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult(false, ReturnConstants.DB_EX); + return new ServerResult(false,ReturnConstants.DB_EX); } } /** * 删除学生信息 - * + * * @param id 学生ID * @return 结果 */ @Override public ServerResult deleteStuById(Long id) { try { - //todo 删除子表数据 - stuDao.deleteResultsBySId(id); + //删除子表数据 + stuDao.deleteResultsBySId(id); Integer renewal = stuDao.deleteStuById(id); - if (renewal > 0) { - return new ServerResult(true, renewal); - } else { - return new ServerResult(false, ReturnConstants.SYS_FAILL); + if (renewal >0){ + return new ServerResult(true,renewal); + }else { + return new ServerResult(false,ReturnConstants.SYS_FAILL); } - } catch (RuntimeException e) { + }catch (RuntimeException e){ logger.error(e.getMessage()); - return new ServerResult(false, ReturnConstants.DB_EX); + return new ServerResult(false,ReturnConstants.DB_EX); } } /** * 新增成绩信息 - * + * * @param stu 学生对象 */ public boolean insertResults(Stu stu) { @@ -184,8 +187,8 @@ public class StuServiceImpl implements StuService { Long id = stu.getId(); if (StringUtils.isNotNull(resultsList)) { List list = new ArrayList(); - for (Results results : resultsList) { - results.setSId(id); + for (Results results : resultsList){ + results.setsId(id); list.add(results); } if (list.size() > 0) { diff --git a/hchyun/hchyun-test/src/main/resources/mapper/test/ResultsMapper.xml b/hchyun/hchyun-test/src/main/resources/mapper/test/ResultsMapper.xml new file mode 100644 index 0000000..a74e6a0 --- /dev/null +++ b/hchyun/hchyun-test/src/main/resources/mapper/test/ResultsMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + select id, s_id, java, images, file from sys_results + + + + + + + + insert into sys_results + + s_id, + java, + images, + file, + + + #{sId}, + #{java}, + #{images}, + #{file}, + + + + + update sys_results + + s_id = #{sId}, + java = #{java}, + images = #{images}, + file = #{file}, + + where id = #{id} + + + + delete from sys_results where id = #{id} + + + + delete from sys_results where id in + + #{id} + + + \ No newline at end of file diff --git a/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml b/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml index ae1ab2d..8ef63bc 100644 --- a/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml +++ b/hchyun/hchyun-test/src/main/resources/mapper/test/StuMapper.xml @@ -1,9 +1,9 @@ +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -23,6 +23,8 @@ + + @@ -31,50 +33,50 @@ - + - + insert into sys_stu - name, + name, tel, - email, + email, create_time, create_by, update_time, update_by, - + - #{name}, + #{name}, #{tel}, - #{email}, + #{email}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, - + update sys_stu - name = #{name}, + name = #{name}, tel = #{tel}, - email = #{email}, + email = #{email}, create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, @@ -88,14 +90,14 @@ - delete from sys_stu where id in + delete from sys_stu where id in #{id} - + - delete from sys_results where s_id in + delete from sys_results where s_id in #{sId} @@ -106,9 +108,9 @@ - insert into sys_results( s_id, java) values - - ( #{item.sId}, #{item.java}) + insert into sys_results(s_id,java,images,file) values + + (#{item.sId},#{item.java},#{item.images},#{item.file}) \ No newline at end of file