diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd4..c81d665bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -6,14 +6,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 - * + * * @author ruoyi */ -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication -{ - public static void main(String[] args) - { +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class RuoYiApplication { + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java index 9d82a2378..b476d1e64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java @@ -5,14 +5,12 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 - * + * * @author ruoyi */ -public class RuoYiServletInitializer extends SpringBootServletInitializer -{ +public class RuoYiServletInitializer extends SpringBootServletInitializer { @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(RuoYiApplication.class); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index a84897def..1e3fa98ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,7 +1,12 @@ package com.ruoyi.web.controller.common; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.config.ServerConfig; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.file.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,68 +16,56 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.config.ServerConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 通用请求处理 - * + * * @author ruoyi */ @Controller -public class CommonController -{ +public class CommonController { private static final Logger log = LoggerFactory.getLogger(CommonController.class); - + @Autowired private ServerConfig serverConfig; - + /** * 通用下载请求 - * + * * @param fileName 文件名称 - * @param delete 是否删除 + * @param delete 是否删除 */ @GetMapping("common/download") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { - try - { - if (!FileUtils.checkAllowDownload(fileName)) - { + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { + try { + if (!FileUtils.checkAllowDownload(fileName)) { throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); String filePath = RuoYiConfig.getDownloadPath() + fileName; - + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); FileUtils.writeBytes(filePath, response.getOutputStream()); - if (delete) - { + if (delete) { FileUtils.deleteFile(filePath); } } - catch (Exception e) - { + catch (Exception e) { log.error("下载文件失败", e); } } - + /** * 通用上传请求 */ @PostMapping("/common/upload") @ResponseBody - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { + public AjaxResult uploadFile(MultipartFile file) throws Exception { + try { // 上传文件路径 String filePath = RuoYiConfig.getUploadPath(); // 上传并返回新文件名称 @@ -83,23 +76,19 @@ public class CommonController ajax.put("url", url); return ajax; } - catch (Exception e) - { + catch (Exception e) { return AjaxResult.error(e.getMessage()); } } - + /** * 本地资源通用下载 */ @GetMapping("/common/download/resource") public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) - throws Exception - { - try - { - if (!FileUtils.checkAllowDownload(resource)) - { + throws Exception { + try { + if (!FileUtils.checkAllowDownload(resource)) { throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 @@ -112,8 +101,7 @@ public class CommonController FileUtils.setAttachmentResponseHeader(response, downloadName); FileUtils.writeBytes(downloadPath, response.getOutputStream()); } - catch (Exception e) - { + catch (Exception e) { log.error("下载文件失败", e); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java index 78d6da74b..cedb910ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java @@ -6,75 +6,67 @@ import org.springframework.web.bind.annotation.RequestMapping; /** * 模态窗口 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/modal") -public class DemoDialogController -{ +public class DemoDialogController { private String prefix = "demo/modal"; - + /** * 模态窗口 */ @GetMapping("/dialog") - public String dialog() - { + public String dialog() { return prefix + "/dialog"; } - + /** * 弹层组件 */ @GetMapping("/layer") - public String layer() - { + public String layer() { return prefix + "/layer"; } - + /** * 表单 */ @GetMapping("/form") - public String form() - { + public String form() { return prefix + "/form"; } - + /** * 表格 */ @GetMapping("/table") - public String table() - { + public String table() { return prefix + "/table"; } - + /** * 表格check */ @GetMapping("/check") - public String check() - { + public String check() { return prefix + "/table/check"; } - + /** * 表格radio */ @GetMapping("/radio") - public String radio() - { + public String radio() { return prefix + "/table/radio"; } - + /** * 表格回传父窗体 */ @GetMapping("/parent") - public String parent() - { + public String parent() { return prefix + "/table/parent"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java index e523dd6fc..2625a0527 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java @@ -1,32 +1,33 @@ package com.ruoyi.web.controller.demo.controller; -import java.util.ArrayList; -import java.util.List; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.CxSelect; import com.ruoyi.common.json.JSONObject; import com.ruoyi.common.json.JSONObject.JSONArray; import com.ruoyi.common.utils.StringUtils; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; /** * 表单相关 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/form") -public class DemoFormController -{ +public class DemoFormController { private String prefix = "demo/form"; - + private final static List users = new ArrayList(); + { users.add(new UserFormModel(1, "1000001", "测试1", "15888888888")); users.add(new UserFormModel(2, "1000002", "测试2", "15666666666")); @@ -34,175 +35,156 @@ public class DemoFormController users.add(new UserFormModel(4, "1000004", "测试4", "15666666666")); users.add(new UserFormModel(5, "1000005", "测试5", "15666666666")); } - + /** * 按钮页 */ @GetMapping("/button") - public String button() - { + public String button() { return prefix + "/button"; } - + /** * 下拉框 */ @GetMapping("/select") - public String select() - { + public String select() { return prefix + "/select"; } - + /** * 时间轴 */ @GetMapping("/timeline") - public String timeline() - { + public String timeline() { return prefix + "/timeline"; } - + /** * 表单校验 */ @GetMapping("/validate") - public String validate() - { + public String validate() { return prefix + "/validate"; } - + /** * 功能扩展（包含文件上传） */ @GetMapping("/jasny") - public String jasny() - { + public String jasny() { return prefix + "/jasny"; } - + /** * 拖动排序 */ @GetMapping("/sortable") - public String sortable() - { + public String sortable() { return prefix + "/sortable"; } - + /** * 单据打印 */ @GetMapping("/invoice") - public String invoice() - { + public String invoice() { return prefix + "/invoice"; } - + /** * 标签 & 提示 */ @GetMapping("/labels_tips") - public String labels_tips() - { + public String labels_tips() { return prefix + "/labels_tips"; } - + /** * 选项卡 & 面板 */ @GetMapping("/tabs_panels") - public String tabs_panels() - { + public String tabs_panels() { return prefix + "/tabs_panels"; } - + /** * 栅格 */ @GetMapping("/grid") - public String grid() - { + public String grid() { return prefix + "/grid"; } - + /** * 表单向导 */ @GetMapping("/wizard") - public String wizard() - { + public String wizard() { return prefix + "/wizard"; } - + /** * 文件上传 */ @GetMapping("/upload") - public String upload() - { + public String upload() { return prefix + "/upload"; } - + /** * 日期和时间页 */ @GetMapping("/datetime") - public String datetime() - { + public String datetime() { return prefix + "/datetime"; } - + /** * 左右互选组件 */ @GetMapping("/duallistbox") - public String duallistbox() - { + public String duallistbox() { return prefix + "/duallistbox"; } - + /** * 基本表单 */ @GetMapping("/basic") - public String basic() - { + public String basic() { return prefix + "/basic"; } - + /** * 卡片列表 */ @GetMapping("/cards") - public String cards() - { + public String cards() { return prefix + "/cards"; } - + /** * summernote 富文本编辑器 */ @GetMapping("/summernote") - public String summernote() - { + public String summernote() { return prefix + "/summernote"; } - + /** * 搜索自动补全 */ @GetMapping("/autocomplete") - public String autocomplete() - { + public String autocomplete() { return prefix + "/autocomplete"; } - + /** * 多级联动下拉 */ @GetMapping("/cxselect") - public String cxselect(ModelMap mmap) - { + public String cxselect(ModelMap mmap) { CxSelect cxSelectTB = new CxSelect(); cxSelectTB.setN("淘宝"); cxSelectTB.setV("taobao"); @@ -216,7 +198,7 @@ public class DemoFormController tmList.add(cxSelectTm); tmList.add(cxSelectJhs); cxSelectTB.setS(tmList); - + CxSelect cxSelectJD = new CxSelect(); cxSelectJD.setN("京东"); cxSelectJD.setV("jd"); @@ -230,21 +212,20 @@ public class DemoFormController jdList.add(cxSelectCs); jdList.add(cxSelectSx); cxSelectJD.setS(jdList); - + List cxList = new ArrayList(); cxList.add(cxSelectTB); cxList.add(cxSelectJD); - + mmap.put("data", JSON.toJSON(cxList)); return prefix + "/cxselect"; } - + /** * 局部刷新 */ @GetMapping("/localrefresh") - public String localRefresh(ModelMap mmap) - { + public String localRefresh(ModelMap mmap) { JSONArray list = new JSONArray(); JSONObject item = new JSONObject(); item.put("name", "这条任务数据是由ModelMap传递到页面的，点击添加按钮后会将这条数据替换为新数据"); @@ -256,16 +237,15 @@ public class DemoFormController mmap.put("max", 10); return prefix + "/localrefresh"; } - + /** * 局部刷新-添加任务 - * + * * @param fragment 页面中的模板名称 * @param taskName 任务名称 */ @PostMapping("/localrefresh/task") - public String localRefreshTask(String fragment, String taskName, ModelMap mmap) - { + public String localRefreshTask(String fragment, String taskName, ModelMap mmap) { JSONArray list = new JSONArray(); JSONObject item = new JSONObject(); item.put("name", StringUtils.defaultIfBlank(taskName, "通过电话销售过程中了解各盛市的设备仪器使用、采购情况及相关重要追踪人")); @@ -280,111 +260,105 @@ public class DemoFormController mmap.put("tasks", list); return prefix + "/localrefresh::" + fragment; } - + /** * 模拟数据 */ @GetMapping("/cityData") @ResponseBody - public String cityData() - { + public String cityData() { String data = "[{\"n\":\"湖南省\",\"s\":[{\"n\":\"长沙市\",\"s\":[{\"n\":\"芙蓉区\"},{\"n\":\"天心区\"},{\"n\":\"岳麓区\"},{\"n\":\"开福区\"},{\"n\":\"雨花区\"},{\"n\":\"望城区\"},{\"n\":\"长沙县\"},{\"n\":\"宁乡县\"},{\"n\":\"浏阳市\"}]},{\"n\":\"株洲市\",\"s\":[{\"n\":\"荷塘区\"},{\"n\":\"芦淞区\"},{\"n\":\"石峰区\"},{\"n\":\"天元区\"},{\"n\":\"株洲县\"},{\"n\":\"攸县\"},{\"n\":\"茶陵县\"},{\"n\":\"炎陵县\"},{\"n\":\"醴陵市\"}]},{\"n\":\"湘潭市\",\"s\":[{\"n\":\"雨湖区\"},{\"n\":\"岳塘区\"},{\"n\":\"湘潭县\"},{\"n\":\"湘乡市\"},{\"n\":\"韶山市\"}]},{\"n\":\"衡阳市\",\"s\":[{\"n\":\"珠晖区\"},{\"n\":\"雁峰区\"},{\"n\":\"石鼓区\"},{\"n\":\"蒸湘区\"},{\"n\":\"南岳区\"},{\"n\":\"衡阳县\"},{\"n\":\"衡南县\"},{\"n\":\"衡山县\"},{\"n\":\"衡东县\"},{\"n\":\"祁东县\"},{\"n\":\"耒阳市\"},{\"n\":\"常宁市\"}]},{\"n\":\"邵阳市\",\"s\":[{\"n\":\"双清区\"},{\"n\":\"大祥区\"},{\"n\":\"北塔区\"},{\"n\":\"邵东县\"},{\"n\":\"新邵县\"},{\"n\":\"邵阳县\"},{\"n\":\"隆回县\"},{\"n\":\"洞口县\"},{\"n\":\"绥宁县\"},{\"n\":\"新宁县\"},{\"n\":\"城步苗族自治县\"},{\"n\":\"武冈市\"}]},{\"n\":\"岳阳市\",\"s\":[{\"n\":\"岳阳楼区\"},{\"n\":\"云溪区\"},{\"n\":\"君山区\"},{\"n\":\"岳阳县\"},{\"n\":\"华容县\"},{\"n\":\"湘阴县\"},{\"n\":\"平江县\"},{\"n\":\"汨罗市\"},{\"n\":\"临湘市\"}]},{\"n\":\"常德市\",\"s\":[{\"n\":\"武陵区\"},{\"n\":\"鼎城区\"},{\"n\":\"安乡县\"},{\"n\":\"汉寿县\"},{\"n\":\"澧县\"},{\"n\":\"临澧县\"},{\"n\":\"桃源县\"},{\"n\":\"石门县\"},{\"n\":\"津市市\"}]},{\"n\":\"张家界市\",\"s\":[{\"n\":\"永定区\"},{\"n\":\"武陵源区\"},{\"n\":\"慈利县\"},{\"n\":\"桑植县\"}]},{\"n\":\"益阳市\",\"s\":[{\"n\":\"资阳区\"},{\"n\":\"赫山区\"},{\"n\":\"南县\"},{\"n\":\"桃江县\"},{\"n\":\"安化县\"},{\"n\":\"沅江市\"}]},{\"n\":\"郴州市\",\"s\":[{\"n\":\"北湖区\"},{\"n\":\"苏仙区\"},{\"n\":\"桂阳县\"},{\"n\":\"宜章县\"},{\"n\":\"永兴县\"},{\"n\":\"嘉禾县\"},{\"n\":\"临武县\"},{\"n\":\"汝城县\"},{\"n\":\"桂东县\"},{\"n\":\"安仁县\"},{\"n\":\"资兴市\"}]},{\"n\":\"永州市\",\"s\":[{\"n\":\"零陵区\"},{\"n\":\"冷水滩区\"},{\"n\":\"祁阳县\"},{\"n\":\"东安县\"},{\"n\":\"双牌县\"},{\"n\":\"道县\"},{\"n\":\"江永县\"},{\"n\":\"宁远县\"},{\"n\":\"蓝山县\"},{\"n\":\"新田县\"},{\"n\":\"江华瑶族自治县\"}]},{\"n\":\"怀化市\",\"s\":[{\"n\":\"鹤城区\"},{\"n\":\"中方县\"},{\"n\":\"沅陵县\"},{\"n\":\"辰溪县\"},{\"n\":\"溆浦县\"},{\"n\":\"会同县\"},{\"n\":\"麻阳苗族自治县\"},{\"n\":\"新晃侗族自治县\"},{\"n\":\"芷江侗族自治县\"},{\"n\":\"靖州苗族侗族自治县\"},{\"n\":\"通道侗族自治县\"},{\"n\":\"洪江市\"}]},{\"n\":\"娄底市\",\"s\":[{\"n\":\"娄星区\"},{\"n\":\"双峰县\"},{\"n\":\"新化县\"},{\"n\":\"冷水江市\"},{\"n\":\"涟源市\"}]},{\"n\":\"湘西土家族苗族自治州\",\"s\":[{\"n\":\"吉首市\"},{\"n\":\"泸溪县\"},{\"n\":\"凤凰县\"},{\"n\":\"花垣县\"},{\"n\":\"保靖县\"},{\"n\":\"古丈县\"},{\"n\":\"永顺县\"},{\"n\":\"龙山县\"}]}]},{\"n\":\"广东省\",\"s\":[{\"n\":\"广州市\",\"s\":[{\"n\":\"荔湾区\"},{\"n\":\"越秀区\"},{\"n\":\"海珠区\"},{\"n\":\"天河区\"},{\"n\":\"白云区\"},{\"n\":\"黄埔区\"},{\"n\":\"番禺区\"},{\"n\":\"花都区\"},{\"n\":\"南沙区\"},{\"n\":\"萝岗区\"},{\"n\":\"增城市\"},{\"n\":\"从化市\"}]},{\"n\":\"韶关市\",\"s\":[{\"n\":\"武江区\"},{\"n\":\"浈江区\"},{\"n\":\"曲江区\"},{\"n\":\"始兴县\"},{\"n\":\"仁化县\"},{\"n\":\"翁源县\"},{\"n\":\"乳源瑶族自治县\"},{\"n\":\"新丰县\"},{\"n\":\"乐昌市\"},{\"n\":\"南雄市\"}]},{\"n\":\"深圳市\",\"s\":[{\"n\":\"罗湖区\"},{\"n\":\"福田区\"},{\"n\":\"南山区\"},{\"n\":\"宝安区\"},{\"n\":\"龙岗区\"},{\"n\":\"盐田区\"}]},{\"n\":\"珠海市\",\"s\":[{\"n\":\"香洲区\"},{\"n\":\"斗门区\"},{\"n\":\"金湾区\"}]},{\"n\":\"汕头市\",\"s\":[{\"n\":\"龙湖区\"},{\"n\":\"金平区\"},{\"n\":\"濠江区\"},{\"n\":\"潮阳区\"},{\"n\":\"潮南区\"},{\"n\":\"澄海区\"},{\"n\":\"南澳县\"}]},{\"n\":\"佛山市\",\"s\":[{\"n\":\"禅城区\"},{\"n\":\"南海区\"},{\"n\":\"顺德区\"},{\"n\":\"三水区\"},{\"n\":\"高明区\"}]},{\"n\":\"江门市\",\"s\":[{\"n\":\"蓬江区\"},{\"n\":\"江海区\"},{\"n\":\"新会区\"},{\"n\":\"台山市\"},{\"n\":\"开平市\"},{\"n\":\"鹤山市\"},{\"n\":\"恩平市\"}]},{\"n\":\"湛江市\",\"s\":[{\"n\":\"赤坎区\"},{\"n\":\"霞山区\"},{\"n\":\"坡头区\"},{\"n\":\"麻章区\"},{\"n\":\"遂溪县\"},{\"n\":\"徐闻县\"},{\"n\":\"廉江市\"},{\"n\":\"雷州市\"},{\"n\":\"吴川市\"}]},{\"n\":\"茂名市\",\"s\":[{\"n\":\"茂南区\"},{\"n\":\"茂港区\"},{\"n\":\"电白县\"},{\"n\":\"高州市\"},{\"n\":\"化州市\"},{\"n\":\"信宜市\"}]},{\"n\":\"肇庆市\",\"s\":[{\"n\":\"端州区\"},{\"n\":\"鼎湖区\"},{\"n\":\"广宁县\"},{\"n\":\"怀集县\"},{\"n\":\"封开县\"},{\"n\":\"德庆县\"},{\"n\":\"高要市\"},{\"n\":\"四会市\"}]},{\"n\":\"惠州市\",\"s\":[{\"n\":\"惠城区\"},{\"n\":\"惠阳区\"},{\"n\":\"博罗县\"},{\"n\":\"惠东县\"},{\"n\":\"龙门县\"}]},{\"n\":\"梅州市\",\"s\":[{\"n\":\"梅江区\"},{\"n\":\"梅县\"},{\"n\":\"大埔县\"},{\"n\":\"丰顺县\"},{\"n\":\"五华县\"},{\"n\":\"平远县\"},{\"n\":\"蕉岭县\"},{\"n\":\"兴宁市\"}]},{\"n\":\"汕尾市\",\"s\":[{\"n\":\"城区\"},{\"n\":\"海丰县\"},{\"n\":\"陆河县\"},{\"n\":\"陆丰市\"}]},{\"n\":\"河源市\",\"s\":[{\"n\":\"源城区\"},{\"n\":\"紫金县\"},{\"n\":\"龙川县\"},{\"n\":\"连平县\"},{\"n\":\"和平县\"},{\"n\":\"东源县\"}]},{\"n\":\"阳江市\",\"s\":[{\"n\":\"江城区\"},{\"n\":\"阳西县\"},{\"n\":\"阳东县\"},{\"n\":\"阳春市\"}]},{\"n\":\"清远市\",\"s\":[{\"n\":\"清城区\"},{\"n\":\"清新区\"},{\"n\":\"佛冈县\"},{\"n\":\"阳山县\"},{\"n\":\"连山壮族瑶族自治县\"},{\"n\":\"连南瑶族自治县\"},{\"n\":\"英德市\"},{\"n\":\"连州市\"}]},{\"n\":\"东莞市\"},{\"n\":\"中山市\"},{\"n\":\"潮州市\",\"s\":[{\"n\":\"湘桥区\"},{\"n\":\"潮安区\"},{\"n\":\"饶平县\"}]},{\"n\":\"揭阳市\",\"s\":[{\"n\":\"榕城区\"},{\"n\":\"揭东区\"},{\"n\":\"揭西县\"},{\"n\":\"惠来县\"},{\"n\":\"普宁市\"}]},{\"n\":\"云浮市\",\"s\":[{\"n\":\"云城区\"},{\"n\":\"新兴县\"},{\"n\":\"郁南县\"},{\"n\":\"云安县\"},{\"n\":\"罗定市\"}]}]}]"; return data; } - + /** * 获取用户数据 */ @GetMapping("/userModel") @ResponseBody - public AjaxResult userModel() - { + public AjaxResult userModel() { AjaxResult ajax = new AjaxResult(); - + ajax.put("code", 200); ajax.put("value", users); return ajax; } - + /** * 获取数据集合 */ @GetMapping("/collection") @ResponseBody - public AjaxResult collection() - { - String[] array = { "ruoyi 1", "ruoyi 2", "ruoyi 3", "ruoyi 4", "ruoyi 5" }; + public AjaxResult collection() { + String[] array = {"ruoyi 1", "ruoyi 2", "ruoyi 3", "ruoyi 4", "ruoyi 5"}; AjaxResult ajax = new AjaxResult(); ajax.put("value", array); return ajax; } } -class UserFormModel -{ - /** 用户ID */ +class UserFormModel { + /** + * 用户ID + */ private int userId; - - /** 用户编号 */ + + /** + * 用户编号 + */ private String userCode; - - /** 用户姓名 */ + + /** + * 用户姓名 + */ private String userName; - - /** 用户手机 */ + + /** + * 用户手机 + */ private String userPhone; - - public UserFormModel() - { - + + public UserFormModel() { + } - - public UserFormModel(int userId, String userCode, String userName, String userPhone) - { + + public UserFormModel(int userId, String userCode, String userName, String userPhone) { this.userId = userId; this.userCode = userCode; this.userName = userName; this.userPhone = userPhone; } - - public int getUserId() - { + + public int getUserId() { return userId; } - - public void setUserId(int userId) - { + + public void setUserId(int userId) { this.userId = userId; } - - public String getUserCode() - { + + public String getUserCode() { return userCode; } - - public void setUserCode(String userCode) - { + + public void setUserCode(String userCode) { this.userCode = userCode; } - - public String getUserName() - { + + public String getUserName() { return userName; } - - public void setUserName(String userName) - { + + public void setUserName(String userName) { this.userName = userName; } - - public String getUserPhone() - { + + public String getUserPhone() { return userPhone; } - - public void setUserPhone(String userPhone) - { + + public void setUserPhone(String userPhone) { this.userPhone = userPhone; } - + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java index 490c3e061..13bddd420 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java @@ -6,30 +6,27 @@ import org.springframework.web.bind.annotation.RequestMapping; /** * 图标相关 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/icon") -public class DemoIconController -{ +public class DemoIconController { private String prefix = "demo/icon"; - + /** * FontAwesome图标 */ @GetMapping("/fontawesome") - public String fontAwesome() - { + public String fontAwesome() { return prefix + "/fontawesome"; } - + /** * Glyphicons图标 */ @GetMapping("/glyphicons") - public String glyphicons() - { + public String glyphicons() { return prefix + "/glyphicons"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java index c7544a325..fffb1d5c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java @@ -1,17 +1,5 @@ package com.ruoyi.web.controller.demo.controller; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.PageDomain; @@ -23,19 +11,28 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.web.controller.demo.domain.CustomerModel; import com.ruoyi.web.controller.demo.domain.UserOperateModel; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * 操作控制 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/operate") -public class DemoOperateController extends BaseController -{ +public class DemoOperateController extends BaseController { private String prefix = "demo/operate"; - + private final static Map users = new LinkedHashMap(); + { users.put(1, new UserOperateModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0")); users.put(2, new UserOperateModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1")); @@ -64,261 +61,226 @@ public class DemoOperateController extends BaseController users.put(25, new UserOperateModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1")); users.put(26, new UserOperateModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1")); } - + /** * 表格 */ @GetMapping("/table") - public String table() - { + public String table() { return prefix + "/table"; } - + /** * 其他 */ @GetMapping("/other") - public String other() - { + public String other() { return prefix + "/other"; } - + /** * 查询数据 */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(UserOperateModel userModel) - { + public TableDataInfo list(UserOperateModel userModel) { TableDataInfo rspData = new TableDataInfo(); List userList = new ArrayList(users.values()); // 查询条件过滤 - if (StringUtils.isNotEmpty(userModel.getSearchValue())) - { + if (StringUtils.isNotEmpty(userModel.getSearchValue())) { userList.clear(); - for (Map.Entry entry : users.entrySet()) - { - if (entry.getValue().getUserName().equals(userModel.getSearchValue())) - { + for (Map.Entry entry : users.entrySet()) { + if (entry.getValue().getUserName().equals(userModel.getSearchValue())) { userList.add(entry.getValue()); } } } - else if (StringUtils.isNotEmpty(userModel.getUserName())) - { + else if (StringUtils.isNotEmpty(userModel.getUserName())) { userList.clear(); - for (Map.Entry entry : users.entrySet()) - { - if (entry.getValue().getUserName().equals(userModel.getUserName())) - { + for (Map.Entry entry : users.entrySet()) { + if (entry.getValue().getUserName().equals(userModel.getUserName())) { userList.add(entry.getValue()); } } } PageDomain pageDomain = TableSupport.buildPageRequest(); - if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) - { + if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) { rspData.setRows(userList); rspData.setTotal(userList.size()); return rspData; } Integer pageNum = (pageDomain.getPageNum() - 1) * 10; Integer pageSize = pageDomain.getPageNum() * 10; - if (pageSize > userList.size()) - { + if (pageSize > userList.size()) { pageSize = userList.size(); } rspData.setRows(userList.subList(pageNum, pageSize)); rspData.setTotal(userList.size()); return rspData; } - + /** * 新增用户 */ @GetMapping("/add") - public String add(ModelMap mmap) - { + public String add(ModelMap mmap) { return prefix + "/add"; } - + /** * 新增保存用户 */ @PostMapping("/add") @ResponseBody - public AjaxResult addSave(UserOperateModel user) - { + public AjaxResult addSave(UserOperateModel user) { Integer userId = users.size() + 1; user.setUserId(userId); return AjaxResult.success(users.put(userId, user)); } - + /** * 新增保存主子表信息 */ @PostMapping("/customer/add") @ResponseBody - public AjaxResult addSave(CustomerModel customerModel) - { + public AjaxResult addSave(CustomerModel customerModel) { System.out.println(customerModel.toString()); return AjaxResult.success(); } - + /** * 修改用户 */ @GetMapping("/edit/{userId}") - public String edit(@PathVariable("userId") Integer userId, ModelMap mmap) - { + public String edit(@PathVariable("userId") Integer userId, ModelMap mmap) { mmap.put("user", users.get(userId)); return prefix + "/edit"; } - + /** * 修改保存用户 */ @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(UserOperateModel user) - { + public AjaxResult editSave(UserOperateModel user) { return AjaxResult.success(users.put(user.getUserId(), user)); } - + /** * 导出 */ @PostMapping("/export") @ResponseBody - public AjaxResult export(UserOperateModel user) - { + public AjaxResult export(UserOperateModel user) { List list = new ArrayList(users.values()); ExcelUtil util = new ExcelUtil(UserOperateModel.class); return util.exportExcel(list, "用户数据"); } - + /** * 下载模板 */ @GetMapping("/importTemplate") @ResponseBody - public AjaxResult importTemplate() - { + public AjaxResult importTemplate() { ExcelUtil util = new ExcelUtil(UserOperateModel.class); return util.importTemplateExcel("用户数据"); } - + /** * 导入数据 */ @PostMapping("/importData") @ResponseBody - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception - { + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { ExcelUtil util = new ExcelUtil(UserOperateModel.class); List userList = util.importExcel(file.getInputStream()); String message = importUser(userList, updateSupport); return AjaxResult.success(message); } - + /** * 删除用户 */ @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { Integer[] userIds = Convert.toIntArray(ids); - for (Integer userId : userIds) - { + for (Integer userId : userIds) { users.remove(userId); } return AjaxResult.success(); } - + /** * 查看详细 */ @GetMapping("/detail/{userId}") - public String detail(@PathVariable("userId") Integer userId, ModelMap mmap) - { + public String detail(@PathVariable("userId") Integer userId, ModelMap mmap) { mmap.put("user", users.get(userId)); return prefix + "/detail"; } - + @PostMapping("/clean") @ResponseBody - public AjaxResult clean() - { + public AjaxResult clean() { users.clear(); return success(); } - + /** * 导入用户数据 - * - * @param userList 用户数据列表 + * + * @param userList 用户数据列表 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @return 结果 */ - public String importUser(List userList, Boolean isUpdateSupport) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { + public String importUser(List userList, Boolean isUpdateSupport) { + if (StringUtils.isNull(userList) || userList.size() == 0) { throw new BusinessException("导入用户数据不能为空！"); } int successNum = 0; int failureNum = 0; StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); - for (UserOperateModel user : userList) - { - try - { + for (UserOperateModel user : userList) { + try { // 验证是否存在这个用户 boolean userFlag = false; - for (Map.Entry entry : users.entrySet()) - { - if (entry.getValue().getUserName().equals(user.getUserName())) - { + for (Map.Entry entry : users.entrySet()) { + if (entry.getValue().getUserName().equals(user.getUserName())) { userFlag = true; break; } } - if (!userFlag) - { + if (!userFlag) { Integer userId = users.size() + 1; user.setUserId(userId); users.put(userId, user); successNum++; successMsg.append("
" + successNum + "、用户 " + user.getUserName() + " 导入成功"); } - else if (isUpdateSupport) - { + else if (isUpdateSupport) { users.put(user.getUserId(), user); successNum++; successMsg.append("
" + successNum + "、用户 " + user.getUserName() + " 更新成功"); } - else - { + else { failureNum++; failureMsg.append("
" + failureNum + "、用户 " + user.getUserName() + " 已存在"); } } - catch (Exception e) - { + catch (Exception e) { failureNum++; String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); } } - if (failureNum > 0) - { + if (failureNum > 0) { failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); throw new BusinessException(failureMsg.toString()); } - else - { + else { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java index 318e8f08b..d32d84280 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java @@ -6,48 +6,43 @@ import org.springframework.web.bind.annotation.RequestMapping; /** * 报表 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/report") -public class DemoReportController -{ +public class DemoReportController { private String prefix = "demo/report"; - + /** * 百度ECharts */ @GetMapping("/echarts") - public String echarts() - { + public String echarts() { return prefix + "/echarts"; } - + /** * 图表插件 */ @GetMapping("/peity") - public String peity() - { + public String peity() { return prefix + "/peity"; } - + /** * 线状图插件 */ @GetMapping("/sparkline") - public String sparkline() - { + public String sparkline() { return prefix + "/sparkline"; } - + /** * 图表组合 */ @GetMapping("/metrics") - public String metrics() - { + public String metrics() { return prefix + "/metrics"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java index 61cdcd73b..7aaa33e88 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.demo.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -19,19 +8,27 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.*; /** * 表格相关 - * + * * @author ruoyi */ @Controller @RequestMapping("/demo/table") -public class DemoTableController extends BaseController -{ +public class DemoTableController extends BaseController { private String prefix = "demo/table"; - + private final static List users = new ArrayList(); + { users.add(new UserTableModel(1, "1000001", "测试1", "0", "15888888888", "ry@qq.com", 150.0, "0")); users.add(new UserTableModel(2, "1000002", "测试2", "1", "15666666666", "ry@qq.com", 180.0, "1")); @@ -60,8 +57,9 @@ public class DemoTableController extends BaseController users.add(new UserTableModel(25, "1000025", "测试25", "1", "15666666666", "ry@qq.com", 250.0, "1")); users.add(new UserTableModel(26, "1000026", "测试26", "1", "15666666666", "ry@qq.com", 250.0, "1")); } - + private final static List columns = new ArrayList(); + { columns.add(new UserTableColumn("用户ID", "userId")); columns.add(new UserTableColumn("用户编号", "userCode")); @@ -70,282 +68,249 @@ public class DemoTableController extends BaseController columns.add(new UserTableColumn("用户邮箱", "userEmail")); columns.add(new UserTableColumn("用户状态", "status")); } - + /** * 搜索相关 */ @GetMapping("/search") - public String search() - { + public String search() { return prefix + "/search"; } - + /** * 数据汇总 */ @GetMapping("/footer") - public String footer() - { + public String footer() { return prefix + "/footer"; } - + /** * 组合表头 */ @GetMapping("/groupHeader") - public String groupHeader() - { + public String groupHeader() { return prefix + "/groupHeader"; } - + /** * 表格导出 */ @GetMapping("/export") - public String export() - { + public String export() { return prefix + "/export"; } - + /** * 翻页记住选择 */ @GetMapping("/remember") - public String remember() - { + public String remember() { return prefix + "/remember"; } - + /** * 跳转至指定页 */ @GetMapping("/pageGo") - public String pageGo() - { + public String pageGo() { return prefix + "/pageGo"; } - + /** * 自定义查询参数 */ @GetMapping("/params") - public String params() - { + public String params() { return prefix + "/params"; } - + /** * 多表格 */ @GetMapping("/multi") - public String multi() - { + public String multi() { return prefix + "/multi"; } - + /** * 点击按钮加载表格 */ @GetMapping("/button") - public String button() - { + public String button() { return prefix + "/button"; } - + /** * 直接加载表格数据 */ @GetMapping("/data") - public String data(ModelMap mmap) - { + public String data(ModelMap mmap) { mmap.put("users", users); return prefix + "/data"; } - + /** * 表格冻结列 */ @GetMapping("/fixedColumns") - public String fixedColumns() - { + public String fixedColumns() { return prefix + "/fixedColumns"; } - + /** * 自定义触发事件 */ @GetMapping("/event") - public String event() - { + public String event() { return prefix + "/event"; } - + /** * 表格细节视图 */ @GetMapping("/detail") - public String detail() - { + public String detail() { return prefix + "/detail"; } - + /** * 表格父子视图 */ @GetMapping("/child") - public String child() - { + public String child() { return prefix + "/child"; } - + /** * 表格图片预览 */ @GetMapping("/image") - public String image() - { + public String image() { return prefix + "/image"; } - + /** * 动态增删改查 */ @GetMapping("/curd") - public String curd() - { + public String curd() { return prefix + "/curd"; } - + /** * 表格拖拽操作 */ @GetMapping("/reorder") - public String reorder() - { + public String reorder() { return prefix + "/reorder"; } - + /** * 表格列宽拖动 */ @GetMapping("/resizable") - public String resizable() - { + public String resizable() { return prefix + "/resizable"; } - + /** * 表格行内编辑操作 */ @GetMapping("/editable") - public String editable() - { + public String editable() { return prefix + "/editable"; } - + /** * 主子表提交 */ @GetMapping("/subdata") - public String subdata() - { + public String subdata() { return prefix + "/subdata"; } - + /** * 表格自动刷新 */ @GetMapping("/refresh") - public String refresh() - { + public String refresh() { return prefix + "/refresh"; } - + /** * 表格打印配置 */ @GetMapping("/print") - public String print() - { + public String print() { return prefix + "/print"; } - + /** * 表格标题格式化 */ @GetMapping("/headerStyle") - public String headerStyle() - { + public String headerStyle() { return prefix + "/headerStyle"; } - + /** * 表格动态列 */ @GetMapping("/dynamicColumns") - public String dynamicColumns() - { + public String dynamicColumns() { return prefix + "/dynamicColumns"; } - + /** * 表格其他操作 */ @GetMapping("/other") - public String other() - { + public String other() { return prefix + "/other"; } - + /** * 动态获取列 */ @PostMapping("/ajaxColumns") @ResponseBody - public AjaxResult ajaxColumns(UserTableColumn userColumn) - { + public AjaxResult ajaxColumns(UserTableColumn userColumn) { List columnList = new ArrayList(Arrays.asList(new UserTableColumn[columns.size()])); Collections.copy(columnList, columns); - if (userColumn != null && "userBalance".equals(userColumn.getField())) - { + if (userColumn != null && "userBalance".equals(userColumn.getField())) { columnList.add(new UserTableColumn("用户余额", "userBalance")); } return AjaxResult.success(columnList); } - + /** * 查询数据 */ @PostMapping("/list") @ResponseBody - public TableDataInfo list(UserTableModel userModel) - { + public TableDataInfo list(UserTableModel userModel) { TableDataInfo rspData = new TableDataInfo(); List userList = new ArrayList(Arrays.asList(new UserTableModel[users.size()])); Collections.copy(userList, users); // 查询条件过滤 - if (StringUtils.isNotEmpty(userModel.getUserName())) - { + if (StringUtils.isNotEmpty(userModel.getUserName())) { userList.clear(); - for (UserTableModel user : users) - { - if (user.getUserName().equals(userModel.getUserName())) - { + for (UserTableModel user : users) { + if (user.getUserName().equals(userModel.getUserName())) { userList.add(user); } } } PageDomain pageDomain = TableSupport.buildPageRequest(); - if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) - { + if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) { rspData.setRows(userList); rspData.setTotal(userList.size()); return rspData; } Integer pageNum = (pageDomain.getPageNum() - 1) * 10; Integer pageSize = pageDomain.getPageNum() * 10; - if (pageSize > userList.size()) - { + if (pageSize > userList.size()) { pageSize = userList.size(); } rspData.setRows(userList.subList(pageNum, pageSize)); @@ -354,83 +319,95 @@ public class DemoTableController extends BaseController } } -class UserTableColumn -{ - /** 表头 */ +class UserTableColumn { + /** + * 表头 + */ private String title; - /** 字段 */ + /** + * 字段 + */ private String field; - - public UserTableColumn() - { - + + public UserTableColumn() { + } - - public UserTableColumn(String title, String field) - { + + public UserTableColumn(String title, String field) { this.title = title; this.field = field; } - - public String getTitle() - { + + public String getTitle() { return title; } - - public void setTitle(String title) - { + + public void setTitle(String title) { this.title = title; } - - public String getField() - { + + public String getField() { return field; } - - public void setField(String field) - { + + public void setField(String field) { this.field = field; } } -class UserTableModel -{ - /** 用户ID */ +class UserTableModel { + /** + * 用户ID + */ private int userId; - - /** 用户编号 */ + + /** + * 用户编号 + */ private String userCode; - - /** 用户姓名 */ + + /** + * 用户姓名 + */ private String userName; - - /** 用户性别 */ + + /** + * 用户性别 + */ private String userSex; - - /** 用户手机 */ + + /** + * 用户手机 + */ private String userPhone; - - /** 用户邮箱 */ + + /** + * 用户邮箱 + */ private String userEmail; - - /** 用户余额 */ + + /** + * 用户余额 + */ private double userBalance; - - /** 用户状态（0正常 1停用） */ + + /** + * 用户状态（0正常 1停用） + */ private String status; - - /** 创建时间 */ + + /** + * 创建时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - - public UserTableModel() - { - + + public UserTableModel() { + } - + public UserTableModel(int userId, String userCode, String userName, String userSex, String userPhone, - String userEmail, double userBalance, String status) - { + String userEmail, double userBalance, String status) { this.userId = userId; this.userCode = userCode; this.userName = userName; @@ -441,94 +418,76 @@ class UserTableModel this.status = status; this.createTime = DateUtils.getNowDate(); } - - public int getUserId() - { + + public int getUserId() { return userId; } - - public void setUserId(int userId) - { + + public void setUserId(int userId) { this.userId = userId; } - - public String getUserCode() - { + + public String getUserCode() { return userCode; } - - public void setUserCode(String userCode) - { + + public void setUserCode(String userCode) { this.userCode = userCode; } - - public String getUserName() - { + + public String getUserName() { return userName; } - - public void setUserName(String userName) - { + + public void setUserName(String userName) { this.userName = userName; } - - public String getUserSex() - { + + public String getUserSex() { return userSex; } - - public void setUserSex(String userSex) - { + + public void setUserSex(String userSex) { this.userSex = userSex; } - - public String getUserPhone() - { + + public String getUserPhone() { return userPhone; } - - public void setUserPhone(String userPhone) - { + + public void setUserPhone(String userPhone) { this.userPhone = userPhone; } - - public String getUserEmail() - { + + public String getUserEmail() { return userEmail; } - - public void setUserEmail(String userEmail) - { + + public void setUserEmail(String userEmail) { this.userEmail = userEmail; } - - public double getUserBalance() - { + + public double getUserBalance() { return userBalance; } - - public void setUserBalance(double userBalance) - { + + public void setUserBalance(double userBalance) { this.userBalance = userBalance; } - - public String getStatus() - { + + public String getStatus() { return status; } - - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - - public Date getCreateTime() - { + + public Date getCreateTime() { return createTime; } - - public void setCreateTime(Date createTime) - { + + public void setCreateTime(Date createTime) { this.createTime = createTime; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/CustomerModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/CustomerModel.java index d1aebf2ba..fe50770f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/CustomerModel.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/CustomerModel.java @@ -1,116 +1,104 @@ package com.ruoyi.web.controller.demo.domain; -import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.List; + /** * 客户测试信息 - * + * * @author ruoyi */ -public class CustomerModel -{ +public class CustomerModel { /** * 客户姓名 */ private String name; - + /** * 客户手机 */ private String phonenumber; - + /** * 客户性别 */ private String sex; - + /** * 客户生日 */ private String birthday; - + /** * 客户描述 */ private String remark; - + /** * 商品信息 */ private List goods; - - public String getName() - { + + public String getName() { return name; } - - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - - public String getPhonenumber() - { + + public String getPhonenumber() { return phonenumber; } - - public void setPhonenumber(String phonenumber) - { + + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - - - public String getSex() - { + + + public String getSex() { return sex; } - - public void setSex(String sex) - { + + public void setSex(String sex) { this.sex = sex; } - - public String getBirthday() - { + + public String getBirthday() { return birthday; } - - public void setBirthday(String birthday) - { + + public void setBirthday(String birthday) { this.birthday = birthday; } - - public String getRemark() - { + + public String getRemark() { return remark; } - - public void setRemark(String remark) - { + + public void setRemark(String remark) { this.remark = remark; } - - public List getGoods() - { + + public List getGoods() { return goods; } - - public void setGoods(List goods) - { + + public void setGoods(List goods) { this.goods = goods; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("name", getName()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("birthday", getBirthday()) - .append("goods", getGoods()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("birthday", getBirthday()) + .append("goods", getGoods()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/GoodsModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/GoodsModel.java index 897a010e6..f1e7852f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/GoodsModel.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/GoodsModel.java @@ -1,26 +1,26 @@ package com.ruoyi.web.controller.demo.domain; -import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; + /** * 商品测试信息 - * + * * @author ruoyi */ -public class GoodsModel -{ +public class GoodsModel { /** * 商品名称 */ private String name; - + /** * 商品重量 */ private Integer weight; - + /** * 商品价格 */ @@ -30,70 +30,60 @@ public class GoodsModel * 商品日期 */ private Date date; - + /** * 商品种类 */ private String type; - - public String getName() - { + + public String getName() { return name; } - - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - - public Integer getWeight() - { + + public Integer getWeight() { return weight; } - - public void setWeight(Integer weight) - { + + public void setWeight(Integer weight) { this.weight = weight; } - - public Double getPrice() - { + + public Double getPrice() { return price; } - - public void setPrice(Double price) - { + + public void setPrice(Double price) { this.price = price; } - - public Date getDate() - { + + public Date getDate() { return date; } - - public void setDate(Date date) - { + + public void setDate(Date date) { this.date = date; } - - public String getType() - { + + public String getType() { return type; } - - public void setType(String type) - { + + public void setType(String type) { this.type = type; } - + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("name", getName()) - .append("weight", getWeight()) - .append("price", getPrice()) - .append("date", getDate()) - .append("type", getType()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("weight", getWeight()) + .append("price", getPrice()) + .append("date", getDate()) + .append("type", getType()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java index 3324cc7ca..5b4f36aa5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java @@ -1,49 +1,47 @@ package com.ruoyi.web.controller.demo.domain; -import java.util.Date; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.utils.DateUtils; -public class UserOperateModel extends BaseEntity -{ +import java.util.Date; + +public class UserOperateModel extends BaseEntity { private static final long serialVersionUID = 1L; - + private int userId; - + @Excel(name = "用户编号") private String userCode; - + @Excel(name = "用户姓名") private String userName; - + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") private String userSex; - + @Excel(name = "用户手机") private String userPhone; - + @Excel(name = "用户邮箱") private String userEmail; - + @Excel(name = "用户余额") private double userBalance; - + @Excel(name = "用户状态", readConverterExp = "0=正常,1=停用") private String status; - + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date createTime; - - public UserOperateModel() - { - + + public UserOperateModel() { + } - + public UserOperateModel(int userId, String userCode, String userName, String userSex, String userPhone, - String userEmail, double userBalance, String status) - { + String userEmail, double userBalance, String status) { this.userId = userId; this.userCode = userCode; this.userName = userName; @@ -54,96 +52,78 @@ public class UserOperateModel extends BaseEntity this.status = status; this.createTime = DateUtils.getNowDate(); } - - public int getUserId() - { + + public int getUserId() { return userId; } - - public void setUserId(int userId) - { + + public void setUserId(int userId) { this.userId = userId; } - - public String getUserCode() - { + + public String getUserCode() { return userCode; } - - public void setUserCode(String userCode) - { + + public void setUserCode(String userCode) { this.userCode = userCode; } - - public String getUserName() - { + + public String getUserName() { return userName; } - - public void setUserName(String userName) - { + + public void setUserName(String userName) { this.userName = userName; } - - public String getUserSex() - { + + public String getUserSex() { return userSex; } - - public void setUserSex(String userSex) - { + + public void setUserSex(String userSex) { this.userSex = userSex; } - - public String getUserPhone() - { + + public String getUserPhone() { return userPhone; } - - public void setUserPhone(String userPhone) - { + + public void setUserPhone(String userPhone) { this.userPhone = userPhone; } - - public String getUserEmail() - { + + public String getUserEmail() { return userEmail; } - - public void setUserEmail(String userEmail) - { + + public void setUserEmail(String userEmail) { this.userEmail = userEmail; } - - public double getUserBalance() - { + + public double getUserBalance() { return userBalance; } - - public void setUserBalance(double userBalance) - { + + public void setUserBalance(double userBalance) { this.userBalance = userBalance; } - - public String getStatus() - { + + public String getStatus() { return status; } - - public void setStatus(String status) - { + + public void setStatus(String status) { this.status = status; } - + @Override - public Date getCreateTime() - { + public Date getCreateTime() { return createTime; } - + @Override - public void setCreateTime(Date createTime) - { + public void setCreateTime(Date createTime) { this.createTime = createTime; } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java index 1ba897cf1..8da32d585 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java @@ -1,5 +1,8 @@ package com.ruoyi.web.controller.monitor; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.framework.web.service.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -7,75 +10,64 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.web.service.CacheService; /** * 缓存监控 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/cache") -public class CacheController extends BaseController -{ +public class CacheController extends BaseController { private String prefix = "monitor/cache"; - + @Autowired private CacheService cacheService; - + @GetMapping() - public String cache(ModelMap mmap) - { + public String cache(ModelMap mmap) { mmap.put("cacheNames", cacheService.getCacheNames()); return prefix + "/cache"; } - + @PostMapping("/getNames") - public String getCacheNames(String fragment, ModelMap mmap) - { + public String getCacheNames(String fragment, ModelMap mmap) { mmap.put("cacheNames", cacheService.getCacheNames()); return prefix + "/cache::" + fragment; } - + @PostMapping("/getKeys") - public String getCacheKeys(String fragment, String cacheName, ModelMap mmap) - { + public String getCacheKeys(String fragment, String cacheName, ModelMap mmap) { mmap.put("cacheName", cacheName); mmap.put("cacheKyes", cacheService.getCacheKeys(cacheName)); return prefix + "/cache::" + fragment; } - + @PostMapping("/getValue") - public String getCacheValue(String fragment, String cacheName, String cacheKey, ModelMap mmap) - { + public String getCacheValue(String fragment, String cacheName, String cacheKey, ModelMap mmap) { mmap.put("cacheName", cacheName); mmap.put("cacheKey", cacheKey); mmap.put("cacheValue", cacheService.getCacheValue(cacheName, cacheKey)); return prefix + "/cache::" + fragment; } - + @PostMapping("/clearCacheName") @ResponseBody - public AjaxResult clearCacheName(String cacheName, ModelMap mmap) - { + public AjaxResult clearCacheName(String cacheName, ModelMap mmap) { cacheService.clearCacheName(cacheName); return AjaxResult.success(); } - + @PostMapping("/clearCacheKey") @ResponseBody - public AjaxResult clearCacheKey(String cacheName, String cacheKey, ModelMap mmap) - { + public AjaxResult clearCacheKey(String cacheName, String cacheKey, ModelMap mmap) { cacheService.clearCacheKey(cacheName, cacheKey); return AjaxResult.success(); } - + @GetMapping("/clearAll") @ResponseBody - public AjaxResult clearAll(ModelMap mmap) - { + public AjaxResult clearAll(ModelMap mmap) { cacheService.clearAll(); return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java index b2647893c..f77941594 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java @@ -1,26 +1,24 @@ package com.ruoyi.web.controller.monitor; +import com.ruoyi.common.core.controller.BaseController; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; /** * druid 监控 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/data") -public class DruidController extends BaseController -{ +public class DruidController extends BaseController { private String prefix = "/druid"; - + @RequiresPermissions("monitor:data:view") @GetMapping() - public String index() - { + public String index() { return redirect(prefix + "/index"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java index 764197d39..19525e57e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java @@ -1,28 +1,26 @@ package com.ruoyi.web.controller.monitor; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.framework.web.domain.Server; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.framework.web.domain.Server; /** * 服务器监控 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/server") -public class ServerController extends BaseController -{ +public class ServerController extends BaseController { private String prefix = "monitor/server"; - + @RequiresPermissions("monitor:server:view") @GetMapping() - public String server(ModelMap mmap) throws Exception - { + public String server(ModelMap mmap) throws Exception { Server server = new Server(); server.copyTo(); mmap.put("server", server); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index c18c860dd..15f54025f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -1,7 +1,14 @@ package com.ruoyi.web.controller.monitor; -import java.util.List; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.shiro.service.SysPasswordService; +import com.ruoyi.system.domain.SysLogininfor; +import com.ruoyi.system.service.ISysLogininforService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -9,66 +16,55 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; + +import java.util.List; /** * 系统访问记录 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController -{ +public class SysLogininforController extends BaseController { private String prefix = "monitor/logininfor"; - + @Autowired private ISysLogininforService logininforService; - + @Autowired private SysPasswordService passwordService; - + @RequiresPermissions("monitor:logininfor:view") @GetMapping() - public String logininfor() - { + public String logininfor() { return prefix + "/logininfor"; } - + @RequiresPermissions("monitor:logininfor:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysLogininfor logininfor) - { + public TableDataInfo list(SysLogininfor logininfor) { startPage(); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); } - + @Log(title = "登录日志", businessType = BusinessType.EXPORT) @RequiresPermissions("monitor:logininfor:export") @PostMapping("/export") @ResponseBody - 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, "登录日志"); } - + @RequiresPermissions("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(logininforService.deleteLogininforByIds(ids)); } @@ -76,18 +72,16 @@ public class SysLogininforController extends BaseController @Log(title = "登录日志", businessType = BusinessType.CLEAN) @PostMapping("/clean") @ResponseBody - public AjaxResult clean() - { + public AjaxResult clean() { logininforService.cleanLogininfor(); return success(); } - + @RequiresPermissions("monitor:logininfor:unlock") @Log(title = "账户解锁", businessType = BusinessType.OTHER) @PostMapping("/unlock") @ResponseBody - public AjaxResult unlock(String loginName) - { + public AjaxResult unlock(String loginName) { passwordService.clearLoginRecordCache(loginName); return success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 468866e18..d2d418bc6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -1,15 +1,5 @@ package com.ruoyi.web.controller.monitor; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -18,61 +8,62 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 操作日志记录 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController -{ +public class SysOperlogController extends BaseController { private String prefix = "monitor/operlog"; - + @Autowired private ISysOperLogService operLogService; - + @RequiresPermissions("monitor:operlog:view") @GetMapping() - public String operlog() - { + public String operlog() { return prefix + "/operlog"; } - + @RequiresPermissions("monitor:operlog:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysOperLog operLog) - { + public TableDataInfo list(SysOperLog operLog) { startPage(); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); } - + @Log(title = "操作日志", businessType = BusinessType.EXPORT) @RequiresPermissions("monitor:operlog:export") @PostMapping("/export") @ResponseBody - 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, "操作日志"); } - + @RequiresPermissions("monitor:operlog:remove") @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(operLogService.deleteOperLogByIds(ids)); } - + @RequiresPermissions("monitor:operlog:detail") @GetMapping("/detail/{operId}") - public String detail(@PathVariable("operId") Long operId, ModelMap mmap) - { + public String detail(@PathVariable("operId") Long operId, ModelMap mmap) { mmap.put("operLog", operLogService.selectOperLogById(operId)); return prefix + "/detail"; } @@ -81,8 +72,7 @@ public class SysOperlogController extends BaseController @RequiresPermissions("monitor:operlog:remove") @PostMapping("/clean") @ResponseBody - public AjaxResult clean() - { + public AjaxResult clean() { operLogService.cleanOperLog(); return success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 3ae9e81ea..9279474c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -1,14 +1,5 @@ package com.ruoyi.web.controller.monitor; -import java.util.List; -import org.apache.shiro.authz.annotation.Logical; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -21,61 +12,63 @@ import com.ruoyi.framework.shiro.session.OnlineSession; import com.ruoyi.framework.shiro.session.OnlineSessionDAO; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.service.ISysUserOnlineService; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 在线用户监控 - * + * * @author ruoyi */ @Controller @RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController -{ +public class SysUserOnlineController extends BaseController { private String prefix = "monitor/online"; - + @Autowired private ISysUserOnlineService userOnlineService; - + @Autowired private OnlineSessionDAO onlineSessionDAO; - + @RequiresPermissions("monitor:online:view") @GetMapping() - public String online() - { + public String online() { return prefix + "/online"; } - + @RequiresPermissions("monitor:online:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysUserOnline userOnline) - { + public TableDataInfo list(SysUserOnline userOnline) { startPage(); List list = userOnlineService.selectUserOnlineList(userOnline); return getDataTable(list); } - - @RequiresPermissions(value = { "monitor:online:batchForceLogout", "monitor:online:forceLogout" }, logical = Logical.OR) + + @RequiresPermissions(value = {"monitor:online:batchForceLogout", "monitor:online:forceLogout"}, logical = Logical.OR) @Log(title = "在线用户", businessType = BusinessType.FORCE) @PostMapping("/batchForceLogout") @ResponseBody - public AjaxResult batchForceLogout(String ids) - { - for (String sessionId : Convert.toStrArray(ids)) - { + public AjaxResult batchForceLogout(String ids) { + for (String sessionId : Convert.toStrArray(ids)) { SysUserOnline online = userOnlineService.selectOnlineById(sessionId); - if (online == null) - { + if (online == null) { return error("用户已下线"); } OnlineSession onlineSession = (OnlineSession) onlineSessionDAO.readSession(online.getSessionId()); - if (onlineSession == null) - { + if (onlineSession == null) { return error("用户已下线"); } - if (sessionId.equals(ShiroUtils.getSessionId())) - { + if (sessionId.equals(ShiroUtils.getSessionId())) { return error("当前登录用户无法强退"); } onlineSessionDAO.delete(onlineSession); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java index 230cc3b29..382cd5f02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java @@ -1,65 +1,62 @@ package com.ruoyi.web.controller.system; -import java.awt.image.BufferedImage; -import java.io.IOException; +import com.google.code.kaptcha.Constants; +import com.google.code.kaptcha.Producer; +import com.ruoyi.common.core.controller.BaseController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; -import com.google.code.kaptcha.Constants; -import com.google.code.kaptcha.Producer; -import com.ruoyi.common.core.controller.BaseController; +import java.awt.image.BufferedImage; +import java.io.IOException; /** * 图片验证码（支持算术形式） - * + * * @author ruoyi */ @Controller @RequestMapping("/captcha") -public class SysCaptchaController extends BaseController -{ +public class SysCaptchaController extends BaseController { + @Resource(name = "captchaProducer") private Producer captchaProducer; - + @Resource(name = "captchaProducerMath") private Producer captchaProducerMath; - + /** * 验证码生成 */ @GetMapping(value = "/captchaImage") - public ModelAndView getKaptchaImage(HttpServletRequest request, HttpServletResponse response) - { + public ModelAndView getKaptchaImage(HttpServletRequest request, HttpServletResponse response) { ServletOutputStream out = null; - try - { + try { HttpSession session = request.getSession(); response.setDateHeader("Expires", 0); response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); response.addHeader("Cache-Control", "post-check=0, pre-check=0"); response.setHeader("Pragma", "no-cache"); response.setContentType("image/jpeg"); - + String type = request.getParameter("type"); String capStr = null; String code = null; BufferedImage bi = null; - if ("math".equals(type)) - { + if ("math".equals(type)) { String capText = captchaProducerMath.createText(); capStr = capText.substring(0, capText.lastIndexOf("@")); code = capText.substring(capText.lastIndexOf("@") + 1); bi = captchaProducerMath.createImage(capStr); } - else if ("char".equals(type)) - { + else if ("char".equals(type)) { capStr = code = captchaProducer.createText(); bi = captchaProducer.createImage(capStr); } @@ -67,23 +64,17 @@ public class SysCaptchaController extends BaseController out = response.getOutputStream(); ImageIO.write(bi, "jpg", out); out.flush(); - } - catch (Exception e) - { + catch (Exception e) { e.printStackTrace(); } - finally - { - try - { - if (out != null) - { + finally { + try { + if (out != null) { out.close(); } } - catch (IOException e) - { + catch (IOException e) { e.printStackTrace(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 96307b84f..0e33c269a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -21,61 +10,64 @@ import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 参数配置 信息操作处理 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/config") -public class SysConfigController extends BaseController -{ +public class SysConfigController extends BaseController { private String prefix = "system/config"; - + @Autowired private ISysConfigService configService; - + @RequiresPermissions("system:config:view") @GetMapping() - public String config() - { + public String config() { return prefix + "/config"; } - + /** * 查询参数配置列表 */ @RequiresPermissions("system:config:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysConfig config) - { + public TableDataInfo list(SysConfig config) { startPage(); List list = configService.selectConfigList(config); return getDataTable(list); } - + @Log(title = "参数管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:config:export") @PostMapping("/export") @ResponseBody - 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, "参数数据"); } - + /** * 新增参数配置 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - + /** * 新增保存参数配置 */ @@ -83,26 +75,23 @@ public class SysConfigController extends BaseController @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysConfig config) - { - if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult addSave(@Validated SysConfig config) { + if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setCreateBy(ShiroUtils.getLoginName()); return toAjax(configService.insertConfig(config)); } - + /** * 修改参数配置 */ @GetMapping("/edit/{configId}") - public String edit(@PathVariable("configId") Long configId, ModelMap mmap) - { + public String edit(@PathVariable("configId") Long configId, ModelMap mmap) { mmap.put("config", configService.selectConfigById(configId)); return prefix + "/edit"; } - + /** * 修改保存参数配置 */ @@ -110,16 +99,14 @@ public class SysConfigController extends BaseController @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysConfig config) - { - if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) - { + public AjaxResult editSave(@Validated SysConfig config) { + if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) { return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } config.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(configService.updateConfig(config)); } - + /** * 删除参数配置 */ @@ -127,11 +114,10 @@ public class SysConfigController extends BaseController @Log(title = "参数管理", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(configService.deleteConfigByIds(ids)); } - + /** * 清空缓存 */ @@ -139,19 +125,17 @@ public class SysConfigController extends BaseController @Log(title = "参数管理", businessType = BusinessType.CLEAN) @GetMapping("/clearCache") @ResponseBody - public AjaxResult clearCache() - { + public AjaxResult clearCache() { configService.clearCache(); return success(); } - + /** * 校验参数键名 */ @PostMapping("/checkConfigKeyUnique") @ResponseBody - public String checkConfigKeyUnique(SysConfig config) - { + public String checkConfigKeyUnique(SysConfig config) { return configService.checkConfigKeyUnique(config); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index b0cba0472..3bb5b7026 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -22,47 +11,51 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 部门信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/dept") -public class SysDeptController extends BaseController -{ +public class SysDeptController extends BaseController { private String prefix = "system/dept"; - + @Autowired private ISysDeptService deptService; - + @RequiresPermissions("system:dept:view") @GetMapping() - public String dept() - { + public String dept() { return prefix + "/dept"; } - + @RequiresPermissions("system:dept:list") @PostMapping("/list") @ResponseBody - public List list(SysDept dept) - { + public List list(SysDept dept) { List deptList = deptService.selectDeptList(dept); return deptList; } - + /** * 新增部门 */ @GetMapping("/add/{parentId}") - public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) - { + public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { mmap.put("dept", deptService.selectDeptById(parentId)); return prefix + "/add"; } - + /** * 新增保存部门 */ @@ -70,31 +63,27 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysDept dept) - { - if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult addSave(@Validated SysDept dept) { + if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } dept.setCreateBy(ShiroUtils.getLoginName()); return toAjax(deptService.insertDept(dept)); } - + /** * 修改 */ @GetMapping("/edit/{deptId}") - public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) - { + public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) { SysDept dept = deptService.selectDeptById(deptId); - if (StringUtils.isNotNull(dept) && 100L == deptId) - { + if (StringUtils.isNotNull(dept) && 100L == deptId) { dept.setParentName("无"); } mmap.put("dept", dept); return prefix + "/edit"; } - + /** * 保存 */ @@ -102,25 +91,21 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysDept dept) - { - if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) - { + public AjaxResult editSave(@Validated SysDept dept) { + if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } - else if (dept.getParentId().equals(dept.getDeptId())) - { + else if (dept.getParentId().equals(dept.getDeptId())) { return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) - && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) - { + && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) { return AjaxResult.error("该部门包含未停用的子部门！"); } dept.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(deptService.updateDept(dept)); } - + /** * 删除 */ @@ -128,75 +113,67 @@ public class SysDeptController extends BaseController @RequiresPermissions("system:dept:remove") @GetMapping("/remove/{deptId}") @ResponseBody - public AjaxResult remove(@PathVariable("deptId") Long deptId) - { - if (deptService.selectDeptCount(deptId) > 0) - { + public AjaxResult remove(@PathVariable("deptId") Long deptId) { + if (deptService.selectDeptCount(deptId) > 0) { return AjaxResult.warn("存在下级部门,不允许删除"); } - if (deptService.checkDeptExistUser(deptId)) - { + if (deptService.checkDeptExistUser(deptId)) { return AjaxResult.warn("部门存在用户,不允许删除"); } return toAjax(deptService.deleteDeptById(deptId)); } - + /** * 校验部门名称 */ @PostMapping("/checkDeptNameUnique") @ResponseBody - public String checkDeptNameUnique(SysDept dept) - { + public String checkDeptNameUnique(SysDept dept) { return deptService.checkDeptNameUnique(dept); } - + /** * 选择部门树 - * - * @param deptId 部门ID + * + * @param deptId 部门ID * @param excludeId 排除ID */ - @GetMapping(value = { "/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}" }) + @GetMapping(value = {"/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}"}) public String selectDeptTree(@PathVariable("deptId") Long deptId, - @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap) - { + @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap) { mmap.put("dept", deptService.selectDeptById(deptId)); mmap.put("excludeId", excludeId); return prefix + "/tree"; } - + /** * 加载部门列表树 */ @GetMapping("/treeData") @ResponseBody - public List treeData() - { + public List treeData() { List ztrees = deptService.selectDeptTree(new SysDept()); return ztrees; } - + /** * 加载部门列表树（排除下级） */ @GetMapping("/treeData/{excludeId}") @ResponseBody - public List treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) - { + public List treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) { SysDept dept = new SysDept(); dept.setDeptId(excludeId); List ztrees = deptService.selectDeptTreeExcludeChild(dept); return ztrees; } - + /** * 加载角色部门（数据权限）列表树 */ @GetMapping("/roleDeptTreeData") @ResponseBody - public List deptTreeData(SysRole role) - { + public List deptTreeData(SysRole role) { List ztrees = deptService.roleDeptTreeData(role); return ztrees; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 87109589d..9bac9571f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -20,59 +9,62 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictDataService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 数据字典信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController -{ +public class SysDictDataController extends BaseController { private String prefix = "system/dict/data"; - + @Autowired private ISysDictDataService dictDataService; - + @RequiresPermissions("system:dict:view") @GetMapping() - public String dictData() - { + public String dictData() { return prefix + "/data"; } - + @PostMapping("/list") @RequiresPermissions("system:dict:list") @ResponseBody - public TableDataInfo list(SysDictData dictData) - { + public TableDataInfo list(SysDictData dictData) { startPage(); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); } - + @Log(title = "字典数据", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") @PostMapping("/export") @ResponseBody - 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, "字典数据"); } - + /** * 新增字典类型 */ @GetMapping("/add/{dictType}") - public String add(@PathVariable("dictType") String dictType, ModelMap mmap) - { + public String add(@PathVariable("dictType") String dictType, ModelMap mmap) { mmap.put("dictType", dictType); return prefix + "/add"; } - + /** * 新增保存字典类型 */ @@ -80,22 +72,20 @@ public class SysDictDataController extends BaseController @RequiresPermissions("system:dict:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysDictData dict) - { + public AjaxResult addSave(@Validated SysDictData dict) { dict.setCreateBy(ShiroUtils.getLoginName()); return toAjax(dictDataService.insertDictData(dict)); } - + /** * 修改字典类型 */ @GetMapping("/edit/{dictCode}") - public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap) - { + public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap) { mmap.put("dict", dictDataService.selectDictDataById(dictCode)); return prefix + "/edit"; } - + /** * 修改保存字典类型 */ @@ -103,18 +93,16 @@ public class SysDictDataController extends BaseController @RequiresPermissions("system:dict:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysDictData dict) - { + public AjaxResult editSave(@Validated SysDictData dict) { dict.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(dictDataService.updateDictData(dict)); } - + @Log(title = "字典数据", businessType = BusinessType.DELETE) @RequiresPermissions("system:dict:remove") @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(dictDataService.deleteDictDataByIds(ids)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index e8b352190..623e62aaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -22,59 +11,62 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictTypeService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 数据字典信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/dict") -public class SysDictTypeController extends BaseController -{ +public class SysDictTypeController extends BaseController { private String prefix = "system/dict/type"; - + @Autowired private ISysDictTypeService dictTypeService; - + @RequiresPermissions("system:dict:view") @GetMapping() - public String dictType() - { + public String dictType() { return prefix + "/type"; } - + @PostMapping("/list") @RequiresPermissions("system:dict:list") @ResponseBody - public TableDataInfo list(SysDictType dictType) - { + public TableDataInfo list(SysDictType dictType) { startPage(); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); } - + @Log(title = "字典类型", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") @PostMapping("/export") @ResponseBody - 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, "字典类型"); } - + /** * 新增字典类型 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - + /** * 新增保存字典类型 */ @@ -82,26 +74,23 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysDictType dict) - { - if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult addSave(@Validated SysDictType dict) { + if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } dict.setCreateBy(ShiroUtils.getLoginName()); return toAjax(dictTypeService.insertDictType(dict)); } - + /** * 修改字典类型 */ @GetMapping("/edit/{dictId}") - public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap) - { + public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap) { mmap.put("dict", dictTypeService.selectDictTypeById(dictId)); return prefix + "/edit"; } - + /** * 修改保存字典类型 */ @@ -109,25 +98,22 @@ public class SysDictTypeController extends BaseController @RequiresPermissions("system:dict:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysDictType dict) - { - if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) - { + public AjaxResult editSave(@Validated SysDictType dict) { + if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } dict.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(dictTypeService.updateDictType(dict)); } - + @Log(title = "字典类型", businessType = BusinessType.DELETE) @RequiresPermissions("system:dict:remove") @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(dictTypeService.deleteDictTypeByIds(ids)); } - + /** * 清空缓存 */ @@ -135,53 +121,48 @@ public class SysDictTypeController extends BaseController @Log(title = "字典类型", businessType = BusinessType.CLEAN) @GetMapping("/clearCache") @ResponseBody - public AjaxResult clearCache() - { + public AjaxResult clearCache() { dictTypeService.clearCache(); return success(); } - + /** * 查询字典详细 */ @RequiresPermissions("system:dict:list") @GetMapping("/detail/{dictId}") - public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap) - { + public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap) { mmap.put("dict", dictTypeService.selectDictTypeById(dictId)); mmap.put("dictList", dictTypeService.selectDictTypeAll()); return "system/dict/data/data"; } - + /** * 校验字典类型 */ @PostMapping("/checkDictTypeUnique") @ResponseBody - public String checkDictTypeUnique(SysDictType dictType) - { + public String checkDictTypeUnique(SysDictType dictType) { return dictTypeService.checkDictTypeUnique(dictType); } - + /** * 选择字典树 */ @GetMapping("/selectDictTree/{columnId}/{dictType}") public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType, - ModelMap mmap) - { + ModelMap mmap) { mmap.put("columnId", columnId); mmap.put("dict", dictTypeService.selectDictTypeByType(dictType)); return prefix + "/tree"; } - + /** * 加载字典列表树 */ @GetMapping("/treeData") @ResponseBody - public List treeData() - { + public List treeData() { List ztrees = dictTypeService.selectDictTree(new SysDictType()); return ztrees; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 4ac9fb758..13e58059c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.Date; -import java.util.List; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.core.controller.BaseController; @@ -18,36 +7,43 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.CookieUtils; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.*; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; +import java.util.List; /** * 首页 业务处理 - * + * * @author ruoyi */ @Controller -public class SysIndexController extends BaseController -{ +public class SysIndexController extends BaseController { + @Autowired private ISysMenuService menuService; - + @Autowired private ISysConfigService configService; - + @Autowired private SysPasswordService passwordService; - + // 系统首页 @GetMapping("/index") - public String index(ModelMap mmap) - { + public String index(ModelMap mmap) { // 取身份信息 SysUser user = ShiroUtils.getSysUser(); // 根据用户id取出菜单 @@ -61,18 +57,16 @@ public class SysIndexController extends BaseController mmap.put("demoEnabled", RuoYiConfig.isDemoEnabled()); mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate())); mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate())); - + // 菜单导航显示风格 String menuStyle = configService.selectConfigByKey("sys.index.menuStyle"); // 移动端，默认使左侧导航菜单，否则取默认配置 String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle; - + // 优先Cookie配置导航菜单 Cookie[] cookies = ServletUtils.getRequest().getCookies(); - for (Cookie cookie : cookies) - { - if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName())) - { + for (Cookie cookie : cookies) { + if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName())) { indexStyle = cookie.getValue(); break; } @@ -80,71 +74,61 @@ public class SysIndexController extends BaseController String webIndex = "topnav".equalsIgnoreCase(indexStyle) ? "index-topnav" : "index"; return webIndex; } - + // 锁定屏幕 @GetMapping("/lockscreen") - public String lockscreen(ModelMap mmap) - { + public String lockscreen(ModelMap mmap) { mmap.put("user", ShiroUtils.getSysUser()); ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true); return "lock"; } - + // 解锁屏幕 @PostMapping("/unlockscreen") @ResponseBody - public AjaxResult unlockscreen(String password) - { + public AjaxResult unlockscreen(String password) { SysUser user = ShiroUtils.getSysUser(); - if (StringUtils.isNull(user)) - { + if (StringUtils.isNull(user)) { return AjaxResult.error("服务器超时，请重新登陆"); } - if (passwordService.matches(user, password)) - { + if (passwordService.matches(user, password)) { ServletUtils.getSession().removeAttribute(ShiroConstants.LOCK_SCREEN); return AjaxResult.success(); } return AjaxResult.error("密码不正确，请重新输入。"); } - + // 切换主题 @GetMapping("/system/switchSkin") - public String switchSkin() - { + public String switchSkin() { return "skin"; } - + // 切换菜单 @GetMapping("/system/menuStyle/{style}") - public void menuStyle(@PathVariable String style, HttpServletResponse response) - { + public void menuStyle(@PathVariable String style) { + HttpServletResponse response = ServletUtils.getResponse(); CookieUtils.setCookie(response, "nav-style", style); } - + // 系统介绍 @GetMapping("/system/main") - public String main(ModelMap mmap) - { + public String main(ModelMap mmap) { mmap.put("version", RuoYiConfig.getVersion()); return "main"; } - + // 检查初始密码是否提醒修改 - public boolean initPasswordIsModify(Date pwdUpdateDate) - { + public boolean initPasswordIsModify(Date pwdUpdateDate) { Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify")); return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null; } - + // 检查密码是否过期 - public boolean passwordIsExpiration(Date pwdUpdateDate) - { + public boolean passwordIsExpiration(Date pwdUpdateDate) { Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays")); - if (passwordValidateDays != null && passwordValidateDays > 0) - { - if (StringUtils.isNull(pwdUpdateDate)) - { + if (passwordValidateDays != null && passwordValidateDays > 0) { + if (StringUtils.isNull(pwdUpdateDate)) { // 如果从未修改过初始密码，直接提醒过期 return true; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 1652f74ef..be9a7116d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -1,7 +1,9 @@ package com.ruoyi.web.controller.system; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.UsernamePasswordToken; @@ -10,56 +12,52 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * 登录验证 - * + * * @author ruoyi */ @Controller -public class SysLoginController extends BaseController -{ +public class SysLoginController extends BaseController { + @GetMapping("/login") - public String login(HttpServletRequest request, HttpServletResponse response) - { + public String login(HttpServletRequest request, HttpServletResponse response) { + // 如果是Ajax请求，返回Json字符串。 - if (ServletUtils.isAjaxRequest(request)) - { + if (ServletUtils.isAjaxRequest(request)) { return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}"); } - + return "login"; } - + @PostMapping("/login") @ResponseBody - public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) - { + public AjaxResult ajaxLogin(String username, + String password, + Boolean rememberMe) { + UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe); Subject subject = SecurityUtils.getSubject(); - try - { + try { subject.login(token); return success(); } - catch (AuthenticationException e) - { + catch (AuthenticationException e) { String msg = "用户或密码错误"; - if (StringUtils.isNotEmpty(e.getMessage())) - { + if (StringUtils.isNotEmpty(e.getMessage())) { msg = e.getMessage(); } return error(msg); } } - + @GetMapping("/unauth") - public String unauth() - { + public String unauth() { return "error/unauth"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 05d6e2595..a2559a78c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -22,38 +11,43 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.framework.shiro.util.AuthorizationUtils; import com.ruoyi.system.service.ISysMenuService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 菜单信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/menu") -public class SysMenuController extends BaseController -{ +public class SysMenuController extends BaseController { private String prefix = "system/menu"; - + @Autowired private ISysMenuService menuService; - + @RequiresPermissions("system:menu:view") @GetMapping() - public String menu() - { + public String menu() { return prefix + "/menu"; } - + @RequiresPermissions("system:menu:list") @PostMapping("/list") @ResponseBody - public List list(SysMenu menu) - { + public List list(SysMenu menu) { Long userId = ShiroUtils.getUserId(); List menuList = menuService.selectMenuList(menu, userId); return menuList; } - + /** * 删除菜单 */ @@ -61,33 +55,27 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:remove") @GetMapping("/remove/{menuId}") @ResponseBody - public AjaxResult remove(@PathVariable("menuId") Long menuId) - { - if (menuService.selectCountMenuByParentId(menuId) > 0) - { + public AjaxResult remove(@PathVariable("menuId") Long menuId) { + if (menuService.selectCountMenuByParentId(menuId) > 0) { return AjaxResult.warn("存在子菜单,不允许删除"); } - if (menuService.selectCountRoleMenuByMenuId(menuId) > 0) - { + if (menuService.selectCountRoleMenuByMenuId(menuId) > 0) { return AjaxResult.warn("菜单已分配,不允许删除"); } AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.deleteMenuById(menuId)); } - + /** * 新增 */ @GetMapping("/add/{parentId}") - public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) - { + public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { SysMenu menu = null; - if (0L != parentId) - { + if (0L != parentId) { menu = menuService.selectMenuById(parentId); } - else - { + else { menu = new SysMenu(); menu.setMenuId(0L); menu.setMenuName("主目录"); @@ -95,7 +83,7 @@ public class SysMenuController extends BaseController mmap.put("menu", menu); return prefix + "/add"; } - + /** * 新增保存菜单 */ @@ -103,27 +91,24 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:add") @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysMenu menu) - { - if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult addSave(@Validated SysMenu menu) { + if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } menu.setCreateBy(ShiroUtils.getLoginName()); AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.insertMenu(menu)); } - + /** * 修改菜单 */ @GetMapping("/edit/{menuId}") - public String edit(@PathVariable("menuId") Long menuId, ModelMap mmap) - { + public String edit(@PathVariable("menuId") Long menuId, ModelMap mmap) { mmap.put("menu", menuService.selectMenuById(menuId)); return prefix + "/edit"; } - + /** * 修改保存菜单 */ @@ -131,66 +116,59 @@ public class SysMenuController extends BaseController @RequiresPermissions("system:menu:edit") @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysMenu menu) - { - if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) - { + public AjaxResult editSave(@Validated SysMenu menu) { + if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } menu.setUpdateBy(ShiroUtils.getLoginName()); AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.updateMenu(menu)); } - + /** * 选择菜单图标 */ @GetMapping("/icon") - public String icon() - { + public String icon() { return prefix + "/icon"; } - + /** * 校验菜单名称 */ @PostMapping("/checkMenuNameUnique") @ResponseBody - public String checkMenuNameUnique(SysMenu menu) - { + public String checkMenuNameUnique(SysMenu menu) { return menuService.checkMenuNameUnique(menu); } - + /** * 加载角色菜单列表树 */ @GetMapping("/roleMenuTreeData") @ResponseBody - public List roleMenuTreeData(SysRole role) - { + public List roleMenuTreeData(SysRole role) { Long userId = ShiroUtils.getUserId(); List ztrees = menuService.roleMenuTreeData(role, userId); return ztrees; } - + /** * 加载所有菜单列表树 */ @GetMapping("/menuTreeData") @ResponseBody - public List menuTreeData() - { + public List menuTreeData() { Long userId = ShiroUtils.getUserId(); List ztrees = menuService.menuTreeData(userId); return ztrees; } - + /** * 选择菜单树 */ @GetMapping("/selectMenuTree/{menuId}") - public String selectMenuTree(@PathVariable("menuId") Long menuId, ModelMap mmap) - { + public String selectMenuTree(@PathVariable("menuId") Long menuId, ModelMap mmap) { mmap.put("menu", menuService.selectMenuById(menuId)); return prefix + "/tree"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 5b3d478d6..0c69e7bce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -1,15 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -18,50 +8,53 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公告 信息操作处理 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/notice") -public class SysNoticeController extends BaseController -{ +public class SysNoticeController extends BaseController { private String prefix = "system/notice"; - + @Autowired private ISysNoticeService noticeService; - + @RequiresPermissions("system:notice:view") @GetMapping() - public String notice() - { + public String notice() { return prefix + "/notice"; } - + /** * 查询公告列表 */ @RequiresPermissions("system:notice:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysNotice notice) - { + public TableDataInfo list(SysNotice notice) { startPage(); List list = noticeService.selectNoticeList(notice); return getDataTable(list); } - + /** * 新增公告 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - + /** * 新增保存公告 */ @@ -69,22 +62,20 @@ public class SysNoticeController extends BaseController @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(SysNotice notice) - { + public AjaxResult addSave(SysNotice notice) { notice.setCreateBy(ShiroUtils.getLoginName()); return toAjax(noticeService.insertNotice(notice)); } - + /** * 修改公告 */ @GetMapping("/edit/{noticeId}") - public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap) - { + public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap) { mmap.put("notice", noticeService.selectNoticeById(noticeId)); return prefix + "/edit"; } - + /** * 修改保存公告 */ @@ -92,12 +83,11 @@ public class SysNoticeController extends BaseController @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(SysNotice notice) - { + public AjaxResult editSave(SysNotice notice) { notice.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(noticeService.updateNotice(notice)); } - + /** * 删除公告 */ @@ -105,8 +95,7 @@ public class SysNoticeController extends BaseController @Log(title = "通知公告", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(noticeService.deleteNoticeByIds(ids)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 966361b95..5eded4f4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -21,74 +10,74 @@ import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 岗位信息操作处理 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/post") -public class SysPostController extends BaseController -{ +public class SysPostController extends BaseController { private String prefix = "system/post"; - + @Autowired private ISysPostService postService; - + @RequiresPermissions("system:post:view") @GetMapping() - public String operlog() - { + public String operlog() { return prefix + "/post"; } - + @RequiresPermissions("system:post:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysPost post) - { + public TableDataInfo list(SysPost post) { startPage(); List list = postService.selectPostList(post); return getDataTable(list); } - + @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:post:export") @PostMapping("/export") @ResponseBody - 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, "岗位数据"); } - + @RequiresPermissions("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { - try - { + public AjaxResult remove(String ids) { + try { return toAjax(postService.deletePostByIds(ids)); } - catch (Exception e) - { + catch (Exception e) { return error(e.getMessage()); } } - + /** * 新增岗位 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - + /** * 新增保存岗位 */ @@ -96,30 +85,26 @@ public class SysPostController extends BaseController @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysPost post) - { - if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult addSave(@Validated SysPost post) { + if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } - else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } post.setCreateBy(ShiroUtils.getLoginName()); return toAjax(postService.insertPost(post)); } - + /** * 修改岗位 */ @GetMapping("/edit/{postId}") - public String edit(@PathVariable("postId") Long postId, ModelMap mmap) - { + public String edit(@PathVariable("postId") Long postId, ModelMap mmap) { mmap.put("post", postService.selectPostById(postId)); return prefix + "/edit"; } - + /** * 修改保存岗位 */ @@ -127,37 +112,32 @@ public class SysPostController extends BaseController @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysPost post) - { - if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) - { + public AjaxResult editSave(@Validated SysPost post) { + if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } - else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) - { + else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } post.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(postService.updatePost(post)); } - + /** * 校验岗位名称 */ @PostMapping("/checkPostNameUnique") @ResponseBody - public String checkPostNameUnique(SysPost post) - { + public String checkPostNameUnique(SysPost post) { return postService.checkPostNameUnique(post); } - + /** * 校验岗位编码 */ @PostMapping("/checkPostCodeUnique") @ResponseBody - public String checkPostCodeUnique(SysPost post) - { + public String checkPostCodeUnique(SysPost post) { return postService.checkPostCodeUnique(post); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 880dab685..59ad1e054 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.controller.BaseController; @@ -22,152 +11,141 @@ import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; /** * 个人信息 业务处理 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController -{ +public class SysProfileController extends BaseController { private static final Logger log = LoggerFactory.getLogger(SysProfileController.class); - + private String prefix = "system/user/profile"; - + @Autowired private ISysUserService userService; @Autowired private SysPasswordService passwordService; - + /** * 个人信息 */ @GetMapping() - public String profile(ModelMap mmap) - { + public String profile(ModelMap mmap) { SysUser user = ShiroUtils.getSysUser(); mmap.put("user", user); mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId())); mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId())); return prefix + "/profile"; } - + @GetMapping("/checkPassword") @ResponseBody - public boolean checkPassword(String password) - { + public boolean checkPassword(String password) { SysUser user = ShiroUtils.getSysUser(); - if (passwordService.matches(user, password)) - { + if (passwordService.matches(user, password)) { return true; } return false; } - + @GetMapping("/resetPwd") - public String resetPwd(ModelMap mmap) - { + public String resetPwd(ModelMap mmap) { SysUser user = ShiroUtils.getSysUser(); mmap.put("user", userService.selectUserById(user.getUserId())); return prefix + "/resetPwd"; } - + @Log(title = "重置密码", businessType = BusinessType.UPDATE) @PostMapping("/resetPwd") @ResponseBody - public AjaxResult resetPwd(String oldPassword, String newPassword) - { + public AjaxResult resetPwd(String oldPassword, String newPassword) { SysUser user = ShiroUtils.getSysUser(); - if (!passwordService.matches(user, oldPassword)) - { + if (!passwordService.matches(user, oldPassword)) { return error("修改密码失败，旧密码错误"); } - if (passwordService.matches(user, newPassword)) - { + if (passwordService.matches(user, newPassword)) { return error("新密码不能与旧密码相同"); } user.setSalt(ShiroUtils.randomSalt()); user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt())); user.setPwdUpdateDate(DateUtils.getNowDate()); - if (userService.resetUserPwd(user) > 0) - { + if (userService.resetUserPwd(user) > 0) { ShiroUtils.setSysUser(userService.selectUserById(user.getUserId())); return success(); } return error("修改密码异常，请联系管理员"); } - + /** * 修改用户 */ @GetMapping("/edit") - public String edit(ModelMap mmap) - { + public String edit(ModelMap mmap) { SysUser user = ShiroUtils.getSysUser(); mmap.put("user", userService.selectUserById(user.getUserId())); return prefix + "/edit"; } - + /** * 修改头像 */ @GetMapping("/avatar") - public String avatar(ModelMap mmap) - { + public String avatar(ModelMap mmap) { SysUser user = ShiroUtils.getSysUser(); mmap.put("user", userService.selectUserById(user.getUserId())); return prefix + "/avatar"; } - + /** * 修改用户 */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PostMapping("/update") @ResponseBody - public AjaxResult update(SysUser user) - { + public AjaxResult update(SysUser user) { SysUser currentUser = ShiroUtils.getSysUser(); currentUser.setUserName(user.getUserName()); currentUser.setEmail(user.getEmail()); currentUser.setPhonenumber(user.getPhonenumber()); currentUser.setSex(user.getSex()); - if (userService.updateUserInfo(currentUser) > 0) - { + if (userService.updateUserInfo(currentUser) > 0) { ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId())); return success(); } return error(); } - + /** * 保存头像 */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PostMapping("/updateAvatar") @ResponseBody - public AjaxResult updateAvatar(@RequestParam("avatarfile") MultipartFile file) - { + public AjaxResult updateAvatar(@RequestParam("avatarfile") MultipartFile file) { SysUser currentUser = ShiroUtils.getSysUser(); - try - { - if (!file.isEmpty()) - { + try { + if (!file.isEmpty()) { String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file); currentUser.setAvatar(avatar); - if (userService.updateUserInfo(currentUser) > 0) - { + if (userService.updateUserInfo(currentUser) > 0) { ShiroUtils.setSysUser(userService.selectUserById(currentUser.getUserId())); return success(); } } return error(); } - catch (Exception e) - { + catch (Exception e) { log.error("修改头像失败！", e); return error(e.getMessage()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 24f67ac6a..ad516ba72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -1,43 +1,39 @@ package com.ruoyi.web.controller.system; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.framework.shiro.service.SysRegisterService; +import com.ruoyi.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.framework.shiro.service.SysRegisterService; -import com.ruoyi.system.service.ISysConfigService; /** * 注册验证 - * + * * @author ruoyi */ @Controller -public class SysRegisterController extends BaseController -{ +public class SysRegisterController extends BaseController { @Autowired private SysRegisterService registerService; - + @Autowired private ISysConfigService configService; - + @GetMapping("/register") - public String register() - { + public String register() { return "register"; } - + @PostMapping("/register") @ResponseBody - public AjaxResult ajaxRegister(SysUser user) - { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { + public AjaxResult ajaxRegister(SysUser user) { + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return error("当前系统没有开启注册功能！"); } String msg = registerService.register(user); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index a48cca245..f30e7294c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -1,16 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -25,61 +14,64 @@ import com.ruoyi.framework.shiro.util.AuthorizationUtils; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 角色信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/role") -public class SysRoleController extends BaseController -{ +public class SysRoleController extends BaseController { private String prefix = "system/role"; - + @Autowired private ISysRoleService roleService; - + @Autowired private ISysUserService userService; - + @RequiresPermissions("system:role:view") @GetMapping() - public String role() - { + public String role() { return prefix + "/role"; } - + @RequiresPermissions("system:role:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysRole role) - { + public TableDataInfo list(SysRole role) { startPage(); List list = roleService.selectRoleList(role); return getDataTable(list); } - + @Log(title = "角色管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:role:export") @PostMapping("/export") @ResponseBody - 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, "角色数据"); } - + /** * 新增角色 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } - + /** * 新增保存角色 */ @@ -87,32 +79,28 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysRole role) - { - if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + public AjaxResult addSave(@Validated SysRole role) { + if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } - else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setCreateBy(ShiroUtils.getLoginName()); AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(roleService.insertRole(role)); - + } - + /** * 修改角色 */ @GetMapping("/edit/{roleId}") - public String edit(@PathVariable("roleId") Long roleId, ModelMap mmap) - { + public String edit(@PathVariable("roleId") Long roleId, ModelMap mmap) { mmap.put("role", roleService.selectRoleById(roleId)); return prefix + "/edit"; } - + /** * 修改保存角色 */ @@ -120,32 +108,28 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysRole role) - { + public AjaxResult editSave(@Validated SysRole role) { roleService.checkRoleAllowed(role); - if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) - { + if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); } - else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) - { + else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setUpdateBy(ShiroUtils.getLoginName()); AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(roleService.updateRole(role)); } - + /** * 角色分配数据权限 */ @GetMapping("/authDataScope/{roleId}") - public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap) - { + public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap) { mmap.put("role", roleService.selectRoleById(roleId)); return prefix + "/dataScope"; } - + /** * 保存角色分配数据权限 */ @@ -153,56 +137,50 @@ public class SysRoleController extends BaseController @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PostMapping("/authDataScope") @ResponseBody - public AjaxResult authDataScopeSave(SysRole role) - { + public AjaxResult authDataScopeSave(SysRole role) { roleService.checkRoleAllowed(role); role.setUpdateBy(ShiroUtils.getLoginName()); - if (roleService.authDataScope(role) > 0) - { + if (roleService.authDataScope(role) > 0) { ShiroUtils.setSysUser(userService.selectUserById(ShiroUtils.getSysUser().getUserId())); return success(); } return error(); } - + @RequiresPermissions("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(roleService.deleteRoleByIds(ids)); } - + /** * 校验角色名称 */ @PostMapping("/checkRoleNameUnique") @ResponseBody - public String checkRoleNameUnique(SysRole role) - { + public String checkRoleNameUnique(SysRole role) { return roleService.checkRoleNameUnique(role); } - + /** * 校验角色权限 */ @PostMapping("/checkRoleKeyUnique") @ResponseBody - public String checkRoleKeyUnique(SysRole role) - { + public String checkRoleKeyUnique(SysRole role) { return roleService.checkRoleKeyUnique(role); } - + /** * 选择菜单树 */ @GetMapping("/selectMenuTree") - public String selectMenuTree() - { + public String selectMenuTree() { return prefix + "/tree"; } - + /** * 角色状态修改 */ @@ -210,89 +188,81 @@ public class SysRoleController extends BaseController @RequiresPermissions("system:role:edit") @PostMapping("/changeStatus") @ResponseBody - public AjaxResult changeStatus(SysRole role) - { + public AjaxResult changeStatus(SysRole role) { roleService.checkRoleAllowed(role); return toAjax(roleService.changeStatus(role)); } - + /** * 分配用户 */ @RequiresPermissions("system:role:edit") @GetMapping("/authUser/{roleId}") - public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap) - { + public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap) { mmap.put("role", roleService.selectRoleById(roleId)); return prefix + "/authUser"; } - + /** * 查询已分配用户角色列表 */ @RequiresPermissions("system:role:list") @PostMapping("/authUser/allocatedList") @ResponseBody - public TableDataInfo allocatedList(SysUser user) - { + public TableDataInfo allocatedList(SysUser user) { startPage(); List list = userService.selectAllocatedList(user); return getDataTable(list); } - + /** * 取消授权 */ @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/cancel") @ResponseBody - public AjaxResult cancelAuthUser(SysUserRole userRole) - { + public AjaxResult cancelAuthUser(SysUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } - + /** * 批量取消授权 */ @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/cancelAll") @ResponseBody - public AjaxResult cancelAuthUserAll(Long roleId, String userIds) - { + public AjaxResult cancelAuthUserAll(Long roleId, String userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); } - + /** * 选择用户 */ @GetMapping("/authUser/selectUser/{roleId}") - public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap) - { + public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap) { mmap.put("role", roleService.selectRoleById(roleId)); return prefix + "/selectUser"; } - + /** * 查询未分配用户角色列表 */ @RequiresPermissions("system:role:list") @PostMapping("/authUser/unallocatedList") @ResponseBody - public TableDataInfo unallocatedList(SysUser user) - { + public TableDataInfo unallocatedList(SysUser user) { startPage(); List list = userService.selectUnallocatedList(user); return getDataTable(list); } - + /** * 批量选择用户授权 */ @Log(title = "角色管理", businessType = BusinessType.GRANT) @PostMapping("/authUser/selectAll") @ResponseBody - public AjaxResult selectAuthUserAll(Long roleId, String userIds) - { + public AjaxResult selectAuthUserAll(Long roleId, String userIds) { return toAjax(roleService.insertAuthUsers(roleId, userIds)); } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 9b40cfa13..25c29da63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -1,18 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import java.util.stream.Collectors; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -28,91 +15,94 @@ import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.stream.Collectors; /** * 用户信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/user") -public class SysUserController extends BaseController -{ +public class SysUserController extends BaseController { private String prefix = "system/user"; - + @Autowired private ISysUserService userService; - + @Autowired private ISysRoleService roleService; - + @Autowired private ISysPostService postService; - + @Autowired private SysPasswordService passwordService; - + @RequiresPermissions("system:user:view") @GetMapping() - public String user() - { + public String user() { return prefix + "/user"; } - + @RequiresPermissions("system:user:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysUser user) - { + public TableDataInfo list(SysUser user) { startPage(); List list = userService.selectUserList(user); return getDataTable(list); } - + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") @PostMapping("/export") @ResponseBody - 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) @RequiresPermissions("system:user:import") @PostMapping("/importData") @ResponseBody - 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()); String operName = ShiroUtils.getSysUser().getLoginName(); String message = userService.importUser(userList, updateSupport, operName); return AjaxResult.success(message); } - + @RequiresPermissions("system:user:view") @GetMapping("/importTemplate") @ResponseBody - public AjaxResult importTemplate() - { + public AjaxResult importTemplate() { ExcelUtil util = new ExcelUtil(SysUser.class); return util.importTemplateExcel("用户数据"); } - + /** * 新增用户 */ @GetMapping("/add") - public String add(ModelMap mmap) - { + public String add(ModelMap mmap) { mmap.put("roles", roleService.selectRoleAll().stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); mmap.put("posts", postService.selectPostAll()); return prefix + "/add"; } - + /** * 新增保存用户 */ @@ -120,20 +110,16 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(@Validated SysUser user) - { - if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName()))) - { + public AjaxResult addSave(@Validated SysUser user) { + if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName()))) { return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在"); } user.setSalt(ShiroUtils.randomSalt()); @@ -141,20 +127,19 @@ public class SysUserController extends BaseController user.setCreateBy(ShiroUtils.getLoginName()); return toAjax(userService.insertUser(user)); } - + /** * 修改用户 */ @GetMapping("/edit/{userId}") - public String edit(@PathVariable("userId") Long userId, ModelMap mmap) - { + public String edit(@PathVariable("userId") Long userId, ModelMap mmap) { List roles = roleService.selectRolesByUserId(userId); mmap.put("user", userService.selectUserById(userId)); mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); mmap.put("posts", postService.selectPostsByUserId(userId)); return prefix + "/edit"; } - + /** * 修改保存用户 */ @@ -162,57 +147,49 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(@Validated SysUser user) - { + public AjaxResult editSave(@Validated SysUser user) { userService.checkUserAllowed(user); if (StringUtils.isNotEmpty(user.getPhonenumber()) - && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) - { + && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) - && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) - { + && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在"); } user.setUpdateBy(ShiroUtils.getLoginName()); return toAjax(userService.updateUser(user)); } - + @RequiresPermissions("system:user:resetPwd") @GetMapping("/resetPwd/{userId}") - public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) - { + public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) { mmap.put("user", userService.selectUserById(userId)); return prefix + "/resetPwd"; } - + @RequiresPermissions("system:user:resetPwd") @Log(title = "重置密码", businessType = BusinessType.UPDATE) @PostMapping("/resetPwd") @ResponseBody - public AjaxResult resetPwdSave(SysUser user) - { + public AjaxResult resetPwdSave(SysUser user) { userService.checkUserAllowed(user); user.setSalt(ShiroUtils.randomSalt()); user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); - if (userService.resetUserPwd(user) > 0) - { - if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue()) - { + if (userService.resetUserPwd(user) > 0) { + if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue()) { ShiroUtils.setSysUser(userService.selectUserById(user.getUserId())); } return success(); } return error(); } - + /** * 进入授权角色页 */ @GetMapping("/authRole/{userId}") - public String authRole(@PathVariable("userId") Long userId, ModelMap mmap) - { + public String authRole(@PathVariable("userId") Long userId, ModelMap mmap) { SysUser user = userService.selectUserById(userId); // 获取用户所属的角色列表 List roles = roleService.selectRolesByUserId(userId); @@ -220,7 +197,7 @@ public class SysUserController extends BaseController mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); return prefix + "/authRole"; } - + /** * 用户授权角色 */ @@ -228,51 +205,46 @@ public class SysUserController extends BaseController @Log(title = "用户管理", businessType = BusinessType.GRANT) @PostMapping("/authRole/insertAuthRole") @ResponseBody - public AjaxResult insertAuthRole(Long userId, Long[] roleIds) - { + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) { userService.insertUserAuth(userId, roleIds); return success(); } - + @RequiresPermissions("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(userService.deleteUserByIds(ids)); } - + /** * 校验用户名 */ @PostMapping("/checkLoginNameUnique") @ResponseBody - public String checkLoginNameUnique(SysUser user) - { + public String checkLoginNameUnique(SysUser user) { return userService.checkLoginNameUnique(user.getLoginName()); } - + /** * 校验手机号码 */ @PostMapping("/checkPhoneUnique") @ResponseBody - public String checkPhoneUnique(SysUser user) - { + public String checkPhoneUnique(SysUser user) { return userService.checkPhoneUnique(user); } - + /** * 校验email邮箱 */ @PostMapping("/checkEmailUnique") @ResponseBody - public String checkEmailUnique(SysUser user) - { + public String checkEmailUnique(SysUser user) { return userService.checkEmailUnique(user); } - + /** * 用户状态修改 */ @@ -280,8 +252,7 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:edit") @PostMapping("/changeStatus") @ResponseBody - public AjaxResult changeStatus(SysUser user) - { + public AjaxResult changeStatus(SysUser user) { userService.checkUserAllowed(user); return toAjax(userService.changeStatus(user)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java index 53ce0f1ba..6bd7b4d6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java @@ -1,26 +1,24 @@ package com.ruoyi.web.controller.tool; +import com.ruoyi.common.core.controller.BaseController; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; /** * build 表单构建 - * + * * @author ruoyi */ @Controller @RequestMapping("/tool/build") -public class BuildController extends BaseController -{ +public class BuildController extends BaseController { private String prefix = "tool/build"; - + @RequiresPermissions("tool:build:view") @GetMapping() - public String build() - { + public String build() { return prefix + "/build"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java index cfa748f30..c1eff4c68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java @@ -1,24 +1,22 @@ package com.ruoyi.web.controller.tool; +import com.ruoyi.common.core.controller.BaseController; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.ruoyi.common.core.controller.BaseController; /** * swagger 接口 - * + * * @author ruoyi */ @Controller @RequestMapping("/tool/swagger") -public class SwaggerController extends BaseController -{ +public class SwaggerController extends BaseController { @RequiresPermissions("tool:swagger:view") @GetMapping() - public String index() - { + public String index() { return redirect("/swagger-ui.html"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java index bddbe7789..d9dbfad65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java @@ -1,175 +1,143 @@ package com.ruoyi.web.controller.tool; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + 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; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 - * + * * @author ruoyi */ @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")); } - + @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") @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 error("用户不存在"); } } - + @ApiOperation("新增用户") @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 error("用户ID不能为空"); } return AjaxResult.success(users.put(user.getUserId(), user)); } - + @ApiOperation("更新用户") @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 error("用户ID不能为空"); } - if (users.isEmpty() || !users.containsKey(user.getUserId())) - { + if (users.isEmpty() || !users.containsKey(user.getUserId())) { return error("用户不存在"); } users.remove(user.getUserId()); return AjaxResult.success(users.put(user.getUserId(), user)); } - + @ApiOperation("删除用户信息") @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 success(); } - else - { + else { return error("用户不存在"); } } } @ApiModel("用户实体") -class UserEntity -{ +class UserEntity { @ApiModelProperty("用户ID") private Integer userId; - + @ApiModelProperty("用户名称") private String username; - + @ApiModelProperty("用户密码") private String password; - + @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/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index d4f020098..4f1ed9b53 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -1,10 +1,10 @@ package com.ruoyi.web.core.config; +import com.ruoyi.common.config.RuoYiConfig; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; @@ -16,14 +16,16 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * Swagger2的接口配置 - * + * * @author ruoyi */ @Configuration @EnableSwagger2 -public class SwaggerConfig -{ - /** 是否开启swagger */ +public class SwaggerConfig { + + /** + * 是否开启swagger + */ @Value("${swagger.enabled}") private boolean enabled; @@ -31,8 +33,7 @@ public class SwaggerConfig * 创建API */ @Bean - public Docket createRestApi() - { + public Docket createRestApi() { return new Docket(DocumentationType.SWAGGER_2) // 是否启用Swagger .enable(enabled) @@ -48,12 +49,11 @@ public class SwaggerConfig .paths(PathSelectors.any()) .build(); } - + /** * 添加摘要信息 */ - private ApiInfo apiInfo() - { + private ApiInfo apiInfo() { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 5243abd67..3fdd52198 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: root!@# # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d013a3f1e..dad5bafb2 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 8090 servlet: # 应用的访问路径 context-path: / @@ -98,7 +98,7 @@ shiro: # 验证码开关 captchaEnabled: true # 验证码类型 math 数组计算 char 字符 - captchaType: math + captchaType: char cookie: # 设置Cookie的域名 默认空，即当前访问的域名 domain: diff --git a/ruoyi-admin/src/main/resources/logback-spring.xml b/ruoyi-admin/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..4340f4d74 --- /dev/null +++ b/ruoyi-admin/src/main/resources/logback-spring.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml deleted file mode 100644 index d69a57207..000000000 --- a/ruoyi-admin/src/main/resources/logback.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/error/unauth.html b/ruoyi-admin/src/main/resources/templates/error/unauth.html index e4826433c..471aa5dda 100644 --- a/ruoyi-admin/src/main/resources/templates/error/unauth.html +++ b/ruoyi-admin/src/main/resources/templates/error/unauth.html @@ -4,25 +4,27 @@ RuoYi - 403 - + -
-

403

-

您没有访问权限！

- -
- 对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面 - 返回主页 -
+
+

403

+

您没有访问权限！

+ +
+ 对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面 + 返回主页
- +
+ + + diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index 265d5cc94..abeb30445 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + +
- - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + +
@@ -85,11 +85,11 @@
- +
- +
@@ -172,13 +172,13 @@
- - + +
- +
@@ -187,27 +187,27 @@
- +
- - + +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 13aac3b48..126e3c5d5 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -1,12 +1,12 @@ - + 若依系统首页 - + @@ -18,7 +18,7 @@
- + - +
@@ -237,16 +262,17 @@ 刷新
- + - -
+ +
-
© [[${copyrightYear}]] RuoYi Copyright
+
© [[${copyrightYear}]] RuoYi Copyright
@@ -264,107 +290,112 @@ diff --git a/ruoyi-admin/src/main/resources/templates/lock.html b/ruoyi-admin/src/main/resources/templates/lock.html index 763df1372..5c0b2b9ec 100644 --- a/ruoyi-admin/src/main/resources/templates/lock.html +++ b/ruoyi-admin/src/main/resources/templates/lock.html @@ -3,27 +3,108 @@ - + 锁定屏幕 - +
[[ ${user.loginName} ]] / [[${#strings.defaultString(user.userName, '-')}]]
- +
- User Image + User Image
- +
@@ -42,49 +123,49 @@ -
-
-
-