|
@@ -1,13 +1,12 @@
|
|
-package com.jiayue.ssi.controller;
|
|
|
|
|
|
+package com.jiayue.pfr.controller;
|
|
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.jiayue.ssi.constant.CacheConstants;
|
|
|
|
-import com.jiayue.ssi.constant.CustomException;
|
|
|
|
-import com.jiayue.ssi.entity.SysParameter;
|
|
|
|
-import com.jiayue.ssi.service.SysParameterService;
|
|
|
|
-import com.jiayue.ssi.util.ResponseVO;
|
|
|
|
|
|
+import com.jiayue.pfr.constant.CustomException;
|
|
|
|
+import com.jiayue.pfr.entity.SysParameter;
|
|
|
|
+import com.jiayue.pfr.service.SysParameterService;
|
|
|
|
+import com.jiayue.pfr.util.SaResultRefit;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -34,42 +33,39 @@ public class SysParameterController {
|
|
* @return 执行结果
|
|
* @return 执行结果
|
|
*/
|
|
*/
|
|
@PostMapping(value = "/addParameter")
|
|
@PostMapping(value = "/addParameter")
|
|
- public ResponseVO addParameter(@RequestBody SysParameter sysParameter) throws CustomException {
|
|
|
|
|
|
+ public SaResultRefit addParameter(@RequestBody SysParameter sysParameter) throws CustomException {
|
|
try {
|
|
try {
|
|
if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
|
|
- return ResponseVO.fail("参数名不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名不能为空!");
|
|
} else {
|
|
} else {
|
|
String sysKey = sysParameter.getSysKey().trim();
|
|
String sysKey = sysParameter.getSysKey().trim();
|
|
if (sysKey.contains(" ")){
|
|
if (sysKey.contains(" ")){
|
|
- return ResponseVO.fail("参数名不能含有空格!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名不能含有空格!");
|
|
}
|
|
}
|
|
if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
|
|
if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
|
|
- return ResponseVO.fail(sysKey + "参数名已存在!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips(sysKey + "参数名已存在!");
|
|
} else if (sysKey.length() > 50) {
|
|
} else if (sysKey.length() > 50) {
|
|
- return ResponseVO.fail("参数名长度不能超过50个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名长度不能超过50个字符!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isEmpty(sysParameter.getSysValue())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysValue())) {
|
|
- return ResponseVO.fail("参数值不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数值不能为空!");
|
|
} else if (sysParameter.getSysValue().length() > 50) {
|
|
} else if (sysParameter.getSysValue().length() > 50) {
|
|
- return ResponseVO.fail("参数值长度不能超过50个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数值长度不能超过50个字符!");
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
|
|
- return ResponseVO.fail("参数描述不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数描述不能为空!");
|
|
} else if (sysParameter.getSysDescribe().length() > 200) {
|
|
} else if (sysParameter.getSysDescribe().length() > 200) {
|
|
- return ResponseVO.fail("参数描述长度不能超过200个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
|
|
}
|
|
}
|
|
boolean bo = sysParameterService.save(sysParameter);
|
|
boolean bo = sysParameterService.save(sysParameter);
|
|
if (bo) {
|
|
if (bo) {
|
|
- if ("useSendMail".equals(sysParameter.getSysKey())) {
|
|
|
|
- CacheConstants.use_send_mail = Boolean.parseBoolean(sysParameter.getSysValue());
|
|
|
|
- }
|
|
|
|
- return ResponseVO.success("添加参数信息成功");
|
|
|
|
|
|
+ return SaResultRefit.ok("添加参数信息成功");
|
|
} else {
|
|
} else {
|
|
log.error("添加参数信息失败");
|
|
log.error("添加参数信息失败");
|
|
- return ResponseVO.fail("添加参数信息失败");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("添加参数信息失败");
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
throw new CustomException("添加参数信息异常", e);
|
|
throw new CustomException("添加参数信息异常", e);
|
|
@@ -83,55 +79,52 @@ public class SysParameterController {
|
|
* @return 执行结果
|
|
* @return 执行结果
|
|
*/
|
|
*/
|
|
@PostMapping(value = "/updateParameter")
|
|
@PostMapping(value = "/updateParameter")
|
|
- public ResponseVO updateParameter(@RequestBody SysParameter sysParameter) throws CustomException {
|
|
|
|
|
|
+ public SaResultRefit updateParameter(@RequestBody SysParameter sysParameter) throws CustomException {
|
|
try {
|
|
try {
|
|
SysParameter existSysParameter = sysParameterService.getById(sysParameter.getId());
|
|
SysParameter existSysParameter = sysParameterService.getById(sysParameter.getId());
|
|
if (existSysParameter == null) {
|
|
if (existSysParameter == null) {
|
|
- return ResponseVO.fail("非法访问不能修改!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("非法访问不能修改!");
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysKey()) || StringUtils.isEmpty(sysParameter.getSysKey().trim())) {
|
|
- return ResponseVO.fail("参数名不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名不能为空!");
|
|
} else {
|
|
} else {
|
|
String sysKey = sysParameter.getSysKey().trim();
|
|
String sysKey = sysParameter.getSysKey().trim();
|
|
if (sysKey.contains(" ")){
|
|
if (sysKey.contains(" ")){
|
|
- return ResponseVO.fail("参数名不能含有空格!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名不能含有空格!");
|
|
}
|
|
}
|
|
if (sysKey.length() > 50) {
|
|
if (sysKey.length() > 50) {
|
|
- return ResponseVO.fail("参数名长度不能超过50个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数名长度不能超过50个字符!");
|
|
} else if (!existSysParameter.getSysKey().equals(sysKey)) {
|
|
} else if (!existSysParameter.getSysKey().equals(sysKey)) {
|
|
if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
|
|
if (!"null".equals(sysParameterService.queryByKey(sysKey, "null"))) {
|
|
- return ResponseVO.fail(sysKey + "参数名已存在!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips(sysKey + "参数名已存在!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isEmpty(sysParameter.getSysValue())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysValue())) {
|
|
- return ResponseVO.fail("参数值不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数值不能为空!");
|
|
} else if (sysParameter.getSysValue().length() > 50) {
|
|
} else if (sysParameter.getSysValue().length() > 50) {
|
|
- return ResponseVO.fail("参数值长度不能超过50个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数值长度不能超过50个字符!");
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
|
|
if (StringUtils.isEmpty(sysParameter.getSysDescribe())) {
|
|
- return ResponseVO.fail("参数描述不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数描述不能为空!");
|
|
} else if (sysParameter.getSysDescribe().length() > 200) {
|
|
} else if (sysParameter.getSysDescribe().length() > 200) {
|
|
- return ResponseVO.fail("参数描述长度不能超过200个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
|
|
}
|
|
}
|
|
|
|
|
|
SysParameter oldSysParameter = sysParameterService.getById(sysParameter.getId());
|
|
SysParameter oldSysParameter = sysParameterService.getById(sysParameter.getId());
|
|
if (sysParameter.getVersion().intValue() != oldSysParameter.getVersion().intValue()){
|
|
if (sysParameter.getVersion().intValue() != oldSysParameter.getVersion().intValue()){
|
|
- return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("此数据被操作过,自动刷新列表后请重试操作!");
|
|
}
|
|
}
|
|
|
|
|
|
boolean bo = sysParameterService.updateById(sysParameter);
|
|
boolean bo = sysParameterService.updateById(sysParameter);
|
|
if (bo) {
|
|
if (bo) {
|
|
- if ("useSendMail".equals(sysParameter.getSysKey())) {
|
|
|
|
- CacheConstants.use_send_mail = Boolean.parseBoolean(sysParameter.getSysValue());
|
|
|
|
- }
|
|
|
|
- return ResponseVO.success("修改参数信息成功");
|
|
|
|
|
|
+ return SaResultRefit.ok("修改参数信息成功");
|
|
} else {
|
|
} else {
|
|
log.error("修改参数信息失败");
|
|
log.error("修改参数信息失败");
|
|
- return ResponseVO.fail("修改参数信息失败");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("修改参数信息失败");
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
throw new CustomException("修改参数信息异常", e);
|
|
throw new CustomException("修改参数信息异常", e);
|
|
@@ -142,25 +135,22 @@ public class SysParameterController {
|
|
* 删除用户信息
|
|
* 删除用户信息
|
|
*/
|
|
*/
|
|
@PostMapping(value = "/deleteParameter")
|
|
@PostMapping(value = "/deleteParameter")
|
|
- public ResponseVO deleteParameter(String id) throws CustomException {
|
|
|
|
|
|
+ public SaResultRefit deleteParameter(String id) throws CustomException {
|
|
try {
|
|
try {
|
|
if (StringUtils.isEmpty(id)) {
|
|
if (StringUtils.isEmpty(id)) {
|
|
- return ResponseVO.fail("id不能为空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("id不能为空!");
|
|
}
|
|
}
|
|
SysParameter sysParameter = sysParameterService.getById(Integer.parseInt(id));
|
|
SysParameter sysParameter = sysParameterService.getById(Integer.parseInt(id));
|
|
if (sysParameter == null) {
|
|
if (sysParameter == null) {
|
|
- return ResponseVO.fail("此数据被操作过,自动刷新列表后请重试操作!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("此数据被操作过,自动刷新列表后请重试操作!");
|
|
}
|
|
}
|
|
|
|
|
|
- if ("useSendMail".equals(sysParameter.getSysKey())) {
|
|
|
|
- CacheConstants.use_send_mail = true;
|
|
|
|
- }
|
|
|
|
boolean bo = sysParameterService.removeById(Integer.parseInt(id));
|
|
boolean bo = sysParameterService.removeById(Integer.parseInt(id));
|
|
if (bo) {
|
|
if (bo) {
|
|
- return ResponseVO.success("删除参数信息成功");
|
|
|
|
|
|
+ return SaResultRefit.ok("删除参数信息成功");
|
|
} else {
|
|
} else {
|
|
log.error("删除用户信息失败");
|
|
log.error("删除用户信息失败");
|
|
- return ResponseVO.fail("删除参数信息失败");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("删除参数信息失败");
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
throw new CustomException("删除参数信息异常", e);
|
|
throw new CustomException("删除参数信息异常", e);
|
|
@@ -173,7 +163,7 @@ public class SysParameterController {
|
|
* @return 参数信息
|
|
* @return 参数信息
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/getAll")
|
|
@GetMapping(value = "/getAll")
|
|
- public ResponseVO getAll(String currentPage, String pageSize, String keywords) throws CustomException {
|
|
|
|
|
|
+ public SaResultRefit getAll(String currentPage, String pageSize, String keywords) throws CustomException {
|
|
try {
|
|
try {
|
|
Integer cp;
|
|
Integer cp;
|
|
if (StringUtils.isNotEmpty(currentPage)) {
|
|
if (StringUtils.isNotEmpty(currentPage)) {
|
|
@@ -181,11 +171,11 @@ public class SysParameterController {
|
|
cp = Integer.parseInt(currentPage);
|
|
cp = Integer.parseInt(currentPage);
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- return ResponseVO.fail("currentPage不是整数!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("currentPage不是整数!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- return ResponseVO.fail("currentPage不能是空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("currentPage不能是空!");
|
|
}
|
|
}
|
|
|
|
|
|
Integer ps;
|
|
Integer ps;
|
|
@@ -194,15 +184,15 @@ public class SysParameterController {
|
|
ps = Integer.parseInt(pageSize);
|
|
ps = Integer.parseInt(pageSize);
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- return ResponseVO.fail("pageSize不是整数!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("pageSize不是整数!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- return ResponseVO.fail("pageSize不能是空!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("pageSize不能是空!");
|
|
}
|
|
}
|
|
if (StringUtils.isNotEmpty(keywords)) {
|
|
if (StringUtils.isNotEmpty(keywords)) {
|
|
if (keywords.length() > 200) {
|
|
if (keywords.length() > 200) {
|
|
- return ResponseVO.fail("参数描述长度不能超过200个字符!");
|
|
|
|
|
|
+ return SaResultRefit.errorTips("参数描述长度不能超过200个字符!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
QueryWrapper<SysParameter> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<SysParameter> wrapper = new QueryWrapper<>();
|
|
@@ -210,24 +200,9 @@ public class SysParameterController {
|
|
wrapper.eq("sys_key", keywords);
|
|
wrapper.eq("sys_key", keywords);
|
|
}
|
|
}
|
|
Page<SysParameter> result = sysParameterService.page(new Page<>(cp, ps), wrapper);
|
|
Page<SysParameter> result = sysParameterService.page(new Page<>(cp, ps), wrapper);
|
|
- return ResponseVO.success(result);
|
|
|
|
|
|
+ return SaResultRefit.data(result);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
throw new CustomException("获取参数异常", e);
|
|
throw new CustomException("获取参数异常", e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 获取是否邮箱口令参数
|
|
|
|
- *
|
|
|
|
- * @return 邮箱口令
|
|
|
|
- */
|
|
|
|
- @GetMapping(value = "/getUseSendMail")
|
|
|
|
- public ResponseVO getUseSendMail() throws CustomException {
|
|
|
|
- try {
|
|
|
|
- String useSendMail = sysParameterService.queryByKey("useSendMail", "true");
|
|
|
|
- return ResponseVO.success(useSendMail);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- throw new CustomException("获取邮箱口令参数异常", e);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
}
|
|
}
|