KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】返回对象与属性重名修改

Browse Source
This commit is contained in:
梁琦涛
2023-04-03 15:26:32 +08:00
parent 592399e405
commit a581579eab
85 changed files with 1601 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java → jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Results.java
+16 -16
View File
@@ -15,7 +15,7 @@ import lombok.Data;
*/ */
@Data @Data
@ApiModel(value="接口返回对象", description="接口返回对象") @ApiModel(value="接口返回对象", description="接口返回对象")
public class Result<T> implements Serializable { public class Results<T> implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -49,36 +49,36 @@ public class Result<T> implements Serializable {
@ApiModelProperty(value = "时间戳") @ApiModelProperty(value = "时间戳")
private long timestamp = System.currentTimeMillis(); private long timestamp = System.currentTimeMillis();
public Result() { public Results() {
// do other // do other
} }
public static<T> Result<T> OK() { public static<T> Results<T> OK() {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.SC_OK_200);
r.setMessage("成功"); r.setMessage("成功");
return r; return r;
} }
public static<T> Result<T> OK(String message) { public static<T> Results<T> OK(String message) {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.SC_OK_200);
r.setMessage(message); r.setMessage(message);
return r; return r;
} }
public static<T> Result<T> OK(T data) { public static<T> Results<T> OK(T data) {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.SC_OK_200);
r.setResult(data); r.setResult(data);
return r; return r;
} }
public static<T> Result<T> OK(String msg, T data) { public static<T> Results<T> OK(String msg, T data) {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setSuccess(true); r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200); r.setCode(CommonConstant.SC_OK_200);
r.setMessage(msg); r.setMessage(msg);
@@ -86,8 +86,8 @@ public class Result<T> implements Serializable {
return r; return r;
} }
public static<T> Result<T> error(String msg, T data) { public static<T> Results<T> error(String msg, T data) {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setSuccess(false); r.setSuccess(false);
r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500); r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500);
r.setMessage(msg); r.setMessage(msg);
@@ -95,12 +95,12 @@ public class Result<T> implements Serializable {
return r; return r;
} }
public static<T> Result<T> error(String msg) { public static<T> Results<T> error(String msg) {
return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg); return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
} }
public static<T> Result<T> error(int code, String msg) { public static<T> Results<T> error(int code, String msg) {
Result<T> r = new Result<>(); Results<T> r = new Results<>();
r.setCode(code); r.setCode(code);
r.setMessage(msg); r.setMessage(msg);
r.setSuccess(false); r.setSuccess(false);
@@ -110,7 +110,7 @@ public class Result<T> implements Serializable {
/** /**
* 无权限访问返回结果 * 无权限访问返回结果
*/ */
public static Result<Object> noauth(String msg) { public static Results<Object> noauth(String msg) {
return error(CommonConstant.SC_JERO_NO_AUTHZ, msg); return error(CommonConstant.SC_JERO_NO_AUTHZ, msg);
} }
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.jero.common.aspect;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.PropertyFilter; import com.alibaba.fastjson.serializer.PropertyFilter;
import com.jero.common.api.dto.LogDTO; import com.jero.common.api.dto.LogDTO;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.ModuleType; import com.jero.common.constant.enums.ModuleType;
@@ -198,8 +198,8 @@ public class AutoLogAspect {
* @return * @return
*/ */
private String getOnlineLogContent(Object obj, String content){ private String getOnlineLogContent(Object obj, String content){
if (obj instanceof Result){ if (obj instanceof Results){
Result<T> res = (Result)obj; Results<T> res = (Results)obj;
String msg = res.getMessage(); String msg = res.getMessage();
String tableName = res.getOnlTable(); String tableName = res.getOnlTable();
if(oConvertUtils.isNotEmpty(tableName)){ if(oConvertUtils.isNotEmpty(tableName)){
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+5 -5
View File
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.jero.common.api.CommonAPI; import com.jero.common.api.CommonAPI;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.Dict; import com.jero.common.aspect.annotation.Dict;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
@@ -89,7 +89,7 @@ public class DictAspect {
* @param result * @param result
*/ */
private void parseDictText(Object result) { private void parseDictText(Object result) {
if (result instanceof Result && ((Result) result).getResult() instanceof IPage) { if (result instanceof Results && ((Results) result).getResult() instanceof IPage) {
List<JSONObject> items = new ArrayList<>(); List<JSONObject> items = new ArrayList<>();
//step.1 筛选出加了 Dict 注解的字段列表 //step.1 筛选出加了 Dict 注解的字段列表
@@ -97,7 +97,7 @@ public class DictAspect {
// 字典数据列表， key = 字典code，value=数据列表 // 字典数据列表， key = 字典code，value=数据列表
Map<String, List<String>> dataListMap = new HashMap<>(); Map<String, List<String>> dataListMap = new HashMap<>();
addItems((Result) result, items, dictFieldList, dataListMap); addItems((Results) result, items, dictFieldList, dataListMap);
//step.2 调用翻译方法，一次性翻译 //step.2 调用翻译方法，一次性翻译
Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap); Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap);
@@ -105,7 +105,7 @@ public class DictAspect {
//step.3 将翻译结果填充到返回结果里 //step.3 将翻译结果填充到返回结果里
putItems(items, dictFieldList, translText); putItems(items, dictFieldList, translText);
((IPage) ((Result) result).getResult()).setRecords(items); ((IPage) ((Results) result).getResult()).setRecords(items);
} }
} }
@@ -144,7 +144,7 @@ public class DictAspect {
} }
} }
private void addItems(Result<IPage<T>> result, List<JSONObject> items, List<Field> dictFieldList, Map<String, List<String>> dataListMap) { private void addItems(Results<IPage<T>> result, List<JSONObject> items, List<Field> dictFieldList, Map<String, List<String>> dataListMap) {
for (Object obj : result.getResult().getRecords()) { for (Object obj : result.getResult().getRecords()) {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json="{}"; String json="{}";
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java
+19 -19
View File
@@ -1,6 +1,6 @@
package com.jero.common.exception; package com.jero.common.exception;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.AuthorizationException;
@@ -28,33 +28,33 @@ public class JeroBootExceptionHandler {
* 处理自定义异常 * 处理自定义异常
*/ */
@ExceptionHandler(JeroBootException.class) @ExceptionHandler(JeroBootException.class)
public Result<T> handleJeroBootException(JeroBootException e){ public Results<T> handleJeroBootException(JeroBootException e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
@ExceptionHandler(NoHandlerFoundException.class) @ExceptionHandler(NoHandlerFoundException.class)
public Result<T> handlerNoFoundException(Exception e) { public Results<T> handlerNoFoundException(Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error(404, "路径不存在，请检查路径是否正确"); return Results.error(404, "路径不存在，请检查路径是否正确");
} }
@ExceptionHandler(DuplicateKeyException.class) @ExceptionHandler(DuplicateKeyException.class)
public Result<T> handleDuplicateKeyException(DuplicateKeyException e){ public Results<T> handleDuplicateKeyException(DuplicateKeyException e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("数据库中已存在该记录"); return Results.error("数据库中已存在该记录");
} }
@ExceptionHandler({UnauthorizedException.class, AuthorizationException.class}) @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
public Result<Object> handleAuthorizationException(AuthorizationException e){ public Results<Object> handleAuthorizationException(AuthorizationException e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.noauth("没有权限，请联系管理员授权"); return Results.noauth("没有权限，请联系管理员授权");
} }
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public Result<T> handleException(Exception e){ public Results<T> handleException(Exception e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败，"+e.getMessage()); return Results.error("操作失败，"+e.getMessage());
} }
/** /**
@@ -63,7 +63,7 @@ public class JeroBootExceptionHandler {
* @return * @return
*/ */
@ExceptionHandler(HttpRequestMethodNotSupportedException.class) @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
public Result<T> httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){ public Results<T> httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("不支持"); sb.append("不支持");
sb.append(e.getMethod()); sb.append(e.getMethod());
@@ -77,28 +77,28 @@ public class JeroBootExceptionHandler {
} }
} }
log.error(sb.toString(), e); log.error(sb.toString(), e);
return Result.error(405,sb.toString()); return Results.error(405,sb.toString());
} }
/** /**
* spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException
*/ */
@ExceptionHandler(MaxUploadSizeExceededException.class) @ExceptionHandler(MaxUploadSizeExceededException.class)
public Result<T> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { public Results<T> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); return Results.error("文件大小超出10MB限制, 请压缩或降低文件质量! ");
} }
@ExceptionHandler(DataIntegrityViolationException.class) @ExceptionHandler(DataIntegrityViolationException.class)
public Result<T> handleDataIntegrityViolationException(DataIntegrityViolationException e) { public Results<T> handleDataIntegrityViolationException(DataIntegrityViolationException e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("字段太长,超出数据库字段的长度"); return Results.error("字段太长,超出数据库字段的长度");
} }
@ExceptionHandler(PoolException.class) @ExceptionHandler(PoolException.class)
public Result<T> handlePoolException(PoolException e) { public Results<T> handlePoolException(PoolException e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("Redis 连接异常!"); return Results.error("Redis 连接异常!");
} }
} }
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+5 -5
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
@@ -162,7 +162,7 @@ public class JeroController<T, S extends IService<T>> {
* @param request * @param request
* @return * @return
*/ */
protected Result<T> importExcel(HttpServletRequest request,HttpServletResponse response, Class<T> clazz) { protected Results<T> importExcel(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
if(Objects.isNull(response)){ if(Objects.isNull(response)){
log.info("打印未使用参数"); log.info("打印未使用参数");
} }
@@ -184,10 +184,10 @@ public class JeroController<T, S extends IService<T>> {
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒 //1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
//update-end-author:taoyan date:20190528 for:批量插入数据 //update-end-author:taoyan date:20190528 for:批量插入数据
return Result.OK("文件导入成功！数据行数：" + list.size()); return Results.OK("文件导入成功！数据行数：" + list.size());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件导入失败:" + e.getMessage()); return Results.error("文件导入失败:" + e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -196,6 +196,6 @@ public class JeroController<T, S extends IService<T>> {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
} }
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java
+4 -4
View File
@@ -2,7 +2,7 @@ package com.jero.common.util;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -19,9 +19,9 @@ public class ImportExcelUtil {
} }
public static Result<JSONObject> imporReturnRes(int errorLines, int successLines, List<String> errorMessage){ public static Results<JSONObject> imporReturnRes(int errorLines, int successLines, List<String> errorMessage){
if (errorLines == 0) { if (errorLines == 0) {
return Result.OK("共" + successLines + "行数据全部导入成功！"); return Results.OK("共" + successLines + "行数据全部导入成功！");
} else { } else {
JSONObject result = new JSONObject(5); JSONObject result = new JSONObject(5);
int totalCount = successLines + errorLines; int totalCount = successLines + errorLines;
@@ -34,7 +34,7 @@ public class ImportExcelUtil {
String fileName = fileUrl.substring(lastIndex + 1); String fileName = fileUrl.substring(lastIndex + 1);
result.put("fileUrl", "/sys/common/static/" + fileUrl); result.put("fileUrl", "/sys/common/static/" + fileUrl);
result.put("fileName", fileName); result.put("fileName", fileName);
Result<JSONObject> res = Result.OK(result); Results<JSONObject> res = Results.OK(result);
res.setCode(201); res.setCode(201);
res.setMessage("文件导入成功，但有错误。"); res.setMessage("文件导入成功，但有错误。");
return res; return res;
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/RestDesformUtil.java
+9 -9
View File
@@ -1,7 +1,7 @@
package com.jero.common.util; package com.jero.common.util;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
@@ -37,7 +37,7 @@ public class RestDesformUtil {
* @param token * @param token
* @return * @return
*/ */
public static Result<T> queryOne(String desformCode, String dataId, String token) { public static Results<T> queryOne(String desformCode, String dataId, String token) {
String url = getBaseUrl(desformCode, dataId).toString(); String url = getBaseUrl(desformCode, dataId).toString();
HttpHeaders headers = getHeaders(token); HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class); ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
@@ -52,7 +52,7 @@ public class RestDesformUtil {
* @param token * @param token
* @return * @return
*/ */
public static Result<T> addOne(String desformCode, JSONObject formData, String token) { public static Results<T> addOne(String desformCode, JSONObject formData, String token) {
return addOrEditOne(desformCode, formData, token, HttpMethod.POST); return addOrEditOne(desformCode, formData, token, HttpMethod.POST);
} }
@@ -64,11 +64,11 @@ public class RestDesformUtil {
* @param token * @param token
* @return * @return
*/ */
public static Result<T> editOne(String desformCode, JSONObject formData, String token) { public static Results<T> editOne(String desformCode, JSONObject formData, String token) {
return addOrEditOne(desformCode, formData, token, HttpMethod.PUT); return addOrEditOne(desformCode, formData, token, HttpMethod.PUT);
} }
private static Result<T> addOrEditOne(String desformCode, JSONObject formData, String token, HttpMethod method) { private static Results<T> addOrEditOne(String desformCode, JSONObject formData, String token, HttpMethod method) {
String url = getBaseUrl(desformCode).toString(); String url = getBaseUrl(desformCode).toString();
HttpHeaders headers = getHeaders(token); HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class); ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
@@ -83,19 +83,19 @@ public class RestDesformUtil {
* @param token * @param token
* @return * @return
*/ */
public static Result<T> removeOne(String desformCode, String dataId, String token) { public static Results<T> removeOne(String desformCode, String dataId, String token) {
String url = getBaseUrl(desformCode, dataId).toString(); String url = getBaseUrl(desformCode, dataId).toString();
HttpHeaders headers = getHeaders(token); HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class); ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
return packageReturn(result); return packageReturn(result);
} }
private static Result<T> packageReturn(ResponseEntity<JSONObject> result) { private static Results<T> packageReturn(ResponseEntity<JSONObject> result) {
JSONObject json = result.getBody(); JSONObject json = result.getBody();
if (!Objects.isNull(json)) { if (!Objects.isNull(json)) {
return json.toJavaObject(Result.class); return json.toJavaObject(Results.class);
} }
return Result.error("操作失败"); return Results.error("操作失败");
} }
private static StringBuilder getBaseUrl() { private static StringBuilder getBaseUrl() {
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/CsrfFilter.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.jero.config;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -66,7 +66,7 @@ public class CsrfFilter implements Filter {
log = "跨站请求---->>>" + ip + "||" + date + "||" + referurl + "||" + url; log = "跨站请求---->>>" + ip + "||" + date + "||" + referurl + "||" + url;
LOGGER.warn(log); LOGGER.warn(log);
//发送错误信息 //发送错误信息
JSONObject json = JSONUtil.parseObj(Result.error("监测到跨站请求，请求失败"), false); JSONObject json = JSONUtil.parseObj(Results.error("监测到跨站请求，请求失败"), false);
res.setCharacterEncoding("UTF-8"); res.setCharacterEncoding("UTF-8");
res.setContentType("application/json; charset=utf-8"); res.setContentType("application/json; charset=utf-8");
PrintWriter out = res.getWriter(); PrintWriter out = res.getWriter();
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/sign/interceptor/SignAuthInterceptor.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.SortedMap;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.util.DateUtils; import com.jero.common.util.DateUtils;
import com.jero.config.sign.util.BodyReaderHttpServletRequestWrapper; import com.jero.config.sign.util.BodyReaderHttpServletRequestWrapper;
@@ -64,7 +64,7 @@ public class SignAuthInterceptor implements HandlerInterceptor {
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
response.setContentType("application/json; charset=utf-8"); response.setContentType("application/json; charset=utf-8");
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
Result<?> result = Result.error("Sign签名校验失败！"); Results<?> result = Results.error("Sign签名校验失败！");
out.print(JSON.toJSON(result)); out.print(JSON.toJSON(result));
return false; return false;
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/interceptor/OnlineInterceptor.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.jero.generater.interceptor;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.jero.common.api.dto.OnlineAuthDTO; import com.jero.common.api.dto.OnlineAuthDTO;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.OnlineAuth; import com.jero.common.aspect.annotation.OnlineAuth;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.util.JwtUtil; import com.jero.common.system.util.JwtUtil;
@@ -111,7 +111,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
if ("exportXls".equals(paramString)) { if ("exportXls".equals(paramString)) {
printWriter.print(""); printWriter.print("");
} else { } else {
Result<T> result = Result.error("无权限访问(操作)"); Results<T> result = Results.error("无权限访问(操作)");
printWriter.print(JSON.toJSON(result)); printWriter.print(JSON.toJSON(result));
} }
} catch (IOException e) { } catch (IOException e) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java
+43 -43
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.generater.modules.online.auth.entity.OnlAuthData; import com.jero.generater.modules.online.auth.entity.OnlAuthData;
import com.jero.generater.modules.online.auth.entity.OnlAuthPage; import com.jero.generater.modules.online.auth.entity.OnlAuthPage;
@@ -58,8 +58,8 @@ public class OnlCgformAuthController {
@GetMapping({"/authData/{cgformId}"}) @GetMapping({"/authData/{cgformId}"})
public Result<List<OnlAuthData>> a(@PathVariable("cgformId") String paramString) { public Results<List<OnlAuthData>> a(@PathVariable("cgformId") String paramString) {
Result<List<OnlAuthData>> result = new Result<>(); Results<List<OnlAuthData>> result = new Results<>();
LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString); lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString);
List<OnlAuthData> list = this.onlAuthDataService.list(lambdaQueryWrapper); List<OnlAuthData> list = this.onlAuthDataService.list(lambdaQueryWrapper);
@@ -70,35 +70,35 @@ public class OnlCgformAuthController {
@PostMapping({"/authData"}) @PostMapping({"/authData"})
public Result<Object> addAuthData(@RequestBody OnlAuthData paramOnlAuthData) { public Results<Object> addAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
try { try {
this.onlAuthDataService.save(paramOnlAuthData); this.onlAuthDataService.save(paramOnlAuthData);
return Result.OK(OP_CONSTANT); return Results.OK(OP_CONSTANT);
} catch (Exception exception) { } catch (Exception exception) {
log.error(exception.getMessage(), exception); log.error(exception.getMessage(), exception);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/editAuthData"}) @PostMapping({"/editAuthData"})
public Result<OnlAuthData> editAuthData(@RequestBody OnlAuthData paramOnlAuthData) { public Results<OnlAuthData> editAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
Result<OnlAuthData> result = new Result<>(); Results<OnlAuthData> result = new Results<>();
this.onlAuthDataService.updateById(paramOnlAuthData); this.onlAuthDataService.updateById(paramOnlAuthData);
return result; return result;
} }
@PostMapping({"/authData/{id}"}) @PostMapping({"/authData/{id}"})
public Result<T> getAuthDataById(@PathVariable("id") String paramString) { public Results<T> getAuthDataById(@PathVariable("id") String paramString) {
this.onlAuthDataService.deleteOne(paramString); this.onlAuthDataService.deleteOne(paramString);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
@GetMapping({"/authButton/{cgformId}"}) @GetMapping({"/authButton/{cgformId}"})
public Result<Map<String, Object>> getAuthButton(@PathVariable("cgformId") String paramString) { public Results<Map<String, Object>> getAuthButton(@PathVariable("cgformId") String paramString) {
Result<Map<String, Object>> result = new Result<>(); Results<Map<String, Object>> result = new Results<>();
LambdaQueryWrapper<OnlCgformButton> buttonLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformButton> buttonLambdaQueryWrapper = new LambdaQueryWrapper<>();
buttonLambdaQueryWrapper.eq(OnlCgformButton::getCgformHeadId, paramString) buttonLambdaQueryWrapper.eq(OnlCgformButton::getCgformHeadId, paramString)
@@ -121,7 +121,7 @@ public class OnlCgformAuthController {
@PostMapping({"/authButton"}) @PostMapping({"/authButton"})
public Result<OnlAuthPage> addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) { public Results<OnlAuthPage> addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) {
try { try {
String str = paramOnlAuthPage.getId(); String str = paramOnlAuthPage.getId();
boolean bool = false; boolean bool = false;
@@ -137,33 +137,33 @@ public class OnlCgformAuthController {
paramOnlAuthPage.setStatus(1); paramOnlAuthPage.setStatus(1);
this.onlAuthPageService.save(paramOnlAuthPage); this.onlAuthPageService.save(paramOnlAuthPage);
} }
return Result.OK(OP_CONSTANT, paramOnlAuthPage); return Results.OK(OP_CONSTANT, paramOnlAuthPage);
} catch (Exception exception) { } catch (Exception exception) {
log.error(exception.getMessage(), exception); log.error(exception.getMessage(), exception);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/authButton/{id}"}) @PostMapping({"/authButton/{id}"})
public Result<String> d(@PathVariable("id") String paramString) { public Results<String> d(@PathVariable("id") String paramString) {
LambdaUpdateWrapper<OnlAuthPage> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<OnlAuthPage> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(OnlAuthPage::getId, paramString).set(OnlAuthPage::getStatus, 0); lambdaUpdateWrapper.eq(OnlAuthPage::getId, paramString).set(OnlAuthPage::getStatus, 0);
this.onlAuthPageService.update(lambdaUpdateWrapper); this.onlAuthPageService.update(lambdaUpdateWrapper);
return Result.OK(OP_CONSTANT); return Results.OK(OP_CONSTANT);
} }
@GetMapping({"/authColumn/{cgformId}"}) @GetMapping({"/authColumn/{cgformId}"})
public Result<List<AuthColumnVO>> e(@PathVariable("cgformId") String paramString) { public Results<List<AuthColumnVO>> e(@PathVariable("cgformId") String paramString) {
Result<List<AuthColumnVO>> result = new Result<>(); Results<List<AuthColumnVO>> result = new Results<>();
LambdaQueryWrapper<OnlCgformField> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformField> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, paramString); lambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, paramString);
lambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); lambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum);
List<OnlCgformField> list = this.onlCgformFieldService.list(lambdaQueryWrapper); List<OnlCgformField> list = this.onlCgformFieldService.list(lambdaQueryWrapper);
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
return Result.error(NOT_INFO_CONSTANT); return Results.error(NOT_INFO_CONSTANT);
} }
LambdaQueryWrapper<OnlAuthPage> pageLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlAuthPage> pageLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -176,7 +176,7 @@ public class OnlCgformAuthController {
arrayList.add(authColumnVO); arrayList.add(authColumnVO);
} }
result.setResult(arrayList); result.setResult(arrayList);
Result.OK("加载字段权限数据完成"); Results.OK("加载字段权限数据完成");
return result; return result;
} }
@@ -216,36 +216,36 @@ public class OnlCgformAuthController {
@PostMapping({"/editAuthColumn"}) @PostMapping({"/editAuthColumn"})
public Result<T> editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { public Results<T> editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try { try {
if (paramAuthColumnVO.getStatus() == 1) { if (paramAuthColumnVO.getStatus() == 1) {
this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO); this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO);
} else { } else {
this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO); this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO);
} }
return Result.OK(OP_CONSTANT); return Results.OK(OP_CONSTANT);
} catch (Exception exception) { } catch (Exception exception) {
log.error(exception.getMessage(), exception); log.error(exception.getMessage(), exception);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/authColumn"}) @PostMapping({"/authColumn"})
public Result<T> addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { public Results<T> addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try { try {
this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO); this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO);
return Result.OK(OP_CONSTANT); return Results.OK(OP_CONSTANT);
} catch (Exception exception) { } catch (Exception exception) {
log.error(exception.getMessage(), exception); log.error(exception.getMessage(), exception);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@GetMapping({"/authPage/{cgformId}/{type}"}) @GetMapping({"/authPage/{cgformId}/{type}"})
public Result<List<AuthPageVO>> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) { public Results<List<AuthPageVO>> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) {
Result<List<AuthPageVO>> result = new Result<>(); Results<List<AuthPageVO>> result = new Results<>();
List<AuthPageVO> list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger); List<AuthPageVO> list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger);
result.setResult(list); result.setResult(list);
result.setSuccess(true); result.setSuccess(true);
@@ -254,8 +254,8 @@ public class OnlCgformAuthController {
@GetMapping({"/validAuthData/{cgformId}"}) @GetMapping({"/validAuthData/{cgformId}"})
public Result<List<OnlAuthData>> validAuthData(@PathVariable("cgformId") String paramString) { public Results<List<OnlAuthData>> validAuthData(@PathVariable("cgformId") String paramString) {
Result<List<OnlAuthData>> result = new Result<>(); Results<List<OnlAuthData>> result = new Results<>();
LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString) lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString)
@@ -270,8 +270,8 @@ public class OnlCgformAuthController {
@GetMapping({"/roleAuth"}) @GetMapping({"/roleAuth"})
public Result<List<OnlAuthRelation>> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) { public Results<List<OnlAuthRelation>> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) {
Result<List<OnlAuthRelation>> result = new Result<>(); Results<List<OnlAuthRelation>> result = new Results<>();
LambdaQueryWrapper<OnlAuthRelation> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlAuthRelation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthRelation::getRoleId, paramString1) lambdaQueryWrapper.eq(OnlAuthRelation::getRoleId, paramString1)
@@ -287,42 +287,42 @@ public class OnlCgformAuthController {
@PostMapping({"/roleColumnAuth/{roleId}/{cgformId}"}) @PostMapping({"/roleColumnAuth/{roleId}/{cgformId}"})
public Result<T> addRoleColumnAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { public Results<T> addRoleColumnAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT);
List<String> list = json.toJavaList(String.class); List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 1, list); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 1, list);
return Result.OK(); return Results.OK();
} }
@PostMapping({"/roleButtonAuth/{roleId}/{cgformId}"}) @PostMapping({"/roleButtonAuth/{roleId}/{cgformId}"})
public Result<T> addrRleButtonAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { public Results<T> addrRleButtonAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT);
List<String> list = json.toJavaList(String.class); List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 2, list); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 2, list);
return Result.OK(); return Results.OK();
} }
@PostMapping({"/roleDataAuth/{roleId}/{cgformId}"}) @PostMapping({"/roleDataAuth/{roleId}/{cgformId}"})
public Result<T> addRoleDataAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { public Results<T> addRoleDataAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT);
List<String> list = json.toJavaList(String.class); List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 3, list); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 3, list);
return Result.OK(); return Results.OK();
} }
@GetMapping({"/getAuthColumn/{desformCode}"}) @GetMapping({"/getAuthColumn/{desformCode}"})
public Result<List<AuthColumnVO>> getAuthColumn(@PathVariable("desformCode") String paramString) { public Results<List<AuthColumnVO>> getAuthColumn(@PathVariable("desformCode") String paramString) {
LambdaQueryWrapper<OnlCgformHead> cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformHead> cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper<>();
cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString); cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString);
OnlCgformHead onlCgformHead = this.onlCgformHeadService.getOne(cgformHeadLambdaQueryWrapper); OnlCgformHead onlCgformHead = this.onlCgformHeadService.getOne(cgformHeadLambdaQueryWrapper);
if (onlCgformHead == null) { if (onlCgformHead == null) {
Result.error(NOT_INFO_CONSTANT); Results.error(NOT_INFO_CONSTANT);
} }
Result<List<AuthColumnVO>> result = new Result<>(); Results<List<AuthColumnVO>> result = new Results<>();
LambdaQueryWrapper<OnlCgformField> cgformFieldLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformField> cgformFieldLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (!Objects.isNull(onlCgformHead)) { if (!Objects.isNull(onlCgformHead)) {
cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId()); cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId());
@@ -330,7 +330,7 @@ public class OnlCgformAuthController {
cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum);
List<OnlCgformField> list = this.onlCgformFieldService.list(cgformFieldLambdaQueryWrapper); List<OnlCgformField> list = this.onlCgformFieldService.list(cgformFieldLambdaQueryWrapper);
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
Result.error(NOT_INFO_CONSTANT); Results.error(NOT_INFO_CONSTANT);
} }
ArrayList<AuthColumnVO> arrayList = new ArrayList<>(); ArrayList<AuthColumnVO> arrayList = new ArrayList<>();
for (OnlCgformField onlCgformField : list) { for (OnlCgformField onlCgformField : list) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+84 -84
View File
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.OnlineAuth; import com.jero.common.aspect.annotation.OnlineAuth;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
@@ -99,23 +99,23 @@ public class OnlCgformApiController {
private static final String CHECK_ERROR = "查询失败，"; private static final String CHECK_ERROR = "查询失败，";
@PostMapping({"/addAll"}) @PostMapping({"/addAll"})
public Result<T> a(@RequestBody OnlCgformModel var1) { public Results<T> a(@RequestBody OnlCgformModel var1) {
try { try {
String var2 = var1.getHead().getTableName(); String var2 = var1.getHead().getTableName();
return Boolean.TRUE.equals(DbTableUtil.a(var2)) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); return Boolean.TRUE.equals(DbTableUtil.a(var2)) ? Results.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1);
} catch (Exception var3) { } catch (Exception var3) {
log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3); log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/editAll"}) @PostMapping({"/editAll"})
public Result<T> b(@RequestBody OnlCgformModel var1) { public Results<T> b(@RequestBody OnlCgformModel var1) {
try { try {
return this.onlCgformHeadService.editAll(var1); return this.onlCgformHeadService.editAll(var1);
} catch (Exception var3) { } catch (Exception var3) {
log.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3); log.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -126,11 +126,11 @@ public class OnlCgformApiController {
) )
@OnlineAuth("getColumns") @OnlineAuth("getColumns")
@GetMapping({"/getColumns/{code}"}) @GetMapping({"/getColumns/{code}"})
public Result<OnlComplexModel> a(@PathVariable("code") String var1) { public Results<OnlComplexModel> a(@PathVariable("code") String var1) {
Result<OnlComplexModel> var2 = new Result<>(); Results<OnlComplexModel> var2 = new Results<>();
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3); OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3);
var4.setIsDesForm(var3.getIsDesForm()); var4.setIsDesForm(var3.getIsDesForm());
@@ -149,11 +149,11 @@ public class OnlCgformApiController {
@PermissionData @PermissionData
@OnlineAuth("getData") @OnlineAuth("getData")
@GetMapping({"/getData/{code}"}) @GetMapping({"/getData/{code}"})
public Result<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) {
Result<Map<String, Object>> var3 = new Result<>(); Results<Map<String, Object>> var3 = new Results<>();
OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); OnlCgformHead var4 = this.onlCgformHeadService.getById(var1);
if (var4 == null) { if (var4 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
try { try {
String var5 = var4.getTableName(); String var5 = var4.getTableName();
@@ -163,7 +163,7 @@ public class OnlCgformApiController {
var3.setResult(var7); var3.setResult(var7);
} catch (Exception var8) { } catch (Exception var8) {
log.error(var8.getMessage(), var8); log.error(var8.getMessage(), var8);
return Result.error("数据库查询失败，" + var8.getMessage()); return Results.error("数据库查询失败，" + var8.getMessage());
} }
var3.setOnlTable(var4.getTableName()); var3.setOnlTable(var4.getTableName());
@@ -178,13 +178,13 @@ public class OnlCgformApiController {
) )
@OnlineAuth("getFormItem") @OnlineAuth("getFormItem")
@GetMapping({"/getFormItem/{code}"}) @GetMapping({"/getFormItem/{code}"})
public Result<JSONObject> b(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<JSONObject> b(@PathVariable("code") String var1, HttpServletRequest var2) {
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
Result.error("表不存在"); Results.error("表不存在");
} }
Result<JSONObject> var4 = new Result<>(); Results<JSONObject> var4 = new Results<>();
OnlCgformEnhanceJs var5 = this.onlCgformHeadService.queryEnhanceJs(var1, "form"); OnlCgformEnhanceJs var5 = this.onlCgformHeadService.queryEnhanceJs(var1, "form");
JSONObject var6 = this.onlineService.queryOnlineFormObj(var3, var5); JSONObject var6 = this.onlineService.queryOnlineFormObj(var3, var5);
if (!Objects.isNull(var3)) { if (!Objects.isNull(var3)) {
@@ -272,13 +272,13 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE module = ModuleType.ONLINE
) )
@GetMapping({"/getFormItemBytbname/{table}"}) @GetMapping({"/getFormItemBytbname/{table}"})
public Result<JSONObject> a(@PathVariable("table") String var1, @RequestParam(name = "taskId", required = false) String var2) { public Results<JSONObject> a(@PathVariable("table") String var1, @RequestParam(name = "taskId", required = false) String var2) {
Result<JSONObject> var3 = new Result<>(); Results<JSONObject> var3 = new Results<>();
LambdaQueryWrapper<OnlCgformHead> var4 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformHead> var4 = new LambdaQueryWrapper<>();
var4.eq(OnlCgformHead::getTableName, var1); var4.eq(OnlCgformHead::getTableName, var1);
OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4); OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4);
if (var5 == null) { if (var5 == null) {
Result.error("表不存在"); Results.error("表不存在");
} }
JSONObject var6 = new JSONObject(); JSONObject var6 = new JSONObject();
@@ -294,14 +294,14 @@ public class OnlCgformApiController {
@OnlineAuth("getEnhanceJs") @OnlineAuth("getEnhanceJs")
@GetMapping({"/getEnhanceJs/{code}"}) @GetMapping({"/getEnhanceJs/{code}"})
public Result<T> c(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<T> c(@PathVariable("code") String var1, HttpServletRequest var2) {
String var3 = ""; String var3 = "";
OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhanceJs(var1, "form"); OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhanceJs(var1, "form");
if (var4 != null && oConvertUtils.isNotEmpty(var4.getCgJs())) { if (var4 != null && oConvertUtils.isNotEmpty(var4.getCgJs())) {
var3 = EnhanceJsUtil.b(var4.getCgJs(), (List) null); var3 = EnhanceJsUtil.b(var4.getCgJs(), (List) null);
} }
return Result.OK(var3); return Results.OK(var3);
} }
@AutoLog( @AutoLog(
@@ -309,34 +309,34 @@ public class OnlCgformApiController {
value = "online表单数据查询" value = "online表单数据查询"
) )
@GetMapping({"/form/{code}/{id}"}) @GetMapping({"/form/{code}/{id}"})
public Result<Map<String, Object>> b(@PathVariable("code") String var1, @PathVariable("id") String var2) { public Results<Map<String, Object>> b(@PathVariable("code") String var1, @PathVariable("id") String var2) {
try { try {
Map<String, Object> var3 = this.onlCgformHeadService.queryManyFormData(var1, var2); Map<String, Object> var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
return Result.OK(CgformUtil.b(var3)); return Results.OK(CgformUtil.b(var3));
} catch (Exception var4) { } catch (Exception var4) {
log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); log.error(ONLINE_CHECK_EX + var4.getMessage(), var4);
return Result.error(CHECK_ERROR + var4.getMessage()); return Results.error(CHECK_ERROR + var4.getMessage());
} }
} }
@GetMapping({"/subform/{table}/{mainId}"}) @GetMapping({"/subform/{table}/{mainId}"})
public Result<Map<String, Object>> c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { public Results<Map<String, Object>> c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
try { try {
Map<String, Object> var3 = this.onlCgformHeadService.querySubFormData(var1, var2); Map<String, Object> var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
return Result.OK(CgformUtil.b(var3)); return Results.OK(CgformUtil.b(var3));
} catch (Exception var4) { } catch (Exception var4) {
log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); log.error(ONLINE_CHECK_EX + var4.getMessage(), var4);
return Result.error(CHECK_ERROR + var4.getMessage()); return Results.error(CHECK_ERROR + var4.getMessage());
} }
} }
@GetMapping({"/subform/list/{table}/{mainId}"}) @GetMapping({"/subform/list/{table}/{mainId}"})
public Result<List<Map<String, Object>>> d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { public Results<List<Map<String, Object>>> d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
try { try {
return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2)); return Results.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
} catch (Exception var4) { } catch (Exception var4) {
log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); log.error(ONLINE_CHECK_EX + var4.getMessage(), var4);
return Result.error(CHECK_ERROR + var4.getMessage()); return Results.error(CHECK_ERROR + var4.getMessage());
} }
} }
@@ -346,7 +346,7 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE module = ModuleType.ONLINE
) )
@GetMapping({"/form/table_name/{tableName}/{dataId}"}) @GetMapping({"/form/table_name/{tableName}/{dataId}"})
public Result<Map<String, Object>> e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) { public Results<Map<String, Object>> e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) {
try { try {
LambdaQueryWrapper<OnlCgformHead> var3 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformHead> var3 = new LambdaQueryWrapper<>();
var3.eq(OnlCgformHead::getTableName, var1); var3.eq(OnlCgformHead::getTableName, var1);
@@ -354,13 +354,13 @@ public class OnlCgformApiController {
if (var4 == null) { if (var4 == null) {
throw new JeroBootException("OnlCgform tableName: " + var1 + " 不存在！"); throw new JeroBootException("OnlCgform tableName: " + var1 + " 不存在！");
} else { } else {
Result<Map<String, Object>> var5 = this.b(var4.getId(), var2); Results<Map<String, Object>> var5 = this.b(var4.getId(), var2);
var5.setOnlTable(var1); var5.setOnlTable(var1);
return var5; return var5;
} }
} catch (Exception var6) { } catch (Exception var6) {
log.error("Online表单查询异常，" + var6.getMessage(), var6); log.error("Online表单查询异常，" + var6.getMessage(), var6);
return Result.error(CHECK_ERROR + var6.getMessage()); return Results.error(CHECK_ERROR + var6.getMessage());
} }
} }
@@ -371,8 +371,8 @@ public class OnlCgformApiController {
) )
@OnlineAuth("form") @OnlineAuth("form")
@PostMapping({"/form/{code}"}) @PostMapping({"/form/{code}"})
public Result<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) { public Results<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) {
Result<String> var4 = new Result<>(); Results<String> var4 = new Results<>();
try { try {
String var5 = CgformUtil.a(); String var5 = CgformUtil.a();
@@ -398,15 +398,15 @@ public class OnlCgformApiController {
) )
@OnlineAuth("form") @OnlineAuth("form")
@PostMapping({"/form/update/{code}"}) @PostMapping({"/form/update/{code}"})
public Result<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2) { public Results<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2) {
try { try {
String var3 = this.onlCgformHeadService.editManyFormData(var1, var2); String var3 = this.onlCgformHeadService.editManyFormData(var1, var2);
Result<String> var4 = Result.OK("操作成功!"); Results<String> var4 = Results.OK("操作成功!");
var4.setOnlTable(var3); var4.setOnlTable(var3);
return var4; return var4;
} catch (Exception var5) { } catch (Exception var5) {
log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5); log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5);
return Result.error("修改失败，" + CgformUtil.a(var5)); return Results.error("修改失败，" + CgformUtil.a(var5));
} }
} }
@@ -417,19 +417,19 @@ public class OnlCgformApiController {
) )
@OnlineAuth("form") @OnlineAuth("form")
@PostMapping({"/form/{code}/{id}"}) @PostMapping({"/form/{code}/{id}"})
public Result<String> f(@PathVariable("code") String var1, @PathVariable("id") String var2) { public Results<String> f(@PathVariable("code") String var1, @PathVariable("id") String var2) {
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
try { try {
getVar4(var1, var2, var3); getVar4(var1, var2, var3);
} catch (Exception var12) { } catch (Exception var12) {
log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var12.getMessage(), var12); log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var12.getMessage(), var12);
return Result.error("删除失败"); return Results.error("删除失败");
} }
Result<String> var13 = Result.OK("删除成功!"); Results<String> var13 = Results.OK("删除成功!");
var13.setOnlTable(var3.getTableName()); var13.setOnlTable(var3.getTableName());
return var13; return var13;
} }
@@ -478,10 +478,10 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE module = ModuleType.ONLINE
) )
@PostMapping({"/formByCode/{code}/{id}"}) @PostMapping({"/formByCode/{code}/{id}"})
public Result<String> g(@PathVariable("code") String var1, @PathVariable("id") String var2) { public Results<String> g(@PathVariable("code") String var1, @PathVariable("id") String var2) {
OnlCgformHead var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var1)); OnlCgformHead var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var1));
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
try { try {
if (var2.contains(",")) { if (var2.contains(",")) {
@@ -492,10 +492,10 @@ public class OnlCgformApiController {
} }
} catch (Exception var5) { } catch (Exception var5) {
log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5); log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5);
return Result.error("删除失败"); return Results.error("删除失败");
} }
Result<String> var6 = Result.OK("删除成功!"); Results<String> var6 = Results.OK("删除成功!");
var6.setOnlTable(var3.getTableName()); var6.setOnlTable(var3.getTableName());
return var6; return var6;
} }
@@ -503,28 +503,28 @@ public class OnlCgformApiController {
@OnlineAuth("getQueryInfo") @OnlineAuth("getQueryInfo")
@GetMapping({"/getQueryInfo/{code}"}) @GetMapping({"/getQueryInfo/{code}"})
public Result<List<Map<String, String>>> b(@PathVariable("code") String var1) { public Results<List<Map<String, String>>> b(@PathVariable("code") String var1) {
try { try {
List<Map<String, String>> var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1); List<Map<String, String>> var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1);
return Result.OK(var2); return Results.OK(var2);
} catch (Exception var3) { } catch (Exception var3) {
log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3); log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
return Result.error("查询失败"); return Results.error("查询失败");
} }
} }
@PostMapping({"/doDbSynch/{code}/{synMethod}"}) @PostMapping({"/doDbSynch/{code}/{synMethod}"})
public Result<T> h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) { public Results<T> h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) {
try { try {
long var3 = System.currentTimeMillis(); long var3 = System.currentTimeMillis();
this.onlCgformHeadService.doDbSynch(var1, var2); this.onlCgformHeadService.doDbSynch(var1, var2);
log.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒"); log.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
} catch (Exception var5) { } catch (Exception var5) {
log.error(var5.getMessage(), var5); log.error(var5.getMessage(), var5);
return Result.error("同步数据库失败，" + CgformUtil.a(var5)); return Results.error("同步数据库失败，" + CgformUtil.a(var5));
} }
return Result.OK("同步数据库成功!"); return Results.OK("同步数据库成功!");
} }
@OnlineAuth("exportXls") @OnlineAuth("exportXls")
@@ -625,15 +625,15 @@ public class OnlCgformApiController {
@OnlineAuth("importXls") @OnlineAuth("importXls")
@PostMapping({"/importXls/{code}"}) @PostMapping({"/importXls/{code}"})
public Result<T> b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) { public Results<T> b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) {
long var4 = System.currentTimeMillis(); long var4 = System.currentTimeMillis();
Result<T> var6 = new Result<>(); Results<T> var6 = new Results<>();
String var7 = ""; String var7 = "";
try { try {
OnlCgformHead var8 = this.onlCgformHeadService.getById(var1); OnlCgformHead var8 = this.onlCgformHeadService.getById(var1);
if (var8 == null) { if (var8 == null) {
return Result.error("数据库不存在该表记录"); return Results.error("数据库不存在该表记录");
} }
LambdaQueryWrapper<OnlCgformField> var9 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformField> var9 = new LambdaQueryWrapper<>();
@@ -824,7 +824,7 @@ public class OnlCgformApiController {
} }
@PostMapping({"/doButton"}) @PostMapping({"/doButton"})
public Result<T> a(@RequestBody JSONObject var1) { public Results<T> a(@RequestBody JSONObject var1) {
String var2 = var1.getString("formId"); String var2 = var1.getString("formId");
String var3 = var1.getString("dataId"); String var3 = var1.getString("dataId");
String var4 = var1.getString("buttonCode"); String var4 = var1.getString("buttonCode");
@@ -833,10 +833,10 @@ public class OnlCgformApiController {
this.onlCgformHeadService.executeCustomerButton(var4, var2, var3); this.onlCgformHeadService.executeCustomerButton(var4, var2, var3);
} catch (Exception var7) { } catch (Exception var7) {
log.error(var7.getMessage(), var7); log.error(var7.getMessage(), var7);
return Result.error("执行失败!"); return Results.error("执行失败!");
} }
return Result.OK("执行成功!"); return Results.OK("执行成功!");
} }
public Object a(OnlCgformHead var1, DataSource var2, String var3) { public Object a(OnlCgformHead var1, DataSource var2, String var3) {
@@ -952,25 +952,25 @@ public class OnlCgformApiController {
} }
@GetMapping({"/checkOnlyTable"}) @GetMapping({"/checkOnlyTable"})
public Result<Integer> i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) { public Results<Integer> i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) {
OnlCgformHead var3; OnlCgformHead var3;
if (oConvertUtils.isEmpty(var2)) { if (oConvertUtils.isEmpty(var2)) {
if (Boolean.TRUE.equals(DbTableUtil.a(var1))) { if (Boolean.TRUE.equals(DbTableUtil.a(var1))) {
return Result.OK(-1); return Results.OK(-1);
} }
var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var1)); var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var1));
if (oConvertUtils.isNotEmpty(var3)) { if (oConvertUtils.isNotEmpty(var3)) {
return Result.OK(-1); return Results.OK(-1);
} }
} else { } else {
var3 = this.onlCgformHeadService.getById(var2); var3 = this.onlCgformHeadService.getById(var2);
if (!var1.equals(var3.getTableName()) && Boolean.TRUE.equals(DbTableUtil.a(var1))) { if (!var1.equals(var3.getTableName()) && Boolean.TRUE.equals(DbTableUtil.a(var1))) {
return Result.OK(-1); return Results.OK(-1);
} }
} }
return Result.OK(1); return Results.OK(1);
} }
/** /**
@@ -981,7 +981,7 @@ public class OnlCgformApiController {
* @date 2021/4/6 11:41 * @date 2021/4/6 11:41
*/ */
@PostMapping({"/codeGenerate"}) @PostMapping({"/codeGenerate"})
public Result<List<String>> codeGenerate(@RequestBody JSONObject jsonObject) { public Results<List<String>> codeGenerate(@RequestBody JSONObject jsonObject) {
OnlGenerateModel onlGenerateModel = JSON.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class); OnlGenerateModel onlGenerateModel = JSON.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class);
List<String> list; List<String> list;
@@ -992,10 +992,10 @@ public class OnlCgformApiController {
list = this.onlCgformHeadService.generateOneToMany(onlGenerateModel); list = this.onlCgformHeadService.generateOneToMany(onlGenerateModel);
} }
return Result.OK(list); return Results.OK(list);
} catch (Exception var5) { } catch (Exception var5) {
var5.printStackTrace(); var5.printStackTrace();
return Result.error(var5.getMessage()); return Results.error(var5.getMessage());
} }
} }
@@ -1054,11 +1054,11 @@ public class OnlCgformApiController {
) )
@GetMapping({"/getTreeData/{code}"}) @GetMapping({"/getTreeData/{code}"})
@PermissionData @PermissionData
public Result<Map<String, Object>> d(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<Map<String, Object>> d(@PathVariable("code") String var1, HttpServletRequest var2) {
Result<Map<String, Object>> var3 = new Result<>(); Results<Map<String, Object>> var3 = new Results<>();
OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); OnlCgformHead var4 = this.onlCgformHeadService.getById(var1);
if (var4 == null) { if (var4 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
try { try {
String var5 = var4.getTableName(); String var5 = var4.getTableName();
@@ -1079,7 +1079,7 @@ public class OnlCgformApiController {
var3.setResult(var11); var3.setResult(var11);
} catch (Exception var12) { } catch (Exception var12) {
log.error(var12.getMessage(), var12); log.error(var12.getMessage(), var12);
return Result.error("数据库查询失败" + var12.getMessage()); return Results.error("数据库查询失败" + var12.getMessage());
} }
var3.setOnlTable(var4.getTableName()); var3.setOnlTable(var4.getTableName());
@@ -1093,8 +1093,8 @@ public class OnlCgformApiController {
} }
@PostMapping({"/crazyForm/{name}"}) @PostMapping({"/crazyForm/{name}"})
public Result<String> b(@PathVariable("name") String var1, @RequestBody JSONObject var2) { public Results<String> b(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
Result<String> var3 = new Result<>(); Results<String> var3 = new Results<>();
try { try {
String var4 = CgformUtil.a(); String var4 = CgformUtil.a();
var2.put("id", var4); var2.put("id", var4);
@@ -1104,12 +1104,12 @@ public class OnlCgformApiController {
return var3; return var3;
} catch (Exception var5) { } catch (Exception var5) {
log.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5); log.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
return Result.error("保存失败"); return Results.error("保存失败");
} }
} }
@PostMapping({"/crazyForm/update/{name}"}) @PostMapping({"/crazyForm/update/{name}"})
public Result<T> c(@PathVariable("name") String var1, @RequestBody JSONObject var2) { public Results<T> c(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
try { try {
var2.remove("create_by"); var2.remove("create_by");
var2.remove("create_time"); var2.remove("create_time");
@@ -1118,10 +1118,10 @@ public class OnlCgformApiController {
this.onlCgformHeadService.editCrazyFormData(var1, var2); this.onlCgformHeadService.editCrazyFormData(var1, var2);
} catch (Exception var4) { } catch (Exception var4) {
log.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4); log.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
return Result.error("保存失败"); return Results.error("保存失败");
} }
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@AutoLog( @AutoLog(
@@ -1130,11 +1130,11 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE module = ModuleType.ONLINE
) )
@GetMapping({"/getErpColumns/{code}"}) @GetMapping({"/getErpColumns/{code}"})
public Result<Map<String, Object>> c(@PathVariable("code") String var1) { public Results<Map<String, Object>> c(@PathVariable("code") String var1) {
Result<Map<String, Object>> var2 = new Result<>(); Results<Map<String, Object>> var2 = new Results<>();
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
HashMap<String, Object> var4 = new HashMap<>(); HashMap<String, Object> var4 = new HashMap<>();
OnlComplexModel var5 = this.onlineService.queryOnlineConfig(var3); OnlComplexModel var5 = this.onlineService.queryOnlineConfig(var3);
@@ -1177,13 +1177,13 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE module = ModuleType.ONLINE
) )
@GetMapping({"/getErpFormItem/{code}"}) @GetMapping({"/getErpFormItem/{code}"})
public Result<JSONObject> e(@PathVariable("code") String var1) { public Results<JSONObject> e(@PathVariable("code") String var1) {
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error("表不存在"); return Results.error("表不存在");
} }
Result<JSONObject> var4 = new Result<>(); Results<JSONObject> var4 = new Results<>();
JSONObject var5 = this.onlineService.queryOnlineFormObj(var3); JSONObject var5 = this.onlineService.queryOnlineFormObj(var3);
var4.setResult(var5); var4.setResult(var5);
var4.setOnlTable(var3.getTableName()); var4.setOnlTable(var3.getTableName());
@@ -1191,8 +1191,8 @@ public class OnlCgformApiController {
} }
@GetMapping({"/querySelectOptions"}) @GetMapping({"/querySelectOptions"})
public Result<List<TreeModel>> a(@ModelAttribute LinkDown var1) { public Results<List<TreeModel>> a(@ModelAttribute LinkDown var1) {
Result<List<TreeModel>> var2 = new Result<>(); Results<List<TreeModel>> var2 = new Results<>();
List<TreeModel> var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1); List<TreeModel> var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1);
var2.setResult(var3); var2.setResult(var3);
var2.setSuccess(true); var2.setSuccess(true);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java
+24 -24
View File
@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformButton; import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService; import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
@@ -33,8 +33,8 @@ public class OnlCgformButtonController {
@GetMapping({"/list/{code}"}) @GetMapping({"/list/{code}"})
public Result<IPage<OnlCgformButton>> list(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) { public Results<IPage<OnlCgformButton>> list(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) {
Result<IPage<OnlCgformButton>> var6 = new Result<>(); Results<IPage<OnlCgformButton>> var6 = new Results<>();
var1.setCgformHeadId(var5); var1.setCgformHeadId(var5);
QueryWrapper<OnlCgformButton> var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgformButton> var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformButton> var8 = new Page<>(var2, var3); Page<OnlCgformButton> var8 = new Page<>(var2, var3);
@@ -45,83 +45,83 @@ public class OnlCgformButtonController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformButton cgformButton) { public Results<Object> add(@RequestBody OnlCgformButton cgformButton) {
try { try {
this.onlCgformButtonService.save(cgformButton); this.onlCgformButtonService.save(cgformButton);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/aitest"}) @PostMapping({"/aitest"})
public Result<Object> aitest(@RequestBody JSONArray jsonArray) { public Results<Object> aitest(@RequestBody JSONArray jsonArray) {
try { try {
for(int i = 0; i < jsonArray.size(); ++i) { for(int i = 0; i < jsonArray.size(); ++i) {
JSONObject jsonObject = jsonArray.getJSONObject(i); JSONObject jsonObject = jsonArray.getJSONObject(i);
OnlCgformButton cgformButton = JSON.parseObject(jsonObject.toJSONString(), OnlCgformButton.class); OnlCgformButton cgformButton = JSON.parseObject(jsonObject.toJSONString(), OnlCgformButton.class);
this.onlCgformButtonService.saveButton(cgformButton); this.onlCgformButtonService.saveButton(cgformButton);
} }
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformButton cgformButton) { public Results<Object> edit(@RequestBody OnlCgformButton cgformButton) {
OnlCgformButton existCgformButton = this.onlCgformButtonService.getById(cgformButton.getId()); OnlCgformButton existCgformButton = this.onlCgformButtonService.getById(cgformButton.getId());
if (existCgformButton == null) { if (existCgformButton == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean flag = this.onlCgformButtonService.updateById(cgformButton); boolean flag = this.onlCgformButtonService.updateById(cgformButton);
if (flag) { if (flag) {
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<Object> delete(@RequestBody Map<String,String> map) { public Results<Object> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isEmpty(id)){ if(StringUtils.isEmpty(id)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id); OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id);
if (cgformButton == null) { if (cgformButton == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean flag = this.onlCgformButtonService.removeById(id); boolean flag = this.onlCgformButtonService.removeById(id);
if (flag) { if (flag) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<Object> deleteBatch(@RequestBody Map<String,String> map) { public Results<Object> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if (ids != null && !"".equals(ids.trim())) { if (ids != null && !"".equals(ids.trim())) {
this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(","))); this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} else { } else {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgformButton> queryById(@RequestParam(name = "id",required = true) String id) { public Results<OnlCgformButton> queryById(@RequestParam(name = "id",required = true) String id) {
OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id); OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id);
if (cgformButton == null) { if (cgformButton == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
return Result.OK(cgformButton); return Results.OK(cgformButton);
} }
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java
+24 -24
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
@@ -32,25 +32,25 @@ public class OnlCgformFieldController {
private static final String EN_IS_NULL = "未找到对应实体"; private static final String EN_IS_NULL = "未找到对应实体";
@GetMapping({"/listByHeadCode"}) @GetMapping({"/listByHeadCode"})
public Result<List<OnlCgformField>> a(@RequestParam("headCode") String var1) { public Results<List<OnlCgformField>> a(@RequestParam("headCode") String var1) {
LambdaQueryWrapper<OnlCgformHead> var2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformHead> var2 = new LambdaQueryWrapper<>();
var2.eq(OnlCgformHead::getTableName, var1); var2.eq(OnlCgformHead::getTableName, var1);
OnlCgformHead var3 = this.onlCgformHeadService.getOne(var2); OnlCgformHead var3 = this.onlCgformHeadService.getOne(var2);
return var3 == null ? Result.error("不存在的code") : this.b(var3.getId()); return var3 == null ? Results.error("不存在的code") : this.b(var3.getId());
} }
@GetMapping({"/listByHeadId"}) @GetMapping({"/listByHeadId"})
public Result<List<OnlCgformField>> b(@RequestParam("headId") String var1) { public Results<List<OnlCgformField>> b(@RequestParam("headId") String var1) {
QueryWrapper<OnlCgformField> var2 = new QueryWrapper<>(); QueryWrapper<OnlCgformField> var2 = new QueryWrapper<>();
var2.eq("cgform_head_id", var1); var2.eq("cgform_head_id", var1);
var2.orderByAsc("order_num"); var2.orderByAsc("order_num");
List<OnlCgformField> var3 = this.onlCgformFieldService.list(var2); List<OnlCgformField> var3 = this.onlCgformFieldService.list(var2);
return Result.OK(var3); return Results.OK(var3);
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgformField>> a(OnlCgformField var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<IPage<OnlCgformField>> a(OnlCgformField var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result<IPage<OnlCgformField>> var5 = new Result<>(); Results<IPage<OnlCgformField>> var5 = new Results<>();
QueryWrapper<OnlCgformField> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgformField> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformField> var7 = new Page<>(var2, var3); Page<OnlCgformField> var7 = new Page<>(var2, var3);
IPage<OnlCgformField> var8 = this.onlCgformFieldService.page(var7, var6); IPage<OnlCgformField> var8 = this.onlCgformFieldService.page(var7, var6);
@@ -60,64 +60,64 @@ public class OnlCgformFieldController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformField var1) { public Results<Object> add(@RequestBody OnlCgformField var1) {
try { try {
this.onlCgformFieldService.save(var1); this.onlCgformFieldService.save(var1);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformField var1) { public Results<Object> edit(@RequestBody OnlCgformField var1) {
OnlCgformField var3 = this.onlCgformFieldService.getById(var1.getId()); OnlCgformField var3 = this.onlCgformFieldService.getById(var1.getId());
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean var4 = this.onlCgformFieldService.updateById(var1); boolean var4 = this.onlCgformFieldService.updateById(var1);
if (var4) { if (var4) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<Object> delete(@RequestBody Map<String,String> map) { public Results<Object> delete(@RequestBody Map<String,String> map) {
String var1 = map.get("id"); String var1 = map.get("id");
OnlCgformField var3 = this.onlCgformFieldService.getById(var1); OnlCgformField var3 = this.onlCgformFieldService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean var4 = this.onlCgformFieldService.removeById(var1); boolean var4 = this.onlCgformFieldService.removeById(var1);
if (var4) { if (var4) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
if (var1 != null && !"".equals(var1.trim())) { if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(","))); this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} else { } else {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<Object> queryById(@RequestParam(name = "id",required = true) String var1) { public Results<Object> queryById(@RequestParam(name = "id",required = true) String var1) {
OnlCgformField var3 = this.onlCgformFieldService.getById(var1); OnlCgformField var3 = this.onlCgformFieldService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
return Result.OK(var3); return Results.OK(var3);
} }
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+96 -96
View File
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.codegenerate.database.DbReadTableUtil; import com.jero.codegenerate.database.DbReadTableUtil;
import com.jero.codegenerate.properties.CodeConfigProperties; import com.jero.codegenerate.properties.CodeConfigProperties;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.enums.CgformEnum; import com.jero.common.constant.enums.CgformEnum;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.util.JwtUtil; import com.jero.common.system.util.JwtUtil;
@@ -61,8 +61,8 @@ public class OnlCgformHeadController {
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgformHead>> a(OnlCgformHead var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<IPage<OnlCgformHead>> a(OnlCgformHead var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result<IPage<OnlCgformHead>> var5 = new Result<>(); Results<IPage<OnlCgformHead>> var5 = new Results<>();
QueryWrapper<OnlCgformHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgformHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformHead> var7 = new Page<>(var2, var3); Page<OnlCgformHead> var7 = new Page<>(var2, var3);
IPage<OnlCgformHead> var8 = this.onlCgformHeadService.page(var7, var6); IPage<OnlCgformHead> var8 = this.onlCgformHeadService.page(var7, var6);
@@ -76,295 +76,295 @@ public class OnlCgformHeadController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformHead var1) { public Results<Object> add(@RequestBody OnlCgformHead var1) {
try { try {
this.onlCgformHeadService.save(var1); this.onlCgformHeadService.save(var1);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformHead var1) { public Results<Object> edit(@RequestBody OnlCgformHead var1) {
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1.getId()); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1.getId());
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean var4 = this.onlCgformHeadService.updateById(var1); boolean var4 = this.onlCgformHeadService.updateById(var1);
if (var4) { if (var4) {
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if (id == null || "".equals(id.trim())) { if (id == null || "".equals(id.trim())) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
this.onlCgformHeadService.deleteRecordAndTable(id); this.onlCgformHeadService.deleteRecordAndTable(id);
} catch (DBException | SQLException e) { } catch (DBException | SQLException e) {
return Result.error("删除失败" + e.getMessage()); return Results.error("删除失败" + e.getMessage());
} }
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
@PostMapping({"/removeRecord"}) @PostMapping({"/removeRecord"})
public Result<T> removeRecord(@RequestBody Map<String, String> map) { public Results<T> removeRecord(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if (id == null || "".equals(id.trim())) { if (id == null || "".equals(id.trim())) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
this.onlCgformHeadService.deleteRecord(id); this.onlCgformHeadService.deleteRecord(id);
} catch (DBException | SQLException e) { } catch (DBException | SQLException e) {
return Result.error("移除失败" + e.getMessage()); return Results.error("移除失败" + e.getMessage());
} }
return Result.OK("移除成功!"); return Results.OK("移除成功!");
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
String var2 = map.get("flag"); String var2 = map.get("flag");
if (var2 == null || "".equals(var2.trim())) { if (var2 == null || "".equals(var2.trim())) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
if (var1 != null && !"".equals(var1.trim())) { if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformHeadService.deleteBatch(var1, var2); this.onlCgformHeadService.deleteBatch(var1, var2);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} else { } else {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgformHead> queryById(@RequestParam(name = "id", required = true) String id) { public Results<OnlCgformHead> queryById(@RequestParam(name = "id", required = true) String id) {
OnlCgformHead cgformHead = this.onlCgformHeadService.getById(id); OnlCgformHead cgformHead = this.onlCgformHeadService.getById(id);
if (cgformHead == null) { if (cgformHead == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
return Result.OK(cgformHead); return Results.OK(cgformHead);
} }
} }
@GetMapping({"/queryByTableNames"}) @GetMapping({"/queryByTableNames"})
public Result<List<OnlCgformHead>> queryByTableNames(@RequestParam(name = "tableNames", required = true) String var1) { public Results<List<OnlCgformHead>> queryByTableNames(@RequestParam(name = "tableNames", required = true) String var1) {
LambdaQueryWrapper<OnlCgformHead> var2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgformHead> var2 = new LambdaQueryWrapper<>();
String[] var3 = var1.split(","); String[] var3 = var1.split(",");
var2.in(OnlCgformHead::getTableName, Arrays.asList(var3)); var2.in(OnlCgformHead::getTableName, Arrays.asList(var3));
List<OnlCgformHead> var4 = this.onlCgformHeadService.list(var2); List<OnlCgformHead> var4 = this.onlCgformHeadService.list(var2);
return var4 == null ? Result.error(EN_IS_NULL) : Result.OK(var4); return var4 == null ? Results.error(EN_IS_NULL) : Results.OK(var4);
} }
@PostMapping({"/addEnhanceJs/{code}"}) @PostMapping({"/addEnhanceJs/{code}"})
public Result<T> addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { public Results<T> addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
try { try {
var2.setCgformHeadId(var1); var2.setCgformHeadId(var1);
this.onlCgformHeadService.saveEnhance(var2); this.onlCgformHeadService.saveEnhance(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@GetMapping({"/enhanceJs/{code}"}) @GetMapping({"/enhanceJs/{code}"})
public Result<OnlCgformEnhanceJs> getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<OnlCgformEnhanceJs> getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) {
try { try {
String var3 = var2.getParameter("type"); String var3 = var2.getParameter("type");
OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3); OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3);
return var4 == null ? Result.error("查询为空") : Result.OK(var4); return var4 == null ? Results.error("查询为空") : Results.OK(var4);
} catch (Exception var5) { } catch (Exception var5) {
log.error(var5.getMessage(), var5); log.error(var5.getMessage(), var5);
return Result.error("查询失败!"); return Results.error("查询失败!");
} }
} }
@PostMapping({"/enhanceJs/{code}"}) @PostMapping({"/enhanceJs/{code}"})
public Result<T> editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { public Results<T> editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
try { try {
var2.setCgformHeadId(var1); var2.setCgformHeadId(var1);
this.onlCgformHeadService.editEnhance(var2); this.onlCgformHeadService.editEnhance(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@GetMapping({"/enhanceButton/{formId}"}) @GetMapping({"/enhanceButton/{formId}"})
public Result<List<OnlCgformButton>> getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) { public Results<List<OnlCgformButton>> getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) {
try { try {
List<OnlCgformButton> var3 = this.onlCgformHeadService.queryButtonList(var1); List<OnlCgformButton> var3 = this.onlCgformHeadService.queryButtonList(var1);
return var3 != null && !var3.isEmpty() ? Result.OK(var3) : Result.error("查询为空"); return var3 != null && !var3.isEmpty() ? Results.OK(var3) : Results.error("查询为空");
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error("查询失败!"); return Results.error("查询失败!");
} }
} }
@GetMapping({"/enhanceSql/{formId}"}) @GetMapping({"/enhanceSql/{formId}"})
public Result<List<OnlCgformEnhanceSql>> getEnhanceSql(@PathVariable("formId") String var1, HttpServletRequest var2) { public Results<List<OnlCgformEnhanceSql>> getEnhanceSql(@PathVariable("formId") String var1, HttpServletRequest var2) {
List<OnlCgformEnhanceSql> var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1); List<OnlCgformEnhanceSql> var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1);
return Result.OK(var3); return Results.OK(var3);
} }
@RequiresRoles({"admin"}) @RequiresRoles({"admin"})
@PostMapping({"/addEnhanceSql/{formId}"}) @PostMapping({"/addEnhanceSql/{formId}"})
public Result<T> addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { public Results<T> addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
try { try {
var2.setCgformHeadId(var1); var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.saveEnhanceSql(var2); this.onlCgformEnhanceService.saveEnhanceSql(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} else { } else {
return Result.error("保存失败,该按钮已存在增强配置!"); return Results.error("保存失败,该按钮已存在增强配置!");
} }
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@RequiresRoles({"admin"}) @RequiresRoles({"admin"})
@PostMapping({"/enhanceSql/{formId}"}) @PostMapping({"/enhanceSql/{formId}"})
public Result<T> editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { public Results<T> editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
try { try {
var2.setCgformHeadId(var1); var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.updateEnhanceSql(var2); this.onlCgformEnhanceService.updateEnhanceSql(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} else { } else {
return Result.error("保存失败,该按钮已存在增强配置!"); return Results.error("保存失败,该按钮已存在增强配置!");
} }
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@PostMapping({"/enhanceSql"}) @PostMapping({"/enhanceSql"})
public Result<T> deletenhanceSql(@RequestBody Map<String, String> map) { public Results<T> deletenhanceSql(@RequestBody Map<String, String> map) {
String var1 = map.get("id"); String var1 = map.get("id");
if (StringUtils.isBlank(var1)) { if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
this.onlCgformEnhanceService.deleteEnhanceSql(var1); this.onlCgformEnhanceService.deleteEnhanceSql(var1);
return Result.OK("删除成功"); return Results.OK("删除成功");
} catch (Exception var3) { } catch (Exception var3) {
log.error(var3.getMessage(), var3); log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR); return Results.error(DEL_ERROR);
} }
} }
@PostMapping({"/deletebatchEnhanceSql"}) @PostMapping({"/deletebatchEnhanceSql"})
public Result<T> deletebatchEnhanceSql(@RequestBody Map<String, String> map) { public Results<T> deletebatchEnhanceSql(@RequestBody Map<String, String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
if (StringUtils.isBlank(var1)) { if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
List<String> var2 = Arrays.asList(var1.split(",")); List<String> var2 = Arrays.asList(var1.split(","));
this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2); this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2);
return Result.OK("删除成功"); return Results.OK("删除成功");
} catch (Exception var3) { } catch (Exception var3) {
log.error(var3.getMessage(), var3); log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR); return Results.error(DEL_ERROR);
} }
} }
@GetMapping({"/enhanceJava/{formId}"}) @GetMapping({"/enhanceJava/{formId}"})
public Result<List<OnlCgformEnhanceJava>> getEnhanceJava(@PathVariable("formId") String formId, OnlCgformEnhanceJava var2) { public Results<List<OnlCgformEnhanceJava>> getEnhanceJava(@PathVariable("formId") String formId, OnlCgformEnhanceJava var2) {
List<OnlCgformEnhanceJava> var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId); List<OnlCgformEnhanceJava> var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId);
return Result.OK(var3); return Results.OK(var3);
} }
@PostMapping({"/addEnhanceJava/{formId}"}) @PostMapping({"/addEnhanceJava/{formId}"})
public Result<T> addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) { public Results<T> addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) {
try { try {
if (!CgformUtil.a(var2)) { if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!"); return Results.error("类实例化失败，请检查!");
} else { } else {
var2.setCgformHeadId(formId); var2.setCgformHeadId(formId);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.saveEnhanceJava(var2); this.onlCgformEnhanceService.saveEnhanceJava(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} else { } else {
return Result.error("保存失败,配置重复了!"); return Results.error("保存失败,配置重复了!");
} }
} }
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@PostMapping({"/enhanceJava/{formId}"}) @PostMapping({"/enhanceJava/{formId}"})
public Result<T> c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) { public Results<T> c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) {
try { try {
if (!CgformUtil.a(var2)) { if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!"); return Results.error("类实例化失败，请检查!");
} else { } else {
var2.setCgformHeadId(var1); var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.updateEnhanceJava(var2); this.onlCgformEnhanceService.updateEnhanceJava(var2);
return Result.OK(OP_SUCCESS); return Results.OK(OP_SUCCESS);
} else { } else {
return Result.error("保存失败,配置重复了!"); return Results.error("保存失败,配置重复了!");
} }
} }
} catch (Exception var4) { } catch (Exception var4) {
log.error(var4.getMessage(), var4); log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR); return Results.error(SAVE_ERROR);
} }
} }
@PostMapping({"/enhanceJava"}) @PostMapping({"/enhanceJava"})
public Result<T> g(@RequestBody Map<String, String> map) { public Results<T> g(@RequestBody Map<String, String> map) {
String var1 = map.get("id"); String var1 = map.get("id");
if (StringUtils.isBlank(var1)) { if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
this.onlCgformEnhanceService.deleteEnhanceJava(var1); this.onlCgformEnhanceService.deleteEnhanceJava(var1);
return Result.OK("删除成功"); return Results.OK("删除成功");
} catch (Exception var3) { } catch (Exception var3) {
log.error(var3.getMessage(), var3); log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR); return Results.error(DEL_ERROR);
} }
} }
@PostMapping({"/deleteBatchEnhanceJava"}) @PostMapping({"/deleteBatchEnhanceJava"})
public Result<T> h(@RequestBody Map<String, String> map) { public Results<T> h(@RequestBody Map<String, String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
if (StringUtils.isBlank(var1)) { if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR); return Results.error(PARAM_ERROR);
} }
try { try {
List<String> var2 = Arrays.asList(var1.split(",")); List<String> var2 = Arrays.asList(var1.split(","));
this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2); this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2);
return Result.OK("删除成功"); return Results.OK("删除成功");
} catch (Exception var3) { } catch (Exception var3) {
log.error(var3.getMessage(), var3); log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR); return Results.error(DEL_ERROR);
} }
} }
@GetMapping({"/queryTables"}) @GetMapping({"/queryTables"})
public Result<ArrayList<HashMap<String,String>>> a(@RequestParam(name = "tableName", required = false) String var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<ArrayList<HashMap<String,String>>> a(@RequestParam(name = "tableName", required = false) String var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
String var5 = JwtUtil.getUserNameByToken(var4); String var5 = JwtUtil.getUserNameByToken(var4);
if (!"admin".equals(var5)) { if (!"admin".equals(var5)) {
return Result.error("noadminauth"); return Results.error("noadminauth");
} else { } else {
new ArrayList<>(); new ArrayList<>();
@@ -373,7 +373,7 @@ public class OnlCgformHeadController {
var6 = DbReadTableUtil.listTableName(); var6 = DbReadTableUtil.listTableName();
} catch (SQLException var12) { } catch (SQLException var12) {
log.error(var12.getMessage(), var12); log.error(var12.getMessage(), var12);
return Result.error("同步失败，未获取数据库表信息"); return Results.error("同步失败，未获取数据库表信息");
} }
CgformUtil.b(var6); CgformUtil.b(var6);
@@ -391,20 +391,20 @@ public class OnlCgformHeadController {
} }
} }
return Result.OK(var8); return Results.OK(var8);
} }
} }
@PostMapping({"/transTables/{tbnames}"}) @PostMapping({"/transTables/{tbnames}"})
@RequiresRoles({"admin"}) @RequiresRoles({"admin"})
public Result<T> d(@PathVariable("tbnames") String var1, HttpServletRequest var2) { public Results<T> d(@PathVariable("tbnames") String var1, HttpServletRequest var2) {
String var3 = JwtUtil.getUserNameByToken(var2); String var3 = JwtUtil.getUserNameByToken(var2);
if (!"admin".equals(var3)) { if (!"admin".equals(var3)) {
return Result.error("noadminauth"); return Results.error("noadminauth");
} else if (oConvertUtils.isEmpty(var1)) { } else if (oConvertUtils.isEmpty(var1)) {
return Result.error("未识别的表名信息"); return Results.error("未识别的表名信息");
} else if (c != null && c.equals(var1)) { } else if (c != null && c.equals(var1)) {
return Result.error("不允许重复生成!"); return Results.error("不允许重复生成!");
} else { } else {
c = var1; c = var1;
String[] var4 = var1.split(","); String[] var4 = var1.split(",");
@@ -420,7 +420,7 @@ public class OnlCgformHeadController {
} }
c = null; c = null;
return Result.OK("同步完成!"); return Results.OK("同步完成!");
} }
} }
@@ -432,7 +432,7 @@ public class OnlCgformHeadController {
* @date 2021/4/6 11:20 * @date 2021/4/6 11:20
*/ */
@GetMapping({"/rootFile"}) @GetMapping({"/rootFile"})
public Result<JSONArray> rootFile() { public Results<JSONArray> rootFile() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
File[] files = File.listRoots(); File[] files = File.listRoots();
int var4 = files.length; int var4 = files.length;
@@ -453,7 +453,7 @@ public class OnlCgformHeadController {
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
} }
return Result.OK(jsonArray); return Results.OK(jsonArray);
} }
/** /**
@@ -464,7 +464,7 @@ public class OnlCgformHeadController {
* @date 2021/4/6 11:20 * @date 2021/4/6 11:20
*/ */
@GetMapping({"/fileTree"}) @GetMapping({"/fileTree"})
public Result<JSONArray> fileTree(@RequestParam(name = "parentPath", required = true) String parentPath) { public Results<JSONArray> fileTree(@RequestParam(name = "parentPath", required = true) String parentPath) {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
File file = new File(parentPath); File file = new File(parentPath);
File[] files = file.listFiles(); File[] files = file.listFiles();
@@ -486,14 +486,14 @@ public class OnlCgformHeadController {
} }
} }
return Result.OK(jsonArray); return Results.OK(jsonArray);
} }
@GetMapping({"/tableInfo"}) @GetMapping({"/tableInfo"})
public Result<HashMap<String, Object>> tableInfo(@RequestParam(name = "code", required = true) String code) { public Results<HashMap<String, Object>> tableInfo(@RequestParam(name = "code", required = true) String code) {
OnlCgformHead onlCgformHead = this.onlCgformHeadService.getById(code); OnlCgformHead onlCgformHead = this.onlCgformHeadService.getById(code);
if (onlCgformHead == null) { if (onlCgformHead == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("main", onlCgformHead); map.put("main", onlCgformHead);
@@ -507,7 +507,7 @@ public class OnlCgformHeadController {
List<Map<String, Object>> jspModelList = CgformEnum.getJspModelList(tableType); List<Map<String, Object>> jspModelList = CgformEnum.getJspModelList(tableType);
map.put("jspModeList", jspModelList); map.put("jspModeList", jspModelList);
map.put("projectPath", CodeConfigProperties.getProjectPath()); map.put("projectPath", CodeConfigProperties.getProjectPath());
return Result.OK(map); return Results.OK(map);
} }
} }
@@ -546,11 +546,11 @@ public class OnlCgformHeadController {
} }
@PostMapping({"/copyOnline"}) @PostMapping({"/copyOnline"})
public Result<T> k(@RequestParam(name = "code", required = true) String var1) { public Results<T> k(@RequestParam(name = "code", required = true) String var1) {
try { try {
OnlCgformHead var2 = this.onlCgformHeadService.getById(var1); OnlCgformHead var2 = this.onlCgformHeadService.getById(var1);
if (var2 == null) { if (var2 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} }
this.onlCgformHeadService.copyOnlineTableConfig(var2); this.onlCgformHeadService.copyOnlineTableConfig(var2);
@@ -558,7 +558,7 @@ public class OnlCgformHeadController {
var3.printStackTrace(); var3.printStackTrace();
} }
return Result.OK(); return Results.OK();
} }
private boolean l(String var1) { private boolean l(String var1) {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java
+26 -26
View File
@@ -3,7 +3,7 @@ package com.jero.generater.modules.online.cgform.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex; import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
@@ -29,89 +29,89 @@ public class OnlCgformIndexController {
private static final String EN_IS_NULL = "未找到对应实体"; private static final String EN_IS_NULL = "未找到对应实体";
@GetMapping({"/listByHeadId"}) @GetMapping({"/listByHeadId"})
public Result<List<OnlCgformIndex>> listByHeadId(@RequestParam("headId") String headId) { public Results<List<OnlCgformIndex>> listByHeadId(@RequestParam("headId") String headId) {
QueryWrapper<OnlCgformIndex> queryWrapper = new QueryWrapper<>(); QueryWrapper<OnlCgformIndex> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("cgform_head_id", headId); queryWrapper.eq("cgform_head_id", headId);
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
List<OnlCgformIndex> cgformIndexList = this.onlCgformIndexService.list(queryWrapper); List<OnlCgformIndex> cgformIndexList = this.onlCgformIndexService.list(queryWrapper);
return Result.OK(cgformIndexList); return Results.OK(cgformIndexList);
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgformIndex>> list(OnlCgformIndex cgformIndex, public Results<IPage<OnlCgformIndex>> list(OnlCgformIndex cgformIndex,
@RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize,
HttpServletRequest request) { HttpServletRequest request) {
QueryWrapper<OnlCgformIndex> queryWrapper = QueryGenerator.initQueryWrapper(cgformIndex, request.getParameterMap()); QueryWrapper<OnlCgformIndex> queryWrapper = QueryGenerator.initQueryWrapper(cgformIndex, request.getParameterMap());
Page<OnlCgformIndex> page = new Page<>(pageNo, pageSize); Page<OnlCgformIndex> page = new Page<>(pageNo, pageSize);
IPage<OnlCgformIndex> cgformIndexPage = this.onlCgformIndexService.page(page, queryWrapper); IPage<OnlCgformIndex> cgformIndexPage = this.onlCgformIndexService.page(page, queryWrapper);
return Result.OK(cgformIndexPage); return Results.OK(cgformIndexPage);
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformIndex cgformIndex) { public Results<Object> add(@RequestBody OnlCgformIndex cgformIndex) {
try { try {
this.onlCgformIndexService.save(cgformIndex); this.onlCgformIndexService.save(cgformIndex);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformIndex cgformIndex) { public Results<Object> edit(@RequestBody OnlCgformIndex cgformIndex) {
OnlCgformIndex existCgformIndex = this.onlCgformIndexService.getById(cgformIndex.getId()); OnlCgformIndex existCgformIndex = this.onlCgformIndexService.getById(cgformIndex.getId());
if (existCgformIndex == null) { if (existCgformIndex == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean flag = this.onlCgformIndexService.updateById(cgformIndex); boolean flag = this.onlCgformIndexService.updateById(cgformIndex);
if (flag) { if (flag) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<Object> delete(@RequestBody Map<String,String> map) { public Results<Object> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(id); OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(id);
if (cgformIndex == null) { if (cgformIndex == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
boolean flag = this.onlCgformIndexService.removeById(id); boolean flag = this.onlCgformIndexService.removeById(id);
if (flag) { if (flag) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<Object> deleteBatch(@RequestBody Map<String,String> map) { public Results<Object> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if (ids != null && !"".equals(ids.trim())) { if (ids != null && !"".equals(ids.trim())) {
this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(","))); this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} else { } else {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgformIndex> queryById(@RequestParam(name = "id",required = true) String var1) { public Results<OnlCgformIndex> queryById(@RequestParam(name = "id",required = true) String var1) {
OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(var1); OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(var1);
if (cgformIndex == null) { if (cgformIndex == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
return Result.OK(cgformIndex); return Results.OK(cgformIndex);
} }
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/IOnlCgformHeadService.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.jero.generater.modules.online.cgform.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.generater.modules.online.cgform.entity.*; import com.jero.generater.modules.online.cgform.entity.*;
import com.jero.generater.modules.online.cgform.model.OnlCgformModel; import com.jero.generater.modules.online.cgform.model.OnlCgformModel;
@@ -21,9 +21,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public interface IOnlCgformHeadService extends IService<OnlCgformHead> { public interface IOnlCgformHeadService extends IService<OnlCgformHead> {
Result<T> addAll(OnlCgformModel var1); Results<T> addAll(OnlCgformModel var1);
Result<T> editAll(OnlCgformModel var1); Results<T> editAll(OnlCgformModel var1);
void doDbSynch(String var1, String var2) throws HibernateException, IOException, TemplateException, SQLException, DBException; void doDbSynch(String var1, String var2) throws HibernateException, IOException, TemplateException, SQLException, DBException;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java
+6 -6
View File
@@ -13,7 +13,7 @@ import com.jero.codegenerate.generate.pojo.ColumnVo;
import com.jero.codegenerate.generate.pojo.TableVo; import com.jero.codegenerate.generate.pojo.TableVo;
import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo; import com.jero.codegenerate.generate.pojo.onetomany.MainTableVo;
import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo; import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.CgformEnum; import com.jero.common.constant.enums.CgformEnum;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
@@ -93,7 +93,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<T> addAll(OnlCgformModel model) { public Results<T> addAll(OnlCgformModel model) {
String var2 = UUID.randomUUID().toString().replace("-", ""); String var2 = UUID.randomUUID().toString().replace("-", "");
OnlCgformHead var3 = model.getHead(); OnlCgformHead var3 = model.getHead();
List<OnlCgformField> var4 = model.getFields(); List<OnlCgformField> var4 = model.getFields();
@@ -128,21 +128,21 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
this.fieldService.saveBatch(var4); this.fieldService.saveBatch(var4);
this.indexService.saveBatch(var5); this.indexService.saveBatch(var5);
this.a(var3, var4); this.a(var3, var4);
return Result.OK("添加成功"); return Results.OK("添加成功");
} }
@Override @Override
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<T> editAll(OnlCgformModel model) { public Results<T> editAll(OnlCgformModel model) {
OnlCgformHead var2 = model.getHead(); OnlCgformHead var2 = model.getHead();
OnlCgformHead var3 = super.getById(var2.getId()); OnlCgformHead var3 = super.getById(var2.getId());
if (var3 == null) { if (var3 == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} else { } else {
getIsDbSynch(model, var2, var3); getIsDbSynch(model, var2, var3);
return Result.OK("全部修改成功"); return Results.OK("全部修改成功");
} }
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportAPI.java
+30 -30
View File
@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
@@ -75,18 +75,18 @@ public class OnlCgreportAPI {
@GetMapping({"/getColumnsAndData/{code}"}) @GetMapping({"/getColumnsAndData/{code}"})
@PermissionData @PermissionData
public Result<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) {
OnlCgreportHead var3 = this.onlCgreportHeadService.getById(var1); OnlCgreportHead var3 = this.onlCgreportHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
return getMapResult(var1, var2, var3); return getMapResult(var1, var2, var3);
} }
} }
@NotNull @NotNull
private Result<Map<String, Object>> getMapResult(@PathVariable("code") String var1, HttpServletRequest var2, OnlCgreportHead var3) { private Results<Map<String, Object>> getMapResult(@PathVariable("code") String var1, HttpServletRequest var2, OnlCgreportHead var3) {
Result<Map<String, Object>> var4 = this.b(var1, var2); Results<Map<String, Object>> var4 = this.b(var1, var2);
if (var4.getCode().equals(200)) { if (var4.getCode().equals(200)) {
JSONObject var5 = JSON.parseObject(JSON.toJSONString(var4.getResult())); JSONObject var5 = JSON.parseObject(JSON.toJSONString(var4.getResult()));
JSONArray var6 = var5.getJSONArray("records"); JSONArray var6 = var5.getJSONArray("records");
@@ -138,7 +138,7 @@ public class OnlCgreportAPI {
var19.put("fieldHrefSlots", var10); var19.put("fieldHrefSlots", var10);
var19.put("cgreportHeadName", var3.getName()); var19.put("cgreportHeadName", var3.getName());
var19.put("isGroupTitle", var12); var19.put("isGroupTitle", var12);
return Result.OK(var19); return Results.OK(var19);
} else { } else {
return var4; return var4;
} }
@@ -197,10 +197,10 @@ public class OnlCgreportAPI {
/** @deprecated */ /** @deprecated */
@Deprecated @Deprecated
@GetMapping({"/getColumns/{code}"}) @GetMapping({"/getColumns/{code}"})
public Result<Map<String,Object>> a(@PathVariable("code") String var1) { public Results<Map<String,Object>> a(@PathVariable("code") String var1) {
OnlCgreportHead var2 = this.onlCgreportHeadService.getById(var1); OnlCgreportHead var2 = this.onlCgreportHeadService.getById(var1);
if (var2 == null) { if (var2 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
QueryWrapper<OnlCgreportItem> var3 = new QueryWrapper<>(); QueryWrapper<OnlCgreportItem> var3 = new QueryWrapper<>();
var3.eq(CGR_HEAD_ID, var1); var3.eq(CGR_HEAD_ID, var1);
@@ -232,7 +232,7 @@ public class OnlCgreportAPI {
var14.put(COLUMNS, var5); var14.put(COLUMNS, var5);
var14.put(DICT_OPTIONS, var6); var14.put(DICT_OPTIONS, var6);
var14.put("cgreportHeadName", var2.getName()); var14.put("cgreportHeadName", var2.getName());
return Result.OK(var14); return Results.OK(var14);
} }
} }
@@ -253,10 +253,10 @@ public class OnlCgreportAPI {
@GetMapping({"/getData/{code}"}) @GetMapping({"/getData/{code}"})
@PermissionData @PermissionData
public Result<Map<String, Object>> b(@PathVariable("code") String var1, HttpServletRequest var2) { public Results<Map<String, Object>> b(@PathVariable("code") String var1, HttpServletRequest var2) {
OnlCgreportHead var3 = this.onlCgreportHeadService.getById(var1); OnlCgreportHead var3 = this.onlCgreportHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
String var4 = var3.getCgrSql().trim(); String var4 = var3.getCgrSql().trim();
String var5 = var3.getDbSource(); String var5 = var3.getDbSource();
@@ -273,35 +273,35 @@ public class OnlCgreportAPI {
var7 = this.onlCgreportHeadService.executeSelectSql(var4, var3.getId(), var6); var7 = this.onlCgreportHeadService.executeSelectSql(var4, var3.getId(), var6);
} }
return Result.OK(var7); return Results.OK(var7);
} catch (Exception var8) { } catch (Exception var8) {
log.error(var8.getMessage(), var8); log.error(var8.getMessage(), var8);
return Result.error("SQL执行失败：" + var8.getMessage()); return Results.error("SQL执行失败：" + var8.getMessage());
} }
} }
} }
@GetMapping({"/getQueryInfo/{code}"}) @GetMapping({"/getQueryInfo/{code}"})
public Result<List<Map<String, String>>> b(@PathVariable("code") String var1) { public Results<List<Map<String, String>>> b(@PathVariable("code") String var1) {
try { try {
List<Map<String, String>> var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1); List<Map<String, String>> var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
return Result.OK(var2); return Results.OK(var2);
} catch (Exception var3) { } catch (Exception var3) {
log.info(var3.getMessage(), var3); log.info(var3.getMessage(), var3);
return Result.error("查询失败"); return Results.error("查询失败");
} }
} }
@GetMapping({"/getParamsInfo/{code}"}) @GetMapping({"/getParamsInfo/{code}"})
public Result<List<OnlCgreportParam>> c(@PathVariable("code") String var1) { public Results<List<OnlCgreportParam>> c(@PathVariable("code") String var1) {
try { try {
LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper<>();
var2.eq(OnlCgreportParam::getCgrheadId, var1); var2.eq(OnlCgreportParam::getCgrheadId, var1);
List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2); List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2);
return Result.OK(var3); return Results.OK(var3);
} catch (Exception var4) { } catch (Exception var4) {
log.info(var4.getMessage(), var4); log.info(var4.getMessage(), var4);
return Result.error("查询失败"); return Results.error("查询失败");
} }
} }
@@ -328,7 +328,7 @@ public class OnlCgreportAPI {
List<Map<String, Object>> var7 = (List)var6.get("items"); List<Map<String, Object>> var7 = (List)var6.get("items");
var2.setAttribute(GET_ALL, true); var2.setAttribute(GET_ALL, true);
Result<Map<String, Object>> var8 = this.b(var1, var2); Results<Map<String, Object>> var8 = this.b(var1, var2);
List<Map<String, Object>> var9 = null; List<Map<String, Object>> var9 = null;
if (var8.getCode().equals(200)) { if (var8.getCode().equals(200)) {
Map<String, Object> var10 = var8.getResult(); Map<String, Object> var10 = var8.getResult();
@@ -481,12 +481,12 @@ public class OnlCgreportAPI {
} }
@GetMapping({"/getRpColumns/{code}"}) @GetMapping({"/getRpColumns/{code}"})
public Result<Map<String,Object>> d(@PathVariable("code") String var1) { public Results<Map<String,Object>> d(@PathVariable("code") String var1) {
LambdaQueryWrapper<OnlCgreportHead> var2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgreportHead> var2 = new LambdaQueryWrapper<>();
var2.eq(OnlCgreportHead::getCode, var1); var2.eq(OnlCgreportHead::getCode, var1);
OnlCgreportHead var3 = this.onlCgreportHeadService.getOne(var2); OnlCgreportHead var3 = this.onlCgreportHeadService.getOne(var2);
if (var3 == null) { if (var3 == null) {
return Result.error(EN_IS_NULL); return Results.error(EN_IS_NULL);
} else { } else {
QueryWrapper<OnlCgreportItem> var4 = new QueryWrapper<>(); QueryWrapper<OnlCgreportItem> var4 = new QueryWrapper<>();
var4.eq(CGR_HEAD_ID, var3.getId()); var4.eq(CGR_HEAD_ID, var3.getId());
@@ -521,29 +521,29 @@ public class OnlCgreportAPI {
var14.put(DICT_OPTIONS, var7); var14.put(DICT_OPTIONS, var7);
var14.put("cgRpConfigId", var3.getId()); var14.put("cgRpConfigId", var3.getId());
var14.put("cgRpConfigName", var3.getName()); var14.put("cgRpConfigName", var3.getName());
return Result.OK(var14); return Results.OK(var14);
} }
} }
@PostMapping({"/testConnection"}) @PostMapping({"/testConnection"})
public Result<String> a(@RequestBody DynamicDataSourceModel var1) { public Results<String> a(@RequestBody DynamicDataSourceModel var1) {
Result<String> var4; Results<String> var4;
try (Connection var2 = DriverManager.getConnection(var1.getDbUrl(), var1.getDbUsername(), var1.getDbPassword())){ try (Connection var2 = DriverManager.getConnection(var1.getDbUrl(), var1.getDbUsername(), var1.getDbPassword())){
Class.forName(var1.getDbDriver()); Class.forName(var1.getDbDriver());
Result<String> var3; Results<String> var3;
if (var2 == null) { if (var2 == null) {
var3 = Result.OK("数据库连接失败：错误未知"); var3 = Results.OK("数据库连接失败：错误未知");
return var3; return var3;
} }
var3 = Result.OK("数据库连接成功"); var3 = Results.OK("数据库连接成功");
return var3; return var3;
} catch (ClassNotFoundException var17) { } catch (ClassNotFoundException var17) {
log.error(var17.toString()); log.error(var17.toString());
var4 = Result.error("数据库连接失败：驱动类不存在"); var4 = Results.error("数据库连接失败：驱动类不存在");
} catch (Exception var18) { } catch (Exception var18) {
log.error(var18.toString()); log.error(var18.toString());
var4 = Result.error("数据库连接失败：" + var18.getMessage()); var4 = Results.error("数据库连接失败：" + var18.getMessage());
return var4; return var4;
} }
return var4; return var4;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java
+18 -18
View File
@@ -4,7 +4,7 @@ package com.jero.generater.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel; import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -43,11 +43,11 @@ public class OnlCgreportHeadController {
private BaseCommonService baseCommonService; private BaseCommonService baseCommonService;
@GetMapping({"/parseSql"}) @GetMapping({"/parseSql"})
public Result<Map<String, Object>> a(@RequestParam(name = "sql") String var1, @RequestParam(name = "dbKey",required = false) String var2) { public Results<Map<String, Object>> a(@RequestParam(name = "sql") String var1, @RequestParam(name = "dbKey",required = false) String var2) {
if (StringUtils.isNotBlank(var2)) { if (StringUtils.isNotBlank(var2)) {
DynamicDataSourceModel var3 = this.sysBaseAPI.getDynamicDbSourceByCode(var2); DynamicDataSourceModel var3 = this.sysBaseAPI.getDynamicDbSourceByCode(var2);
if (var3 == null) { if (var3 == null) {
return Result.error("数据源不存在"); return Results.error("数据源不存在");
} }
} }
@@ -91,7 +91,7 @@ public class OnlCgreportHeadController {
var13.put("fields", var4); var13.put("fields", var4);
var13.put("params", var5); var13.put("params", var5);
return Result.OK(var13); return Results.OK(var13);
} catch (Exception var12) { } catch (Exception var12) {
log.error(var12.getMessage(), var12); log.error(var12.getMessage(), var12);
String var9 = "解析失败，"; String var9 = "解析失败，";
@@ -108,13 +108,13 @@ public class OnlCgreportHeadController {
var9 = var9 + "SQL语法错误."; var9 = var9 + "SQL语法错误.";
} }
return Result.error(var9); return Results.error(var9);
} }
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgreportHead>> a(OnlCgreportHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<IPage<OnlCgreportHead>> a(OnlCgreportHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result<IPage<OnlCgreportHead>> var5 = new Result<>(); Results<IPage<OnlCgreportHead>> var5 = new Results<>();
QueryWrapper<OnlCgreportHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgreportHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportHead> var7 = new Page<>(var2, var3); Page<OnlCgreportHead> var7 = new Page<>(var2, var3);
IPage<OnlCgreportHead> var8 = this.onlCgreportHeadService.page(var7, var6); IPage<OnlCgreportHead> var8 = this.onlCgreportHeadService.page(var7, var6);
@@ -124,7 +124,7 @@ public class OnlCgreportHeadController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<String> add(@RequestBody OnlCgreportModel var1) { public Results<String> add(@RequestBody OnlCgreportModel var1) {
try { try {
String var3 = CgformUtil.a(); String var3 = CgformUtil.a();
OnlCgreportHead var4 = var1.getHead(); OnlCgreportHead var4 = var1.getHead();
@@ -150,44 +150,44 @@ public class OnlCgreportHeadController {
this.onlCgreportHeadService.save(var4); this.onlCgreportHeadService.save(var4);
this.onlCgreportParamService.saveBatch(var5); this.onlCgreportParamService.saveBatch(var5);
this.onlCgreportItemService.saveBatch(var6); this.onlCgreportItemService.saveBatch(var6);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception var9) { } catch (Exception var9) {
log.error(var9.getMessage(), var9); log.error(var9.getMessage(), var9);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/editAll"}) @PostMapping({"/editAll"})
public Result<String> editAll(@RequestBody OnlCgreportModel cgreportModel) { public Results<String> editAll(@RequestBody OnlCgreportModel cgreportModel) {
try { try {
return this.onlCgreportHeadService.editAll(cgreportModel); return this.onlCgreportHeadService.editAll(cgreportModel);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<String> delete(@RequestBody Map<String,String> map) { public Results<String> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
return this.onlCgreportHeadService.delete(id); return this.onlCgreportHeadService.delete(id);
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<String> deleteBatch(@RequestBody Map<String,String> map) { public Results<String> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
return this.onlCgreportHeadService.bathDelete(ids.split(",")); return this.onlCgreportHeadService.bathDelete(ids.split(","));
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgreportHead> queryById(@RequestParam(name = "id",required = true) String id) { public Results<OnlCgreportHead> queryById(@RequestParam(name = "id",required = true) String id) {
Result<OnlCgreportHead> result = new Result<>(); Results<OnlCgreportHead> result = new Results<>();
OnlCgreportHead cgreportHead = this.onlCgreportHeadService.getById(id); OnlCgreportHead cgreportHead = this.onlCgreportHeadService.getById(id);
result.setResult(cgreportHead); result.setResult(cgreportHead);
return result; return result;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java
+17 -17
View File
@@ -4,7 +4,7 @@ package com.jero.generater.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem; import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
@@ -27,20 +27,20 @@ public class OnlCgreportItemController {
private IOnlCgreportItemService onlCgreportItemService; private IOnlCgreportItemService onlCgreportItemService;
@GetMapping({"/listByHeadId"}) @GetMapping({"/listByHeadId"})
public Result<List<OnlCgreportItem>> a(@RequestParam("headId") String var1) { public Results<List<OnlCgreportItem>> a(@RequestParam("headId") String var1) {
QueryWrapper<OnlCgreportItem> var2 = new QueryWrapper<>(); QueryWrapper<OnlCgreportItem> var2 = new QueryWrapper<>();
var2.eq("cgrhead_id", var1); var2.eq("cgrhead_id", var1);
var2.orderByAsc("order_num"); var2.orderByAsc("order_num");
List<OnlCgreportItem> var3 = this.onlCgreportItemService.list(var2); List<OnlCgreportItem> var3 = this.onlCgreportItemService.list(var2);
Result<List<OnlCgreportItem>> var4 = new Result<>(); Results<List<OnlCgreportItem>> var4 = new Results<>();
var4.setSuccess(true); var4.setSuccess(true);
var4.setResult(var3); var4.setResult(var3);
return var4; return var4;
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgreportItem>> a(OnlCgreportItem var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<IPage<OnlCgreportItem>> a(OnlCgreportItem var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result<IPage<OnlCgreportItem>> var5 = new Result<>(); Results<IPage<OnlCgreportItem>> var5 = new Results<>();
QueryWrapper<OnlCgreportItem> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgreportItem> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportItem> var7 = new Page<>(var2, var3); Page<OnlCgreportItem> var7 = new Page<>(var2, var3);
IPage<OnlCgreportItem> var8 = this.onlCgreportItemService.page(var7, var6); IPage<OnlCgreportItem> var8 = this.onlCgreportItemService.page(var7, var6);
@@ -50,40 +50,40 @@ public class OnlCgreportItemController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<String> a(@RequestBody OnlCgreportItem var1) { public Results<String> a(@RequestBody OnlCgreportItem var1) {
this.onlCgreportItemService.save(var1); this.onlCgreportItemService.save(var1);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<String> b(@RequestBody OnlCgreportItem var1) { public Results<String> b(@RequestBody OnlCgreportItem var1) {
this.onlCgreportItemService.updateById(var1); this.onlCgreportItemService.updateById(var1);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<String> b(@RequestBody Map<String,String> map) { public Results<String> b(@RequestBody Map<String,String> map) {
String var1 = map.get("id"); String var1 = map.get("id");
if(StringUtils.isEmpty(var1)){ if(StringUtils.isEmpty(var1)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
this.onlCgreportItemService.removeById(var1); this.onlCgreportItemService.removeById(var1);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<String> c(@RequestBody Map<String,String> map) { public Results<String> c(@RequestBody Map<String,String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
if(StringUtils.isBlank(var1)){ if(StringUtils.isBlank(var1)){
return Result.error("参数不识别!"); return Results.error("参数不识别!");
} }
this.onlCgreportItemService.removeByIds(Arrays.asList(var1.split(","))); this.onlCgreportItemService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("批量删除成功!"); return Results.OK("批量删除成功!");
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgreportItem> d(@RequestParam(name = "id",required = true) String var1) { public Results<OnlCgreportItem> d(@RequestParam(name = "id",required = true) String var1) {
Result<OnlCgreportItem> var2 = new Result<>(); Results<OnlCgreportItem> var2 = new Results<>();
OnlCgreportItem var3 = this.onlCgreportItemService.getById(var1); OnlCgreportItem var3 = this.onlCgreportItemService.getById(var1);
var2.setResult(var3); var2.setResult(var3);
var2.setSuccess(true); var2.setSuccess(true);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java
+17 -17
View File
@@ -4,7 +4,7 @@ package com.jero.generater.modules.online.cgreport.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam; import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
@@ -28,20 +28,20 @@ public class OnlCgreportParamController {
@GetMapping({"/listByHeadId"}) @GetMapping({"/listByHeadId"})
public Result<List<OnlCgreportParam>> a(@RequestParam("headId") String var1) { public Results<List<OnlCgreportParam>> a(@RequestParam("headId") String var1) {
QueryWrapper<OnlCgreportParam> var2 = new QueryWrapper<>(); QueryWrapper<OnlCgreportParam> var2 = new QueryWrapper<>();
var2.eq("cgrhead_id", var1); var2.eq("cgrhead_id", var1);
var2.orderByAsc("order_num"); var2.orderByAsc("order_num");
List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2); List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2);
Result<List<OnlCgreportParam>> var4 = new Result<>(); Results<List<OnlCgreportParam>> var4 = new Results<>();
var4.setSuccess(true); var4.setSuccess(true);
var4.setResult(var3); var4.setResult(var3);
return var4; return var4;
} }
@GetMapping({"/list"}) @GetMapping({"/list"})
public Result<IPage<OnlCgreportParam>> a(OnlCgreportParam var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { public Results<IPage<OnlCgreportParam>> a(OnlCgreportParam var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result<IPage<OnlCgreportParam>> var5 = new Result<>(); Results<IPage<OnlCgreportParam>> var5 = new Results<>();
QueryWrapper<OnlCgreportParam> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); QueryWrapper<OnlCgreportParam> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportParam> var7 = new Page<>(var2, var3); Page<OnlCgreportParam> var7 = new Page<>(var2, var3);
IPage<OnlCgreportParam> var8 = this.onlCgreportParamService.page(var7, var6); IPage<OnlCgreportParam> var8 = this.onlCgreportParamService.page(var7, var6);
@@ -51,40 +51,40 @@ public class OnlCgreportParamController {
} }
@PostMapping({"/add"}) @PostMapping({"/add"})
public Result<String> a(@RequestBody OnlCgreportParam var1) { public Results<String> a(@RequestBody OnlCgreportParam var1) {
this.onlCgreportParamService.save(var1); this.onlCgreportParamService.save(var1);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@PostMapping({"/edit"}) @PostMapping({"/edit"})
public Result<String> b(@RequestBody OnlCgreportParam var1) { public Results<String> b(@RequestBody OnlCgreportParam var1) {
this.onlCgreportParamService.updateById(var1); this.onlCgreportParamService.updateById(var1);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@PostMapping({"/delete"}) @PostMapping({"/delete"})
public Result<Object> b(@RequestBody Map<String, String> map) { public Results<Object> b(@RequestBody Map<String, String> map) {
String var1 = map.get("id"); String var1 = map.get("id");
if(StringUtils.isBlank(var1)){ if(StringUtils.isBlank(var1)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.onlCgreportParamService.removeById(var1); this.onlCgreportParamService.removeById(var1);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
@PostMapping({"/deleteBatch"}) @PostMapping({"/deleteBatch"})
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String var1 = map.get("ids"); String var1 = map.get("ids");
if(StringUtils.isBlank(var1)){ if(StringUtils.isBlank(var1)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.onlCgreportParamService.removeByIds(Arrays.asList(var1.split(","))); this.onlCgreportParamService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("批量删除成功!"); return Results.OK("批量删除成功!");
} }
@GetMapping({"/queryById"}) @GetMapping({"/queryById"})
public Result<OnlCgreportParam> d(@RequestParam(name = "id", required = true) String var1) { public Results<OnlCgreportParam> d(@RequestParam(name = "id", required = true) String var1) {
Result<OnlCgreportParam> var2 = new Result<>(); Results<OnlCgreportParam> var2 = new Results<>();
OnlCgreportParam var3 = this.onlCgreportParamService.getById(var1); OnlCgreportParam var3 = this.onlCgreportParamService.getById(var1);
var2.setResult(var3); var2.setResult(var3);
return var2; return var2;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/IOnlCgreportHeadService.java
+4 -4
View File
@@ -5,16 +5,16 @@ import com.baomidou.mybatisplus.extension.service.IService;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportHead; import com.jero.generater.modules.online.cgreport.entity.OnlCgreportHead;
import com.jero.generater.modules.online.cgreport.model.OnlCgreportModel; import com.jero.generater.modules.online.cgreport.model.OnlCgreportModel;
public interface IOnlCgreportHeadService extends IService<OnlCgreportHead> { public interface IOnlCgreportHeadService extends IService<OnlCgreportHead> {
Result<String> editAll(OnlCgreportModel var1); Results<String> editAll(OnlCgreportModel var1);
Result<String> delete(String var1); Results<String> delete(String var1);
Result<String> bathDelete(String[] var1); Results<String> bathDelete(String[] var1);
Map<String, Object> executeSelectSql(String var1, String var2, Map<String, Object> var3) throws SQLException; Map<String, Object> executeSelectSql(String var1, String var2, Map<String, Object> var3) throws SQLException;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/service/a/OnlCgreportHeadServiceImpl.java
+8 -8
View File
@@ -12,9 +12,9 @@ import java.util.*;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -209,11 +209,11 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<String> editAll(OnlCgreportModel values) { public Results<String> editAll(OnlCgreportModel values) {
OnlCgreportHead var2 = values.getHead(); OnlCgreportHead var2 = values.getHead();
OnlCgreportHead var3 = super.getById(var2.getId()); OnlCgreportHead var3 = super.getById(var2.getId());
if (var3 == null) { if (var3 == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} else { } else {
super.updateById(var2); super.updateById(var2);
LambdaQueryWrapper<OnlCgreportItem> var4 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgreportItem> var4 = new LambdaQueryWrapper<>();
@@ -238,7 +238,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
this.onlCgreportItemService.saveBatch(values.getItems()); this.onlCgreportItemService.saveBatch(values.getItems());
this.onlCgreportParamService.saveBatch(values.getParams()); this.onlCgreportParamService.saveBatch(values.getParams());
return Result.OK("全部修改成功"); return Results.OK("全部修改成功");
} }
} }
@@ -246,7 +246,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<String> delete(String id) { public Results<String> delete(String id) {
boolean var2 = super.removeById(id); boolean var2 = super.removeById(id);
if (var2) { if (var2) {
LambdaQueryWrapper<OnlCgreportItem> var3 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OnlCgreportItem> var3 = new LambdaQueryWrapper<>();
@@ -257,14 +257,14 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
this.onlCgreportParamService.remove(var4); this.onlCgreportParamService.remove(var4);
} }
return Result.OK("删除成功"); return Results.OK("删除成功");
} }
@Override @Override
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<String> bathDelete(String[] ids) { public Results<String> bathDelete(String[] ids) {
String[] var2 = ids; String[] var2 = ids;
int var3 = ids.length; int var3 = ids.length;
@@ -281,7 +281,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
} }
} }
return Result.OK("删除成功"); return Results.OK("删除成功");
} }
@Override @Override
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/cloud/provider/JcloudDemoProvider.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.modules.demo.cloud.provider; package com.jero.modules.demo.cloud.provider;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.demo.cloud.service.JcloudDemoService; import com.jero.modules.demo.cloud.service.JcloudDemoService;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +20,7 @@ public class JcloudDemoProvider {
private JcloudDemoService jcloudDemoService; private JcloudDemoService jcloudDemoService;
@GetMapping("/getMessage") @GetMapping("/getMessage")
public Result<String> getMessage(@RequestParam String name) { public Results<String> getMessage(@RequestParam String name) {
return jcloudDemoService.getMessage(name); return jcloudDemoService.getMessage(name);
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/cloud/service/JcloudDemoService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.modules.demo.cloud.service; package com.jero.modules.demo.cloud.service;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
public interface JcloudDemoService { public interface JcloudDemoService {
Result<String> getMessage(String name); Results<String> getMessage(String name);
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
+3 -3
View File
@@ -1,13 +1,13 @@
package com.jero.modules.demo.cloud.service.impl; package com.jero.modules.demo.cloud.service.impl;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.demo.cloud.service.JcloudDemoService; import com.jero.modules.demo.cloud.service.JcloudDemoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class JcloudDemoServiceImpl implements JcloudDemoService { public class JcloudDemoServiceImpl implements JcloudDemoService {
@Override @Override
public Result<String> getMessage(String name) { public Results<String> getMessage(String name) {
return Result.OK("Hello，" + name); return Results.OK("Hello，" + name);
} }
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java
+4 -4
View File
@@ -1,6 +1,6 @@
package com.jero.modules.demo.mock; package com.jero.modules.demo.mock;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -120,8 +120,8 @@ public class MockController {
* @return * @return
*/ */
@GetMapping("/queryDiskInfo") @GetMapping("/queryDiskInfo")
public Result<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){ public Results<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
Result<List<Map<String,Object>>> res = new Result<>(); Results<List<Map<String,Object>>> res = new Results<>();
try { try {
// 当前文件系统类 // 当前文件系统类
FileSystemView fsv = FileSystemView.getFileSystemView(); FileSystemView fsv = FileSystemView.getFileSystemView();
@@ -145,7 +145,7 @@ public class MockController {
res.setResult(list); res.setResult(list);
res.setMessage("查询成功"); res.setMessage("查询成功");
} catch (Exception e) { } catch (Exception e) {
return Result.error("查询失败"+e.getMessage()); return Results.error("查询失败"+e.getMessage());
} }
return res; return res;
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java
+19 -19
View File
@@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.VXESocketConst; import com.jero.common.constant.VXESocketConst;
import com.jero.common.system.query.MatchTypeEnum; import com.jero.common.system.query.MatchTypeEnum;
import com.jero.common.system.query.QueryCondition; import com.jero.common.system.query.QueryCondition;
@@ -40,7 +40,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/change1") @GetMapping("/change1")
public Result<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { public Results<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -52,7 +52,7 @@ public class VxeMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -63,7 +63,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/change2") @GetMapping("/change2")
public Result<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { public Results<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -76,7 +76,7 @@ public class VxeMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -87,7 +87,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/change3") @GetMapping("/change3")
public Result<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { public Results<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -99,7 +99,7 @@ public class VxeMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
private void mockChange(JSONObject rowData) { private void mockChange(JSONObject rowData) {
@@ -123,7 +123,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/change4") @GetMapping("/change4")
public Result<T> mockChange4(@RequestParam("status") String status) { public Results<T> mockChange4(@RequestParam("status") String status) {
// 封装socket数据 // 封装socket数据
JSONObject socketData = new JSONObject(); JSONObject socketData = new JSONObject();
// 这里的 key 是前端注册时使用的key，必须保持一致 // 这里的 key 是前端注册时使用的key，必须保持一致
@@ -136,7 +136,7 @@ public class VxeMockController {
// 调用 sendMessageToAll 发送给所有在线的用户 // 调用 sendMessageToAll 发送给所有在线的用户
VXESocket.sendMessageToAll(message); VXESocket.sendMessageToAll(message);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -145,11 +145,11 @@ public class VxeMockController {
* @param rowData 行数据，实际使用时可以替换成一个实体类 * @param rowData 行数据，实际使用时可以替换成一个实体类
*/ */
@PostMapping ("/immediateSaveRow") @PostMapping ("/immediateSaveRow")
public Result<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException { public Results<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
log.info("即时保存.rowData：" + rowData.toJSONString()); log.info("即时保存.rowData：" + rowData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感 // 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(500); Thread.sleep(500);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -158,7 +158,7 @@ public class VxeMockController {
* @param tableData 表格数据（实际使用时可以替换成一个List实体类） * @param tableData 表格数据（实际使用时可以替换成一个List实体类）
*/ */
@PostMapping("/immediateSaveAll") @PostMapping("/immediateSaveAll")
public Result<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException { public Results<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
// 【注】： // 【注】：
// 1、tableData里包含该页所有的数据 // 1、tableData里包含该页所有的数据
// 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了， // 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了，
@@ -169,7 +169,7 @@ public class VxeMockController {
log.info("即时保存.tableData：" + tableData.toJSONString()); log.info("即时保存.tableData：" + tableData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感 // 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(1000); Thread.sleep(1000);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -181,7 +181,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/getData") @GetMapping("/getData")
public Result<IPage<JSONObject>> getMockData( public Results<IPage<JSONObject>> getMockData(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
// 父级id，根据父级id查询子级，如果为空则查询顶级 // 父级id，根据父级id查询子级，如果为空则查询顶级
@@ -192,10 +192,10 @@ public class VxeMockController {
// 读取JSON数据 // 读取JSON数据
JSONArray dataList = readJsonData(path); JSONArray dataList = readJsonData(path);
if (dataList == null) { if (dataList == null) {
return Result.error("读取数据失败！"); return Results.error("读取数据失败！");
} }
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize); IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
return Result.OK(page); return Results.OK(page);
} }
/** /**
@@ -207,7 +207,7 @@ public class VxeMockController {
* @return * @return
*/ */
@GetMapping("/getDdjhData") @GetMapping("/getDdjhData")
public Result<IPage<JSONObject>> getMockDdjhData( public Results<IPage<JSONObject>> getMockDdjhData(
// SpringMVC 会自动将参数注入到实体里 // SpringMVC 会自动将参数注入到实体里
MockEntity mockEntity, MockEntity mockEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -268,13 +268,13 @@ public class VxeMockController {
// 读取JSON数据 // 读取JSON数据
JSONArray dataList = readJsonData(path); JSONArray dataList = readJsonData(path);
if (dataList == null) { if (dataList == null) {
return Result.error("读取数据失败！"); return Results.error("读取数据失败！");
} }
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize); IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
List<JSONObject> records = getJsonObjects(dataList, page); List<JSONObject> records = getJsonObjects(dataList, page);
page.setRecords(records); page.setRecords(records);
return Result.OK(page); return Results.OK(page);
} }
@NotNull @NotNull
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
+25 -25
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
@@ -57,8 +57,8 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表") @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
@GetMapping(value = "/list") @GetMapping(value = "/list")
@PermissionData(pageComponent = "jero/JeroDemoList") @PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, public Results<IPage<JeroDemo>> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap()); QueryWrapper<JeroDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap());
Page<JeroDemo> page = new Page<>(pageNo, pageSize); Page<JeroDemo> page = new Page<>(pageNo, pageSize);
@@ -67,7 +67,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
log.info("查询当前页数量：" + pageList.getSize()); log.info("查询当前页数量：" + pageList.getSize());
log.info("查询结果数量：" + pageList.getRecords().size()); log.info("查询结果数量：" + pageList.getRecords().size());
log.info("数据总数：" + pageList.getTotal()); log.info("数据总数：" + pageList.getTotal());
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -79,9 +79,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@PostMapping(value = "/add") @PostMapping(value = "/add")
@AutoLog(value = "添加测试DEMO") @AutoLog(value = "添加测试DEMO")
@ApiOperation(value = "添加DEMO", notes = "添加DEMO") @ApiOperation(value = "添加DEMO", notes = "添加DEMO")
public Result<T> add(@RequestBody JeroDemo jeroDemo) { public Results<T> add(@RequestBody JeroDemo jeroDemo) {
JeroDemoService.save(jeroDemo); JeroDemoService.save(jeroDemo);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -93,9 +93,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
@ApiOperation(value = "编辑DEMO", notes = "编辑DEMO") @ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
@AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3) @AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
public Result<T> edit(@RequestBody JeroDemo jeroDemo) { public Results<T> edit(@RequestBody JeroDemo jeroDemo) {
JeroDemoService.updateById(jeroDemo); JeroDemoService.updateById(jeroDemo);
return Result.OK("更新成功！"); return Results.OK("更新成功！");
} }
/** /**
@@ -107,13 +107,13 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@AutoLog(value = "删除测试DEMO") @AutoLog(value = "删除测试DEMO")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO") @ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
JeroDemoService.removeById(id); JeroDemoService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -124,13 +124,13 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
@ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO") @ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.JeroDemoService.removeByIds(Arrays.asList(ids.split(","))); this.JeroDemoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -141,9 +141,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
@ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO") @ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
public Result<JeroDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) { public Results<JeroDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
JeroDemo jeroDemo = JeroDemoService.getById(id); JeroDemo jeroDemo = JeroDemoService.getById(id);
return Result.OK(jeroDemo); return Results.OK(jeroDemo);
} }
/** /**
@@ -168,7 +168,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
* @return * @return
*/ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<JeroDemo> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<JeroDemo> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, JeroDemo.class); return super.importExcel(request, response, JeroDemo.class);
} }
@@ -245,9 +245,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
// ==========================================动态表单 JSON接收测试=========================================== // ==========================================动态表单 JSON接收测试===========================================
@PostMapping(value = "/testOnlineAdd") @PostMapping(value = "/testOnlineAdd")
public Result<T> testOnlineAdd(@RequestBody JSONObject json) { public Results<T> testOnlineAdd(@RequestBody JSONObject json) {
log.info(json.toJSONString()); log.info(json.toJSONString());
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/*----------------------------------------外部获取权限示例------------------------------------*/ /*----------------------------------------外部获取权限示例------------------------------------*/
@@ -262,14 +262,14 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/ */
@GetMapping(value = "/mpList") @GetMapping(value = "/mpList")
@PermissionData(pageComponent = "jero/JeroDemoList") @PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, public Results<IPage<JeroDemo>> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = new QueryWrapper<JeroDemo>(); QueryWrapper<JeroDemo> queryWrapper = new QueryWrapper<JeroDemo>();
//编程方式，给queryWrapper装载数据权限规则 //编程方式，给queryWrapper装载数据权限规则
QueryGenerator.installAuthMplus(queryWrapper, JeroDemo.class); QueryGenerator.installAuthMplus(queryWrapper, JeroDemo.class);
Page<JeroDemo> page = new Page<JeroDemo>(pageNo, pageSize); Page<JeroDemo> page = new Page<JeroDemo>(pageNo, pageSize);
IPage<JeroDemo> pageList = JeroDemoService.page(page, queryWrapper); IPage<JeroDemo> pageList = JeroDemoService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -283,9 +283,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/ */
@GetMapping(value = "/sqlList") @GetMapping(value = "/sqlList")
@PermissionData(pageComponent = "jero/JeroDemoList") @PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, public Results<IPage<JeroDemo>> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo); IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo);
return Result.OK(pageList); return Results.OK(pageList);
} }
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
+23 -23
View File
@@ -3,7 +3,7 @@ package com.jero.modules.demo.test.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
@@ -65,11 +65,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<JeroOrderMain>> queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { public Results<IPage<JeroOrderMain>> queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap()); QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<>(pageNo, pageSize); Page<JeroOrderMain> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper); IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -79,11 +79,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) { public Results<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain(); JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList()); jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -93,11 +93,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) { public Results<T> eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain(); JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList()); jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -107,13 +107,13 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
jeroOrderMainService.delMain(id); jeroOrderMainService.delMain(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -123,13 +123,13 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(","))); this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Results.OK("批量删除成功!");
} }
/** /**
@@ -139,9 +139,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) { public Results<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id);
return Result.OK(jeroOrderMain); return Results.OK(jeroOrderMain);
} }
/** /**
@@ -151,9 +151,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@GetMapping(value = "/queryOrderCustomerListByMainId") @GetMapping(value = "/queryOrderCustomerListByMainId")
public Result<List<JeroOrderCustomer>> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) { public Results<List<JeroOrderCustomer>> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderCustomer> jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id); List<JeroOrderCustomer> jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id);
return Result.OK(jeroOrderCustomerList); return Results.OK(jeroOrderCustomerList);
} }
/** /**
@@ -163,9 +163,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return * @return
*/ */
@GetMapping(value = "/queryOrderTicketListByMainId") @GetMapping(value = "/queryOrderTicketListByMainId")
public Result<List<JeroOrderTicket>> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) { public Results<List<JeroOrderTicket>> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderTicket> jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id); List<JeroOrderTicket> jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id);
return Result.OK(jeroOrderTicketList); return Results.OK(jeroOrderTicketList);
} }
/** /**
@@ -217,7 +217,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -233,10 +233,10 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
BeanUtils.copyProperties(page, po); BeanUtils.copyProperties(page, po);
jeroOrderMainService.saveMain(po, page.getJeroOrderCustomerList(), page.getJeroOrderTicketList()); jeroOrderMainService.saveMain(po, page.getJeroOrderCustomerList(), page.getJeroOrderTicketList());
} }
return Result.OK("文件导入成功！"); return Results.OK("文件导入成功！");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件导入失败：" + e.getMessage()); return Results.error("文件导入失败：" + e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -245,7 +245,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java
+48 -50
View File
@@ -5,7 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.api.vo.ResultConstant; import com.jero.common.api.vo.ResultConstant;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.demo.test.entity.JeroOrderCustomer; import com.jero.modules.demo.test.entity.JeroOrderCustomer;
@@ -19,10 +19,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@@ -62,14 +60,14 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@GetMapping(value = "/orderList") @GetMapping(value = "/orderList")
public Result<IPage<JeroOrderMain>> respondePagedData(JeroOrderMain jeroOrderMain, public Results<IPage<JeroOrderMain>> respondePagedData(JeroOrderMain jeroOrderMain,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap()); QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<>(pageNo, pageSize); Page<JeroOrderMain> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper); IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -79,11 +77,11 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) { public Results<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain(); JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.save(jeroOrderMain); jeroOrderMainService.save(jeroOrderMain);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -93,11 +91,11 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping("/edit") @PostMapping("/edit")
public Result<T> edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) { public Results<T> edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain(); JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.updateById(jeroOrderMain); jeroOrderMainService.updateById(jeroOrderMain);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -107,13 +105,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
jeroOrderMainService.delMain(id); jeroOrderMainService.delMain(id);
return Result.OK(ResultConstant.DEL_OK); return Results.OK(ResultConstant.DEL_OK);
} }
/** /**
@@ -123,13 +121,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(","))); this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK); return Results.OK(ResultConstant.BATCH_DEL_OK);
} }
/** /**
@@ -139,9 +137,9 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) { public Results<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id);
return Result.OK(jeroOrderMain); return Results.OK(jeroOrderMain);
} }
@@ -152,14 +150,14 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@GetMapping(value = "/listOrderCustomerByMainId") @GetMapping(value = "/listOrderCustomerByMainId")
public Result<IPage<JeroOrderCustomer>> queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer, public Results<IPage<JeroOrderCustomer>> queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<JeroOrderCustomer> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap()); QueryWrapper<JeroOrderCustomer> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap());
Page<JeroOrderCustomer> page = new Page<>(pageNo, pageSize); Page<JeroOrderCustomer> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderCustomer> pageList = jeroOrderCustomerService.page(page, queryWrapper); IPage<JeroOrderCustomer> pageList = jeroOrderCustomerService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -169,14 +167,14 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@GetMapping(value = "/listOrderTicketByMainId") @GetMapping(value = "/listOrderTicketByMainId")
public Result<IPage<JeroOrderTicket>> queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket, public Results<IPage<JeroOrderTicket>> queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<JeroOrderTicket> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap()); QueryWrapper<JeroOrderTicket> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap());
Page<JeroOrderTicket> page = new Page<>(pageNo, pageSize); Page<JeroOrderTicket> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderTicket> pageList = jeroOrderTicketService.page(page, queryWrapper); IPage<JeroOrderTicket> pageList = jeroOrderTicketService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -186,9 +184,9 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/addCustomer") @PostMapping(value = "/addCustomer")
public Result<T> addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { public Results<T> addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
jeroOrderCustomerService.save(jeroOrderCustomer); jeroOrderCustomerService.save(jeroOrderCustomer);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -198,9 +196,9 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping("/editCustomer") @PostMapping("/editCustomer")
public Result<T> editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { public Results<T> editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
jeroOrderCustomerService.updateById(jeroOrderCustomer); jeroOrderCustomerService.updateById(jeroOrderCustomer);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -210,13 +208,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/deleteCustomer") @PostMapping(value = "/deleteCustomer")
public Result<T> deleteCustomer(@RequestBody Map<String, String> map) { public Results<T> deleteCustomer(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
jeroOrderCustomerService.removeById(id); jeroOrderCustomerService.removeById(id);
return Result.OK(ResultConstant.DEL_OK); return Results.OK(ResultConstant.DEL_OK);
} }
/** /**
@@ -226,13 +224,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatchCustomer") @PostMapping(value = "/deleteBatchCustomer")
public Result<T> deleteBatchCustomer(@RequestBody Map<String, String> map) { public Results<T> deleteBatchCustomer(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(","))); this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK); return Results.OK(ResultConstant.BATCH_DEL_OK);
} }
/** /**
@@ -242,9 +240,9 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/addTicket") @PostMapping(value = "/addTicket")
public Result<T> addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { public Results<T> addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
jeroOrderTicketService.save(jeroOrderTicket); jeroOrderTicketService.save(jeroOrderTicket);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -254,9 +252,9 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping("/editTicket") @PostMapping("/editTicket")
public Result<T> editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { public Results<T> editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
jeroOrderTicketService.updateById(jeroOrderTicket); jeroOrderTicketService.updateById(jeroOrderTicket);
return Result.OK(ResultConstant.OP_OK); return Results.OK(ResultConstant.OP_OK);
} }
/** /**
@@ -266,13 +264,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/deleteTicket") @PostMapping(value = "/deleteTicket")
public Result<T> deleteTicket(@RequestBody Map<String, String> map) { public Results<T> deleteTicket(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
jeroOrderTicketService.removeById(id); jeroOrderTicketService.removeById(id);
return Result.OK(ResultConstant.DEL_OK); return Results.OK(ResultConstant.DEL_OK);
} }
/** /**
@@ -282,13 +280,13 @@ public class JeroOrderTabMainController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatchTicket") @PostMapping(value = "/deleteBatchTicket")
public Result<T> deleteBatchTicket(@RequestBody Map<String, String> map) { public Results<T> deleteBatchTicket(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(","))); this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK); return Results.OK(ResultConstant.BATCH_DEL_OK);
} }
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+28 -28
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.api.vo.ResultConstant; import com.jero.common.api.vo.ResultConstant;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -56,11 +56,11 @@ public class JoaDemoController {
* @return * @return
*/ */
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo, public Results<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<JoaDemo>> result = new Result<>(); Results<IPage<JoaDemo>> result = new Results<>();
QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap()); QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap());
Page<JoaDemo> page = new Page<>(pageNo, pageSize); Page<JoaDemo> page = new Page<>(pageNo, pageSize);
IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper); IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper);
@@ -75,13 +75,13 @@ public class JoaDemoController {
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<Object> add(@RequestBody JoaDemo joaDemo) { public Results<Object> add(@RequestBody JoaDemo joaDemo) {
try { try {
joaDemoService.save(joaDemo); joaDemoService.save(joaDemo);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -91,18 +91,18 @@ public class JoaDemoController {
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody JoaDemo joaDemo) { public Results<Object> edit(@RequestBody JoaDemo joaDemo) {
JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId()); JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId());
if(joaDemoEntity==null) { if(joaDemoEntity==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND); return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else { }else {
boolean ok = joaDemoService.updateById(joaDemo); boolean ok = joaDemoService.updateById(joaDemo);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -111,21 +111,21 @@ public class JoaDemoController {
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<Object> delete(@RequestBody Map<String, String> map) { public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
JoaDemo joaDemo = joaDemoService.getById(id); JoaDemo joaDemo = joaDemoService.getById(id);
if(joaDemo==null) { if(joaDemo==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND); return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else { }else {
boolean ok = joaDemoService.removeById(id); boolean ok = joaDemoService.removeById(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -134,13 +134,13 @@ public class JoaDemoController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
this.joaDemoService.removeByIds(Arrays.asList(ids.split(","))); this.joaDemoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -150,12 +150,12 @@ public class JoaDemoController {
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) { public Results<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
JoaDemo joaDemo = joaDemoService.getById(id); JoaDemo joaDemo = joaDemoService.getById(id);
if(joaDemo==null) { if(joaDemo==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND); return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else { }else {
return Result.OK(joaDemo); return Results.OK(joaDemo);
} }
} }
@@ -200,7 +200,7 @@ public class JoaDemoController {
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -214,10 +214,10 @@ public class JoaDemoController {
for (JoaDemo joaDemoExcel : listJoaDemos) { for (JoaDemo joaDemoExcel : listJoaDemos) {
joaDemoService.save(joaDemoExcel); joaDemoService.save(joaDemoExcel);
} }
return Result.OK("文件导入成功！数据行数:" + listJoaDemos.size()); return Results.OK("文件导入成功！数据行数:" + listJoaDemos.size());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage()); return Results.error("文件导入失败:"+e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -226,7 +226,7 @@ public class JoaDemoController {
} }
} }
} }
return Result.OK("文件导入失败！"); return Results.OK("文件导入失败！");
} }
} }
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java
+19 -19
View File
@@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.MatchTypeEnum; import com.jero.common.system.query.MatchTypeEnum;
import com.jero.common.system.query.QueryCondition; import com.jero.common.system.query.QueryCondition;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -40,7 +40,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/change1") @GetMapping("/change1")
public Result<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { public Results<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -52,7 +52,7 @@ public class DlMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -63,7 +63,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/change2") @GetMapping("/change2")
public Result<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { public Results<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -76,7 +76,7 @@ public class DlMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -87,7 +87,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/change3") @GetMapping("/change3")
public Result<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { public Results<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据 // 封装行数据
@@ -99,7 +99,7 @@ public class DlMockController {
// 模拟更改数据 // 模拟更改数据
this.mockChange(rowData); this.mockChange(rowData);
return Result.OK(); return Results.OK();
} }
private void mockChange(JSONObject rowData) { private void mockChange(JSONObject rowData) {
@@ -122,7 +122,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/change4") @GetMapping("/change4")
public Result<T> mockChange4(@RequestParam("status") String status) { public Results<T> mockChange4(@RequestParam("status") String status) {
// 封装socket数据 // 封装socket数据
JSONObject socketData = new JSONObject(); JSONObject socketData = new JSONObject();
// 这里的 key 是前端注册时使用的key，必须保持一致 // 这里的 key 是前端注册时使用的key，必须保持一致
@@ -135,7 +135,7 @@ public class DlMockController {
// 调用 sendMessageToAll 发送给所有在线的用户 // 调用 sendMessageToAll 发送给所有在线的用户
VXESocket.sendMessageToAll(message); VXESocket.sendMessageToAll(message);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -144,11 +144,11 @@ public class DlMockController {
* @param rowData 行数据，实际使用时可以替换成一个实体类 * @param rowData 行数据，实际使用时可以替换成一个实体类
*/ */
@PostMapping("/immediateSaveRow") @PostMapping("/immediateSaveRow")
public Result<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException { public Results<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
log.info("即时保存.rowData：" + rowData.toJSONString()); log.info("即时保存.rowData：" + rowData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感 // 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(500); Thread.sleep(500);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -157,7 +157,7 @@ public class DlMockController {
* @param tableData 表格数据（实际使用时可以替换成一个List实体类） * @param tableData 表格数据（实际使用时可以替换成一个List实体类）
*/ */
@PostMapping("/immediateSaveAll") @PostMapping("/immediateSaveAll")
public Result<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException { public Results<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
// 【注】： // 【注】：
// 1、tableData里包含该页所有的数据 // 1、tableData里包含该页所有的数据
// 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了， // 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了，
@@ -168,7 +168,7 @@ public class DlMockController {
log.info("即时保存.tableData：" + tableData.toJSONString()); log.info("即时保存.tableData：" + tableData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感 // 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(1000); Thread.sleep(1000);
return Result.OK(); return Results.OK();
} }
/** /**
@@ -180,7 +180,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/getData") @GetMapping("/getData")
public Result<IPage<JSONObject>> getMockData( public Results<IPage<JSONObject>> getMockData(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
// 父级id，根据父级id查询子级，如果为空则查询顶级 // 父级id，根据父级id查询子级，如果为空则查询顶级
@@ -191,10 +191,10 @@ public class DlMockController {
// 读取JSON数据 // 读取JSON数据
JSONArray dataList = readJsonData(path); JSONArray dataList = readJsonData(path);
if (dataList == null) { if (dataList == null) {
return Result.error("读取数据失败！"); return Results.error("读取数据失败！");
} }
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize); IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
return Result.OK(page); return Results.OK(page);
} }
/** /**
@@ -206,7 +206,7 @@ public class DlMockController {
* @return * @return
*/ */
@GetMapping("/getDdjhData") @GetMapping("/getDdjhData")
public Result<IPage<JSONObject>> getMockDdjhData( public Results<IPage<JSONObject>> getMockDdjhData(
// SpringMVC 会自动将参数注入到实体里 // SpringMVC 会自动将参数注入到实体里
MockEntity mockEntity, MockEntity mockEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -246,14 +246,14 @@ public class DlMockController {
// 读取JSON数据 // 读取JSON数据
JSONArray dataList = readJsonData(path); JSONArray dataList = readJsonData(path);
if (dataList == null) { if (dataList == null) {
return Result.error("读取数据失败！"); return Results.error("读取数据失败！");
} }
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize); IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
// 逐行查询子表数据，用于计算拖轮状态 // 逐行查询子表数据，用于计算拖轮状态
List<JSONObject> records = getJsonObjects(dataList, page); List<JSONObject> records = getJsonObjects(dataList, page);
page.setRecords(records); page.setRecords(records);
return Result.OK(page); return Results.OK(page);
} }
@NotNull @NotNull
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.modules.cas.controller; package com.jero.modules.cas.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.util.JwtUtil; import com.jero.common.system.util.JwtUtil;
@@ -56,7 +56,7 @@ public class CasClientController {
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
String multiDepart = "multi_depart"; String multiDepart = "multi_depart";
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
log.info("Rest api login."); log.info("Rest api login.");
try { try {
String validateUrl = prefixUrl+"/p3/serviceValidate"; String validateUrl = prefixUrl+"/p3/serviceValidate";
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
+17 -17
View File
@@ -3,7 +3,7 @@ package com.jero.modules.message.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.message.entity.SysMessage; import com.jero.modules.message.entity.SysMessage;
@@ -43,12 +43,12 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysMessage>> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Results<IPage<SysMessage>> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap()); QueryWrapper<SysMessage> queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap());
Page<SysMessage> page = new Page<>(pageNo, pageSize); Page<SysMessage> page = new Page<>(pageNo, pageSize);
IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper); IPage<SysMessage> pageList = sysMessageService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -58,9 +58,9 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysMessage sysMessage) { public Results<T> add(@RequestBody SysMessage sysMessage) {
sysMessageService.save(sysMessage); sysMessageService.save(sysMessage);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -70,9 +70,9 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysMessage sysMessage) { public Results<T> edit(@RequestBody SysMessage sysMessage) {
sysMessageService.updateById(sysMessage); sysMessageService.updateById(sysMessage);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@@ -83,13 +83,13 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysMessageService.removeById(id); sysMessageService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -99,13 +99,13 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -115,9 +115,9 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysMessage> queryById(@RequestParam(name = "id", required = true) String id) { public Results<SysMessage> queryById(@RequestParam(name = "id", required = true) String id) {
SysMessage sysMessage = sysMessageService.getById(id); SysMessage sysMessage = sysMessageService.getById(id);
return Result.OK(sysMessage); return Results.OK(sysMessage);
} }
/** /**
@@ -138,7 +138,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @return * @return
*/ */
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<SysMessage> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysMessage> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysMessage.class); return super.importExcel(request, response, SysMessage.class);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+21 -21
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.message.entity.MsgParams; import com.jero.modules.message.entity.MsgParams;
@@ -48,12 +48,12 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Results<IPage<SysMessageTemplate>> queryPageList(SysMessageTemplate sysMessageTemplate, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap()); QueryWrapper<SysMessageTemplate> queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap());
Page<SysMessageTemplate> page = new Page<>(pageNo, pageSize); Page<SysMessageTemplate> page = new Page<>(pageNo, pageSize);
IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper); IPage<SysMessageTemplate> pageList = sysMessageTemplateService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -63,9 +63,9 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysMessageTemplate sysMessageTemplate) { public Results<T> add(@RequestBody SysMessageTemplate sysMessageTemplate) {
sysMessageTemplateService.save(sysMessageTemplate); sysMessageTemplateService.save(sysMessageTemplate);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -75,9 +75,9 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) { public Results<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
sysMessageTemplateService.updateById(sysMessageTemplate); sysMessageTemplateService.updateById(sysMessageTemplate);
return Result.OK("更新成功！"); return Results.OK("更新成功！");
} }
/** /**
@@ -87,13 +87,13 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysMessageTemplateService.removeById(id); sysMessageTemplateService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -103,13 +103,13 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(","))); this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -119,9 +119,9 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysMessageTemplate> queryById(@RequestParam(name = "id", required = true) String id) { public Results<SysMessageTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id); SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id);
return Result.OK(sysMessageTemplate); return Results.OK(sysMessageTemplate);
} }
/** /**
@@ -142,7 +142,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @return * @return
*/ */
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<SysMessageTemplate> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysMessageTemplate> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysMessageTemplate.class); return super.importExcel(request, response, SysMessageTemplate.class);
} }
@@ -150,18 +150,18 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* 发送消息 * 发送消息
*/ */
@PostMapping(value = "/sendMsg") @PostMapping(value = "/sendMsg")
public Result<Object> sendMessage(@RequestBody MsgParams msgParams) { public Results<Object> sendMessage(@RequestBody MsgParams msgParams) {
Map<String, String> map = null; Map<String, String> map = null;
try { try {
map = (Map<String, String>) JSON.parse(msgParams.getTestData()); map = (Map<String, String>) JSON.parse(msgParams.getTestData());
} catch (Exception e) { } catch (Exception e) {
return Result.error("解析Json出错！"); return Results.error("解析Json出错！");
} }
boolean isSendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver()); boolean isSendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver());
if (isSendSuccess) { if (isSendSuccess) {
return Result.OK("发送消息任务操作成功!"); return Results.OK("发送消息任务操作成功!");
} else { } else {
return Result.error("发送消息任务添加失败！"); return Results.error("发送消息任务添加失败！");
} }
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/TestSocketController.java
+5 -5
View File
@@ -1,6 +1,6 @@
package com.jero.modules.message.websocket; package com.jero.modules.message.websocket;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.WebsocketConst; import com.jero.common.constant.WebsocketConst;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -18,8 +18,8 @@ public class TestSocketController {
private WebSocket webSocket; private WebSocket webSocket;
@PostMapping("/sendAll") @PostMapping("/sendAll")
public Result<String> sendAll(@RequestBody JSONObject jsonObject) { public Results<String> sendAll(@RequestBody JSONObject jsonObject) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
String message = jsonObject.getString("message"); String message = jsonObject.getString("message");
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
@@ -31,8 +31,8 @@ public class TestSocketController {
} }
@PostMapping("/sendUser") @PostMapping("/sendUser")
public Result<String> sendUser(@RequestBody JSONObject jsonObject) { public Results<String> sendUser(@RequestBody JSONObject jsonObject) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
String userId = jsonObject.getString("userId"); String userId = jsonObject.getString("userId");
String message = jsonObject.getString("message"); String message = jsonObject.getString("message");
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java
+6 -6
View File
@@ -1,7 +1,7 @@
package com.jero.modules.monitor.controller; package com.jero.modules.monitor.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.monitor.domain.RedisInfo; import com.jero.modules.monitor.domain.RedisInfo;
import com.jero.modules.monitor.exception.RedisConnectException; import com.jero.modules.monitor.exception.RedisConnectException;
import com.jero.modules.monitor.service.RedisService; import com.jero.modules.monitor.service.RedisService;
@@ -34,10 +34,10 @@ public class ActuatorRedisController {
* @throws Exception * @throws Exception
*/ */
@GetMapping("/info") @GetMapping("/info")
public Result<List<RedisInfo>> getRedisInfo() throws RedisConnectException { public Results<List<RedisInfo>> getRedisInfo() throws RedisConnectException {
List<RedisInfo> infoList = this.redisService.getRedisInfo(); List<RedisInfo> infoList = this.redisService.getRedisInfo();
log.info(infoList.toString()); log.info(infoList.toString());
return Result.OK(infoList); return Results.OK(infoList);
} }
@GetMapping("/keysSize") @GetMapping("/keysSize")
@@ -87,8 +87,8 @@ public class ActuatorRedisController {
* @return * @return
*/ */
@GetMapping("/queryDiskInfo") @GetMapping("/queryDiskInfo")
public Result<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){ public Results<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
Result<List<Map<String,Object>>> res = new Result<>(); Results<List<Map<String,Object>>> res = new Results<>();
try { try {
// 当前文件系统类 // 当前文件系统类
FileSystemView fsv = FileSystemView.getFileSystemView(); FileSystemView fsv = FileSystemView.getFileSystemView();
@@ -112,7 +112,7 @@ public class ActuatorRedisController {
res.setResult(list); res.setResult(list);
res.setMessage("查询成功"); res.setMessage("查询成功");
} catch (Exception e) { } catch (Exception e) {
return Result.error("查询失败"+e.getMessage()); return Results.error("查询失败"+e.getMessage());
} }
return res; return res;
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java
+3 -4
View File
@@ -2,12 +2,11 @@ package com.jero.modules.ngalain.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Results;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.ngalain.service.NgAlainService; import com.jero.modules.ngalain.service.NgAlainService;
@@ -52,7 +51,7 @@ public class NgAlainController {
@GetMapping("/getDictItems/{dictCode}") @GetMapping("/getDictItems/{dictCode}")
public Object getDictItems(@PathVariable String dictCode) { public Object getDictItems(@PathVariable String dictCode) {
log.info(" dictCode : "+ dictCode); log.info(" dictCode : "+ dictCode);
Result<List<DictModel>> result = new Result<>(); Results<List<DictModel>> result = new Results<>();
List<DictModel> ls = null; List<DictModel> ls = null;
try { try {
ls = sysDictService.queryDictItemsByCode(dictCode); ls = sysDictService.queryDictItemsByCode(dictCode);
@@ -60,7 +59,7 @@ public class NgAlainController {
result.setResult(ls); result.setResult(ls);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
List<JSONObject> dictlist=new ArrayList<>(); List<JSONObject> dictlist=new ArrayList<>();
for (DictModel l : ls) { for (DictModel l : ls) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java
+16 -16
View File
@@ -3,7 +3,7 @@ package com.jero.modules.oss.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
@@ -28,10 +28,10 @@ public class OSSFileController {
@ResponseBody @ResponseBody
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<OSSFile>> queryPageList(OSSFile file, public Results<IPage<OSSFile>> queryPageList(OSSFile file,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<OSSFile>> result = new Result<>(); Results<IPage<OSSFile>> result = new Results<>();
QueryWrapper<OSSFile> queryWrapper = QueryGenerator.initQueryWrapper(file, req.getParameterMap()); QueryWrapper<OSSFile> queryWrapper = QueryGenerator.initQueryWrapper(file, req.getParameterMap());
Page<OSSFile> page = new Page<>(pageNo, pageSize); Page<OSSFile> page = new Page<>(pageNo, pageSize);
IPage<OSSFile> pageList = ossFileService.page(page, queryWrapper); IPage<OSSFile> pageList = ossFileService.page(page, queryWrapper);
@@ -43,34 +43,34 @@ public class OSSFileController {
@ResponseBody @ResponseBody
@PostMapping("/upload") @PostMapping("/upload")
//@RequiresRoles("admin") //@RequiresRoles("admin")
public Result<T> upload(@RequestParam("file") MultipartFile multipartFile) { public Results<T> upload(@RequestParam("file") MultipartFile multipartFile) {
try { try {
ossFileService.upload(multipartFile); ossFileService.upload(multipartFile);
return Result.OK("上传成功！"); return Results.OK("上传成功！");
} }
catch (Exception ex) { catch (Exception ex) {
log.info(ex.getMessage(), ex); log.info(ex.getMessage(), ex);
return Result.error("上传失败"); return Results.error("上传失败");
} }
} }
@ResponseBody @ResponseBody
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String,String> map) { public Results<T> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
OSSFile file = ossFileService.getById(id); OSSFile file = ossFileService.getById(id);
if (file == null) { if (file == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} else { } else {
boolean ok = ossFileService.delete(file); boolean ok = ossFileService.delete(file);
if (ok) { if (ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -78,11 +78,11 @@ public class OSSFileController {
*/ */
@ResponseBody @ResponseBody
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<OSSFile> queryById(@RequestParam(name = "id") String id) { public Results<OSSFile> queryById(@RequestParam(name = "id") String id) {
Result<OSSFile> result = new Result<>(); Results<OSSFile> result = new Results<>();
OSSFile file = ossFileService.getById(id); OSSFile file = ossFileService.getById(id);
if (file == null) { if (file == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} }
else { else {
result.setResult(file); result.setResult(file);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
+30 -30
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -63,12 +63,12 @@ public class QuartzJobController {
* @return * @return
*/ */
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<QuartzJob>> queryPageList(QuartzJob quartzJob, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Results<IPage<QuartzJob>> queryPageList(QuartzJob quartzJob, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, req.getParameterMap()); QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, req.getParameterMap());
Page<QuartzJob> page = new Page<>(pageNo, pageSize); Page<QuartzJob> page = new Page<>(pageNo, pageSize);
IPage<QuartzJob> pageList = quartzJobService.page(page, queryWrapper); IPage<QuartzJob> pageList = quartzJobService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
@@ -81,9 +81,9 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<T> add(@RequestBody QuartzJob quartzJob) { public Results<T> add(@RequestBody QuartzJob quartzJob) {
quartzJobService.saveAndScheduleJob(quartzJob); quartzJobService.saveAndScheduleJob(quartzJob);
return Result.OK("创建定时任务成功"); return Results.OK("创建定时任务成功");
} }
/** /**
@@ -95,14 +95,14 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<T> eidt(@RequestBody QuartzJob quartzJob) { public Results<T> eidt(@RequestBody QuartzJob quartzJob) {
try { try {
quartzJobService.editAndScheduleJob(quartzJob); quartzJobService.editAndScheduleJob(quartzJob);
} catch (SchedulerException e) { } catch (SchedulerException e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("更新定时任务失败!"); return Results.error("更新定时任务失败!");
} }
return Result.OK("更新定时任务成功!"); return Results.OK("更新定时任务成功!");
} }
/** /**
@@ -113,17 +113,17 @@ public class QuartzJobController {
*/ */
//@RequiresRoles("admin") //@RequiresRoles("admin")
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String,String> map) { public Results<T> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
QuartzJob quartzJob = quartzJobService.getById(id); QuartzJob quartzJob = quartzJobService.getById(id);
if (quartzJob == null) { if (quartzJob == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} }
quartzJobService.deleteAndStopJob(quartzJob); quartzJobService.deleteAndStopJob(quartzJob);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
@@ -136,16 +136,16 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String,String> map) { public Results<T> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if (ids == null || "".equals(ids.trim())) { if (ids == null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
for (String id : Arrays.asList(ids.split(","))) { for (String id : Arrays.asList(ids.split(","))) {
QuartzJob job = quartzJobService.getById(id); QuartzJob job = quartzJobService.getById(id);
quartzJobService.deleteAndStopJob(job); quartzJobService.deleteAndStopJob(job);
} }
return Result.OK("删除定时任务成功!"); return Results.OK("删除定时任务成功!");
} }
/** /**
@@ -157,13 +157,13 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
@GetMapping(value = "/pause") @GetMapping(value = "/pause")
@ApiOperation(value = "暂停定时任务") @ApiOperation(value = "暂停定时任务")
public Result<Object> pauseJob(@RequestParam(name = "id") String id) { public Results<Object> pauseJob(@RequestParam(name = "id") String id) {
QuartzJob job = quartzJobService.getById(id); QuartzJob job = quartzJobService.getById(id);
if (job == null) { if (job == null) {
return Result.error("定时任务不存在！"); return Results.error("定时任务不存在！");
} }
quartzJobService.pause(job); quartzJobService.pause(job);
return Result.OK("暂停定时任务成功"); return Results.OK("暂停定时任务成功");
} }
/** /**
@@ -175,13 +175,13 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
@GetMapping(value = "/resume") @GetMapping(value = "/resume")
@ApiOperation(value = "恢复定时任务") @ApiOperation(value = "恢复定时任务")
public Result<Object> resumeJob(@RequestParam(name = "id") String id) { public Results<Object> resumeJob(@RequestParam(name = "id") String id) {
QuartzJob job = quartzJobService.getById(id); QuartzJob job = quartzJobService.getById(id);
if (job == null) { if (job == null) {
return Result.error("定时任务不存在！"); return Results.error("定时任务不存在！");
} }
quartzJobService.resumeJob(job); quartzJobService.resumeJob(job);
return Result.OK("恢复定时任务成功"); return Results.OK("恢复定时任务成功");
} }
/** /**
@@ -192,9 +192,9 @@ public class QuartzJobController {
*/ */
// @RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<QuartzJob> queryById(@RequestParam(name = "id", required = true) String id) { public Results<QuartzJob> queryById(@RequestParam(name = "id", required = true) String id) {
QuartzJob quartzJob = quartzJobService.getById(id); QuartzJob quartzJob = quartzJobService.getById(id);
return Result.OK(quartzJob); return Results.OK(quartzJob);
} }
/** /**
@@ -227,7 +227,7 @@ public class QuartzJobController {
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException { public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
// 错误信息 // 错误信息
@@ -247,7 +247,7 @@ public class QuartzJobController {
successLines+=(listQuartzJobs.size()-errorLines); successLines+=(listQuartzJobs.size()-errorLines);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -266,17 +266,17 @@ public class QuartzJobController {
*/ */
//@RequiresRoles("admin") //@RequiresRoles("admin")
@GetMapping("/execute") @GetMapping("/execute")
public Result<T> execute(@RequestParam(name = "id", required = true) String id) { public Results<T> execute(@RequestParam(name = "id", required = true) String id) {
QuartzJob quartzJob = quartzJobService.getById(id); QuartzJob quartzJob = quartzJobService.getById(id);
if (quartzJob == null) { if (quartzJob == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} }
try { try {
quartzJobService.execute(quartzJob); quartzJobService.execute(quartzJob);
} catch (Exception e) { } catch (Exception e) {
log.info("定时任务 立即执行失败>>"+e.getMessage()); log.info("定时任务 立即执行失败>>"+e.getMessage());
return Result.error("执行失败!"); return Results.error("执行失败!");
} }
return Result.OK("执行成功!"); return Results.OK("执行成功!");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+9 -9
View File
@@ -3,7 +3,7 @@ package com.jero.modules.system.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
@@ -73,8 +73,8 @@ public class CommonController {
* @return * @return
*/ */
@GetMapping("/403") @GetMapping("/403")
public Result<String> noauth() { public Results<String> noauth() {
return Result.error("没有权限，请联系管理员授权"); return Results.error("没有权限，请联系管理员授权");
} }
/** /**
@@ -84,8 +84,8 @@ public class CommonController {
* @return * @return
*/ */
@PostMapping(value = "/upload") @PostMapping(value = "/upload")
public Result<OSSFile> upload(HttpServletRequest request, HttpServletResponse response) { public Results<OSSFile> upload(HttpServletRequest request, HttpServletResponse response) {
Result<OSSFile> result = new Result<>(); Results<OSSFile> result = new Results<>();
String savePath = ""; String savePath = "";
String bizPath = request.getParameter("biz"); String bizPath = request.getParameter("biz");
@@ -244,7 +244,7 @@ public class CommonController {
* @return * @return
*/ */
@RequestMapping("/transitRESTful") @RequestMapping("/transitRESTful")
public Result<Object> transitRESTful(@RequestParam("url") String url, HttpServletRequest request) { public Results<Object> transitRESTful(@RequestParam("url") String url, HttpServletRequest request) {
try { try {
ServletServerHttpRequest httpRequest = new ServletServerHttpRequest(request); ServletServerHttpRequest httpRequest = new ServletServerHttpRequest(request);
// 中转请求method、body // 中转请求method、body
@@ -262,7 +262,7 @@ public class CommonController {
String httpURL = URLDecoder.decode(url, UTF8); String httpURL = URLDecoder.decode(url, UTF8);
ResponseEntity<String> response = RestUtil.request(httpURL, method, headers , variables, params, String.class); ResponseEntity<String> response = RestUtil.request(httpURL, method, headers , variables, params, String.class);
// 封装返回结果 // 封装返回结果
Result<Object> result = new Result<>(); Results<Object> result = new Results<>();
int statusCode = response.getStatusCodeValue(); int statusCode = response.getStatusCodeValue();
result.setCode(statusCode); result.setCode(statusCode);
result.setSuccess(statusCode == 200); result.setSuccess(statusCode == 200);
@@ -271,11 +271,11 @@ public class CommonController {
return result; return result;
} catch (Exception e) { } catch (Exception e) {
log.debug("中转HTTP请求失败", e); log.debug("中转HTTP请求失败", e);
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
} }
private void getResult(Result<Object> result, String responseBody) { private void getResult(Results<Object> result, String responseBody) {
try { try {
// 尝试将返回结果转为JSON // 尝试将返回结果转为JSON
Object json = JSON.parse(responseBody); Object json = JSON.parse(responseBody);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java
+4 -5
View File
@@ -2,15 +2,14 @@ package com.jero.modules.system.controller;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Results;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.util.SqlInjectionUtil; import com.jero.common.util.SqlInjectionUtil;
import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysDictMapper;
import com.jero.modules.system.model.DuplicateCheckVo; import com.jero.modules.system.model.DuplicateCheckVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -41,7 +40,7 @@ public class DuplicateCheckController {
// @RequestMapping(value = "/check", method = RequestMethod.GET) // @RequestMapping(value = "/check", method = RequestMethod.GET)
@GetMapping("/check") @GetMapping("/check")
@ApiOperation("重复校验接口") @ApiOperation("重复校验接口")
public Result<Object> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) { public Results<Object> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
Long num = null; Long num = null;
log.info("----duplicate check------："+ duplicateCheckVo.toString()); log.info("----duplicate check------："+ duplicateCheckVo.toString());
@@ -59,11 +58,11 @@ public class DuplicateCheckController {
if (num == null || num == 0) { if (num == null || num == 0) {
// 该值可用 // 该值可用
return Result.OK("该值可用！"); return Results.OK("该值可用！");
} else { } else {
// 该值不可用 // 该值不可用
log.info("该值不可用，系统中已存在！"); log.info("该值不可用，系统中已存在！");
return Result.error("该值不可用，系统中已存在！"); return Results.error("该值不可用，系统中已存在！");
} }
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+13 -13
View File
@@ -1,7 +1,7 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel; import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.service.ILoginService; import com.jero.modules.system.service.ILoginService;
@@ -32,7 +32,7 @@ public class LoginController {
@ApiOperation("登录接口") @ApiOperation("登录接口")
// @RequestMapping(value = "/login", method = RequestMethod.POST) // @RequestMapping(value = "/login", method = RequestMethod.POST)
@PostMapping("/login") @PostMapping("/login")
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){ public Results<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
return loginService.login(sysLoginModel); return loginService.login(sysLoginModel);
} }
@@ -43,7 +43,7 @@ public class LoginController {
* @return * @return
*/ */
@RequestMapping(value = "/logout") @RequestMapping(value = "/logout")
public Result<Object> logout(HttpServletRequest request,HttpServletResponse response) { public Results<Object> logout(HttpServletRequest request, HttpServletResponse response) {
return loginService.logout(request,response); return loginService.logout(request,response);
} }
@@ -52,7 +52,7 @@ public class LoginController {
* @return * @return
*/ */
@GetMapping("loginfo") @GetMapping("loginfo")
public Result<JSONObject> loginfo() { public Results<JSONObject> loginfo() {
return loginService.loginfo(); return loginService.loginfo();
} }
@@ -61,7 +61,7 @@ public class LoginController {
* @return * @return
*/ */
@GetMapping("visitInfo") @GetMapping("visitInfo")
public Result<List<Map<String,Object>>> visitInfo() { public Results<List<Map<String,Object>>> visitInfo() {
return loginService.visitInfo(); return loginService.visitInfo();
} }
@@ -72,7 +72,7 @@ public class LoginController {
*/ */
// @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT) // @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT)
@PostMapping("/selectDepart") @PostMapping("/selectDepart")
public Result<JSONObject> selectDepart(@RequestBody SysUser user) { public Results<JSONObject> selectDepart(@RequestBody SysUser user) {
return loginService.selectDepart(user); return loginService.selectDepart(user);
} }
@@ -83,7 +83,7 @@ public class LoginController {
* @return * @return
*/ */
@PostMapping(value = "/sms") @PostMapping(value = "/sms")
public Result<String> sms(@RequestBody JSONObject jsonObject) { public Results<String> sms(@RequestBody JSONObject jsonObject) {
return loginService.sms(jsonObject); return loginService.sms(jsonObject);
} }
@@ -95,7 +95,7 @@ public class LoginController {
*/ */
@ApiOperation("手机号登录接口") @ApiOperation("手机号登录接口")
@PostMapping("/phoneLogin") @PostMapping("/phoneLogin")
public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) { public Results<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
return loginService.phoneLogin(jsonObject); return loginService.phoneLogin(jsonObject);
} }
@@ -104,7 +104,7 @@ public class LoginController {
* @return * @return
*/ */
@GetMapping(value = "/getEncryptedString") @GetMapping(value = "/getEncryptedString")
public Result<Map<String,String>> getEncryptedString(){ public Results<Map<String,String>> getEncryptedString(){
return loginService.getEncryptedString(); return loginService.getEncryptedString();
} }
@@ -116,7 +116,7 @@ public class LoginController {
*/ */
@ApiOperation("获取验证码") @ApiOperation("获取验证码")
@GetMapping(value = "/randomImage/{key}") @GetMapping(value = "/randomImage/{key}")
public Result<String> randomImage(HttpServletResponse response,@PathVariable String key){ public Results<String> randomImage(HttpServletResponse response, @PathVariable String key){
return loginService.randomImage(response,key); return loginService.randomImage(response,key);
} }
@@ -128,7 +128,7 @@ public class LoginController {
*/ */
// @RequestMapping(value = "/mLogin", method = RequestMethod.POST) // @RequestMapping(value = "/mLogin", method = RequestMethod.POST)
@PostMapping("/mLogin") @PostMapping("/mLogin")
public Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) { public Results<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) {
return loginService.mLogin(sysLoginModel); return loginService.mLogin(sysLoginModel);
} }
@@ -139,7 +139,7 @@ public class LoginController {
*/ */
// @RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST) // @RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST)
@PostMapping("/checkCaptcha") @PostMapping("/checkCaptcha")
public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){ public Results<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
return loginService.checkCaptcha(sysLoginModel); return loginService.checkCaptcha(sysLoginModel);
} }
@@ -152,7 +152,7 @@ public class LoginController {
*/ */
@ApiOperation("获取RSA公钥") @ApiOperation("获取RSA公钥")
@GetMapping("/getRSAPublicKey") @GetMapping("/getRSAPublicKey")
public Result<String> getRSAPublicKey(){ public Results<String> getRSAPublicKey(){
return loginService.getRSAPublicKey(); return loginService.getRSAPublicKey();
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
+41 -41
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.CommonSendStatus; import com.jero.common.constant.CommonSendStatus;
import com.jero.common.constant.WebsocketConst; import com.jero.common.constant.WebsocketConst;
@@ -85,11 +85,11 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysAnnouncement>> queryPageList(SysAnnouncement sysAnnouncement, public Results<IPage<SysAnnouncement>> queryPageList(SysAnnouncement sysAnnouncement,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<SysAnnouncement>> result = new Result<>(); Results<IPage<SysAnnouncement>> result = new Results<>();
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<>(sysAnnouncement); QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<>(sysAnnouncement);
Page<SysAnnouncement> page = new Page<>(pageNo,pageSize); Page<SysAnnouncement> page = new Page<>(pageNo,pageSize);
@@ -116,7 +116,7 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<Object> add(@RequestBody SysAnnouncement sysAnnouncement) { public Results<Object> add(@RequestBody SysAnnouncement sysAnnouncement) {
try { try {
// update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题
String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); String title = XSSUtils.striptXSS(sysAnnouncement.getTitile());
@@ -125,10 +125,10 @@ public class SysAnnouncementController {
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布 sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布
sysAnnouncementService.saveAnnouncement(sysAnnouncement); sysAnnouncementService.saveAnnouncement(sysAnnouncement);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -139,10 +139,10 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) { public Results<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId()); SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
if(sysAnnouncementEntity==null) { if(sysAnnouncementEntity==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
// update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题
String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); String title = XSSUtils.striptXSS(sysAnnouncement.getTitile());
@@ -150,11 +150,11 @@ public class SysAnnouncementController {
// update-end-author:liusq date:20210804 for:标题处理xss攻击的问题 // update-end-author:liusq date:20210804 for:标题处理xss攻击的问题
boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement); boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -164,23 +164,23 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<Object> delete(@RequestBody Map<String, String> map) { public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) { if(sysAnnouncement==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString()); sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
boolean ok = sysAnnouncementService.updateById(sysAnnouncement); boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -190,10 +190,10 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
String[] id = ids.split(","); String[] id = ids.split(",");
for(int i=0;i<id.length;i++) { for(int i=0;i<id.length;i++) {
@@ -201,7 +201,7 @@ public class SysAnnouncementController {
announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString()); announcement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
sysAnnouncementService.updateById(announcement); sysAnnouncementService.updateById(announcement);
} }
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -212,12 +212,12 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) { if(sysAnnouncement==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
return Result.OK(sysAnnouncement); return Results.OK(sysAnnouncement);
} }
} }
@@ -228,10 +228,10 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/doReleaseData", method = RequestMethod.GET) // @RequestMapping(value = "/doReleaseData", method = RequestMethod.GET)
@GetMapping("/doReleaseData") @GetMapping("/doReleaseData")
public Result<SysAnnouncement> doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { public Results<SysAnnouncement> doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) { if(sysAnnouncement==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中 sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中
sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setSendTime(new Date());
@@ -255,11 +255,11 @@ public class SysAnnouncementController {
obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile()); obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
webSocket.sendMessage(userIds, obj.toJSONString()); webSocket.sendMessage(userIds, obj.toJSONString());
} }
return Result.OK("该系统通知发布成功"); return Results.OK("该系统通知发布成功");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -269,20 +269,20 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/doReovkeData", method = RequestMethod.GET) // @RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
@GetMapping("/doReovkeData") @GetMapping("/doReovkeData")
public Result<Object> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { public Results<Object> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) { if(sysAnnouncement==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布 sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
sysAnnouncement.setCancelTime(new Date()); sysAnnouncement.setCancelTime(new Date());
boolean ok = sysAnnouncementService.updateById(sysAnnouncement); boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
if(ok) { if(ok) {
return Result.OK("该系统通知撤销成功"); return Results.OK("该系统通知撤销成功");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -291,8 +291,8 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/listByUser", method = RequestMethod.GET) // @RequestMapping(value = "/listByUser", method = RequestMethod.GET)
@GetMapping("/listByUser") @GetMapping("/listByUser")
public Result<Map<String,Object>> listByUser() { public Results<Map<String,Object>> listByUser() {
Result<Map<String,Object>> result = new Result<>(); Results<Map<String,Object>> result = new Results<>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId(); String userId = sysUser.getId();
// 1.将系统消息补充到用户通告阅读标记表中 // 1.将系统消息补充到用户通告阅读标记表中
@@ -370,7 +370,7 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -387,10 +387,10 @@ public class SysAnnouncementController {
} }
sysAnnouncementService.save(sysAnnouncementExcel); sysAnnouncementService.save(sysAnnouncementExcel);
} }
return Result.OK("文件导入成功！数据行数：" + listSysAnnouncements.size()); return Results.OK("文件导入成功！数据行数：" + listSysAnnouncements.size());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -399,7 +399,7 @@ public class SysAnnouncementController {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
/** /**
*同步消息 *同步消息
@@ -408,13 +408,13 @@ public class SysAnnouncementController {
*/ */
// @RequestMapping(value = "/syncNotic", method = RequestMethod.GET) // @RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
@GetMapping("/syncNotic") @GetMapping("/syncNotic")
public Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) { public Results<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
Result<SysAnnouncement> result = new Result<>(); Results<SysAnnouncement> result = new Results<>();
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
if(StringUtils.isNotBlank(anntId)){ if(StringUtils.isNotBlank(anntId)){
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId);
if(sysAnnouncement==null) { if(sysAnnouncement==null) {
return Result.error(ERROR_TEXT); return Results.error(ERROR_TEXT);
}else { }else {
if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) { if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+32 -33
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
@@ -14,7 +14,6 @@ import com.jero.modules.system.model.AnnouncementSendModel;
import com.jero.modules.system.service.ISysAnnouncementSendService; import com.jero.modules.system.service.ISysAnnouncementSendService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
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.*;
@@ -48,11 +47,11 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysAnnouncementSend>> queryPageList(SysAnnouncementSend sysAnnouncementSend, public Results<IPage<SysAnnouncementSend>> queryPageList(SysAnnouncementSend sysAnnouncementSend,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<SysAnnouncementSend>> result = new Result<>(); Results<IPage<SysAnnouncementSend>> result = new Results<>();
QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<>(sysAnnouncementSend); QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<>(sysAnnouncementSend);
Page<SysAnnouncementSend> page = new Page<>(pageNo,pageSize); Page<SysAnnouncementSend> page = new Page<>(pageNo,pageSize);
//排序逻辑 处理 //排序逻辑 处理
@@ -77,13 +76,13 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<Object> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { public Results<Object> add(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
try { try {
sysAnnouncementSendService.save(sysAnnouncementSend); sysAnnouncementSendService.save(sysAnnouncementSend);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -93,18 +92,18 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) { public Results<Object> edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId()); SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
if(sysAnnouncementSendEntity==null) { if(sysAnnouncementSendEntity==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -113,22 +112,22 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<Object> delete(@RequestBody Map<String, String> map) { public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) { if(sysAnnouncementSend==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
boolean ok = sysAnnouncementSendService.removeById(id); boolean ok = sysAnnouncementSendService.removeById(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -137,13 +136,13 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids == null || "".equals(ids.trim())) { if(ids == null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(","))); this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -153,12 +152,12 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) {
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) { if(sysAnnouncementSend==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
return Result.OK(sysAnnouncementSend); return Results.OK(sysAnnouncementSend);
} }
} }
@@ -168,8 +167,8 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/editByAnntIdAndUserId") @PostMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) { public Results<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
Result<SysAnnouncementSend> result = new Result<>(); Results<SysAnnouncementSend> result = new Results<>();
String anntId = json.getString("anntId"); String anntId = json.getString("anntId");
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId(); String userId = sysUser.getId();
@@ -188,10 +187,10 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@GetMapping(value = "/getMyAnnouncementSend") @GetMapping(value = "/getMyAnnouncementSend")
public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel, public Results<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Result<IPage<AnnouncementSendModel>> result = new Result<>(); Results<IPage<AnnouncementSendModel>> result = new Results<>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId(); String userId = sysUser.getId();
announcementSendModel.setUserId(userId); announcementSendModel.setUserId(userId);
@@ -209,7 +208,7 @@ public class SysAnnouncementSendController {
* @return * @return
*/ */
@PostMapping(value = "/readAll") @PostMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() { public Results<SysAnnouncementSend> readAll() {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId(); String userId = sysUser.getId();
LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<SysAnnouncementSend> updateWrapper = new LambdaUpdateWrapper<>();
@@ -218,6 +217,6 @@ public class SysAnnouncementSendController {
updateWrapper.last("where user_id ='"+userId+"'"); updateWrapper.last("where user_id ='"+userId+"'");
SysAnnouncementSend announcementSend = new SysAnnouncementSend(); SysAnnouncementSend announcementSend = new SysAnnouncementSend();
sysAnnouncementSendService.update(announcementSend, updateWrapper); sysAnnouncementSendService.update(announcementSend, updateWrapper);
return Result.OK("全部已读"); return Results.OK("全部已读");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+51 -51
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
@@ -59,14 +59,14 @@ public class SysCategoryController {
* @return * @return
*/ */
@GetMapping(value = "/rootList") @GetMapping(value = "/rootList")
public Result<IPage<SysCategory>> queryPageList(SysCategory sysCategory, public Results<IPage<SysCategory>> queryPageList(SysCategory sysCategory,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
if(oConvertUtils.isEmpty(sysCategory.getPid())){ if(oConvertUtils.isEmpty(sysCategory.getPid())){
sysCategory.setPid("0"); sysCategory.setPid("0");
} }
Result<IPage<SysCategory>> result = new Result<>(); Results<IPage<SysCategory>> result = new Results<>();
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start //--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
@@ -81,8 +81,8 @@ public class SysCategoryController {
} }
@GetMapping(value = "/childList") @GetMapping(value = "/childList")
public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) { public Results<List<SysCategory>> queryPageList(SysCategory sysCategory, HttpServletRequest req) {
Result<List<SysCategory>> result = new Result<>(); Results<List<SysCategory>> result = new Results<>();
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap()); QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
List<SysCategory> list = sysCategoryService.list(queryWrapper); List<SysCategory> list = sysCategoryService.list(queryWrapper);
result.setSuccess(true); result.setSuccess(true);
@@ -98,13 +98,13 @@ public class SysCategoryController {
*/ */
@RequiresPermissions("sys:category:add") @RequiresPermissions("sys:category:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<Object> add(@RequestBody SysCategory sysCategory) { public Results<Object> add(@RequestBody SysCategory sysCategory) {
try { try {
sysCategoryService.addSysCategory(sysCategory); sysCategoryService.addSysCategory(sysCategory);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -115,13 +115,13 @@ public class SysCategoryController {
*/ */
@RequiresPermissions("sys:category:edit") @RequiresPermissions("sys:category:edit")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysCategory sysCategory) { public Results<Object> edit(@RequestBody SysCategory sysCategory) {
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId()); SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
if(sysCategoryEntity==null) { if(sysCategoryEntity==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
sysCategoryService.updateSysCategory(sysCategory); sysCategoryService.updateSysCategory(sysCategory);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
@@ -132,17 +132,17 @@ public class SysCategoryController {
*/ */
@RequiresPermissions("sys:category:del") @RequiresPermissions("sys:category:del")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<Object> delete(@RequestBody Map<String, String> map) { public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysCategory sysCategory = sysCategoryService.getById(id); SysCategory sysCategory = sysCategoryService.getById(id);
if(sysCategory==null) { if(sysCategory==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
this.sysCategoryService.deleteSysCategory(id); this.sysCategoryService.deleteSysCategory(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -153,13 +153,13 @@ public class SysCategoryController {
*/ */
@RequiresPermissions("sys:category:del") @RequiresPermissions("sys:category:del")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
this.sysCategoryService.deleteSysCategory(ids); this.sysCategoryService.deleteSysCategory(ids);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -170,12 +170,12 @@ public class SysCategoryController {
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysCategory> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysCategory> queryById(@RequestParam(name="id",required=true) String id) {
SysCategory sysCategory = sysCategoryService.getById(id); SysCategory sysCategory = sysCategoryService.getById(id);
if(sysCategory==null) { if(sysCategory==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
return Result.OK(sysCategory); return Results.OK(sysCategory);
} }
} }
@@ -219,7 +219,7 @@ public class SysCategoryController {
@RequiresPermissions("sys:category:import") @RequiresPermissions("sys:category:import")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -248,10 +248,10 @@ public class SysCategoryController {
} }
sysCategoryService.save(sysCategoryExcel); sysCategoryService.save(sysCategoryExcel);
} }
return Result.OK("文件导入成功！数据行数：" + listSysCategorys.size()); return Results.OK("文件导入成功！数据行数：" + listSysCategorys.size());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件导入失败："+e.getMessage()); return Results.error("文件导入失败："+e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -260,7 +260,7 @@ public class SysCategoryController {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
@@ -270,22 +270,22 @@ public class SysCategoryController {
*/ */
// @RequestMapping(value = "/loadOne", method = RequestMethod.GET) // @RequestMapping(value = "/loadOne", method = RequestMethod.GET)
@GetMapping("/loadOne") @GetMapping("/loadOne")
public Result<SysCategory> loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { public Results<SysCategory> loadOne(@RequestParam(name="field") String field, @RequestParam(name="val") String val) {
try { try {
QueryWrapper<SysCategory> query = new QueryWrapper<>(); QueryWrapper<SysCategory> query = new QueryWrapper<>();
query.eq(field, val); query.eq(field, val);
List<SysCategory> ls = this.sysCategoryService.list(query); List<SysCategory> ls = this.sysCategoryService.list(query);
if(ls==null || ls.isEmpty()) { if(ls==null || ls.isEmpty()) {
return Result.error("查询无果"); return Results.error("查询无果");
}else if(ls.size()>1) { }else if(ls.size()>1) {
return Result.error("查询数据异常,["+field+"]存在多个值:"+val); return Results.error("查询数据异常,["+field+"]存在多个值:"+val);
}else { }else {
return Result.OK(ls.get(0)); return Results.OK(ls.get(0));
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
} }
@@ -293,8 +293,8 @@ public class SysCategoryController {
* 加载节点的子数据 * 加载节点的子数据
*/ */
@GetMapping("/loadTreeChildren") @GetMapping("/loadTreeChildren")
public Result<List<TreeSelectModel>> loadTreeChildren(@RequestParam(name="pid") String pid) { public Results<List<TreeSelectModel>> loadTreeChildren(@RequestParam(name="pid") String pid) {
Result<List<TreeSelectModel>> result = new Result<>(); Results<List<TreeSelectModel>> result = new Results<>();
try { try {
List<TreeSelectModel> ls = this.sysCategoryService.queryListByPid(pid); List<TreeSelectModel> ls = this.sysCategoryService.queryListByPid(pid);
result.setResult(ls); result.setResult(ls);
@@ -312,8 +312,8 @@ public class SysCategoryController {
*/ */
// @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) // @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET)
@GetMapping("/loadTreeRoot") @GetMapping("/loadTreeRoot")
public Result<List<TreeSelectModel>> loadTreeRoot(@RequestParam(name="async") Boolean async,@RequestParam(name="pcode") String pcode) { public Results<List<TreeSelectModel>> loadTreeRoot(@RequestParam(name="async") Boolean async, @RequestParam(name="pcode") String pcode) {
Result<List<TreeSelectModel>> result = new Result<>(); Results<List<TreeSelectModel>> result = new Results<>();
try { try {
List<TreeSelectModel> ls = this.sysCategoryService.queryListByCode(pcode); List<TreeSelectModel> ls = this.sysCategoryService.queryListByCode(pcode);
if(Boolean.FALSE.equals(async)) { if(Boolean.FALSE.equals(async)) {
@@ -347,18 +347,18 @@ public class SysCategoryController {
* @return * @return
*/ */
@GetMapping(value = "/checkCode") @GetMapping(value = "/checkCode")
public Result<T> checkCode(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="code",required = false) String code) { public Results<T> checkCode(@RequestParam(name="pid",required = false) String pid, @RequestParam(name="code",required = false) String code) {
if(oConvertUtils.isEmpty(code)){ if(oConvertUtils.isEmpty(code)){
return Result.error("错误,类型编码为空!"); return Results.error("错误,类型编码为空!");
} }
if(oConvertUtils.isEmpty(pid)){ if(oConvertUtils.isEmpty(pid)){
return Result.OK(); return Results.OK();
} }
SysCategory parent = this.sysCategoryService.getById(pid); SysCategory parent = this.sysCategoryService.getById(pid);
if(code.startsWith(parent.getCode())){ if(code.startsWith(parent.getCode())){
return Result.OK(); return Results.OK();
}else{ }else{
return Result.error("编码不符合规范,须以\""+parent.getCode()+"\"开头!"); return Results.error("编码不符合规范,须以\""+parent.getCode()+"\"开头!");
} }
} }
@@ -373,8 +373,8 @@ public class SysCategoryController {
*/ */
// @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) // @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET)
@GetMapping("/loadTreeData") @GetMapping("/loadTreeData")
public Result<List<TreeSelectModel>> loadDict(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) { public Results<List<TreeSelectModel>> loadDict(@RequestParam(name="pid",required = false) String pid, @RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) {
Result<List<TreeSelectModel>> result = new Result<>(); Results<List<TreeSelectModel>> result = new Results<>();
//pid如果传值了 就忽略pcode的作用 //pid如果传值了 就忽略pcode的作用
if(oConvertUtils.isEmpty(pid)){ if(oConvertUtils.isEmpty(pid)){
if(oConvertUtils.isEmpty(pcode)){ if(oConvertUtils.isEmpty(pcode)){
@@ -413,8 +413,8 @@ public class SysCategoryController {
*/ */
// @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET) // @RequestMapping(value = "/loadDictItem", method = RequestMethod.GET)
@GetMapping("/loadDictItem") @GetMapping("/loadDictItem")
public Result<List<String>> loadDictItem(@RequestParam(name = "ids") String ids, @RequestParam(name = "delNotExist", required = false, defaultValue = "true") boolean delNotExist) { public Results<List<String>> loadDictItem(@RequestParam(name = "ids") String ids, @RequestParam(name = "delNotExist", required = false, defaultValue = "true") boolean delNotExist) {
Result<List<String>> result = new Result<>(); Results<List<String>> result = new Results<>();
// 非空判断 // 非空判断
if (StringUtils.isBlank(ids)) { if (StringUtils.isBlank(ids)) {
result.setSuccess(false); result.setSuccess(false);
@@ -435,8 +435,8 @@ public class SysCategoryController {
*/ */
// @RequestMapping(value = "/loadAllData", method = RequestMethod.GET) // @RequestMapping(value = "/loadAllData", method = RequestMethod.GET)
@GetMapping("/loadAllData") @GetMapping("/loadAllData")
public Result<List<DictModel>> loadAllData(@RequestParam(name="code",required = true) String code) { public Results<List<DictModel>> loadAllData(@RequestParam(name="code",required = true) String code) {
Result<List<DictModel>> result = new Result<>(); Results<List<DictModel>> result = new Results<>();
LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysCategory> query = new LambdaQueryWrapper<>();
if(oConvertUtils.isNotEmpty(code) && !"0".equals(code)){ if(oConvertUtils.isNotEmpty(code) && !"0".equals(code)){
query.likeRight(SysCategory::getCode,code); query.likeRight(SysCategory::getCode,code);
@@ -462,7 +462,7 @@ public class SysCategoryController {
* @return * @return
*/ */
@GetMapping("/getChildListBatch") @GetMapping("/getChildListBatch")
public Result<IPage<SysCategory>> getChildListBatch(@RequestParam("parentIds") String parentIds) { public Results<IPage<SysCategory>> getChildListBatch(@RequestParam("parentIds") String parentIds) {
try { try {
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
List<String> parentIdList = Arrays.asList(parentIds.split(",")); List<String> parentIdList = Arrays.asList(parentIds.split(","));
@@ -470,10 +470,10 @@ public class SysCategoryController {
List<SysCategory> list = sysCategoryService.list(queryWrapper); List<SysCategory> list = sysCategoryService.list(queryWrapper);
IPage<SysCategory> pageList = new Page<>(1, 10, list.size()); IPage<SysCategory> pageList = new Page<>(1, 10, list.size());
pageList.setRecords(list); pageList.setRecords(list);
return Result.OK(pageList); return Results.OK(pageList);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("批量查询子节点失败：" + e.getMessage()); return Results.error("批量查询子节点失败：" + e.getMessage());
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java
+20 -20
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -53,7 +53,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-分页列表查询") @AutoLog(value = "编码校验规则-分页列表查询")
@ApiOperation(value = "编码校验规则-分页列表查询", notes = "编码校验规则-分页列表查询") @ApiOperation(value = "编码校验规则-分页列表查询", notes = "编码校验规则-分页列表查询")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysCheckRule>> queryPageList( public Results<IPage<SysCheckRule>> queryPageList(
SysCheckRule sysCheckRule, SysCheckRule sysCheckRule,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -62,7 +62,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
QueryWrapper<SysCheckRule> queryWrapper = QueryGenerator.initQueryWrapper(sysCheckRule, request.getParameterMap()); QueryWrapper<SysCheckRule> queryWrapper = QueryGenerator.initQueryWrapper(sysCheckRule, request.getParameterMap());
Page<SysCheckRule> page = new Page<>(pageNo, pageSize); Page<SysCheckRule> page = new Page<>(pageNo, pageSize);
IPage<SysCheckRule> pageList = sysCheckRuleService.page(page, queryWrapper); IPage<SysCheckRule> pageList = sysCheckRuleService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
@@ -75,19 +75,19 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-通过Code校验传入的值") @AutoLog(value = "编码校验规则-通过Code校验传入的值")
@ApiOperation(value = "编码校验规则-通过Code校验传入的值", notes = "编码校验规则-通过Code校验传入的值") @ApiOperation(value = "编码校验规则-通过Code校验传入的值", notes = "编码校验规则-通过Code校验传入的值")
@GetMapping(value = "/checkByCode") @GetMapping(value = "/checkByCode")
public Result<Object> checkByCode( public Results<Object> checkByCode(
@RequestParam(name = "ruleCode") String ruleCode, @RequestParam(name = "ruleCode") String ruleCode,
@RequestParam(name = "value") String value @RequestParam(name = "value") String value
) throws UnsupportedEncodingException { ) throws UnsupportedEncodingException {
SysCheckRule sysCheckRule = sysCheckRuleService.getByCode(ruleCode); SysCheckRule sysCheckRule = sysCheckRuleService.getByCode(ruleCode);
if (sysCheckRule == null) { if (sysCheckRule == null) {
return Result.error("该编码不存在"); return Results.error("该编码不存在");
} }
JSONObject errorResult = sysCheckRuleService.checkValue(sysCheckRule, URLDecoder.decode(value, "UTF-8")); JSONObject errorResult = sysCheckRuleService.checkValue(sysCheckRule, URLDecoder.decode(value, "UTF-8"));
if (errorResult == null) { if (errorResult == null) {
return Result.OK(); return Results.OK();
} else { } else {
Result<Object> r = Result.error(errorResult.getString("message")); Results<Object> r = Results.error(errorResult.getString("message"));
r.setResult(errorResult); r.setResult(errorResult);
return r; return r;
} }
@@ -102,9 +102,9 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-添加") @AutoLog(value = "编码校验规则-添加")
@ApiOperation(value = "编码校验规则-添加", notes = "编码校验规则-添加") @ApiOperation(value = "编码校验规则-添加", notes = "编码校验规则-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysCheckRule sysCheckRule) { public Results<T> add(@RequestBody SysCheckRule sysCheckRule) {
sysCheckRuleService.save(sysCheckRule); sysCheckRuleService.save(sysCheckRule);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -116,9 +116,9 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-编辑") @AutoLog(value = "编码校验规则-编辑")
@ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑") @ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysCheckRule sysCheckRule) { public Results<T> edit(@RequestBody SysCheckRule sysCheckRule) {
sysCheckRuleService.updateById(sysCheckRule); sysCheckRuleService.updateById(sysCheckRule);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -130,13 +130,13 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-通过id删除") @AutoLog(value = "编码校验规则-通过id删除")
@ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除") @ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysCheckRuleService.removeById(id); sysCheckRuleService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -148,13 +148,13 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-批量删除") @AutoLog(value = "编码校验规则-批量删除")
@ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除") @ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(","))); this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -166,9 +166,9 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
@AutoLog(value = "编码校验规则-通过id查询") @AutoLog(value = "编码校验规则-通过id查询")
@ApiOperation(value = "编码校验规则-通过id查询", notes = "编码校验规则-通过id查询") @ApiOperation(value = "编码校验规则-通过id查询", notes = "编码校验规则-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysCheckRule> queryById(@RequestParam(name = "id", required = true) String id) { public Results<SysCheckRule> queryById(@RequestParam(name = "id", required = true) String id) {
SysCheckRule sysCheckRule = sysCheckRuleService.getById(id); SysCheckRule sysCheckRule = sysCheckRuleService.getById(id);
return Result.OK(sysCheckRule); return Results.OK(sysCheckRule);
} }
/** /**
@@ -191,7 +191,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<SysCheckRule> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysCheckRule> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysCheckRule.class); return super.importExcel(request, response, SysCheckRule.class);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java
+9 -10
View File
@@ -5,9 +5,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDataLog; import com.jero.modules.system.entity.SysDataLog;
import com.jero.modules.system.service.ISysDataLogService; import com.jero.modules.system.service.ISysDataLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +27,9 @@ public class SysDataLogController {
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysDataLog>> queryPageList(SysDataLog dataLog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysDataLog>> queryPageList(SysDataLog dataLog, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysDataLog>> result = new Result<>(); Results<IPage<SysDataLog>> result = new Results<>();
QueryWrapper<SysDataLog> queryWrapper = QueryGenerator.initQueryWrapper(dataLog, req.getParameterMap()); QueryWrapper<SysDataLog> queryWrapper = QueryGenerator.initQueryWrapper(dataLog, req.getParameterMap());
Page<SysDataLog> page = new Page<>(pageNo, pageSize); Page<SysDataLog> page = new Page<>(pageNo, pageSize);
IPage<SysDataLog> pageList = service.page(page, queryWrapper); IPage<SysDataLog> pageList = service.page(page, queryWrapper);
@@ -50,8 +49,8 @@ public class SysDataLogController {
*/ */
// @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET) // @RequestMapping(value = "/queryCompareList", method = RequestMethod.GET)
@GetMapping("/queryCompareList") @GetMapping("/queryCompareList")
public Result<List<SysDataLog>> queryCompareList(HttpServletRequest req) { public Results<List<SysDataLog>> queryCompareList(HttpServletRequest req) {
Result<List<SysDataLog>> result = new Result<>(); Results<List<SysDataLog>> result = new Results<>();
String dataId1 = req.getParameter("dataId1"); String dataId1 = req.getParameter("dataId1");
String dataId2 = req.getParameter("dataId2"); String dataId2 = req.getParameter("dataId2");
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
@@ -74,8 +73,8 @@ public class SysDataLogController {
*/ */
// @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET) // @RequestMapping(value = "/queryDataVerList", method = RequestMethod.GET)
@GetMapping("/queryDataVerList") @GetMapping("/queryDataVerList")
public Result<List<SysDataLog>> queryDataVerList(HttpServletRequest req) { public Results<List<SysDataLog>> queryDataVerList(HttpServletRequest req) {
Result<List<SysDataLog>> result = new Result<>(); Results<List<SysDataLog>> result = new Results<>();
String dataTable = req.getParameter("dataTable"); String dataTable = req.getParameter("dataTable");
String dataId = req.getParameter("dataId"); String dataId = req.getParameter("dataId");
QueryWrapper<SysDataLog> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysDataLog> queryWrapper = new QueryWrapper<>();
@@ -83,7 +82,7 @@ public class SysDataLogController {
queryWrapper.eq("data_id", dataId); queryWrapper.eq("data_id", dataId);
List<SysDataLog> list = service.list(queryWrapper); List<SysDataLog> list = service.list(queryWrapper);
if(list==null||list.isEmpty()) { if(list==null||list.isEmpty()) {
return Result.error("未找到版本信息"); return Results.error("未找到版本信息");
}else { }else {
result.setResult(list); result.setResult(list);
result.setSuccess(true); result.setSuccess(true);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java
+19 -19
View File
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -55,7 +55,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-分页列表查询") @AutoLog(value = "多数据源管理-分页列表查询")
@ApiOperation(value = "多数据源管理-分页列表查询", notes = "多数据源管理-分页列表查询") @ApiOperation(value = "多数据源管理-分页列表查询", notes = "多数据源管理-分页列表查询")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysDataSource>> queryPageList( public Results<IPage<SysDataSource>> queryPageList(
SysDataSource sysDataSource, SysDataSource sysDataSource,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -75,13 +75,13 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
}); });
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
return Result.OK(pageList); return Results.OK(pageList);
} }
@GetMapping(value = "/options") @GetMapping(value = "/options")
public Result<JSONArray> queryOptions(SysDataSource sysDataSource, HttpServletRequest req) { public Results<JSONArray> queryOptions(SysDataSource sysDataSource, HttpServletRequest req) {
QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap()); QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap());
List<SysDataSource> pageList = sysDataSourceService.list(queryWrapper); List<SysDataSource> pageList = sysDataSourceService.list(queryWrapper);
JSONArray array = new JSONArray(pageList.size()); JSONArray array = new JSONArray(pageList.size());
@@ -92,7 +92,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
option.put("text", item.getName()); option.put("text", item.getName());
array.add(option); array.add(option);
} }
return Result.OK(array); return Results.OK(array);
} }
/** /**
@@ -104,7 +104,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-添加") @AutoLog(value = "多数据源管理-添加")
@ApiOperation(value = "多数据源管理-添加", notes = "多数据源管理-添加") @ApiOperation(value = "多数据源管理-添加", notes = "多数据源管理-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysDataSource sysDataSource) { public Results<T> add(@RequestBody SysDataSource sysDataSource) {
try { try {
String dbPassword = sysDataSource.getDbPassword(); String dbPassword = sysDataSource.getDbPassword();
if(StringUtils.isNotBlank(dbPassword)){ if(StringUtils.isNotBlank(dbPassword)){
@@ -115,7 +115,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -127,7 +127,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-编辑") @AutoLog(value = "多数据源管理-编辑")
@ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑") @ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysDataSource sysDataSource) { public Results<T> edit(@RequestBody SysDataSource sysDataSource) {
try { try {
SysDataSource d = sysDataSourceService.getById(sysDataSource.getId()); SysDataSource d = sysDataSourceService.getById(sysDataSource.getId());
DataSourceCachePool.removeCache(d.getCode()); DataSourceCachePool.removeCache(d.getCode());
@@ -140,7 +140,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -152,15 +152,15 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-通过id删除") @AutoLog(value = "多数据源管理-通过id删除")
@ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除") @ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysDataSource sysDataSource = sysDataSourceService.getById(id); SysDataSource sysDataSource = sysDataSourceService.getById(id);
DataSourceCachePool.removeCache(sysDataSource.getCode()); DataSourceCachePool.removeCache(sysDataSource.getCode());
sysDataSourceService.removeById(id); sysDataSourceService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -172,10 +172,10 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-批量删除") @AutoLog(value = "多数据源管理-批量删除")
@ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除") @ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
idList.forEach(item->{ idList.forEach(item->{
@@ -183,7 +183,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
DataSourceCachePool.removeCache(sysDataSource.getCode()); DataSourceCachePool.removeCache(sysDataSource.getCode());
}); });
this.sysDataSourceService.removeByIds(idList); this.sysDataSourceService.removeByIds(idList);
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -195,9 +195,9 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
@AutoLog(value = "多数据源管理-通过id查询") @AutoLog(value = "多数据源管理-通过id查询")
@ApiOperation(value = "多数据源管理-通过id查询", notes = "多数据源管理-通过id查询") @ApiOperation(value = "多数据源管理-通过id查询", notes = "多数据源管理-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysDataSource> queryById(@RequestParam(name = "id") String id) { public Results<SysDataSource> queryById(@RequestParam(name = "id") String id) {
SysDataSource sysDataSource = sysDataSourceService.getById(id); SysDataSource sysDataSource = sysDataSourceService.getById(id);
return Result.OK(sysDataSource); return Results.OK(sysDataSource);
} }
/** /**
@@ -220,7 +220,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<SysDataSource> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysDataSource> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysDataSource.class); return super.importExcel(request, response, SysDataSource.class);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+43 -43
View File
@@ -3,7 +3,7 @@ package com.jero.modules.system.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
@@ -69,8 +69,8 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/queryMyDeptTreeList", method = RequestMethod.GET) // @RequestMapping(value = "/queryMyDeptTreeList", method = RequestMethod.GET)
@GetMapping("/queryMyDeptTreeList") @GetMapping("/queryMyDeptTreeList")
public Result<List<SysDepartTreeModel>> queryMyDeptTreeList() { public Results<List<SysDepartTreeModel>> queryMyDeptTreeList() {
Result<List<SysDepartTreeModel>> result = new Result<>(); Results<List<SysDepartTreeModel>> result = new Results<>();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
try { try {
if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
@@ -100,8 +100,8 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList") @GetMapping("/queryTreeList")
public Result<List<SysDepartTreeModel>> queryTreeList() { public Results<List<SysDepartTreeModel>> queryTreeList() {
Result<List<SysDepartTreeModel>> result = new Result<>(); Results<List<SysDepartTreeModel>> result = new Results<>();
try { try {
// 从内存中读取 // 从内存中读取
// List<SysDepartTreeModel> list =FindsDepartsChildrenUtil.getSysDepartTreeList(); // List<SysDepartTreeModel> list =FindsDepartsChildrenUtil.getSysDepartTreeList();
@@ -124,8 +124,8 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/queryDepartTreeSync", method = RequestMethod.GET) // @RequestMapping(value = "/queryDepartTreeSync", method = RequestMethod.GET)
@GetMapping("/queryDepartTreeSync") @GetMapping("/queryDepartTreeSync")
public Result<List<SysDepartTreeModel>> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId) { public Results<List<SysDepartTreeModel>> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId) {
Result<List<SysDepartTreeModel>> result = new Result<>(); Results<List<SysDepartTreeModel>> result = new Results<>();
try { try {
List<SysDepartTreeModel> list = sysDepartService.queryTreeListByPid(parentId); List<SysDepartTreeModel> list = sysDepartService.queryTreeListByPid(parentId);
result.setResult(list); result.setResult(list);
@@ -143,7 +143,7 @@ public class SysDepartController {
* @param orgCode 根据orgCode查，departId和orgCode必须有一个不为空 * @param orgCode 根据orgCode查，departId和orgCode必须有一个不为空
*/ */
@GetMapping("/queryAllParentId") @GetMapping("/queryAllParentId")
public Result<JSONObject> queryParentIds( public Results<JSONObject> queryParentIds(
@RequestParam(name = "departId", required = false) String departId, @RequestParam(name = "departId", required = false) String departId,
@RequestParam(name = "orgCode", required = false) String orgCode @RequestParam(name = "orgCode", required = false) String orgCode
) { ) {
@@ -154,12 +154,12 @@ public class SysDepartController {
} else if (oConvertUtils.isNotEmpty(orgCode)) { } else if (oConvertUtils.isNotEmpty(orgCode)) {
data = sysDepartService.queryAllParentIdByOrgCode(orgCode); data = sysDepartService.queryAllParentIdByOrgCode(orgCode);
} else { } else {
return Result.error("departId 和 orgCode 不能都为空！"); return Results.error("departId 和 orgCode 不能都为空！");
} }
return Result.OK(data); return Results.OK(data);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
} }
@@ -174,15 +174,15 @@ public class SysDepartController {
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { public Results<Object> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
try { try {
sysDepart.setCreateBy(username); sysDepart.setCreateBy(username);
sysDepartService.saveDepartData(sysDepart, username); sysDepartService.saveDepartData(sysDepart, username);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -197,19 +197,19 @@ public class SysDepartController {
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { public Results<Object> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
sysDepart.setUpdateBy(username); sysDepart.setUpdateBy(username);
SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId()); SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId());
if (sysDepartEntity == null) { if (sysDepartEntity == null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
} else { } else {
boolean ok = sysDepartService.updateDepartDataById(sysDepart, username); boolean ok = sysDepartService.updateDepartDataById(sysDepart, username);
if (ok) { if (ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -222,21 +222,21 @@ public class SysDepartController {
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> delete(@RequestBody Map<String,String> map) { public Results<Object> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(org.apache.commons.lang.StringUtils.isBlank(id)){ if(org.apache.commons.lang.StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysDepart sysDepart = sysDepartService.getById(id); SysDepart sysDepart = sysDepartService.getById(id);
if(sysDepart==null) { if(sysDepart==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
boolean ok = sysDepartService.delete(id); boolean ok = sysDepartService.delete(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
@@ -250,13 +250,13 @@ public class SysDepartController {
@RequiresPermissions("sys:depart:del") @RequiresPermissions("sys:depart:del")
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestBody Map<String,String> map) { public Results<Object> deleteBatch(@RequestBody Map<String,String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if (ids == null || "".equals(ids.trim())) { if (ids == null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} else { } else {
this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(","))); this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -267,13 +267,13 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET) // @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
@GetMapping("/queryIdTree") @GetMapping("/queryIdTree")
public Result<List<DepartIdModel>> queryIdTree() { public Results<List<DepartIdModel>> queryIdTree() {
try { try {
List<DepartIdModel> list = sysDepartService.queryDepartIdTreeList(); List<DepartIdModel> list = sysDepartService.queryDepartIdTreeList();
return Result.OK(list); return Results.OK(list);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("查询失败"); return Results.error("查询失败");
} }
} }
@@ -287,7 +287,7 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/searchBy", method = RequestMethod.GET) // @RequestMapping(value = "/searchBy", method = RequestMethod.GET)
@GetMapping("/searchBy") @GetMapping("/searchBy")
public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { public Results<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
//部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String departIds = null; String departIds = null;
@@ -296,9 +296,9 @@ public class SysDepartController {
} }
List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds);
if (treeList == null || treeList.isEmpty()) { if (treeList == null || treeList.isEmpty()) {
return Result.error("未查询匹配数据！"); return Results.error("未查询匹配数据！");
} }
return Result.OK(treeList); return Results.OK(treeList);
} }
@@ -338,7 +338,7 @@ public class SysDepartController {
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
List<String> errorMessageList = new ArrayList<>(); List<String> errorMessageList = new ArrayList<>();
List<SysDepart> listSysDeparts = null; List<SysDepart> listSysDeparts = null;
@@ -392,7 +392,7 @@ public class SysDepartController {
return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList); return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage()); return Results.error("文件导入失败:"+e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -401,7 +401,7 @@ public class SysDepartController {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
private void setParentId(SysDepart sysDepart, QueryWrapper<SysDepart> queryWrapper) { private void setParentId(SysDepart sysDepart, QueryWrapper<SysDepart> queryWrapper) {
@@ -423,7 +423,7 @@ public class SysDepartController {
* @return * @return
*/ */
@GetMapping("listAll") @GetMapping("listAll")
public Result<List<SysDepart>> listAll(@RequestParam(name = "id", required = false) String id) { public Results<List<SysDepart>> listAll(@RequestParam(name = "id", required = false) String id) {
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<>();
query.orderByAsc(SysDepart::getOrgCode); query.orderByAsc(SysDepart::getOrgCode);
if(oConvertUtils.isNotEmpty(id)){ if(oConvertUtils.isNotEmpty(id)){
@@ -431,7 +431,7 @@ public class SysDepartController {
query.in(SysDepart::getId,Arrays.asList(arr)); query.in(SysDepart::getId,Arrays.asList(arr));
} }
List<SysDepart> ls = this.sysDepartService.list(query); List<SysDepart> ls = this.sysDepartService.list(query);
return Result.OK(ls); return Results.OK(ls);
} }
/** /**
* 查询数据 查出所有部门,并以树结构数据格式响应给前端 * 查询数据 查出所有部门,并以树结构数据格式响应给前端
@@ -440,8 +440,8 @@ public class SysDepartController {
*/ */
// @RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeByKeyWord", method = RequestMethod.GET)
@GetMapping("/queryTreeByKeyWord") @GetMapping("/queryTreeByKeyWord")
public Result<Map<String,Object>> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord) { public Results<Map<String,Object>> queryTreeByKeyWord(@RequestParam(name = "keyWord", required = false) String keyWord) {
Result<Map<String,Object>> result = new Result<>(); Results<Map<String,Object>> result = new Results<>();
try { try {
Map<String,Object> map=new HashMap<>(); Map<String,Object> map=new HashMap<>();
List<SysDepartTreeModel> list = sysDepartService.queryTreeByKeyWord(keyWord); List<SysDepartTreeModel> list = sysDepartService.queryTreeByKeyWord(keyWord);
@@ -467,8 +467,8 @@ public class SysDepartController {
* @return * @return
*/ */
@GetMapping("/getDepartName") @GetMapping("/getDepartName")
public Result<SysDepart> getDepartName(@RequestParam(name = "orgCode") String orgCode) { public Results<SysDepart> getDepartName(@RequestParam(name = "orgCode") String orgCode) {
Result<SysDepart> result = new Result<>(); Results<SysDepart> result = new Results<>();
LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<>();
query.eq(SysDepart::getOrgCode, orgCode); query.eq(SysDepart::getOrgCode, orgCode);
SysDepart sysDepart = sysDepartService.getOne(query); SysDepart sysDepart = sysDepartService.getOne(query);
@@ -484,8 +484,8 @@ public class SysDepartController {
* @return * @return
*/ */
@GetMapping("/getUsersByDepartId") @GetMapping("/getUsersByDepartId")
public Result<List<SysUser>> getUsersByDepartId(@RequestParam(name = "id") String id) { public Results<List<SysUser>> getUsersByDepartId(@RequestParam(name = "id") String id) {
Result<List<SysUser>> result = new Result<>(); Results<List<SysUser>> result = new Results<>();
List<SysUser> sysUsers = sysUserDepartService.queryUserByDepId(id); List<SysUser> sysUsers = sysUserDepartService.queryUserByDepId(id);
result.setSuccess(true); result.setSuccess(true);
result.setResult(sysUsers); result.setResult(sysUsers);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
+24 -26
View File
@@ -1,13 +1,11 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -63,14 +61,14 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-分页列表查询", notes="部门权限表-分页列表查询") @ApiOperation(value="部门权限表-分页列表查询", notes="部门权限表-分页列表查询")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysDepartPermission>> queryPageList(SysDepartPermission sysDepartPermission, public Results<IPage<SysDepartPermission>> queryPageList(SysDepartPermission sysDepartPermission,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<SysDepartPermission> queryWrapper = QueryGenerator.initQueryWrapper(sysDepartPermission, req.getParameterMap()); QueryWrapper<SysDepartPermission> queryWrapper = QueryGenerator.initQueryWrapper(sysDepartPermission, req.getParameterMap());
Page<SysDepartPermission> page = new Page<>(pageNo, pageSize); Page<SysDepartPermission> page = new Page<>(pageNo, pageSize);
IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper); IPage<SysDepartPermission> pageList = sysDepartPermissionService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -81,9 +79,9 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-添加", notes="部门权限表-添加") @ApiOperation(value="部门权限表-添加", notes="部门权限表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysDepartPermission sysDepartPermission) { public Results<T> add(@RequestBody SysDepartPermission sysDepartPermission) {
sysDepartPermissionService.save(sysDepartPermission); sysDepartPermissionService.save(sysDepartPermission);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -94,9 +92,9 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑") @ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysDepartPermission sysDepartPermission) { public Results<T> edit(@RequestBody SysDepartPermission sysDepartPermission) {
sysDepartPermissionService.updateById(sysDepartPermission); sysDepartPermissionService.updateById(sysDepartPermission);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -107,13 +105,13 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除") @ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysDepartPermissionService.removeById(id); sysDepartPermissionService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -124,13 +122,13 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除") @ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -141,9 +139,9 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
@ApiOperation(value="部门权限表-通过id查询", notes="部门权限表-通过id查询") @ApiOperation(value="部门权限表-通过id查询", notes="部门权限表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysDepartPermission> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysDepartPermission> queryById(@RequestParam(name="id",required=true) String id) {
SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id); SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id);
return Result.OK(sysDepartPermission); return Results.OK(sysDepartPermission);
} }
/** /**
@@ -166,7 +164,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<SysDepartPermission> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysDepartPermission> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysDepartPermission.class); return super.importExcel(request, response, SysDepartPermission.class);
} }
@@ -174,10 +172,10 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
* 部门管理授权查询数据规则数据 * 部门管理授权查询数据规则数据
*/ */
@GetMapping(value = "/datarule/{permissionId}/{departId}") @GetMapping(value = "/datarule/{permissionId}/{departId}")
public Result<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("departId") String departId) { public Results<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId, @PathVariable("departId") String departId) {
List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId);
if(list==null || list.isEmpty()) { if(list==null || list.isEmpty()) {
return Result.error("未找到权限配置信息"); return Results.error("未找到权限配置信息");
}else { }else {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("datarule", list); map.put("datarule", list);
@@ -191,7 +189,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked);
} }
} }
return Result.OK(map); return Results.OK(map);
// TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key // TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
} }
} }
@@ -203,8 +201,8 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
*/ */
// @RequestMapping(value = "/queryTreeListForDeptRole", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeListForDeptRole", method = RequestMethod.GET)
@GetMapping("/queryTreeListForDeptRole") @GetMapping("/queryTreeListForDeptRole")
public Result<Map<String,Object>> queryTreeListForDeptRole(@RequestParam(name="departId",required=true) String departId,HttpServletRequest request) { public Results<Map<String,Object>> queryTreeListForDeptRole(@RequestParam(name="departId",required=true) String departId, HttpServletRequest request) {
Result<Map<String,Object>> result = new Result<>(); Results<Map<String,Object>> result = new Results<>();
//全部权限ids //全部权限ids
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
try { try {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+71 -71
View File
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
@@ -77,9 +77,9 @@ public class SysDictController {
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
@ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询") @ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询")
public Result<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysDict>> result = new Result<>(); Results<IPage<SysDict>> result = new Results<>();
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
Page<SysDict> page = new Page<>(pageNo, pageSize); Page<SysDict> page = new Page<>(pageNo, pageSize);
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper); IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
@@ -103,9 +103,9 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据") @ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据")
// @RequestMapping(value = "/treeList", method = RequestMethod.GET) // @RequestMapping(value = "/treeList", method = RequestMethod.GET)
@GetMapping("/treeList") @GetMapping("/treeList")
public Result<List<SysDictTree>> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<List<SysDictTree>> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<List<SysDictTree>> result = new Result<>(); Results<List<SysDictTree>> result = new Results<>();
LambdaQueryWrapper<SysDict> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDict> query = new LambdaQueryWrapper<>();
// 构造查询条件 // 构造查询条件
String dictName = sysDict.getDictName(); String dictName = sysDict.getDictName();
@@ -131,10 +131,10 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据") @ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据")
// @RequestMapping(value = "/queryAllDictItems", method = RequestMethod.GET) // @RequestMapping(value = "/queryAllDictItems", method = RequestMethod.GET)
@GetMapping("/queryAllDictItems") @GetMapping("/queryAllDictItems")
public Result<Map<String, List<DictModel>>> queryAllDictItems(HttpServletRequest request) { public Results<Map<String, List<DictModel>>> queryAllDictItems(HttpServletRequest request) {
Map<String, List<DictModel>> res ; Map<String, List<DictModel>> res ;
res = sysDictService.queryAllDictItems(); res = sysDictService.queryAllDictItems();
return Result.OK(res); return Results.OK(res);
} }
/** /**
@@ -145,9 +145,9 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据") @ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据")
// @RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET) // @RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET)
@GetMapping("/getDictText/{dictCode}/{key}") @GetMapping("/getDictText/{dictCode}/{key}")
public Result<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) { public Results<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) {
log.info(" dictCode : "+ dictCode); log.info(" dictCode : "+ dictCode);
Result<String> result = new Result<>(); Results<String> result = new Results<>();
String text = null; String text = null;
try { try {
text = sysDictService.queryDictTextByKey(dictCode, key); text = sysDictService.queryDictTextByKey(dictCode, key);
@@ -155,7 +155,7 @@ public class SysDictController {
result.setResult(text); result.setResult(text);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
return result; return result;
} }
@@ -168,20 +168,20 @@ public class SysDictController {
*/ */
// @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET) // @RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
@GetMapping("/getDictItems/{dictCode}") @GetMapping("/getDictItems/{dictCode}")
public Result<List<DictModel>> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) { public Results<List<DictModel>> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
log.info(" dictCode : "+ dictCode); log.info(" dictCode : "+ dictCode);
Result<List<DictModel>> result = new Result<>(); Results<List<DictModel>> result = new Results<>();
try { try {
List<DictModel> ls = sysDictService.getDictItems(dictCode); List<DictModel> ls = sysDictService.getDictItems(dictCode);
if (ls == null) { if (ls == null) {
return Result.error(DICT_CODE_ERROE); return Results.error(DICT_CODE_ERROE);
} }
result.setSuccess(true); result.setSuccess(true);
result.setResult(ls); result.setResult(ls);
log.debug(result.toString()); log.debug(result.toString());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
return result; return result;
} }
@@ -195,16 +195,16 @@ public class SysDictController {
*/ */
// @RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET) // @RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDict/{dictCode}") @GetMapping("/loadDict/{dictCode}")
public Result<List<DictModel>> loadDict(@PathVariable String dictCode, public Results<List<DictModel>> loadDict(@PathVariable String dictCode,
@RequestParam(name="keyword") String keyword, @RequestParam(name="keyword") String keyword,
@RequestParam(value = "sign",required = false) String sign, @RequestParam(value = "sign",required = false) String sign,
@RequestParam(value = "pageSize", required = false) Integer pageSize) { @RequestParam(value = "pageSize", required = false) Integer pageSize) {
log.info(" 加载字典表数据,加载关键字: "+ keyword); log.info(" 加载字典表数据,加载关键字: "+ keyword);
Result<List<DictModel>> result = new Result<>(); Results<List<DictModel>> result = new Results<>();
try { try {
List<DictModel> ls = sysDictService.loadDict(dictCode, keyword, pageSize); List<DictModel> ls = sysDictService.loadDict(dictCode, keyword, pageSize);
if (ls == null) { if (ls == null) {
return Result.error(DICT_CODE_ERROE); return Results.error(DICT_CODE_ERROE);
} }
result.setSuccess(true); result.setSuccess(true);
result.setResult(ls); result.setResult(ls);
@@ -212,7 +212,7 @@ public class SysDictController {
return result; return result;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -226,18 +226,18 @@ public class SysDictController {
*/ */
// @RequestMapping(value = "/loadDictOrderByValue/{dictCode}", method = RequestMethod.GET) // @RequestMapping(value = "/loadDictOrderByValue/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDictOrderByValue/{dictCode}") @GetMapping("/loadDictOrderByValue/{dictCode}")
public Result<List<DictModel>> loadDictOrderByValue( public Results<List<DictModel>> loadDictOrderByValue(
@PathVariable String dictCode, @PathVariable String dictCode,
@RequestParam(name = "keyword") String keyword, @RequestParam(name = "keyword") String keyword,
@RequestParam(value = "sign", required = false) String sign, @RequestParam(value = "sign", required = false) String sign,
@RequestParam(value = "pageSize", required = false) Integer pageSize) { @RequestParam(value = "pageSize", required = false) Integer pageSize) {
// 首次查询查出来用户选中的值，并且不分页 // 首次查询查出来用户选中的值，并且不分页
Result<List<DictModel>> firstRes = this.loadDict(dictCode, keyword, sign, null); Results<List<DictModel>> firstRes = this.loadDict(dictCode, keyword, sign, null);
if (!firstRes.isSuccess()) { if (!firstRes.isSuccess()) {
return firstRes; return firstRes;
} }
// 然后再查询出第一页的数据 // 然后再查询出第一页的数据
Result<List<DictModel>> result = this.loadDict(dictCode, "", sign, pageSize); Results<List<DictModel>> result = this.loadDict(dictCode, "", sign, pageSize);
if (!result.isSuccess()) { if (!result.isSuccess()) {
return result; return result;
} }
@@ -269,13 +269,13 @@ public class SysDictController {
*/ */
// @RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET) // @RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET)
@GetMapping("/loadDictItem/{dictCode}") @GetMapping("/loadDictItem/{dictCode}")
public Result<List<String>> loadDictItem(@PathVariable String dictCode,@RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign,@RequestParam(value = "delNotExist",required = false,defaultValue = "true") boolean delNotExist,HttpServletRequest request) { public Results<List<String>> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, @RequestParam(value = "delNotExist",required = false,defaultValue = "true") boolean delNotExist, HttpServletRequest request) {
Result<List<String>> result = new Result<>(); Results<List<String>> result = new Results<>();
try { try {
if(dictCode.indexOf(",")!=-1) { if(dictCode.indexOf(",")!=-1) {
String[] params = dictCode.split(","); String[] params = dictCode.split(",");
if(params.length!=3) { if(params.length!=3) {
return Result.error(DICT_CODE_ERROE); return Results.error(DICT_CODE_ERROE);
} }
List<String> texts = sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, delNotExist); List<String> texts = sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, delNotExist);
@@ -283,11 +283,11 @@ public class SysDictController {
result.setResult(texts); result.setResult(texts);
log.info(result.toString()); log.info(result.toString());
}else { }else {
return Result.error(DICT_CODE_ERROE); return Results.error(DICT_CODE_ERROE);
} }
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
return result; return result;
@@ -300,13 +300,13 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据") @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据")
// @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) // @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET)
@GetMapping("/loadTreeData") @GetMapping("/loadTreeData")
public Result<List<TreeSelectModel>> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField, public Results<List<TreeSelectModel>> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField,
@RequestParam(name="tableName") String tbname, @RequestParam(name="tableName") String tbname,
@RequestParam(name="text") String text, @RequestParam(name="text") String text,
@RequestParam(name="code") String code, @RequestParam(name="code") String code,
@RequestParam(name="hasChildField", required = false) String hasChildField, @RequestParam(name="hasChildField", required = false) String hasChildField,
@RequestParam(value = "sign", required = false) String sign, HttpServletRequest request) { @RequestParam(value = "sign", required = false) String sign, HttpServletRequest request) {
Result<List<TreeSelectModel>> result = new Result<>(); Results<List<TreeSelectModel>> result = new Results<>();
// SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件) // SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件)
String dictCode = tbname +","+ text +","+ code; String dictCode = tbname +","+ text +","+ code;
@@ -323,12 +323,12 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据") @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据")
// @RequestMapping(value = "/queryAllTreeData", method = RequestMethod.GET) // @RequestMapping(value = "/queryAllTreeData", method = RequestMethod.GET)
@GetMapping("/queryAllTreeData") @GetMapping("/queryAllTreeData")
public Result<List<TreeSelectModel>> queryAllTreeData(@RequestParam(name="pidField") String pidField, public Results<List<TreeSelectModel>> queryAllTreeData(@RequestParam(name="pidField") String pidField,
@RequestParam(name="tableName") String tbname, @RequestParam(name="tableName") String tbname,
@RequestParam(name="text") String text, @RequestParam(name="text") String text,
@RequestParam(name="code") String code, @RequestParam(name="code") String code,
HttpServletRequest request) { HttpServletRequest request) {
Result<List<TreeSelectModel>> result = new Result<>(); Results<List<TreeSelectModel>> result = new Results<>();
// SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件) // SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件)
String dictCode = tbname +","+ text +","+ code; String dictCode = tbname +","+ text +","+ code;
@@ -347,17 +347,17 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<Object> add(@RequestBody SysDict sysDict) { public Results<Object> add(@RequestBody SysDict sysDict) {
try { try {
sysDict.setCreateTime(new Date()); sysDict.setCreateTime(new Date());
sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); sysDict.setDelFlag(CommonConstant.DEL_FLAG_0);
sysDictService.save(sysDict); sysDictService.save(sysDict);
//添加成功后需要刷新缓存 //添加成功后需要刷新缓存
sysDictService.refreshCache(); sysDictService.refreshCache();
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -369,20 +369,20 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<Object> edit(@RequestBody SysDict sysDict) { public Results<Object> edit(@RequestBody SysDict sysDict) {
SysDict sysdict = sysDictService.getById(sysDict.getId()); SysDict sysdict = sysDictService.getById(sysDict.getId());
if(sysdict==null) { if(sysdict==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
sysDict.setUpdateTime(new Date()); sysDict.setUpdateTime(new Date());
boolean ok = sysDictService.updateById(sysDict); boolean ok = sysDictService.updateById(sysDict);
if(ok) { if(ok) {
//编辑成功后需要刷新缓存 //编辑成功后需要刷新缓存
sysDictService.refreshCache(); sysDictService.refreshCache();
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -393,16 +393,16 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> delete(@RequestBody Map<String,String> map) { public Results<Object> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
boolean ok = sysDictService.removeById(id); boolean ok = sysDictService.removeById(id);
if(ok) { if(ok) {
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
}else{ }else{
return Result.error("删除失败!"); return Results.error("删除失败!");
} }
} }
@@ -414,12 +414,12 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典") @ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Results<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(oConvertUtils.isEmpty(ids)) { if(oConvertUtils.isEmpty(ids)) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
sysDictService.removeByIds(Arrays.asList(ids.split(","))); sysDictService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
} }
} }
@@ -429,8 +429,8 @@ public class SysDictController {
* @return * @return
*/ */
@RequestMapping(value = "/refleshCache") @RequestMapping(value = "/refleshCache")
public Result<SysDict> refleshCache() { public Results<SysDict> refleshCache() {
Result<SysDict> result = new Result<>(); Results<SysDict> result = new Results<>();
sysDictService.refreshCache(); sysDictService.refreshCache();
return result; return result;
} }
@@ -472,7 +472,7 @@ public class SysDictController {
@PostMapping(value = "/importExcel") @PostMapping(value = "/importExcel")
public Result<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -514,12 +514,12 @@ public class SysDictController {
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage()); return Results.error("文件导入失败:"+e.getMessage());
} finally { } finally {
fileClose(file); fileClose(file);
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
private void fileClose(MultipartFile file) { private void fileClose(MultipartFile file) {
@@ -536,9 +536,9 @@ public class SysDictController {
* @return * @return
*/ */
@GetMapping(value = "/deleteList") @GetMapping(value = "/deleteList")
public Result<List<SysDict>> deleteList() { public Results<List<SysDict>> deleteList() {
List<SysDict> list = this.sysDictService.queryDeleteList(); List<SysDict> list = this.sysDictService.queryDeleteList();
return Result.OK(list); return Results.OK(list);
} }
/** /**
@@ -547,13 +547,13 @@ public class SysDictController {
* @return * @return
*/ */
@PostMapping(value = "/deletePhysic/{id}") @PostMapping(value = "/deletePhysic/{id}")
public Result<T> deletePhysic(@PathVariable String id) { public Results<T> deletePhysic(@PathVariable String id) {
try { try {
sysDictService.deleteOneDictPhysically(id); sysDictService.deleteOneDictPhysically(id);
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return Result.error("删除失败!"); return Results.error("删除失败!");
} }
} }
@@ -563,13 +563,13 @@ public class SysDictController {
* @return * @return
*/ */
@PostMapping(value = "/back/{id}") @PostMapping(value = "/back/{id}")
public Result<T> back(@PathVariable String id) { public Results<T> back(@PathVariable String id) {
try { try {
sysDictService.updateDictDelFlag(0,id); sysDictService.updateDictDelFlag(0,id);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return Result.error("操作失败!"); return Results.error("操作失败!");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+22 -24
View File
@@ -8,15 +8,13 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Results;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictItemService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -56,9 +54,9 @@ public class SysDictItemController {
@RequiresPermissions("sys:dict:list") @RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysDictItem>> result = new Result<>(); Results<IPage<SysDictItem>> result = new Results<>();
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
queryWrapper.orderByAsc("sort_order"); queryWrapper.orderByAsc("sort_order");
Page<SysDictItem> page = new Page<>(pageNo, pageSize); Page<SysDictItem> page = new Page<>(pageNo, pageSize);
@@ -77,14 +75,14 @@ public class SysDictItemController {
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> add(@RequestBody SysDictItem sysDictItem) { public Results<Object> add(@RequestBody SysDictItem sysDictItem) {
try { try {
sysDictItem.setCreateTime(new Date()); sysDictItem.setCreateTime(new Date());
sysDictItemService.save(sysDictItem); sysDictItemService.save(sysDictItem);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -98,18 +96,18 @@ public class SysDictItemController {
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> edit(@RequestBody SysDictItem sysDictItem) { public Results<Object> edit(@RequestBody SysDictItem sysDictItem) {
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
if(sysdict==null) { if(sysdict==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
sysDictItem.setUpdateTime(new Date()); sysDictItem.setUpdateTime(new Date());
boolean ok = sysDictItemService.updateById(sysDictItem); boolean ok = sysDictItemService.updateById(sysDictItem);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -122,21 +120,21 @@ public class SysDictItemController {
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysDictItem joinSystem = sysDictItemService.getById(id); SysDictItem joinSystem = sysDictItemService.getById(id);
if(joinSystem==null) { if(joinSystem==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
boolean ok = sysDictItemService.removeById(id); boolean ok = sysDictItemService.removeById(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -149,13 +147,13 @@ public class SysDictItemController {
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) { public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -169,7 +167,7 @@ public class SysDictItemController {
// @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET) // @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET)
@GetMapping("/dictItemCheck") @GetMapping("/dictItemCheck")
@ApiOperation("字典重复校验接口") @ApiOperation("字典重复校验接口")
public Result<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { public Results<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
int num = 0; int num = 0;
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue()); queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue());
@@ -181,11 +179,11 @@ public class SysDictItemController {
num = sysDictItemService.count(queryWrapper); num = sysDictItemService.count(queryWrapper);
if (num == 0) { if (num == 0) {
// 该值可用 // 该值可用
return Result.OK("该值可用！"); return Results.OK("该值可用！");
} else { } else {
// 该值不可用 // 该值不可用
log.info("该值不可用，系统中已存在！"); log.info("该值不可用，系统中已存在！");
return Result.error("该值不可用，系统中已存在！"); return Results.error("该值不可用，系统中已存在！");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java
+25 -25
View File
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -52,14 +52,14 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-分页列表查询") @AutoLog(value = "填值规则-分页列表查询")
@ApiOperation(value = "填值规则-分页列表查询", notes = "填值规则-分页列表查询") @ApiOperation(value = "填值规则-分页列表查询", notes = "填值规则-分页列表查询")
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysFillRule>> queryPageList(SysFillRule sysFillRule, public Results<IPage<SysFillRule>> queryPageList(SysFillRule sysFillRule,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<SysFillRule> queryWrapper = QueryGenerator.initQueryWrapper(sysFillRule, req.getParameterMap()); QueryWrapper<SysFillRule> queryWrapper = QueryGenerator.initQueryWrapper(sysFillRule, req.getParameterMap());
Page<SysFillRule> page = new Page<>(pageNo, pageSize); Page<SysFillRule> page = new Page<>(pageNo, pageSize);
IPage<SysFillRule> pageList = sysFillRuleService.page(page, queryWrapper); IPage<SysFillRule> pageList = sysFillRuleService.page(page, queryWrapper);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -69,9 +69,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
* @return * @return
*/ */
@GetMapping(value = "/testFillRule") @GetMapping(value = "/testFillRule")
public Result<Object> testFillRule(@RequestParam("ruleCode") String ruleCode) { public Results<Object> testFillRule(@RequestParam("ruleCode") String ruleCode) {
Object result = FillRuleUtil.executeRule(ruleCode, new JSONObject()); Object result = FillRuleUtil.executeRule(ruleCode, new JSONObject());
return Result.OK(result); return Results.OK(result);
} }
/** /**
@@ -83,9 +83,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-添加") @AutoLog(value = "填值规则-添加")
@ApiOperation(value = "填值规则-添加", notes = "填值规则-添加") @ApiOperation(value = "填值规则-添加", notes = "填值规则-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<T> add(@RequestBody SysFillRule sysFillRule) { public Results<T> add(@RequestBody SysFillRule sysFillRule) {
sysFillRuleService.save(sysFillRule); sysFillRuleService.save(sysFillRule);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -97,9 +97,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-编辑") @AutoLog(value = "填值规则-编辑")
@ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑") @ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysFillRule sysFillRule) { public Results<T> edit(@RequestBody SysFillRule sysFillRule) {
sysFillRuleService.updateById(sysFillRule); sysFillRuleService.updateById(sysFillRule);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
/** /**
@@ -111,13 +111,13 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-通过id删除") @AutoLog(value = "填值规则-通过id删除")
@ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除") @ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysFillRuleService.removeById(id); sysFillRuleService.removeById(id);
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
/** /**
@@ -129,13 +129,13 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-批量删除") @AutoLog(value = "填值规则-批量删除")
@ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除") @ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(","))); this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Results.OK("批量删除成功！");
} }
/** /**
@@ -147,9 +147,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
@AutoLog(value = "填值规则-通过id查询") @AutoLog(value = "填值规则-通过id查询")
@ApiOperation(value = "填值规则-通过id查询", notes = "填值规则-通过id查询") @ApiOperation(value = "填值规则-通过id查询", notes = "填值规则-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysFillRule> queryById(@RequestParam(name = "id", required = true) String id) { public Results<SysFillRule> queryById(@RequestParam(name = "id", required = true) String id) {
SysFillRule sysFillRule = sysFillRuleService.getById(id); SysFillRule sysFillRule = sysFillRuleService.getById(id);
return Result.OK(sysFillRule); return Results.OK(sysFillRule);
} }
/** /**
@@ -172,7 +172,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<SysFillRule> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<SysFillRule> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, SysFillRule.class); return super.importExcel(request, response, SysFillRule.class);
} }
@@ -184,9 +184,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
* @return 运行后的结果 * @return 运行后的结果
*/ */
@PostMapping("/executeRuleByCode/{ruleCode}") @PostMapping("/executeRuleByCode/{ruleCode}")
public Result<Object> executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) { public Results<Object> executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
Object result = FillRuleUtil.executeRule(ruleCode, formData); Object result = FillRuleUtil.executeRule(ruleCode, formData);
return Result.OK(result); return Results.OK(result);
} }
@@ -199,7 +199,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
* *
*/ */
@PostMapping("/executeRuleByCodeBatch") @PostMapping("/executeRuleByCodeBatch")
public Result<JSONArray> executeByRuleCodeBatch(@RequestBody JSONObject ruleData) { public Results<JSONArray> executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
JSONObject commonFormData = ruleData.getJSONObject("commonFormData"); JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
JSONArray rules = ruleData.getJSONArray("rules"); JSONArray rules = ruleData.getJSONArray("rules");
// 遍历 rules ，批量执行规则 // 遍历 rules ，批量执行规则
@@ -219,7 +219,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
obj.put("result", result); obj.put("result", result);
results.add(obj); results.add(obj);
} }
return Result.OK(results); return Results.OK(results);
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java
+10 -10
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysGatewayRoute; import com.jero.modules.system.entity.SysGatewayRoute;
@@ -35,13 +35,13 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
private ISysGatewayRouteService sysGatewayRouteService; private ISysGatewayRouteService sysGatewayRouteService;
@PostMapping(value = "/updateAll") @PostMapping(value = "/updateAll")
public Result<T> updateAll(@RequestBody JSONObject json) { public Results<T> updateAll(@RequestBody JSONObject json) {
sysGatewayRouteService.updateAll(json); sysGatewayRouteService.updateAll(json);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<JSONArray> queryPageList(SysGatewayRoute sysGatewayRoute) { public Results<JSONArray> queryPageList(SysGatewayRoute sysGatewayRoute) {
LambdaQueryWrapper<SysGatewayRoute> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysGatewayRoute> query = new LambdaQueryWrapper<>();
List<SysGatewayRoute> ls = sysGatewayRouteService.list(query); List<SysGatewayRoute> ls = sysGatewayRouteService.list(query);
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
@@ -55,13 +55,13 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
} }
array.add(obj); array.add(obj);
} }
return Result.OK(array); return Results.OK(array);
} }
@GetMapping(value = "/clearRedis") @GetMapping(value = "/clearRedis")
public Result<T> clearRedis() { public Results<T> clearRedis() {
sysGatewayRouteService.clearRedis(); sysGatewayRouteService.clearRedis();
return Result.OK("清除成功！"); return Results.OK("清除成功！");
} }
/** /**
@@ -73,13 +73,13 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysGatewayRouteService.deleteById(id); sysGatewayRouteService.deleteById(id);
return Result.OK("删除路由成功"); return Results.OK("删除路由成功");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java
+13 -13
View File
@@ -4,7 +4,7 @@ package com.jero.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysLog; import com.jero.modules.system.entity.SysLog;
@@ -45,9 +45,9 @@ public class SysLogController {
*/ */
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysLog>> queryPageList(SysLog syslog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysLog>> queryPageList(SysLog syslog, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysLog>> result = new Result<>(); Results<IPage<SysLog>> result = new Results<>();
QueryWrapper<SysLog> queryWrapper = QueryGenerator.initQueryWrapper(syslog, req.getParameterMap()); QueryWrapper<SysLog> queryWrapper = QueryGenerator.initQueryWrapper(syslog, req.getParameterMap());
Page<SysLog> page = new Page<>(pageNo, pageSize); Page<SysLog> page = new Page<>(pageNo, pageSize);
//日志关键词 //日志关键词
@@ -73,21 +73,21 @@ public class SysLogController {
*/ */
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
SysLog sysLog = sysLogService.getById(id); SysLog sysLog = sysLogService.getById(id);
if(sysLog==null) { if(sysLog==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
boolean ok = sysLogService.removeById(id); boolean ok = sysLogService.removeById(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -97,17 +97,17 @@ public class SysLogController {
*/ */
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
if("allclear".equals(ids)) { if("allclear".equals(ids)) {
this.sysLogService.removeAll(); this.sysLogService.removeAll();
return Result.OK("清除成功!"); return Results.OK("清除成功!");
} }
this.sysLogService.removeByIds(Arrays.asList(ids.split(","))); this.sysLogService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
+58 -58
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MD5Util; import com.jero.common.util.MD5Util;
@@ -68,9 +68,9 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<List<SysPermissionTree>> list() { public Results<List<SysPermissionTree>> list() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Result<List<SysPermissionTree>> result = new Result<>(); Results<List<SysPermissionTree>> result = new Results<>();
try { try {
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0); query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
@@ -95,9 +95,9 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/getSystemMenuList", method = RequestMethod.GET) // @RequestMapping(value = "/getSystemMenuList", method = RequestMethod.GET)
@GetMapping("/getSystemMenuList") @GetMapping("/getSystemMenuList")
public Result<List<SysPermissionTree>> getSystemMenuList() { public Results<List<SysPermissionTree>> getSystemMenuList() {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Result<List<SysPermissionTree>> result = new Result<>(); Results<List<SysPermissionTree>> result = new Results<>();
try { try {
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
query.eq(SysPermission::getMenuType,CommonConstant.MENU_TYPE_0); query.eq(SysPermission::getMenuType,CommonConstant.MENU_TYPE_0);
@@ -125,8 +125,8 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/getSystemSubmenu", method = RequestMethod.GET) // @RequestMapping(value = "/getSystemSubmenu", method = RequestMethod.GET)
@GetMapping("/getSystemSubmenu") @GetMapping("/getSystemSubmenu")
public Result<List<SysPermissionTree>> getSystemSubmenu(@RequestParam("parentId") String parentId){ public Results<List<SysPermissionTree>> getSystemSubmenu(@RequestParam("parentId") String parentId){
Result<List<SysPermissionTree>> result = new Result<>(); Results<List<SysPermissionTree>> result = new Results<>();
try{ try{
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
query.eq(SysPermission::getParentId,parentId); query.eq(SysPermission::getParentId,parentId);
@@ -155,7 +155,7 @@ public class SysPermissionController {
* @return 返回 key-value 的 Map * @return 返回 key-value 的 Map
*/ */
@GetMapping("/getSystemSubmenuBatch") @GetMapping("/getSystemSubmenuBatch")
public Result<Map<String, List<SysPermissionTree>>> getSystemSubmenuBatch(@RequestParam("parentIds") String parentIds) { public Results<Map<String, List<SysPermissionTree>>> getSystemSubmenuBatch(@RequestParam("parentIds") String parentIds) {
try { try {
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
List<String> parentIdList = Arrays.asList(parentIds.split(",")); List<String> parentIdList = Arrays.asList(parentIds.split(","));
@@ -175,10 +175,10 @@ public class SysPermissionController {
listMap.put(pid, mapList); listMap.put(pid, mapList);
} }
} }
return Result.OK(listMap); return Results.OK(listMap);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("批量查询子菜单失败：" + e.getMessage()); return Results.error("批量查询子菜单失败：" + e.getMessage());
} }
} }
@@ -189,13 +189,13 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/getUserPermissionByToken", method = RequestMethod.GET) // @RequestMapping(value = "/getUserPermissionByToken", method = RequestMethod.GET)
@GetMapping("/getUserPermissionByToken") @GetMapping("/getUserPermissionByToken")
public Result<JSONObject> getUserPermissionByToken() { public Results<JSONObject> getUserPermissionByToken() {
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
try { try {
//直接获取当前用户不适用前端token //直接获取当前用户不适用前端token
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (oConvertUtils.isEmpty(loginUser)) { if (oConvertUtils.isEmpty(loginUser)) {
return Result.error("请登录系统！"); return Results.error("请登录系统！");
} }
List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername()); List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername());
@@ -221,7 +221,7 @@ public class SysPermissionController {
result.setMessage("查询成功"); result.setMessage("查询成功");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("查询失败:" + e.getMessage()); return Results.error("查询失败:" + e.getMessage());
} }
return result; return result;
} }
@@ -234,14 +234,14 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<Object> add(@RequestBody SysPermission permission) { public Results<Object> add(@RequestBody SysPermission permission) {
try { try {
permission = PermissionDataUtil.intelligentProcessData(permission); permission = PermissionDataUtil.intelligentProcessData(permission);
sysPermissionService.addPermission(permission); sysPermissionService.addPermission(permission);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -253,14 +253,14 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) // @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/edit") @PostMapping("/edit")
public Result<Object> edit(@RequestBody SysPermission permission) { public Results<Object> edit(@RequestBody SysPermission permission) {
try { try {
permission = PermissionDataUtil.intelligentProcessData(permission); permission = PermissionDataUtil.intelligentProcessData(permission);
sysPermissionService.editPermission(permission); sysPermissionService.editPermission(permission);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -272,17 +272,17 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
try { try {
sysPermissionService.deletePermission(id); sysPermissionService.deletePermission(id);
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error(e.getMessage()); return Results.error(e.getMessage());
} }
} }
@@ -294,10 +294,10 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
try { try {
String[] arr = ids.split(","); String[] arr = ids.split(",");
@@ -306,10 +306,10 @@ public class SysPermissionController {
sysPermissionService.deletePermission(id); sysPermissionService.deletePermission(id);
} }
} }
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error(DEL_SUCCESS); return Results.error(DEL_SUCCESS);
} }
} }
@@ -320,8 +320,8 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList") @GetMapping("/queryTreeList")
public Result<Map<String, Object>> queryTreeList() { public Results<Map<String, Object>> queryTreeList() {
Result<Map<String, Object>> result = new Result<>(); Results<Map<String, Object>> result = new Results<>();
// 全部权限ids // 全部权限ids
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
try { try {
@@ -353,12 +353,12 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/queryListAsync", method = RequestMethod.GET) // @RequestMapping(value = "/queryListAsync", method = RequestMethod.GET)
@GetMapping("/queryListAsync") @GetMapping("/queryListAsync")
public Result<List<TreeModel>> queryAsync(@RequestParam(name = "pid", required = false) String parentId) { public Results<List<TreeModel>> queryAsync(@RequestParam(name = "pid", required = false) String parentId) {
Result<List<TreeModel>> result = new Result<>(); Results<List<TreeModel>> result = new Results<>();
try { try {
List<TreeModel> list = sysPermissionService.queryListByParentId(parentId); List<TreeModel> list = sysPermissionService.queryListByParentId(parentId);
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
return Result.error("未找到角色信息"); return Results.error("未找到角色信息");
} else { } else {
result.setResult(list); result.setResult(list);
result.setSuccess(true); result.setSuccess(true);
@@ -377,8 +377,8 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/queryRolePermission", method = RequestMethod.GET) // @RequestMapping(value = "/queryRolePermission", method = RequestMethod.GET)
@GetMapping("/queryRolePermission") @GetMapping("/queryRolePermission")
public Result<List<String>> queryRolePermission(@RequestParam(name = "roleId", required = true) String roleId) { public Results<List<String>> queryRolePermission(@RequestParam(name = "roleId", required = true) String roleId) {
Result<List<String>> result = new Result<>(); Results<List<String>> result = new Results<>();
try { try {
List<SysRolePermission> list = sysRolePermissionService.list(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId)); List<SysRolePermission> list = sysRolePermissionService.list(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId));
result.setResult(list.stream().map(sysRolePermission -> String.valueOf(sysRolePermission.getPermissionId())).collect(Collectors.toList())); result.setResult(list.stream().map(sysRolePermission -> String.valueOf(sysRolePermission.getPermissionId())).collect(Collectors.toList()));
@@ -397,7 +397,7 @@ public class SysPermissionController {
// @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) // @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
@PostMapping("/saveRolePermission") @PostMapping("/saveRolePermission")
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
public Result<String> saveRolePermission(@RequestBody JSONObject json) { public Results<String> saveRolePermission(@RequestBody JSONObject json) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
try { try {
String roleId = json.getString("roleId"); String roleId = json.getString("roleId");
@@ -405,10 +405,10 @@ public class SysPermissionController {
String lastPermissionIds = json.getString("lastpermissionIds"); String lastPermissionIds = json.getString("lastpermissionIds");
this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds); this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds);
log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("授权失败！"); return Results.error("授权失败！");
} }
} }
@@ -667,9 +667,9 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET) // @RequestMapping(value = "/getPermRuleListByPermId", method = RequestMethod.GET)
@GetMapping("/getPermRuleListByPermId") @GetMapping("/getPermRuleListByPermId")
public Result<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) { public Results<List<SysPermissionDataRule>> getPermRuleListByPermId(SysPermissionDataRule sysPermissionDataRule) {
List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId()); List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.getPermRuleListByPermId(sysPermissionDataRule.getPermissionId());
Result<List<SysPermissionDataRule>> result = new Result<>(); Results<List<SysPermissionDataRule>> result = new Results<>();
result.setSuccess(true); result.setSuccess(true);
result.setResult(permRuleList); result.setResult(permRuleList);
return result; return result;
@@ -684,27 +684,27 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST) // @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST)
@PostMapping("/addPermissionRule") @PostMapping("/addPermissionRule")
public Result<Object> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { public Results<Object> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
try { try {
sysPermissionDataRule.setCreateTime(new Date()); sysPermissionDataRule.setCreateTime(new Date());
sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule); sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST }) // @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/editPermissionRule") @PostMapping("/editPermissionRule")
public Result<Object> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { public Results<Object> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
try { try {
sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule); sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule);
return Result.OK("更新成功！"); return Results.OK("更新成功！");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -717,17 +717,17 @@ public class SysPermissionController {
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE) // @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
@PostMapping("/deletePermissionRule") @PostMapping("/deletePermissionRule")
public Result<Object> deletePermissionRule(@RequestBody Map<String,String> map) { public Results<Object> deletePermissionRule(@RequestBody Map<String,String> map) {
try { try {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysPermissionDataRuleService.deletePermissionDataRule(id); sysPermissionDataRuleService.deletePermissionDataRule(id);
return Result.OK("删除成功！"); return Results.OK("删除成功！");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -739,13 +739,13 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/queryPermissionRule", method = RequestMethod.GET) // @RequestMapping(value = "/queryPermissionRule", method = RequestMethod.GET)
@GetMapping("/queryPermissionRule") @GetMapping("/queryPermissionRule")
public Result<List<SysPermissionDataRule>> queryPermissionRule(SysPermissionDataRule sysPermissionDataRule) { public Results<List<SysPermissionDataRule>> queryPermissionRule(SysPermissionDataRule sysPermissionDataRule) {
try { try {
List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.queryPermissionRule(sysPermissionDataRule); List<SysPermissionDataRule> permRuleList = sysPermissionDataRuleService.queryPermissionRule(sysPermissionDataRule);
return Result.OK("查询成功", permRuleList); return Results.OK("查询成功", permRuleList);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -756,8 +756,8 @@ public class SysPermissionController {
*/ */
// @RequestMapping(value = "/queryDepartPermission", method = RequestMethod.GET) // @RequestMapping(value = "/queryDepartPermission", method = RequestMethod.GET)
@GetMapping("/queryDepartPermission") @GetMapping("/queryDepartPermission")
public Result<List<String>> queryDepartPermission(@RequestParam(name = "departId", required = true) String departId) { public Results<List<String>> queryDepartPermission(@RequestParam(name = "departId", required = true) String departId) {
Result<List<String>> result = new Result<>(); Results<List<String>> result = new Results<>();
try { try {
List<SysDepartPermission> list = sysDepartPermissionService.list(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId)); List<SysDepartPermission> list = sysDepartPermissionService.list(new QueryWrapper<SysDepartPermission>().lambda().eq(SysDepartPermission::getDepartId, departId));
result.setResult(list.stream().map(sysDepartPermission -> String.valueOf(sysDepartPermission.getPermissionId())).collect(Collectors.toList())); result.setResult(list.stream().map(sysDepartPermission -> String.valueOf(sysDepartPermission.getPermissionId())).collect(Collectors.toList()));
@@ -776,7 +776,7 @@ public class SysPermissionController {
// @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST) // @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
@PostMapping("/saveDepartPermission") @PostMapping("/saveDepartPermission")
//@RequiresRoles({ "admin" }) //@RequiresRoles({ "admin" })
public Result<String> saveDepartPermission(@RequestBody JSONObject json) { public Results<String> saveDepartPermission(@RequestBody JSONObject json) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
try { try {
String departId = json.getString("departId"); String departId = json.getString("departId");
@@ -784,10 +784,10 @@ public class SysPermissionController {
String lastPermissionIds = json.getString("lastpermissionIds"); String lastPermissionIds = json.getString("lastpermissionIds");
this.sysDepartPermissionService.saveDepartPermission(departId, permissionIds, lastPermissionIds); this.sysDepartPermissionService.saveDepartPermission(departId, permissionIds, lastPermissionIds);
log.info("======部门授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); log.info("======部门授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒");
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("授权失败！"); return Results.error("授权失败！");
} }
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+40 -47
View File
@@ -1,10 +1,8 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -13,16 +11,13 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.PmsUtil;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermission;
import com.jero.modules.system.entity.SysPermissionDataRule; import com.jero.modules.system.entity.SysPermissionDataRule;
@@ -33,13 +28,11 @@ import com.jero.modules.system.service.ISysPermissionDataRuleService;
import com.jero.modules.system.service.ISysPermissionService; import com.jero.modules.system.service.ISysPermissionService;
import com.jero.modules.system.service.ISysRolePermissionService; import com.jero.modules.system.service.ISysRolePermissionService;
import com.jero.modules.system.service.ISysRoleService; import com.jero.modules.system.service.ISysRoleService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -91,11 +84,11 @@ public class SysRoleController {
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysRole>> queryPageList(SysRole role, public Results<IPage<SysRole>> queryPageList(SysRole role,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<SysRole>> result = new Result<>(); Results<IPage<SysRole>> result = new Results<>();
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap()); QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap());
Page<SysRole> page = new Page<>(pageNo, pageSize); Page<SysRole> page = new Page<>(pageNo, pageSize);
IPage<SysRole> pageList = sysRoleService.page(page, queryWrapper); IPage<SysRole> pageList = sysRoleService.page(page, queryWrapper);
@@ -113,14 +106,14 @@ public class SysRoleController {
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
public Result<Object> add(@RequestBody SysRole role) { public Results<Object> add(@RequestBody SysRole role) {
try { try {
role.setCreateTime(new Date()); role.setCreateTime(new Date());
sysRoleService.save(role); sysRoleService.save(role);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -133,19 +126,19 @@ public class SysRoleController {
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<Object> edit(@RequestBody SysRole role) { public Results<Object> edit(@RequestBody SysRole role) {
SysRole sysrole = sysRoleService.getById(role.getId()); SysRole sysrole = sysRoleService.getById(role.getId());
if(sysrole==null) { if(sysrole==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
role.setUpdateTime(new Date()); role.setUpdateTime(new Date());
boolean ok = sysRoleService.updateById(role); boolean ok = sysRoleService.updateById(role);
if(ok) { if(ok) {
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -157,13 +150,13 @@ public class SysRoleController {
@RequiresPermissions("sys:role:del") @RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysRoleService.deleteRole(id); sysRoleService.deleteRole(id);
return Result.OK("删除角色成功"); return Results.OK("删除角色成功");
} }
/** /**
@@ -175,16 +168,16 @@ public class SysRoleController {
@RequiresPermissions("sys:role:del") @RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
if(oConvertUtils.isEmpty(ids)) { if(oConvertUtils.isEmpty(ids)) {
return Result.error("未选中角色！"); return Results.error("未选中角色！");
}else { }else {
sysRoleService.deleteBatchRole(ids.split(",")); sysRoleService.deleteBatchRole(ids.split(","));
return Result.OK("删除角色成功!"); return Results.OK("删除角色成功!");
} }
} }
@@ -196,23 +189,23 @@ public class SysRoleController {
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<SysRole> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysRole> queryById(@RequestParam(name="id",required=true) String id) {
SysRole sysRole = sysRoleService.getById(id); SysRole sysRole = sysRoleService.getById(id);
if(sysRole==null) { if(sysRole==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
return Result.OK(sysRole); return Results.OK(sysRole);
} }
} }
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryall", method = RequestMethod.GET) // @RequestMapping(value = "/queryall", method = RequestMethod.GET)
@GetMapping("/queryall") @GetMapping("/queryall")
public Result<List<SysRole>> queryall() { public Results<List<SysRole>> queryall() {
List<SysRole> list = sysRoleService.list(); List<SysRole> list = sysRoleService.list();
if(list==null||list.isEmpty()) { if(list==null||list.isEmpty()) {
return Result.error("未找到角色信息"); return Results.error("未找到角色信息");
}else { }else {
return Result.OK(list); return Results.OK(list);
} }
} }
@@ -222,8 +215,8 @@ public class SysRoleController {
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) // @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET)
@GetMapping("/checkRoleCode") @GetMapping("/checkRoleCode")
public Result<Boolean> checkUsername(String id,String roleCode) { public Results<Boolean> checkUsername(String id, String roleCode) {
Result<Boolean> result = new Result<>(); Results<Boolean> result = new Results<>();
result.setResult(true);//如果此参数为false则程序发生异常 result.setResult(true);//如果此参数为false则程序发生异常
log.info("--验证角色编码是否唯一---id:"+id+"--roleCode:"+roleCode); log.info("--验证角色编码是否唯一---id:"+id+"--roleCode:"+roleCode);
try { try {
@@ -280,7 +273,7 @@ public class SysRoleController {
@RequiresPermissions("sys:role:import") @RequiresPermissions("sys:role:import")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -293,7 +286,7 @@ public class SysRoleController {
return sysRoleService.importExcelCheckRoleCode(file, params); return sysRoleService.importExcelCheckRoleCode(file, params);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("文件导入失败:" + e.getMessage()); return Results.error("文件导入失败:" + e.getMessage());
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -302,7 +295,7 @@ public class SysRoleController {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
/** /**
@@ -310,10 +303,10 @@ public class SysRoleController {
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@GetMapping(value = "/datarule/{permissionId}/{roleId}") @GetMapping(value = "/datarule/{permissionId}/{roleId}")
public Result<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { public Results<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId, @PathVariable("roleId") String roleId) {
List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId);
if(list==null || list.isEmpty()) { if(list==null || list.isEmpty()) {
return Result.error("未找到权限配置信息"); return Results.error("未找到权限配置信息");
}else { }else {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("datarule", list); map.put("datarule", list);
@@ -328,7 +321,7 @@ public class SysRoleController {
map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked);
} }
} }
return Result.OK(map); return Results.OK(map);
//TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
} }
} }
@@ -338,7 +331,7 @@ public class SysRoleController {
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@PostMapping(value = "/datarule") @PostMapping(value = "/datarule")
public Result<T> saveDatarule(@RequestBody JSONObject jsonObject) { public Results<T> saveDatarule(@RequestBody JSONObject jsonObject) {
try { try {
String permissionId = jsonObject.getString("permissionId"); String permissionId = jsonObject.getString("permissionId");
String roleId = jsonObject.getString("roleId"); String roleId = jsonObject.getString("roleId");
@@ -349,16 +342,16 @@ public class SysRoleController {
.eq(SysRolePermission::getRoleId,roleId); .eq(SysRolePermission::getRoleId,roleId);
SysRolePermission sysRolePermission = sysRolePermissionService.getOne(query); SysRolePermission sysRolePermission = sysRolePermissionService.getOne(query);
if(sysRolePermission==null) { if(sysRolePermission==null) {
return Result.error("请先保存角色菜单权限!"); return Results.error("请先保存角色菜单权限!");
}else { }else {
sysRolePermission.setDataRuleIds(dataRuleIds); sysRolePermission.setDataRuleIds(dataRuleIds);
this.sysRolePermissionService.updateById(sysRolePermission); this.sysRolePermissionService.updateById(sysRolePermission);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e);
return Result.error("保存失败"); return Results.error("保存失败");
} }
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} }
@@ -370,8 +363,8 @@ public class SysRoleController {
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList") @GetMapping("/queryTreeList")
public Result<Map<String,Object>> queryTreeList(HttpServletRequest request) { public Results<Map<String,Object>> queryTreeList(HttpServletRequest request) {
Result<Map<String,Object>> result = new Result<>(); Results<Map<String,Object>> result = new Results<>();
//全部权限ids //全部权限ids
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
try { try {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java
+25 -25
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
@@ -44,9 +44,9 @@ public class SysTenantController {
@PermissionData(pageComponent = "system/TenantList") @PermissionData(pageComponent = "system/TenantList")
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysTenant>> queryPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysTenant>> result = new Result<>(); Results<IPage<SysTenant>> result = new Results<>();
QueryWrapper<SysTenant> queryWrapper = QueryGenerator.initQueryWrapper(sysTenant, req.getParameterMap()); QueryWrapper<SysTenant> queryWrapper = QueryGenerator.initQueryWrapper(sysTenant, req.getParameterMap());
Page<SysTenant> page = new Page<>(pageNo, pageSize); Page<SysTenant> page = new Page<>(pageNo, pageSize);
IPage<SysTenant> pageList = sysTenantService.page(page, queryWrapper); IPage<SysTenant> pageList = sysTenantService.page(page, queryWrapper);
@@ -62,17 +62,17 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<Object> add(@RequestBody SysTenant sysTenant) { public Results<Object> add(@RequestBody SysTenant sysTenant) {
if(sysTenantService.getById(sysTenant.getId())!=null){ if(sysTenantService.getById(sysTenant.getId())!=null){
return Result.error("该编号已存在!"); return Results.error("该编号已存在!");
} }
try { try {
sysTenantService.save(sysTenant); sysTenantService.save(sysTenant);
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -83,17 +83,17 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<Object> edit(@RequestBody SysTenant tenant) { public Results<Object> edit(@RequestBody SysTenant tenant) {
SysTenant sysTenant = sysTenantService.getById(tenant.getId()); SysTenant sysTenant = sysTenantService.getById(tenant.getId());
if(sysTenant==null) { if(sysTenant==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
boolean ok = sysTenantService.updateById(tenant); boolean ok = sysTenantService.updateById(tenant);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Results.OK("操作成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -103,13 +103,13 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String,String> map) { public Results<T> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
sysTenantService.removeTenantById(id); sysTenantService.removeTenantById(id);
return Result.OK("删除成功"); return Results.OK("删除成功");
} }
/** /**
@@ -119,10 +119,10 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(oConvertUtils.isEmpty(ids)) { if(oConvertUtils.isEmpty(ids)) {
return Result.error("未选中租户！"); return Results.error("未选中租户！");
}else { }else {
String[] ls = ids.split(","); String[] ls = ids.split(",");
// 过滤掉已被引用的租户 // 过滤掉已被引用的租户
@@ -137,12 +137,12 @@ public class SysTenantController {
if (!idList.isEmpty()) { if (!idList.isEmpty()) {
sysTenantService.removeByIds(idList); sysTenantService.removeByIds(idList);
if (ls.length == idList.size()) { if (ls.length == idList.size()) {
return Result.OK("删除成功！"); return Results.OK("删除成功！");
} else { } else {
return Result.OK("部分删除成功！（被引用的租户无法删除）"); return Results.OK("部分删除成功！（被引用的租户无法删除）");
} }
}else { }else {
return Result.error("选择的租户都已被引用，无法删除！"); return Results.error("选择的租户都已被引用，无法删除！");
} }
} }
} }
@@ -154,12 +154,12 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<SysTenant> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysTenant> queryById(@RequestParam(name="id",required=true) String id) {
SysTenant sysTenant = sysTenantService.getById(id); SysTenant sysTenant = sysTenantService.getById(id);
if(sysTenant==null) { if(sysTenant==null) {
return Result.error("未找到对应实体"); return Results.error("未找到对应实体");
}else { }else {
return Result.OK(sysTenant); return Results.OK(sysTenant);
} }
} }
@@ -170,7 +170,7 @@ public class SysTenantController {
*/ */
// @RequestMapping(value = "/queryList", method = RequestMethod.GET) // @RequestMapping(value = "/queryList", method = RequestMethod.GET)
@GetMapping("/queryList") @GetMapping("/queryList")
public Result<List<SysTenant>> queryList(@RequestParam(name="ids",required=false) String ids) { public Results<List<SysTenant>> queryList(@RequestParam(name="ids",required=false) String ids) {
LambdaQueryWrapper<SysTenant> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysTenant> query = new LambdaQueryWrapper<>();
query.eq(SysTenant::getStatus, 1); query.eq(SysTenant::getStatus, 1);
if(oConvertUtils.isNotEmpty(ids)){ if(oConvertUtils.isNotEmpty(ids)){
@@ -178,6 +178,6 @@ public class SysTenantController {
} }
//此处查询忽略时间条件 //此处查询忽略时间条件
List<SysTenant> ls = sysTenantService.list(query); List<SysTenant> ls = sysTenantService.list(query);
return Result.OK(ls); return Results.OK(ls);
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java
+30 -30
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
@@ -59,11 +59,11 @@ public class SysUserAgentController {
* @return * @return
*/ */
@GetMapping(value = "/page") @GetMapping(value = "/page")
public Result<IPage<SysUserAgent>> queryPageList(SysUserAgent sysUserAgent, public Results<IPage<SysUserAgent>> queryPageList(SysUserAgent sysUserAgent,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<SysUserAgent>> result = new Result<>(); Results<IPage<SysUserAgent>> result = new Results<>();
QueryWrapper<SysUserAgent> queryWrapper = QueryGenerator.initQueryWrapper(sysUserAgent, req.getParameterMap()); QueryWrapper<SysUserAgent> queryWrapper = QueryGenerator.initQueryWrapper(sysUserAgent, req.getParameterMap());
Page<SysUserAgent> page = new Page<>(pageNo, pageSize); Page<SysUserAgent> page = new Page<>(pageNo, pageSize);
IPage<SysUserAgent> pageList = sysUserAgentService.page(page, queryWrapper); IPage<SysUserAgent> pageList = sysUserAgentService.page(page, queryWrapper);
@@ -78,13 +78,13 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<Object> add(@RequestBody SysUserAgent sysUserAgent) { public Results<Object> add(@RequestBody SysUserAgent sysUserAgent) {
try { try {
sysUserAgentService.save(sysUserAgent); sysUserAgentService.save(sysUserAgent);
return Result.OK("代理人设置成功！"); return Results.OK("代理人设置成功！");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -94,18 +94,18 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysUserAgent sysUserAgent) { public Results<Object> edit(@RequestBody SysUserAgent sysUserAgent) {
SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId()); SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId());
if(sysUserAgentEntity==null) { if(sysUserAgentEntity==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
boolean ok = sysUserAgentService.updateById(sysUserAgent); boolean ok = sysUserAgentService.updateById(sysUserAgent);
if(ok) { if(ok) {
return Result.OK("代理人设置成功!"); return Results.OK("代理人设置成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -114,17 +114,17 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) { public Results<Object> delete(@RequestParam(name="id",required=true) String id) {
SysUserAgent sysUserAgent = sysUserAgentService.getById(id); SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
if(sysUserAgent==null) { if(sysUserAgent==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
boolean ok = sysUserAgentService.removeById(id); boolean ok = sysUserAgentService.removeById(id);
if(ok) { if(ok) {
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
return Result.OK(); return Results.OK();
} }
/** /**
@@ -133,13 +133,13 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) { if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！"); return Results.error("参数不识别！");
}else { }else {
this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(","))); this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!"); return Results.OK("删除成功!");
} }
} }
@@ -149,12 +149,12 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/queryById") @PostMapping(value = "/queryById")
public Result<SysUserAgent> queryById(@RequestParam(name="id",required=true) String id) { public Results<SysUserAgent> queryById(@RequestParam(name="id",required=true) String id) {
SysUserAgent sysUserAgent = sysUserAgentService.getById(id); SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
if(sysUserAgent==null) { if(sysUserAgent==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
return Result.OK(sysUserAgent); return Results.OK(sysUserAgent);
} }
} }
@@ -164,14 +164,14 @@ public class SysUserAgentController {
* @return * @return
*/ */
@PostMapping(value = "/queryByUserName") @PostMapping(value = "/queryByUserName")
public Result<SysUserAgent> queryByUserName(@RequestParam(name="userName",required=true) String userName) { public Results<SysUserAgent> queryByUserName(@RequestParam(name="userName",required=true) String userName) {
LambdaQueryWrapper<SysUserAgent> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUserAgent> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserAgent::getUserName, userName); queryWrapper.eq(SysUserAgent::getUserName, userName);
SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper); SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper);
if(sysUserAgent==null) { if(sysUserAgent==null) {
return Result.error(ERROE_MSG); return Results.error(ERROE_MSG);
}else { }else {
return Result.OK(sysUserAgent); return Results.OK(sysUserAgent);
} }
} }
@@ -208,7 +208,7 @@ public class SysUserAgentController {
*/ */
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) { public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -222,10 +222,10 @@ public class SysUserAgentController {
for (SysUserAgent sysUserAgentExcel : listSysUserAgents) { for (SysUserAgent sysUserAgentExcel : listSysUserAgents) {
sysUserAgentService.save(sysUserAgentExcel); sysUserAgentService.save(sysUserAgentExcel);
} }
return Result.OK("文件导入成功！数据行数：" + listSysUserAgents.size()); return Results.OK("文件导入成功！数据行数：" + listSysUserAgents.size());
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} finally { } finally {
try { try {
file.getInputStream().close(); file.getInputStream().close();
@@ -234,7 +234,7 @@ public class SysUserAgentController {
} }
} }
} }
return Result.error("文件导入失败！"); return Results.error("文件导入失败！");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+126 -126
View File
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.PermissionData; import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
@@ -122,12 +122,12 @@ public class SysUserController {
@PermissionData(pageComponent = "system/UserList") @PermissionData(pageComponent = "system/UserList")
// @RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page") @GetMapping("/page")
public Result<IPage<SysUser>> queryPageList(SysUser user, public Results<IPage<SysUser>> queryPageList(SysUser user,
@RequestParam(name="departId", required = false) String departId, @RequestParam(name="departId", required = false) String departId,
@RequestParam(name="roleId", required = false) String roleId, @RequestParam(name="roleId", required = false) String roleId,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<>(); Results<IPage<SysUser>> result = new Results<>();
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
@@ -164,7 +164,7 @@ public class SysUserController {
@RequiresPermissions("user:add") @RequiresPermissions("user:add")
// @RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add") @PostMapping("/add")
public Result<Object> add(@RequestBody JSONObject jsonObject) { public Results<Object> add(@RequestBody JSONObject jsonObject) {
try { try {
String selectedRoles = jsonObject.getString(SELECTED_ROLES); String selectedRoles = jsonObject.getString(SELECTED_ROLES);
String selectedDeparts = jsonObject.getString("selecteddeparts"); String selectedDeparts = jsonObject.getString("selecteddeparts");
@@ -176,10 +176,10 @@ public class SysUserController {
// 保存用户走一个service 保证事务 // 保存用户走一个service 保证事务
sysUserService.saveUser(user, selectedRoles, selectedDeparts); sysUserService.saveUser(user, selectedRoles, selectedDeparts);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -212,7 +212,7 @@ public class SysUserController {
@RequiresPermissions("user:edit") @RequiresPermissions("user:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PostMapping("/edit") @PostMapping("/edit")
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { public Results<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY); String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
String roles = jsonObject.getString(SELECTED_ROLES); String roles = jsonObject.getString(SELECTED_ROLES);
String departs = jsonObject.getString("selecteddeparts"); String departs = jsonObject.getString("selecteddeparts");
@@ -221,16 +221,16 @@ public class SysUserController {
SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2); baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
if(sysUser==null) { if(sysUser==null) {
return Result.error(INEXISTENCE); return Results.error(INEXISTENCE);
}else { }else {
SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser); SysUser user = getSysUser(jsonObject, rsaPrivateKey, sysUser);
// 修改用户走一个service 保证事务 // 修改用户走一个service 保证事务
sysUserService.editUser(user, roles, departs); sysUserService.editUser(user, roles, departs);
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} }
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
} }
@@ -261,33 +261,33 @@ public class SysUserController {
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@PostMapping("/delete") @PostMapping("/delete")
public Result<T> delete(@RequestBody Map<String,String> map) { public Results<T> delete(@RequestBody Map<String,String> map) {
String id = map.get("id"); String id = map.get("id");
if(StringUtils.isBlank(id)){ if(StringUtils.isBlank(id)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteUser(id); this.sysUserService.deleteUser(id);
return Result.OK("删除用户成功"); return Results.OK("删除用户成功");
} }
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteBatch") @PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids"); String ids = map.get("ids");
if(StringUtils.isBlank(ids)){ if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！"); return Results.error("参数不识别！");
} }
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3); baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteBatchUsers(ids); this.sysUserService.deleteBatchUsers(ids);
return Result.OK("批量删除用户成功"); return Results.OK("批量删除用户成功");
} }
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) // @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
@PostMapping("/frozenBatch") @PostMapping("/frozenBatch")
public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) { public Results<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try { try {
String ids = jsonObject.getString("ids"); String ids = jsonObject.getString("ids");
String status = jsonObject.getString("status"); String status = jsonObject.getString("status");
@@ -300,36 +300,36 @@ public class SysUserController {
} }
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败"+e.getMessage()); return Results.error("操作失败"+e.getMessage());
} }
return Result.OK(OPTION_SUCCESS); return Results.OK(OPTION_SUCCESS);
} }
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById") @GetMapping("/queryById")
public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) { public Results<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
SysUser sysUser = sysUserService.getById(id); SysUser sysUser = sysUserService.getById(id);
if (sysUser == null) { if (sysUser == null) {
return Result.error(INEXISTENCE); return Results.error(INEXISTENCE);
} else { } else {
return Result.OK(sysUser); return Results.OK(sysUser);
} }
} }
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) // @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
@GetMapping("/queryUserRole") @GetMapping("/queryUserRole")
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { public Results<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userid)); List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userid));
if (userRole == null || userRole.isEmpty()) { if (userRole == null || userRole.isEmpty()) {
return Result.error("未找到用户相关角色信息"); return Results.error("未找到用户相关角色信息");
} else { } else {
for (SysUserRole sysUserRole : userRole) { for (SysUserRole sysUserRole : userRole) {
list.add(sysUserRole.getRoleId()); list.add(sysUserRole.getRoleId());
} }
return Result.OK(list); return Results.OK(list);
} }
} }
@@ -344,8 +344,8 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET) // @RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET)
@GetMapping("/checkOnlyUser") @GetMapping("/checkOnlyUser")
public Result<Boolean> checkOnlyUser(SysUser sysUser) { public Results<Boolean> checkOnlyUser(SysUser sysUser) {
Result<Boolean> result = new Result<>(); Results<Boolean> result = new Results<>();
//如果此参数为false则程序发生异常 //如果此参数为false则程序发生异常
result.setResult(true); result.setResult(true);
try { try {
@@ -372,10 +372,10 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) // @RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
@PostMapping("/changePassword") @PostMapping("/changePassword")
public Result<T> changePassword(@RequestBody SysUser sysUser) { public Results<T> changePassword(@RequestBody SysUser sysUser) {
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername())); SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
if (u == null) { if (u == null) {
return Result.error(USER_ERROR_MSG); return Results.error(USER_ERROR_MSG);
} }
sysUser.setId(u.getId()); sysUser.setId(u.getId());
return sysUserService.changePassword(sysUser); return sysUserService.changePassword(sysUser);
@@ -390,8 +390,8 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/userDepartList", method = RequestMethod.GET) // @RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
@GetMapping("/userDepartList") @GetMapping("/userDepartList")
public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) { public Results<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
Result<List<DepartIdModel>> result = new Result<>(); Results<List<DepartIdModel>> result = new Results<>();
try { try {
List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId); List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
if (depIdModelList != null && !depIdModelList.isEmpty()) { if (depIdModelList != null && !depIdModelList.isEmpty()) {
@@ -420,8 +420,8 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/generateUserId", method = RequestMethod.GET) // @RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
@GetMapping("/generateUserId") @GetMapping("/generateUserId")
public Result<String> generateUserId() { public Results<String> generateUserId() {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
log.info("我执行了,生成用户ID=============================="); log.info("我执行了,生成用户ID==============================");
String userId = UUID.randomUUID().toString().replace("-", ""); String userId = UUID.randomUUID().toString().replace("-", "");
result.setSuccess(true); result.setSuccess(true);
@@ -438,8 +438,8 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) // @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
@GetMapping("/queryUserByDepId") @GetMapping("/queryUserByDepId")
public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname ,@RequestParam(name="username",required=false) String username) { public Results<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id, @RequestParam(name="realname",required=false) String realname , @RequestParam(name="username",required=false) String username) {
Result<List<SysUser>> result = new Result<>(); Results<List<SysUser>> result = new Results<>();
SysDepart sysDepart = sysDepartService.getById(id); SysDepart sysDepart = sysDepartService.getById(id);
//去除前端传回参数两边的* //去除前端传回参数两边的*
if(StringUtils.isNotBlank(realname)){ if(StringUtils.isNotBlank(realname)){
@@ -480,14 +480,14 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET) // @RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET)
@GetMapping("/queryUserComponentData") @GetMapping("/queryUserComponentData")
public Result<IPage<SysUser>> queryUserComponentData( public Results<IPage<SysUser>> queryUserComponentData(
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name = "departId", required = false) String departId, @RequestParam(name = "departId", required = false) String departId,
@RequestParam(name="realname",required=false) String realname, @RequestParam(name="realname",required=false) String realname,
@RequestParam(name=USER_NAME,required=false) String username) { @RequestParam(name=USER_NAME,required=false) String username) {
IPage<SysUser> pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo); IPage<SysUser> pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo);
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -532,7 +532,7 @@ public class SysUserController {
@RequiresPermissions("sys:user:import") @RequiresPermissions("sys:user:import")
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel") @PostMapping("/importExcel")
public Result<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException { public Results<JSONObject> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
// 错误信息 // 错误信息
@@ -623,8 +623,8 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/queryByIds", method = RequestMethod.GET) // @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
@GetMapping("/queryByIds") @GetMapping("/queryByIds")
public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) { public Results<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
Result<Collection<SysUser>> result = new Result<>(); Results<Collection<SysUser>> result = new Results<>();
String[] userId = userIds.split(","); String[] userId = userIds.split(",");
Collection<String> idList = Arrays.asList(userId); Collection<String> idList = Arrays.asList(userId);
Collection<SysUser> userRole = sysUserService.listByIds(idList); Collection<SysUser> userRole = sysUserService.listByIds(idList);
@@ -638,7 +638,7 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) // @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
@PostMapping("/updatePassword") @PostMapping("/updatePassword")
public Result<T> updatePassword(@RequestBody JSONObject json) { public Results<T> updatePassword(@RequestBody JSONObject json) {
String username = json.getString(USER_NAME); String username = json.getString(USER_NAME);
String oldpassword = json.getString("oldpassword"); String oldpassword = json.getString("oldpassword");
String password = json.getString("password"); String password = json.getString("password");
@@ -647,7 +647,7 @@ public class SysUserController {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getUsername().equals(username)){ if(!sysUser.getUsername().equals(username)){
return Result.error("只允许修改自己的密码！"); return Results.error("只允许修改自己的密码！");
} }
String RSAPrivateKey = String.valueOf(redisUtil.get(RSAPublicKey)); String RSAPrivateKey = String.valueOf(redisUtil.get(RSAPublicKey));
@@ -662,16 +662,16 @@ public class SysUserController {
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username)); SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
if(user==null) { if(user==null) {
return Result.error(USER_ERROR_MSG); return Results.error(USER_ERROR_MSG);
} }
return sysUserService.resetPassword(username,oldpassword,password,confirmpassword); return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
} }
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/userRoleList", method = RequestMethod.GET) // @RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
@GetMapping("/userRoleList") @GetMapping("/userRoleList")
public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<>(); Results<IPage<SysUser>> result = new Results<>();
Page<SysUser> page = new Page<>(pageNo, pageSize); Page<SysUser> page = new Page<>(pageNo, pageSize);
String roleId = req.getParameter("roleId"); String roleId = req.getParameter("roleId");
String username = req.getParameter(USER_NAME); String username = req.getParameter(USER_NAME);
@@ -690,8 +690,8 @@ public class SysUserController {
@RequiresPermissions("user:add") @RequiresPermissions("user:add")
// @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST) // @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
@PostMapping("/addSysUserRole") @PostMapping("/addSysUserRole")
public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) { public Results<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
try { try {
String sysRoleId = sysUserRoleVO.getRoleId(); String sysRoleId = sysUserRoleVO.getRoleId();
for(String sysUserId:sysUserRoleVO.getUserIdList()) { for(String sysUserId:sysUserRoleVO.getUserIdList()) {
@@ -721,16 +721,16 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
@PostMapping("/deleteUserRole") @PostMapping("/deleteUserRole")
public Result<Object> deleteUserRole(@RequestParam(name="roleId") String roleId, public Results<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
@RequestParam(name="userId",required=true) String userId) { @RequestParam(name="userId",required=true) String userId) {
try { try {
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId); queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId);
sysUserRoleService.remove(queryWrapper); sysUserRoleService.remove(queryWrapper);
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
}catch(Exception e) { }catch(Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(DEL_FAILE); return Results.error(DEL_FAILE);
} }
} }
@@ -742,17 +742,17 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteUserRoleBatch") @PostMapping("/deleteUserRoleBatch")
public Result<SysUserRole> deleteUserRoleBatch( public Results<SysUserRole> deleteUserRoleBatch(
@RequestParam(name="roleId") String roleId, @RequestParam(name="roleId") String roleId,
@RequestParam(name="userIds",required=true) String userIds) { @RequestParam(name="userIds",required=true) String userIds) {
try { try {
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(","))); queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(",")));
sysUserRoleService.remove(queryWrapper); sysUserRoleService.remove(queryWrapper);
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
}catch(Exception e) { }catch(Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(DEL_FAILE); return Results.error(DEL_FAILE);
} }
} }
@@ -762,9 +762,9 @@ public class SysUserController {
// @RequestMapping(value = "/departUserList", method = RequestMethod.GET) // @RequestMapping(value = "/departUserList", method = RequestMethod.GET)
@GetMapping("/departUserList") @GetMapping("/departUserList")
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<>(); Results<IPage<SysUser>> result = new Results<>();
Page<SysUser> page = new Page<>(pageNo, pageSize); Page<SysUser> page = new Page<>(pageNo, pageSize);
String depId = req.getParameter("depId"); String depId = req.getParameter("depId");
String username = req.getParameter(USER_NAME); String username = req.getParameter(USER_NAME);
@@ -809,14 +809,14 @@ public class SysUserController {
*/ */
@GetMapping("/queryByOrgCode") @GetMapping("/queryByOrgCode")
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
public Result<IPage<SysUserSysDepartModel>> queryByDepartId( public Results<IPage<SysUserSysDepartModel>> queryByDepartId(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "orgCode") String orgCode, @RequestParam(name = "orgCode") String orgCode,
SysUser userParams SysUser userParams
) { ) {
IPage<SysUserSysDepartModel> pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page<SysUserSysDepartModel>(pageNo, pageSize)); IPage<SysUserSysDepartModel> pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page<SysUserSysDepartModel>(pageNo, pageSize));
return Result.OK(pageList); return Results.OK(pageList);
} }
/** /**
@@ -825,8 +825,8 @@ public class SysUserController {
@RequiresPermissions("user:add") @RequiresPermissions("user:add")
// @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST) // @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
@PostMapping("/editSysDepartWithUser") @PostMapping("/editSysDepartWithUser")
public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) { public Results<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
try { try {
String sysDepId = sysDepartUsersVO.getDepId(); String sysDepId = sysDepartUsersVO.getDepId();
for(String sysUserId:sysDepartUsersVO.getUserIdList()) { for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
@@ -854,17 +854,17 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
@PostMapping("/deleteUserInDepart") @PostMapping("/deleteUserInDepart")
public Result<Object> deleteUserInDepart(@RequestParam(name="depId") String depId, public Results<Object> deleteUserInDepart(@RequestParam(name="depId") String depId,
@RequestParam(name="userId",required=true) String userId) { @RequestParam(name="userId",required=true) String userId) {
try { try {
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<>(); QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(DEP_ID, depId).eq(USER_ID,userId); queryWrapper.eq(DEP_ID, depId).eq(USER_ID,userId);
sysUserDepartService.remove(queryWrapper); sysUserDepartService.remove(queryWrapper);
sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId);
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
}catch(Exception e) { }catch(Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(DEL_FAILE); return Results.error(DEL_FAILE);
} }
} }
@@ -874,7 +874,7 @@ public class SysUserController {
// @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
@PostMapping("/deleteUserInDepartBatch") @PostMapping("/deleteUserInDepartBatch")
@Transactional @Transactional
public Result<Object> deleteUserInDepartBatch( public Results<Object> deleteUserInDepartBatch(
@RequestParam(name="depId") String depId, @RequestParam(name="depId") String depId,
@RequestParam(name="userIds",required=true) String userIds) { @RequestParam(name="userIds",required=true) String userIds) {
try { try {
@@ -886,10 +886,10 @@ public class SysUserController {
for (String userId : userIdList){ for (String userId : userIdList){
sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId); sysDepartService.deleteHeadDeptAndUserRelatedByUser(depId, userId);
} }
return Result.OK(DEL_SUCCESS); return Results.OK(DEL_SUCCESS);
}catch(Exception e) { }catch(Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(DEL_FAILE); return Results.error(DEL_FAILE);
} }
} }
@@ -900,17 +900,17 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) // @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
@GetMapping("/getCurrentUserDeparts") @GetMapping("/getCurrentUserDeparts")
public Result<Map<String,Object>> getCurrentUserDeparts() { public Results<Map<String,Object>> getCurrentUserDeparts() {
try { try {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId()); List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId());
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("list", list); map.put("list", list);
map.put("orgCode", sysUser.getOrgCode()); map.put("orgCode", sysUser.getOrgCode());
return Result.OK(map); return Results.OK(map);
}catch(Exception e) { }catch(Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("查询失败！"); return Results.error("查询失败！");
} }
} }
@@ -925,8 +925,8 @@ public class SysUserController {
* @return * @return
*/ */
@PostMapping("/register") @PostMapping("/register")
public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) { public Results<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
String phone = jsonObject.getString(PHONE); String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE); String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone); Object code = redisUtil.get(phone);
@@ -989,7 +989,7 @@ public class SysUserController {
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
result.setMessage("注册成功"); result.setMessage("注册成功");
} catch (Exception e) { } catch (Exception e) {
return Result.error("注册失败"); return Results.error("注册失败");
} }
return result; return result;
} }
@@ -998,8 +998,8 @@ public class SysUserController {
* 用户手机号验证 * 用户手机号验证
*/ */
@PostMapping("/phoneVerification") @PostMapping("/phoneVerification")
public Result<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) { public Results<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) {
Result<Map<String,String>> result = new Result<>(); Results<Map<String,String>> result = new Results<>();
String phone = jsonObject.getString(PHONE); String phone = jsonObject.getString(PHONE);
String smscode = jsonObject.getString(SMSCODE); String smscode = jsonObject.getString(SMSCODE);
Object code = redisUtil.get(phone); Object code = redisUtil.get(phone);
@@ -1026,11 +1026,11 @@ public class SysUserController {
* 用户更改密码 * 用户更改密码
*/ */
@GetMapping("/passwordChange") @GetMapping("/passwordChange")
public Result<SysUser> passwordChange(@RequestParam(name=USER_NAME)String username, public Results<SysUser> passwordChange(@RequestParam(name=USER_NAME)String username,
@RequestParam(name="password")String password, @RequestParam(name="password")String password,
@RequestParam(name="smscode")String smscode, @RequestParam(name="smscode")String smscode,
@RequestParam(name="phone") String phone) { @RequestParam(name="phone") String phone) {
Result<SysUser> result = new Result<>(); Results<SysUser> result = new Results<>();
if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone) ) { if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone) ) {
result.setMessage("重置密码失败！"); result.setMessage("重置密码失败！");
result.setSuccess(false); result.setSuccess(false);
@@ -1074,7 +1074,7 @@ public class SysUserController {
*/ */
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/getUserSectionInfoByToken") @GetMapping("/getUserSectionInfoByToken")
public Result<Map<String, Object>> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) { public Results<Map<String, Object>> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
try { try {
String username = null; String username = null;
// 如果没有传递token，就从header中获取token并获取用户信息 // 如果没有传递token，就从header中获取token并获取用户信息
@@ -1096,10 +1096,10 @@ public class SysUserController {
SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map); SysUserController.log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
return Result.OK(map); return Results.OK(map);
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage()); return Results.error(500, "查询失败:" + e.getMessage());
} }
} }
@@ -1112,11 +1112,11 @@ public class SysUserController {
*/ */
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/appUserList") @GetMapping("/appUserList")
public Result<IPage<SysUser>> appUserList(@RequestParam(name = "keyword", required = false) String keyword, public Results<IPage<SysUser>> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
@RequestParam(name = USER_NAME, required = false) String username, @RequestParam(name = USER_NAME, required = false) String username,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name = "syncFlow", required = false) String syncFlow) { @RequestParam(name = "syncFlow", required = false) String syncFlow) {
try { try {
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
if(oConvertUtils.isNotEmpty(syncFlow)){ if(oConvertUtils.isNotEmpty(syncFlow)){
@@ -1134,10 +1134,10 @@ public class SysUserController {
} }
Page<SysUser> page = new Page<>(pageNo, pageSize); Page<SysUser> page = new Page<>(pageNo, pageSize);
IPage<SysUser> res = this.sysUserService.page(page, query); IPage<SysUser> res = this.sysUserService.page(page, query);
return Result.OK(res); return Results.OK(res);
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage()); return Results.error(500, "查询失败:" + e.getMessage());
} }
} }
@@ -1149,7 +1149,7 @@ public class SysUserController {
*/ */
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/recycleBin") @GetMapping("/recycleBin")
public Result<List<SysUser>> getRecycleBin() { public Results<List<SysUser>> getRecycleBin() {
List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted(); List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted();
if (!logicDeletedUserList.isEmpty()) { if (!logicDeletedUserList.isEmpty()) {
// 批量查询用户的所属部门 // 批量查询用户的所属部门
@@ -1159,7 +1159,7 @@ public class SysUserController {
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId()))); logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId())));
} }
return Result.OK(logicDeletedUserList); return Results.OK(logicDeletedUserList);
} }
/** /**
@@ -1171,7 +1171,7 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT) // @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
@PostMapping("/putRecycleBin") @PostMapping("/putRecycleBin")
public Result<T> putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) { public Results<T> putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
String userIds = jsonObject.getString("userIds"); String userIds = jsonObject.getString("userIds");
if (StringUtils.isNotBlank(userIds)) { if (StringUtils.isNotBlank(userIds)) {
SysUser updateUser = new SysUser(); SysUser updateUser = new SysUser();
@@ -1179,7 +1179,7 @@ public class SysUserController {
updateUser.setUpdateTime(new Date()); updateUser.setUpdateTime(new Date());
sysUserService.revertLogicDeleted(Arrays.asList(userIds.split(",")), updateUser); sysUserService.revertLogicDeleted(Arrays.asList(userIds.split(",")), updateUser);
} }
return Result.OK("还原成功"); return Results.OK("还原成功");
} }
/** /**
@@ -1190,11 +1190,11 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
@PostMapping("/deleteRecycleBin") @PostMapping("/deleteRecycleBin")
public Result<T> deleteRecycleBin(@RequestParam("userIds") String userIds) { public Results<T> deleteRecycleBin(@RequestParam("userIds") String userIds) {
if (StringUtils.isNotBlank(userIds)) { if (StringUtils.isNotBlank(userIds)) {
sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(","))); sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
} }
return Result.OK("删除成功"); return Results.OK("删除成功");
} }
@@ -1206,8 +1206,8 @@ public class SysUserController {
@RequiresPermissions("user:edit") @RequiresPermissions("user:edit")
// @RequestMapping(value = "/appEdit", method = RequestMethod.PUT) // @RequestMapping(value = "/appEdit", method = RequestMethod.PUT)
@PostMapping("/appEdit") @PostMapping("/appEdit")
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) { public Results<SysUser> appEdit(HttpServletRequest request, @RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<>(); Results<SysUser> result = new Results<>();
try { try {
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser sysUser = sysUserService.getUserByName(username); SysUser sysUser = sysUserService.getUserByName(username);
@@ -1220,12 +1220,12 @@ public class SysUserController {
Date birthday=jsonObject.getDate("birthday"); Date birthday=jsonObject.getDate("birthday");
SysUser userPhone = sysUserService.getUserByPhone(phone); SysUser userPhone = sysUserService.getUserByPhone(phone);
if(sysUser==null) { if(sysUser==null) {
return Result.error("未找到对应用户!"); return Results.error("未找到对应用户!");
}else { }else {
if(userPhone!=null){ if(userPhone!=null){
String userPhonename = userPhone.getUsername(); String userPhonename = userPhone.getUsername();
if(!userPhonename.equals(username)){ if(!userPhonename.equals(username)){
return Result.error("手机号已存在!"); return Results.error("手机号已存在!");
} }
} }
setUser(sysUser, realname, avatar, sex, phone, email, birthday); setUser(sysUser, realname, avatar, sex, phone, email, birthday);
@@ -1233,7 +1233,7 @@ public class SysUserController {
} }
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败!"); return Results.error("操作失败!");
} }
return result; return result;
} }
@@ -1267,20 +1267,20 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/saveClientId", method = RequestMethod.GET) // @RequestMapping(value = "/saveClientId", method = RequestMethod.GET)
@PostMapping("/saveClientId") @PostMapping("/saveClientId")
public Result<SysUser> saveClientId(HttpServletRequest request,@RequestParam("clientId")String clientId) { public Results<SysUser> saveClientId(HttpServletRequest request, @RequestParam("clientId")String clientId) {
Result<SysUser> result = new Result<>(); Results<SysUser> result = new Results<>();
try { try {
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser sysUser = sysUserService.getUserByName(username); SysUser sysUser = sysUserService.getUserByName(username);
if(sysUser==null) { if(sysUser==null) {
return Result.error("未找到对应用户!"); return Results.error("未找到对应用户!");
}else { }else {
sysUser.setClientId(clientId); sysUser.setClientId(clientId);
sysUserService.updateById(sysUser); sysUserService.updateById(sysUser);
} }
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败!"); return Results.error("操作失败!");
} }
return result; return result;
} }
@@ -1292,7 +1292,7 @@ public class SysUserController {
*/ */
//@RequiresPermissions("sys:user:list") //@RequiresPermissions("sys:user:list")
@GetMapping("/queryChildrenByUsername") @GetMapping("/queryChildrenByUsername")
public Result<Map<String, Object>> queryChildrenByUsername(@RequestParam("userId") String userId) { public Results<Map<String, Object>> queryChildrenByUsername(@RequestParam("userId") String userId) {
//获取用户信息 //获取用户信息
Map<String,Object> map=new HashMap<>(); Map<String,Object> map=new HashMap<>();
SysUser sysUser = sysUserService.getById(userId); SysUser sysUser = sysUserService.getById(userId);
@@ -1308,7 +1308,7 @@ public class SysUserController {
map.put("children",childrenUser); map.put("children",childrenUser);
} }
} }
return Result.OK(map); return Results.OK(map);
} }
/** /**
@@ -1317,8 +1317,8 @@ public class SysUserController {
* @return * @return
*/ */
@GetMapping("/appQueryByDepartId") @GetMapping("/appQueryByDepartId")
public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) { public Results<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) {
Result<List<SysUser>> result = new Result<>(); Results<List<SysUser>> result = new Results<>();
List<String> list=new ArrayList<> (); List<String> list=new ArrayList<> ();
list.add(departId); list.add(departId);
List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null); List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null);
@@ -1331,8 +1331,8 @@ public class SysUserController {
* @return * @return
*/ */
@GetMapping("/appQueryUser") @GetMapping("/appQueryUser")
public Result<List<SysUser>> appQueryUser(@RequestParam(name = "keyword", required = false) String keyword) { public Results<List<SysUser>> appQueryUser(@RequestParam(name = "keyword", required = false) String keyword) {
Result<List<SysUser>> result = new Result<>(); Results<List<SysUser>> result = new Results<>();
LambdaQueryWrapper<SysUser> queryWrapper =new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> queryWrapper =new LambdaQueryWrapper<>();
//TODO 外部模拟登陆临时账号，列表不显示 //TODO 外部模拟登陆临时账号，列表不显示
queryWrapper.ne(SysUser::getUsername,"_reserve_user_external"); queryWrapper.ne(SysUser::getUsername,"_reserve_user_external");
@@ -1359,10 +1359,10 @@ public class SysUserController {
*/ */
// @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT) // @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
@PostMapping("/updateMobile") @PostMapping("/updateMobile")
public Result<SysUser> changMobile(@RequestBody JSONObject json,HttpServletRequest request) { public Results<SysUser> changMobile(@RequestBody JSONObject json, HttpServletRequest request) {
String smscode = json.getString(SMSCODE); String smscode = json.getString(SMSCODE);
String phone = json.getString(PHONE); String phone = json.getString(PHONE);
Result<SysUser> result = new Result<>(); Results<SysUser> result = new Results<>();
//获取登录用户名 //获取登录用户名
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) { if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) {
@@ -1383,11 +1383,11 @@ public class SysUserController {
} }
SysUser user = sysUserService.getUserByName(username); SysUser user = sysUserService.getUserByName(username);
if(user==null) { if(user==null) {
return Result.error(USER_ERROR_MSG); return Results.error(USER_ERROR_MSG);
} }
user.setPhone(phone); user.setPhone(phone);
sysUserService.updateById(user); sysUserService.updateById(user);
return Result.OK("手机号设置成功!"); return Results.OK("手机号设置成功!");
} }
/** /**
@@ -1408,7 +1408,7 @@ public class SysUserController {
@ApiOperation(value = "用户管理-角色配置") @ApiOperation(value = "用户管理-角色配置")
@PostMapping(value = "/setRole") @PostMapping(value = "/setRole")
public Result<SysUser> setRole(@RequestBody JSONObject jsonObject) { public Results<SysUser> setRole(@RequestBody JSONObject jsonObject) {
try { try {
String ids = jsonObject.getString("ids"); String ids = jsonObject.getString("ids");
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
@@ -1416,7 +1416,7 @@ public class SysUserController {
SysUser sysUser = sysUserService.getById(id); SysUser sysUser = sysUserService.getById(id);
baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 2); baseCommonService.addLog("编辑用户角色，id： " + id, CommonConstant.LOG_TYPE_2, 2);
if (sysUser == null) { if (sysUser == null) {
return Result.error(INEXISTENCE); return Results.error(INEXISTENCE);
} else { } else {
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setId(id); user.setId(id);
@@ -1424,15 +1424,15 @@ public class SysUserController {
String roles = jsonObject.getString(SELECTED_ROLES); String roles = jsonObject.getString(SELECTED_ROLES);
sysUserService.addRoleToUser(user, roles); sysUserService.addRoleToUser(user, roles);
return Result.OK("修改成功!"); return Results.OK("修改成功!");
} }
} }
} catch (Exception e) { } catch (Exception e) {
SysUserController.log.error(e.getMessage(), e); SysUserController.log.error(e.getMessage(), e);
return Result.error("操作失败"); return Results.error("操作失败");
} }
return Result.OK("修改成功!"); return Results.OK("修改成功!");
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java
+8 -8
View File
@@ -1,7 +1,7 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
@@ -54,8 +54,8 @@ public class SysUserOnlineController {
// @RequestMapping(value = "/list", method = RequestMethod.GET) // @RequestMapping(value = "/list", method = RequestMethod.GET)
@GetMapping("/list") @GetMapping("/list")
public Result<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Results<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*"); Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*");
SysUserOnlineVO online; SysUserOnlineVO online;
List<SysUserOnlineVO> onlineList = new ArrayList<>(); List<SysUserOnlineVO> onlineList = new ArrayList<>();
@@ -93,7 +93,7 @@ public class SysUserOnlineController {
Collections.reverse(onlineList); Collections.reverse(onlineList);
onlineList.removeAll(Collections.singleton(null)); onlineList.removeAll(Collections.singleton(null));
Result<Page<SysUserOnlineVO>> result = new Result<>(); Results<Page<SysUserOnlineVO>> result = new Results<>();
result.setSuccess(true); result.setSuccess(true);
result.setResult(page); result.setResult(page);
return result; return result;
@@ -104,10 +104,10 @@ public class SysUserOnlineController {
*/ */
// @RequestMapping(value = "/forceLogout",method = RequestMethod.POST) // @RequestMapping(value = "/forceLogout",method = RequestMethod.POST)
@PostMapping("/forceLogout") @PostMapping("/forceLogout")
public Result<Object> forceLogout(@RequestBody SysUserOnlineVO online) { public Results<Object> forceLogout(@RequestBody SysUserOnlineVO online) {
//用户退出逻辑 //用户退出逻辑
if(oConvertUtils.isEmpty(online.getToken())) { if(oConvertUtils.isEmpty(online.getToken())) {
return Result.error("退出登录失败！"); return Results.error("退出登录失败！");
} }
String username = JwtUtil.getUsername(online.getToken()); String username = JwtUtil.getUsername(online.getToken());
LoginUser sysUser = sysBaseAPI.getUserByName(username); LoginUser sysUser = sysBaseAPI.getUserByName(username);
@@ -122,9 +122,9 @@ public class SysUserOnlineController {
redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername())); redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
//调用shiro的logout //调用shiro的logout
SecurityUtils.getSubject().logout(); SecurityUtils.getSubject().logout();
return Result.OK("退出登录成功！"); return Results.OK("退出登录成功！");
}else { }else {
return Result.error("Token无效!"); return Results.error("Token无效!");
} }
} }
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java
+10 -10
View File
@@ -3,7 +3,7 @@ package com.jero.modules.system.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.util.JwtUtil; import com.jero.common.system.util.JwtUtil;
import com.jero.common.util.PasswordUtil; import com.jero.common.util.PasswordUtil;
@@ -68,7 +68,7 @@ public class ThirdLoginController {
AuthRequest authRequest = factory.get(source); AuthRequest authRequest = factory.get(source);
AuthResponse response = authRequest.login(callback); AuthResponse response = authRequest.login(callback);
log.info(JSON.toJSONString(response)); log.info(JSON.toJSONString(response));
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
if(response.getCode()==2000) { if(response.getCode()==2000) {
JSONObject data = JSON.parseObject(JSON.toJSONString(response.getData())); JSONObject data = JSON.parseObject(JSON.toJSONString(response.getData()));
@@ -119,9 +119,9 @@ public class ThirdLoginController {
*/ */
@PostMapping("/user/create") @PostMapping("/user/create")
@ResponseBody @ResponseBody
public Result<String> thirdUserCreate(@RequestBody ThirdLoginModel model) { public Results<String> thirdUserCreate(@RequestBody ThirdLoginModel model) {
log.info("第三方登录创建新账号：" ); log.info("第三方登录创建新账号：" );
Result<String> res = new Result<>(); Results<String> res = new Results<>();
Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE);
if(operateCode==null || !operateCode.toString().equals(model.getOperateCode())){ if(operateCode==null || !operateCode.toString().equals(model.getOperateCode())){
res.setSuccess(false); res.setSuccess(false);
@@ -150,8 +150,8 @@ public class ThirdLoginController {
*/ */
@PostMapping("/user/checkPassword") @PostMapping("/user/checkPassword")
@ResponseBody @ResponseBody
public Result<String> checkPassword(@RequestBody JSONObject json) { public Results<String> checkPassword(@RequestBody JSONObject json) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE); Object operateCode = redisUtil.get(CommonConstant.THIRD_LOGIN_CODE);
if(operateCode==null || !operateCode.toString().equals(json.getString("operateCode"))){ if(operateCode==null || !operateCode.toString().equals(json.getString("operateCode"))){
result.setSuccess(false); result.setSuccess(false);
@@ -211,8 +211,8 @@ public class ThirdLoginController {
// @RequestMapping(value = "/getLoginUser/{token}/{thirdType}", method = RequestMethod.GET) // @RequestMapping(value = "/getLoginUser/{token}/{thirdType}", method = RequestMethod.GET)
@GetMapping("/getLoginUser/{token}/{thirdType}") @GetMapping("/getLoginUser/{token}/{thirdType}")
@ResponseBody @ResponseBody
public Result<JSONObject> getThirdLoginUser(@PathVariable("token") String token,@PathVariable("thirdType") String thirdType) { public Results<JSONObject> getThirdLoginUser(@PathVariable("token") String token, @PathVariable("thirdType") String thirdType) {
Result<JSONObject> result ; Results<JSONObject> result ;
String username = JwtUtil.getUsername(token); String username = JwtUtil.getUsername(token);
//1. 校验用户是否有效 //1. 校验用户是否有效
@@ -253,8 +253,8 @@ public class ThirdLoginController {
@ApiOperation("手机号登录接口") @ApiOperation("手机号登录接口")
@PostMapping("/bindingThirdPhone") @PostMapping("/bindingThirdPhone")
@ResponseBody @ResponseBody
public Result<String> bindingThirdPhone(@RequestBody JSONObject jsonObject) { public Results<String> bindingThirdPhone(@RequestBody JSONObject jsonObject) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
String phone = jsonObject.getString("mobile"); String phone = jsonObject.getString("mobile");
String thirdUserUuid = jsonObject.getString("thirdUserUuid"); String thirdUserUuid = jsonObject.getString("thirdUserUuid");
//校验用户有效性 //校验用户有效性
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ILoginService.java
+13 -13
View File
@@ -1,7 +1,7 @@
package com.jero.modules.system.service; package com.jero.modules.system.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel; import com.jero.modules.system.model.SysLoginModel;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
@@ -25,33 +25,33 @@ public interface ILoginService{
* @param sysLoginModel * @param sysLoginModel
* @return Result * @return Result
*/ */
public Result<JSONObject> login(SysLoginModel sysLoginModel); public Results<JSONObject> login(SysLoginModel sysLoginModel);
/** /**
* 退出登录 * 退出登录
* @param request response * @param request response
* @return Result * @return Result
*/ */
public Result<Object> logout(HttpServletRequest request, HttpServletResponse response); public Results<Object> logout(HttpServletRequest request, HttpServletResponse response);
/** /**
* 获取访问量 * 获取访问量
* @return Result * @return Result
*/ */
public Result<JSONObject> loginfo(); public Results<JSONObject> loginfo();
/** /**
* 获取访问量 * 获取访问量
* @return Result * @return Result
*/ */
public Result<List<Map<String,Object>>> visitInfo(); public Results<List<Map<String,Object>>> visitInfo();
/** /**
* 登陆成功选择用户当前部门 * 登陆成功选择用户当前部门
* @param user * @param user
* @return * @return
*/ */
public Result<JSONObject> selectDepart(SysUser user); public Results<JSONObject> selectDepart(SysUser user);
/** /**
* 短信登录接口 * 短信登录接口
@@ -59,7 +59,7 @@ public interface ILoginService{
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
public Result<String> sms(JSONObject jsonObject); public Results<String> sms(JSONObject jsonObject);
/** /**
* 手机号登录接口 * 手机号登录接口
@@ -67,20 +67,20 @@ public interface ILoginService{
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
public Result<JSONObject> phoneLogin(JSONObject jsonObject); public Results<JSONObject> phoneLogin(JSONObject jsonObject);
/** /**
* 获取加密字符串 * 获取加密字符串
* @return * @return
*/ */
public Result<Map<String,String>> getEncryptedString(); public Results<Map<String,String>> getEncryptedString();
/** /**
* 后台生成图形验证码 ：有效 * 后台生成图形验证码 ：有效
* @param response * @param response
* @param key * @param key
*/ */
public Result<String> randomImage(HttpServletResponse response,String key); public Results<String> randomImage(HttpServletResponse response, String key);
/** /**
* app登录 * app登录
@@ -88,14 +88,14 @@ public interface ILoginService{
* @return * @return
* @throws Exception * @throws Exception
*/ */
public Result<JSONObject> mLogin(SysLoginModel sysLoginModel); public Results<JSONObject> mLogin(SysLoginModel sysLoginModel);
/** /**
* 图形验证码 * 图形验证码
* @param sysLoginModel * @param sysLoginModel
* @return * @return
*/ */
public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel); public Results<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
/** /**
* 返回一个RSA公钥 * 返回一个RSA公钥
@@ -104,5 +104,5 @@ public interface ILoginService{
* @param * @param
* @return com.jero.common.api.vo.Result<java.lang.String> * @return com.jero.common.api.vo.Result<java.lang.String>
*/ */
public Result<String> getRSAPublicKey(); public Results<String> getRSAPublicKey();
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysRoleService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.modules.system.service; package com.jero.modules.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysRole;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -25,7 +25,7 @@ public interface ISysRoleService extends IService<SysRole> {
* @return * @return
* @throws Exception * @throws Exception
*/ */
Result<T> importExcelCheckRoleCode(MultipartFile file, ImportParams params) throws Exception; Results<T> importExcelCheckRoleCode(MultipartFile file, ImportParams params) throws Exception;
/** /**
* 删除角色 * 删除角色
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+4 -4
View File
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.vo.SysUserCacheInfo; import com.jero.common.system.vo.SysUserCacheInfo;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
@@ -46,7 +46,7 @@ public interface ISysUserService extends IService<SysUser> {
* @param confirmpassword * @param confirmpassword
* @return * @return
*/ */
public Result<T> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); public Results<T> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword);
/** /**
* 修改密码 * 修改密码
@@ -54,7 +54,7 @@ public interface ISysUserService extends IService<SysUser> {
* @param sysUser * @param sysUser
* @return * @return
*/ */
public Result<T> changePassword(SysUser sysUser); public Results<T> changePassword(SysUser sysUser);
/** /**
* 删除用户 * 删除用户
@@ -217,7 +217,7 @@ public interface ISysUserService extends IService<SysUser> {
* @param sysUser * @param sysUser
* @return * @return
*/ */
Result checkUserIsEffective(SysUser sysUser); Results checkUserIsEffective(SysUser sysUser);
/** /**
* 查询被逻辑删除的用户 * 查询被逻辑删除的用户
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+42 -42
View File
@@ -6,7 +6,7 @@ import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ClientException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
@@ -68,15 +68,15 @@ public class LoginServiceImpl implements ILoginService {
private static final String USER_INFO = "userInfo"; private static final String USER_INFO = "userInfo";
@Override @Override
public Result<JSONObject> login(SysLoginModel sysLoginModel) { public Results<JSONObject> login(SysLoginModel sysLoginModel) {
Result<JSONObject> result ; Results<JSONObject> result ;
String username = sysLoginModel.getUsername(); String username = sysLoginModel.getUsername();
String password = sysLoginModel.getPassword(); String password = sysLoginModel.getPassword();
String rsaPublicKey = sysLoginModel.getRsaPublicKey(); String rsaPublicKey = sysLoginModel.getRsaPublicKey();
String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null; String rsaPrivateKey = redisUtil.get(rsaPublicKey) != null ? String.valueOf(redisUtil.get(rsaPublicKey)) : null;
if(StrUtil.isEmpty(rsaPrivateKey)){ if(StrUtil.isEmpty(rsaPrivateKey)){
return Result.error("页面过期，请刷新页面"); return Results.error("页面过期，请刷新页面");
} }
//update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
@@ -86,14 +86,14 @@ public class LoginServiceImpl implements ILoginService {
//update-begin-author:taoyan date:20190828 for:校验验证码 //update-begin-author:taoyan date:20190828 for:校验验证码
String captcha = sysLoginModel.getCaptcha(); String captcha = sysLoginModel.getCaptcha();
if(captcha==null){ if(captcha==null){
return Result.error("验证码无效"); return Results.error("验证码无效");
} }
String lowerCaseCaptcha = captcha.toLowerCase(); String lowerCaseCaptcha = captcha.toLowerCase();
String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), UTF_8); String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), UTF_8);
Object checkCode = redisUtil.get(realKey); Object checkCode = redisUtil.get(realKey);
//当进入登录页时，有一定几率出现验证码错误 #1714 //当进入登录页时，有一定几率出现验证码错误 #1714
if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) { if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
return Result.error("验证码错误"); return Results.error("验证码错误");
} }
try { try {
//解密获取密码和用户名 //解密获取密码和用户名
@@ -119,7 +119,7 @@ public class LoginServiceImpl implements ILoginService {
retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username);
} }
if (retryCount >= RETRY_LOGIN_MAX_COUNT){ if (retryCount >= RETRY_LOGIN_MAX_COUNT){
return Result.error("密码错误次数过多，请15分钟后重试"); return Results.error("密码错误次数过多，请15分钟后重试");
} }
//2. 校验用户名或密码是否正确 //2. 校验用户名或密码是否正确
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
@@ -133,7 +133,7 @@ public class LoginServiceImpl implements ILoginService {
redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
} }
String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount);
return Result.error(msg); return Results.error(msg);
} }
//登录成功，清除错误登录次数 //登录成功，清除错误登录次数
redisUtil.del(RETRY_LOGIN_PREFIX + username); redisUtil.del(RETRY_LOGIN_PREFIX + username);
@@ -153,11 +153,11 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<Object> logout(HttpServletRequest request, HttpServletResponse response) { public Results<Object> logout(HttpServletRequest request, HttpServletResponse response) {
//用户退出逻辑 //用户退出逻辑
String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
if(oConvertUtils.isEmpty(token)) { if(oConvertUtils.isEmpty(token)) {
return Result.error("退出登录失败！"); return Results.error("退出登录失败！");
} }
String username = JwtUtil.getUsername(token); String username = JwtUtil.getUsername(token);
LoginUser sysUser = sysBaseAPI.getUserByName(username); LoginUser sysUser = sysBaseAPI.getUserByName(username);
@@ -174,15 +174,15 @@ public class LoginServiceImpl implements ILoginService {
redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername())); redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
//调用shiro的logout //调用shiro的logout
SecurityUtils.getSubject().logout(); SecurityUtils.getSubject().logout();
return Result.OK("退出登录成功！"); return Results.OK("退出登录成功！");
}else { }else {
return Result.error("Token无效!"); return Results.error("Token无效!");
} }
} }
@Override @Override
public Result<JSONObject> loginfo() { public Results<JSONObject> loginfo() {
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
//update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数 //update-begin--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数
// 获取一天的开始和结束时间 // 获取一天的开始和结束时间
@@ -208,8 +208,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<List<Map<String, Object>>> visitInfo() { public Results<List<Map<String, Object>>> visitInfo() {
Result<List<Map<String,Object>>> result = new Result<>(); Results<List<Map<String,Object>>> result = new Results<>();
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
calendar.set(Calendar.HOUR_OF_DAY,0); calendar.set(Calendar.HOUR_OF_DAY,0);
calendar.set(Calendar.MINUTE,0); calendar.set(Calendar.MINUTE,0);
@@ -225,8 +225,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<JSONObject> selectDepart(SysUser user) { public Results<JSONObject> selectDepart(SysUser user) {
Result<JSONObject> result = new Result<>(); Results<JSONObject> result = new Results<>();
String username = user.getUsername(); String username = user.getUsername();
if(oConvertUtils.isEmpty(username)) { if(oConvertUtils.isEmpty(username)) {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
@@ -242,8 +242,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<String> sms(JSONObject jsonObject) { public Results<String> sms(JSONObject jsonObject) {
Result<String> result = new Result<>(); Results<String> result = new Results<>();
String mobile = jsonObject.get("mobile").toString(); String mobile = jsonObject.get("mobile").toString();
//手机号模式 登录模式: "2" 注册模式: "1" //手机号模式 登录模式: "2" 注册模式: "1"
String smsmode=jsonObject.get("smsmode").toString(); String smsmode=jsonObject.get("smsmode").toString();
@@ -271,7 +271,7 @@ public class LoginServiceImpl implements ILoginService {
SysUser sysUser = sysUserService.getUserByPhone(mobile); SysUser sysUser = sysUserService.getUserByPhone(mobile);
if(sysUser!=null) { if(sysUser!=null) {
baseCommonService.addLog("手机号已经注册，请直接登录！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("手机号已经注册，请直接登录！", CommonConstant.LOG_TYPE_1, null);
return Result.error(" 手机号已经注册，请直接登录！"); return Results.error(" 手机号已经注册，请直接登录！");
} }
b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE); b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE);
}else { }else {
@@ -281,7 +281,7 @@ public class LoginServiceImpl implements ILoginService {
if(!result.isSuccess()) { if(!result.isSuccess()) {
String message = result.getMessage(); String message = result.getMessage();
if("该用户不存在，请注册".equals(message)){ if("该用户不存在，请注册".equals(message)){
return Result.error("该用户不存在或未绑定手机号"); return Results.error("该用户不存在或未绑定手机号");
} }
return result; return result;
} }
@@ -303,7 +303,7 @@ public class LoginServiceImpl implements ILoginService {
} catch (ClientException e) { } catch (ClientException e) {
e.printStackTrace(); e.printStackTrace();
return Result.error(" 短信接口未配置，请联系管理员！"); return Results.error(" 短信接口未配置，请联系管理员！");
} }
return result; return result;
} }
@@ -323,8 +323,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<JSONObject> phoneLogin(JSONObject jsonObject) { public Results<JSONObject> phoneLogin(JSONObject jsonObject) {
Result<JSONObject> result ; Results<JSONObject> result ;
String phone = jsonObject.getString("mobile"); String phone = jsonObject.getString("mobile");
//校验用户有效性 //校验用户有效性
@@ -349,8 +349,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<Map<String, String>> getEncryptedString() { public Results<Map<String, String>> getEncryptedString() {
Result<Map<String,String>> result = new Result<>(); Results<Map<String,String>> result = new Results<>();
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("key", EncryptedString.ENCRYPTED_KEY); map.put("key", EncryptedString.ENCRYPTED_KEY);
map.put("iv",EncryptedString.ENCRYPTED_IV); map.put("iv",EncryptedString.ENCRYPTED_IV);
@@ -359,8 +359,8 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<String> randomImage(HttpServletResponse response, String key) { public Results<String> randomImage(HttpServletResponse response, String key) {
Result<String> res = new Result<>(); Results<String> res = new Results<>();
try { try {
String code = RandomUtil.randomString(BASE_CHECK_CODES,4); String code = RandomUtil.randomString(BASE_CHECK_CODES,4);
String lowerCaseCode = code.toLowerCase(); String lowerCaseCode = code.toLowerCase();
@@ -371,14 +371,14 @@ public class LoginServiceImpl implements ILoginService {
res.setResult(base64); res.setResult(base64);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return Result.error("获取验证码出错"+e.getMessage()); return Results.error("获取验证码出错"+e.getMessage());
} }
return res; return res;
} }
@Override @Override
public Result<JSONObject> mLogin(SysLoginModel sysLoginModel) { public Results<JSONObject> mLogin(SysLoginModel sysLoginModel) {
Result<JSONObject> result ; Results<JSONObject> result ;
String username = sysLoginModel.getUsername(); String username = sysLoginModel.getUsername();
String password = sysLoginModel.getPassword(); String password = sysLoginModel.getPassword();
@@ -393,7 +393,7 @@ public class LoginServiceImpl implements ILoginService {
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
String syspassword = sysUser.getPassword(); String syspassword = sysUser.getPassword();
if (!syspassword.equals(userpassword)) { if (!syspassword.equals(userpassword)) {
return Result.error("用户名或密码错误"); return Results.error("用户名或密码错误");
} }
String orgCode = sysUser.getOrgCode(); String orgCode = sysUser.getOrgCode();
@@ -401,7 +401,7 @@ public class LoginServiceImpl implements ILoginService {
//如果当前用户无选择部门 查看部门关联信息 //如果当前用户无选择部门 查看部门关联信息
List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId()); List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
if (departs == null || departs.isEmpty()) { if (departs == null || departs.isEmpty()) {
return Result.error("用户暂未归属部门,不可登录!"); return Results.error("用户暂未归属部门,不可登录!");
} }
orgCode = departs.get(0).getOrgCode(); orgCode = departs.get(0).getOrgCode();
sysUser.setOrgCode(orgCode); sysUser.setOrgCode(orgCode);
@@ -427,29 +427,29 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<T> checkCaptcha(SysLoginModel sysLoginModel) { public Results<T> checkCaptcha(SysLoginModel sysLoginModel) {
String captcha = sysLoginModel.getCaptcha(); String captcha = sysLoginModel.getCaptcha();
String checkKey = sysLoginModel.getCheckKey(); String checkKey = sysLoginModel.getCheckKey();
if(captcha==null){ if(captcha==null){
return Result.error("验证码无效"); return Results.error("验证码无效");
} }
String lowerCaseCaptcha = captcha.toLowerCase(); String lowerCaseCaptcha = captcha.toLowerCase();
String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+checkKey, UTF_8); String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+checkKey, UTF_8);
Object checkCode = redisUtil.get(realKey); Object checkCode = redisUtil.get(realKey);
if(checkCode==null || !checkCode.equals(lowerCaseCaptcha)) { if(checkCode==null || !checkCode.equals(lowerCaseCaptcha)) {
return Result.error("验证码错误"); return Results.error("验证码错误");
} }
return Result.OK(); return Results.OK();
} }
@Override @Override
public Result<String> getRSAPublicKey() { public Results<String> getRSAPublicKey() {
RSA rsa = new RSA(); RSA rsa = new RSA();
String privateKeyBase64 = rsa.getPrivateKeyBase64(); String privateKeyBase64 = rsa.getPrivateKeyBase64();
String publicKeyBase64 = rsa.getPublicKeyBase64(); String publicKeyBase64 = rsa.getPublicKeyBase64();
//存到redis key为公钥 value为私钥 //存到redis key为公钥 value为私钥
redisUtil.set(publicKeyBase64, privateKeyBase64, 180L); redisUtil.set(publicKeyBase64, privateKeyBase64, 180L);
Result<String> result = new Result<>(); Results<String> result = new Results<>();
result.setResult(publicKeyBase64); result.setResult(publicKeyBase64);
return result; return result;
} }
@@ -461,7 +461,7 @@ public class LoginServiceImpl implements ILoginService {
* @param result * @param result
* @return * @return
*/ */
private Result<JSONObject> userInfo(SysUser sysUser, Result<JSONObject> result) { private Results<JSONObject> userInfo(SysUser sysUser, Results<JSONObject> result) {
String multiDepart ="multi_depart"; String multiDepart ="multi_depart";
String syspassword = sysUser.getPassword(); String syspassword = sysUser.getPassword();
String username = sysUser.getUsername(); String username = sysUser.getUsername();
@@ -493,7 +493,7 @@ public class LoginServiceImpl implements ILoginService {
// 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。 // 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。
List<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList); List<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList);
if (tenantList.isEmpty()) { if (tenantList.isEmpty()) {
return Result.error("与该用户关联的租户均已被冻结，无法登录！"); return Results.error("与该用户关联的租户均已被冻结，无法登录！");
} else { } else {
obj.put("tenantList", tenantList); obj.put("tenantList", tenantList);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRoleServiceImpl.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.modules.system.service.impl; package com.jero.modules.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysRole;
@@ -35,7 +35,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
SysUserMapper sysUserMapper; SysUserMapper sysUserMapper;
@Override @Override
public Result importExcelCheckRoleCode(MultipartFile file, ImportParams params) throws Exception { public Results importExcelCheckRoleCode(MultipartFile file, ImportParams params) throws Exception {
List<Object> listSysRoles = ExcelImportUtil.importExcel(file.getInputStream(), SysRole.class, params); List<Object> listSysRoles = ExcelImportUtil.importExcel(file.getInputStream(), SysRole.class, params);
List<String> errorStrs = new ArrayList<>(); List<String> errorStrs = new ArrayList<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+13 -13
View File
@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Results;
import com.jero.modules.system.vo.SysUserRoleNameVo; import com.jero.modules.system.vo.SysUserRoleNameVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
@@ -68,33 +68,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override @Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
public Result<T> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) { public Results<T> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) {
SysUser user = userMapper.getUserByName(username); SysUser user = userMapper.getUserByName(username);
String passwordEncode = PasswordUtil.encrypt(username, oldpassword, user.getSalt()); String passwordEncode = PasswordUtil.encrypt(username, oldpassword, user.getSalt());
if (!user.getPassword().equals(passwordEncode)) { if (!user.getPassword().equals(passwordEncode)) {
return Result.error("旧密码输入错误!"); return Results.error("旧密码输入错误!");
} }
if (oConvertUtils.isEmpty(newpassword)) { if (oConvertUtils.isEmpty(newpassword)) {
return Result.error("新密码不允许为空!"); return Results.error("新密码不允许为空!");
} }
if (!newpassword.equals(confirmpassword)) { if (!newpassword.equals(confirmpassword)) {
return Result.error("两次输入密码不一致!"); return Results.error("两次输入密码不一致!");
} }
String password = PasswordUtil.encrypt(username, newpassword, user.getSalt()); String password = PasswordUtil.encrypt(username, newpassword, user.getSalt());
this.userMapper.update(new SysUser().setPassword(password), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId())); this.userMapper.update(new SysUser().setPassword(password), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
return Result.OK("密码重置成功!"); return Results.OK("密码重置成功!");
} }
@Override @Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
public Result<T> changePassword(SysUser sysUser) { public Results<T> changePassword(SysUser sysUser) {
String salt = oConvertUtils.randomGen(8); String salt = oConvertUtils.randomGen(8);
sysUser.setSalt(salt); sysUser.setSalt(salt);
String password = sysUser.getPassword(); String password = sysUser.getPassword();
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
sysUser.setPassword(passwordEncode); sysUser.setPassword(passwordEncode);
this.userMapper.updateById(sysUser); this.userMapper.updateById(sysUser);
return Result.OK("密码操作成功!"); return Results.OK("密码操作成功!");
} }
@Override @Override
@@ -370,24 +370,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return * @return
*/ */
@Override @Override
public Result<T> checkUserIsEffective(SysUser sysUser) { public Results<T> checkUserIsEffective(SysUser sysUser) {
Result<T> result = new Result<>(); Results<T> result = new Results<>();
//情况1：根据用户信息查询，该用户不存在 //情况1：根据用户信息查询，该用户不存在
if (sysUser == null) { if (sysUser == null) {
baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);
return Result.error("该用户不存在，请注册"); return Results.error("该用户不存在，请注册");
} }
//情况2：根据用户信息查询，该用户已注销 //情况2：根据用户信息查询，该用户已注销
//update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------ //update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------
if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) { if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) {
//update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------ //update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------
baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null);
return Result.error("该用户已注销"); return Results.error("该用户已注销");
} }
//情况3：根据用户信息查询，该用户已冻结 //情况3：根据用户信息查询，该用户已冻结
if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) { if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) {
baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已冻结！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已冻结！", CommonConstant.LOG_TYPE_1, null);
return Result.error("该用户已冻结"); return Results.error("该用户已冻结");
} }
return result; return result;
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -5,7 +5,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.entity.${entityName};
import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -9,7 +9,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.entity.${entityName};
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeecgController; import com.jero.common.system.base.controller.JeecgController;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
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.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -8,7 +8,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
+1 -1
View File
@@ -10,7 +10,7 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import ${bussiPackage}.entity.${entityPackage}.${entityName}; import ${bussiPackage}.entity.${entityPackage}.${entityName};
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -18,7 +18,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+1 -1
View File
@@ -17,7 +17,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
<#list subTables as sub> <#list subTables as sub>
jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/controller/JeroTestFeignController.java
+5 -5
View File
@@ -2,11 +2,11 @@ package com.jero.modules.cloud.feign.controller;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.jero.common.api.vo.Results;
import com.jero.starter.cloud.feign.impl.JeroFeignService; import com.jero.starter.cloud.feign.impl.JeroFeignService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.jero.boot.starter.rabbitmq.client.RabbitMqClient; import com.jero.boot.starter.rabbitmq.client.RabbitMqClient;
import com.jero.common.api.vo.Result;
import com.jero.common.base.BaseMap; import com.jero.common.base.BaseMap;
import com.jero.modules.cloud.constant.CloudConstant; import com.jero.modules.cloud.constant.CloudConstant;
import com.jero.modules.cloud.feign.feign.JeroTestClient; import com.jero.modules.cloud.feign.feign.JeroTestClient;
@@ -33,20 +33,20 @@ public class JeroTestFeignController {
@GetMapping("getMessage") @GetMapping("getMessage")
@ApiOperation(value = "测试feign", notes = "测试feign") @ApiOperation(value = "测试feign", notes = "测试feign")
public Result<String> getMessage() { public Results<String> getMessage() {
return jeroTestClient.getMessage("jero-boot"); return jeroTestClient.getMessage("jero-boot");
} }
@GetMapping("getMessage2") @GetMapping("getMessage2")
@ApiOperation(value = "测试动态feign", notes = "测试动态feign") @ApiOperation(value = "测试动态feign", notes = "测试动态feign")
public Result<String> getMessage2() { public Results<String> getMessage2() {
JeroTestClientDyn myClientDyn = jeroFeignService.newInstance(JeroTestClientDyn.class, CloudConstant.SERVER_NAME_JERO_DEMO); JeroTestClientDyn myClientDyn = jeroFeignService.newInstance(JeroTestClientDyn.class, CloudConstant.SERVER_NAME_JERO_DEMO);
return myClientDyn.getMessage("动态fegin——jero-boot2"); return myClientDyn.getMessage("动态fegin——jero-boot2");
} }
@GetMapping(value = "/rabbitmq") @GetMapping(value = "/rabbitmq")
@ApiOperation(value = "测试rabbitmq", notes = "测试rabbitmq") @ApiOperation(value = "测试rabbitmq", notes = "测试rabbitmq")
public Result<T> rabbitMqClientTest(HttpServletRequest req) { public Results<T> rabbitMqClientTest(HttpServletRequest req) {
//rabbitmq消息队列测试 //rabbitmq消息队列测试
BaseMap map = new BaseMap(); BaseMap map = new BaseMap();
map.put("orderId", RandomUtil.randomNumbers(10)); map.put("orderId", RandomUtil.randomNumbers(10));
@@ -57,6 +57,6 @@ public class JeroTestFeignController {
BaseMap params = new BaseMap(); BaseMap params = new BaseMap();
params.put("orderId", "123456"); params.put("orderId", "123456");
rabbitMqClient.publishEvent(CloudConstant.MQ_DEMO_BUS_EVENT, params); rabbitMqClient.publishEvent(CloudConstant.MQ_DEMO_BUS_EVENT, params);
return Result.OK("MQ发送消息成功"); return Results.OK("MQ发送消息成功");
} }
} }
jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/feign/JeroTestClient.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.modules.cloud.feign.feign; package com.jero.modules.cloud.feign.feign;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import com.jero.modules.cloud.constant.CloudConstant; import com.jero.modules.cloud.constant.CloudConstant;
import com.jero.modules.cloud.feign.feign.fallback.JeroTestClientFallback; import com.jero.modules.cloud.feign.feign.fallback.JeroTestClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
@@ -16,5 +16,5 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface JeroTestClient { public interface JeroTestClient {
@GetMapping(value = "/test/getMessage") @GetMapping(value = "/test/getMessage")
Result<String> getMessage(@RequestParam("name") String name); Results<String> getMessage(@RequestParam("name") String name);
} }
jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/feign/JeroTestClientDyn.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.modules.cloud.feign.feign; package com.jero.modules.cloud.feign.feign;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Results;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface JeroTestClientDyn { public interface JeroTestClientDyn {
@GetMapping(value = "/test/getMessage") @GetMapping(value = "/test/getMessage")
Result<String> getMessage(@RequestParam("name") String name); Results<String> getMessage(@RequestParam("name") String name);
} }