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
@ApiModel(value="接口返回对象", description="接口返回对象")
public class Result<T> implements Serializable {
public class Results<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -49,36 +49,36 @@ public class Result<T> implements Serializable {
@ApiModelProperty(value = "时间戳")
private long timestamp = System.currentTimeMillis();
public Result() {
public Results() {
// do other
}
public static<T> Result<T> OK() {
Result<T> r = new Result<>();
public static<T> Results<T> OK() {
Results<T> r = new Results<>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage("成功");
return r;
}
public static<T> Result<T> OK(String message) {
Result<T> r = new Result<>();
public static<T> Results<T> OK(String message) {
Results<T> r = new Results<>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage(message);
return r;
}
public static<T> Result<T> OK(T data) {
Result<T> r = new Result<>();
public static<T> Results<T> OK(T data) {
Results<T> r = new Results<>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setResult(data);
return r;
}
public static<T> Result<T> OK(String msg, T data) {
Result<T> r = new Result<>();
public static<T> Results<T> OK(String msg, T data) {
Results<T> r = new Results<>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage(msg);
@@ -86,8 +86,8 @@ public class Result<T> implements Serializable {
return r;
}
public static<T> Result<T> error(String msg, T data) {
Result<T> r = new Result<>();
public static<T> Results<T> error(String msg, T data) {
Results<T> r = new Results<>();
r.setSuccess(false);
r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500);
r.setMessage(msg);
@@ -95,12 +95,12 @@ public class Result<T> implements Serializable {
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);
}
public static<T> Result<T> error(int code, String msg) {
Result<T> r = new Result<>();
public static<T> Results<T> error(int code, String msg) {
Results<T> r = new Results<>();
r.setCode(code);
r.setMessage(msg);
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);
}
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.serializer.PropertyFilter;
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.constant.CommonConstant;
import com.jero.common.constant.enums.ModuleType;
@@ -198,8 +198,8 @@ public class AutoLogAspect {
* @return
*/
private String getOnlineLogContent(Object obj, String content){
if (obj instanceof Result){
Result<T> res = (Result)obj;
if (obj instanceof Results){
Results<T> res = (Results)obj;
String msg = res.getMessage();
String tableName = res.getOnlTable();
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.databind.ObjectMapper;
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.constant.CommonConstant;
import com.jero.common.system.vo.DictModel;
@@ -89,7 +89,7 @@ public class DictAspect {
* @param 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<>();
//step.1 筛选出加了 Dict 注解的字段列表
@@ -97,7 +97,7 @@ public class DictAspect {
// 字典数据列表， key = 字典code，value=数据列表
Map<String, List<String>> dataListMap = new HashMap<>();
addItems((Result) result, items, dictFieldList, dataListMap);
addItems((Results) result, items, dictFieldList, dataListMap);
//step.2 调用翻译方法，一次性翻译
Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap);
@@ -105,7 +105,7 @@ public class DictAspect {
//step.3 将翻译结果填充到返回结果里
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()) {
ObjectMapper mapper = new ObjectMapper();
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;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.AuthorizationException;
@@ -28,33 +28,33 @@ public class JeroBootExceptionHandler {
* 处理自定义异常
*/
@ExceptionHandler(JeroBootException.class)
public Result<T> handleJeroBootException(JeroBootException e){
public Results<T> handleJeroBootException(JeroBootException e){
log.error(e.getMessage(), e);
return Result.error(e.getMessage());
return Results.error(e.getMessage());
}
@ExceptionHandler(NoHandlerFoundException.class)
public Result<T> handlerNoFoundException(Exception e) {
public Results<T> handlerNoFoundException(Exception e) {
log.error(e.getMessage(), e);
return Result.error(404, "路径不存在，请检查路径是否正确");
return Results.error(404, "路径不存在，请检查路径是否正确");
}
@ExceptionHandler(DuplicateKeyException.class)
public Result<T> handleDuplicateKeyException(DuplicateKeyException e){
public Results<T> handleDuplicateKeyException(DuplicateKeyException e){
log.error(e.getMessage(), e);
return Result.error("数据库中已存在该记录");
return Results.error("数据库中已存在该记录");
}
@ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
public Result<Object> handleAuthorizationException(AuthorizationException e){
public Results<Object> handleAuthorizationException(AuthorizationException e){
log.error(e.getMessage(), e);
return Result.noauth("没有权限，请联系管理员授权");
return Results.noauth("没有权限，请联系管理员授权");
}
@ExceptionHandler(Exception.class)
public Result<T> handleException(Exception e){
public Results<T> handleException(Exception e){
log.error(e.getMessage(), e);
return Result.error("操作失败，"+e.getMessage());
return Results.error("操作失败，"+e.getMessage());
}
/**
@@ -63,7 +63,7 @@ public class JeroBootExceptionHandler {
* @return
*/
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
public Result<T> httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){
public Results<T> httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e){
StringBuilder sb = new StringBuilder();
sb.append("不支持");
sb.append(e.getMethod());
@@ -77,28 +77,28 @@ public class JeroBootExceptionHandler {
}
}
log.error(sb.toString(), e);
return Result.error(405,sb.toString());
return Results.error(405,sb.toString());
}
/**
* spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException
*/
@ExceptionHandler(MaxUploadSizeExceededException.class)
public Result<T> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
public Results<T> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
log.error(e.getMessage(), e);
return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! ");
return Results.error("文件大小超出10MB限制, 请压缩或降低文件质量! ");
}
@ExceptionHandler(DataIntegrityViolationException.class)
public Result<T> handleDataIntegrityViolationException(DataIntegrityViolationException e) {
public Results<T> handleDataIntegrityViolationException(DataIntegrityViolationException e) {
log.error(e.getMessage(), e);
return Result.error("字段太长,超出数据库字段的长度");
return Results.error("字段太长,超出数据库字段的长度");
}
@ExceptionHandler(PoolException.class)
public Result<T> handlePoolException(PoolException e) {
public Results<T> handlePoolException(PoolException 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.extension.plugins.pagination.Page;
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.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
@@ -162,7 +162,7 @@ public class JeroController<T, S extends IService<T>> {
* @param request
* @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)){
log.info("打印未使用参数");
}
@@ -184,10 +184,10 @@ public class JeroController<T, S extends IService<T>> {
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
//update-end-author:taoyan date:20190528 for:批量插入数据
return Result.OK("文件导入成功！数据行数：" + list.size());
return Results.OK("文件导入成功！数据行数：" + list.size());
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("文件导入失败:" + e.getMessage());
return Results.error("文件导入失败:" + e.getMessage());
} finally {
try {
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.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.exception.JeroBootException;
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) {
return Result.OK("共" + successLines + "行数据全部导入成功！");
return Results.OK("共" + successLines + "行数据全部导入成功！");
} else {
JSONObject result = new JSONObject(5);
int totalCount = successLines + errorLines;
@@ -34,7 +34,7 @@ public class ImportExcelUtil {
String fileName = fileUrl.substring(lastIndex + 1);
result.put("fileUrl", "/sys/common/static/" + fileUrl);
result.put("fileName", fileName);
Result<JSONObject> res = Result.OK(result);
Results<JSONObject> res = Results.OK(result);
res.setCode(201);
res.setMessage("文件导入成功，但有错误。");
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;
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.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -37,7 +37,7 @@ public class RestDesformUtil {
* @param token
* @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();
HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
@@ -52,7 +52,7 @@ public class RestDesformUtil {
* @param token
* @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);
}
@@ -64,11 +64,11 @@ public class RestDesformUtil {
* @param token
* @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);
}
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();
HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
@@ -83,19 +83,19 @@ public class RestDesformUtil {
* @param token
* @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();
HttpHeaders headers = getHeaders(token);
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
return packageReturn(result);
}
private static Result<T> packageReturn(ResponseEntity<JSONObject> result) {
private static Results<T> packageReturn(ResponseEntity<JSONObject> result) {
JSONObject json = result.getBody();
if (!Objects.isNull(json)) {
return json.toJavaObject(Result.class);
return json.toJavaObject(Results.class);
}
return Result.error("操作失败");
return Results.error("操作失败");
}
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.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.LogFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -66,7 +66,7 @@ public class CsrfFilter implements Filter {
log = "跨站请求---->>>" + ip + "||" + date + "||" + referurl + "||" + url;
LOGGER.warn(log);
//发送错误信息
JSONObject json = JSONUtil.parseObj(Result.error("监测到跨站请求，请求失败"), false);
JSONObject json = JSONUtil.parseObj(Results.error("监测到跨站请求，请求失败"), false);
res.setCharacterEncoding("UTF-8");
res.setContentType("application/json; charset=utf-8");
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.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.util.DateUtils;
import com.jero.config.sign.util.BodyReaderHttpServletRequestWrapper;
@@ -64,7 +64,7 @@ public class SignAuthInterceptor implements HandlerInterceptor {
response.setCharacterEncoding("UTF-8");
response.setContentType("application/json; charset=utf-8");
PrintWriter out = response.getWriter();
Result<?> result = Result.error("Sign签名校验失败！");
Results<?> result = Results.error("Sign签名校验失败！");
out.print(JSON.toJSON(result));
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.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.system.api.ISysBaseAPI;
import com.jero.common.system.util.JwtUtil;
@@ -111,7 +111,7 @@ public class OnlineInterceptor implements HandlerInterceptor {
if ("exportXls".equals(paramString)) {
printWriter.print("");
} else {
Result<T> result = Result.error("无权限访问(操作)");
Results<T> result = Results.error("无权限访问(操作)");
printWriter.print(JSON.toJSON(result));
}
} 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.generater.modules.online.auth.entity.OnlAuthData;
import com.jero.generater.modules.online.auth.entity.OnlAuthPage;
@@ -58,8 +58,8 @@ public class OnlCgformAuthController {
@GetMapping({"/authData/{cgformId}"})
public Result<List<OnlAuthData>> a(@PathVariable("cgformId") String paramString) {
Result<List<OnlAuthData>> result = new Result<>();
public Results<List<OnlAuthData>> a(@PathVariable("cgformId") String paramString) {
Results<List<OnlAuthData>> result = new Results<>();
LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString);
List<OnlAuthData> list = this.onlAuthDataService.list(lambdaQueryWrapper);
@@ -70,35 +70,35 @@ public class OnlCgformAuthController {
@PostMapping({"/authData"})
public Result<Object> addAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
public Results<Object> addAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
try {
this.onlAuthDataService.save(paramOnlAuthData);
return Result.OK(OP_CONSTANT);
return Results.OK(OP_CONSTANT);
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/editAuthData"})
public Result<OnlAuthData> editAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
Result<OnlAuthData> result = new Result<>();
public Results<OnlAuthData> editAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
Results<OnlAuthData> result = new Results<>();
this.onlAuthDataService.updateById(paramOnlAuthData);
return result;
}
@PostMapping({"/authData/{id}"})
public Result<T> getAuthDataById(@PathVariable("id") String paramString) {
public Results<T> getAuthDataById(@PathVariable("id") String paramString) {
this.onlAuthDataService.deleteOne(paramString);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
@GetMapping({"/authButton/{cgformId}"})
public Result<Map<String, Object>> getAuthButton(@PathVariable("cgformId") String paramString) {
Result<Map<String, Object>> result = new Result<>();
public Results<Map<String, Object>> getAuthButton(@PathVariable("cgformId") String paramString) {
Results<Map<String, Object>> result = new Results<>();
LambdaQueryWrapper<OnlCgformButton> buttonLambdaQueryWrapper = new LambdaQueryWrapper<>();
buttonLambdaQueryWrapper.eq(OnlCgformButton::getCgformHeadId, paramString)
@@ -121,7 +121,7 @@ public class OnlCgformAuthController {
@PostMapping({"/authButton"})
public Result<OnlAuthPage> addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) {
public Results<OnlAuthPage> addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) {
try {
String str = paramOnlAuthPage.getId();
boolean bool = false;
@@ -137,33 +137,33 @@ public class OnlCgformAuthController {
paramOnlAuthPage.setStatus(1);
this.onlAuthPageService.save(paramOnlAuthPage);
}
return Result.OK(OP_CONSTANT, paramOnlAuthPage);
return Results.OK(OP_CONSTANT, paramOnlAuthPage);
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@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.eq(OnlAuthPage::getId, paramString).set(OnlAuthPage::getStatus, 0);
this.onlAuthPageService.update(lambdaUpdateWrapper);
return Result.OK(OP_CONSTANT);
return Results.OK(OP_CONSTANT);
}
@GetMapping({"/authColumn/{cgformId}"})
public Result<List<AuthColumnVO>> e(@PathVariable("cgformId") String paramString) {
Result<List<AuthColumnVO>> result = new Result<>();
public Results<List<AuthColumnVO>> e(@PathVariable("cgformId") String paramString) {
Results<List<AuthColumnVO>> result = new Results<>();
LambdaQueryWrapper<OnlCgformField> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, paramString);
lambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum);
List<OnlCgformField> list = this.onlCgformFieldService.list(lambdaQueryWrapper);
if (list == null || list.isEmpty()) {
return Result.error(NOT_INFO_CONSTANT);
return Results.error(NOT_INFO_CONSTANT);
}
LambdaQueryWrapper<OnlAuthPage> pageLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -176,7 +176,7 @@ public class OnlCgformAuthController {
arrayList.add(authColumnVO);
}
result.setResult(arrayList);
Result.OK("加载字段权限数据完成");
Results.OK("加载字段权限数据完成");
return result;
}
@@ -216,36 +216,36 @@ public class OnlCgformAuthController {
@PostMapping({"/editAuthColumn"})
public Result<T> editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
public Results<T> editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try {
if (paramAuthColumnVO.getStatus() == 1) {
this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO);
} else {
this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO);
}
return Result.OK(OP_CONSTANT);
return Results.OK(OP_CONSTANT);
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/authColumn"})
public Result<T> addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
public Results<T> addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try {
this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO);
return Result.OK(OP_CONSTANT);
return Results.OK(OP_CONSTANT);
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@GetMapping({"/authPage/{cgformId}/{type}"})
public Result<List<AuthPageVO>> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) {
Result<List<AuthPageVO>> result = new Result<>();
public Results<List<AuthPageVO>> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) {
Results<List<AuthPageVO>> result = new Results<>();
List<AuthPageVO> list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger);
result.setResult(list);
result.setSuccess(true);
@@ -254,8 +254,8 @@ public class OnlCgformAuthController {
@GetMapping({"/validAuthData/{cgformId}"})
public Result<List<OnlAuthData>> validAuthData(@PathVariable("cgformId") String paramString) {
Result<List<OnlAuthData>> result = new Result<>();
public Results<List<OnlAuthData>> validAuthData(@PathVariable("cgformId") String paramString) {
Results<List<OnlAuthData>> result = new Results<>();
LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString)
@@ -270,8 +270,8 @@ public class OnlCgformAuthController {
@GetMapping({"/roleAuth"})
public Result<List<OnlAuthRelation>> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) {
Result<List<OnlAuthRelation>> result = new Result<>();
public Results<List<OnlAuthRelation>> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) {
Results<List<OnlAuthRelation>> result = new Results<>();
LambdaQueryWrapper<OnlAuthRelation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OnlAuthRelation::getRoleId, paramString1)
@@ -287,42 +287,42 @@ public class OnlCgformAuthController {
@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);
List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 1, list);
return Result.OK();
return Results.OK();
}
@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);
List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 2, list);
return Result.OK();
return Results.OK();
}
@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);
List<String> list = json.toJavaList(String.class);
this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 3, list);
return Result.OK();
return Results.OK();
}
@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<>();
cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString);
OnlCgformHead onlCgformHead = this.onlCgformHeadService.getOne(cgformHeadLambdaQueryWrapper);
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<>();
if (!Objects.isNull(onlCgformHead)) {
cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId());
@@ -330,7 +330,7 @@ public class OnlCgformAuthController {
cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum);
List<OnlCgformField> list = this.onlCgformFieldService.list(cgformFieldLambdaQueryWrapper);
if (list == null || list.isEmpty()) {
Result.error(NOT_INFO_CONSTANT);
Results.error(NOT_INFO_CONSTANT);
}
ArrayList<AuthColumnVO> arrayList = new ArrayList<>();
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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.OnlineAuth;
import com.jero.common.aspect.annotation.PermissionData;
@@ -99,23 +99,23 @@ public class OnlCgformApiController {
private static final String CHECK_ERROR = "查询失败，";
@PostMapping({"/addAll"})
public Result<T> a(@RequestBody OnlCgformModel var1) {
public Results<T> a(@RequestBody OnlCgformModel var1) {
try {
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) {
log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/editAll"})
public Result<T> b(@RequestBody OnlCgformModel var1) {
public Results<T> b(@RequestBody OnlCgformModel var1) {
try {
return this.onlCgformHeadService.editAll(var1);
} catch (Exception var3) {
log.error("OnlCgformApiController.editAll()发生异常：" + var3.getMessage(), var3);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@@ -126,11 +126,11 @@ public class OnlCgformApiController {
)
@OnlineAuth("getColumns")
@GetMapping({"/getColumns/{code}"})
public Result<OnlComplexModel> a(@PathVariable("code") String var1) {
Result<OnlComplexModel> var2 = new Result<>();
public Results<OnlComplexModel> a(@PathVariable("code") String var1) {
Results<OnlComplexModel> var2 = new Results<>();
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3);
var4.setIsDesForm(var3.getIsDesForm());
@@ -149,11 +149,11 @@ public class OnlCgformApiController {
@PermissionData
@OnlineAuth("getData")
@GetMapping({"/getData/{code}"})
public Result<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) {
Result<Map<String, Object>> var3 = new Result<>();
public Results<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) {
Results<Map<String, Object>> var3 = new Results<>();
OnlCgformHead var4 = this.onlCgformHeadService.getById(var1);
if (var4 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
try {
String var5 = var4.getTableName();
@@ -163,7 +163,7 @@ public class OnlCgformApiController {
var3.setResult(var7);
} catch (Exception var8) {
log.error(var8.getMessage(), var8);
return Result.error("数据库查询失败，" + var8.getMessage());
return Results.error("数据库查询失败，" + var8.getMessage());
}
var3.setOnlTable(var4.getTableName());
@@ -178,13 +178,13 @@ public class OnlCgformApiController {
)
@OnlineAuth("getFormItem")
@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);
if (var3 == null) {
Result.error("表不存在");
Results.error("表不存在");
}
Result<JSONObject> var4 = new Result<>();
Results<JSONObject> var4 = new Results<>();
OnlCgformEnhanceJs var5 = this.onlCgformHeadService.queryEnhanceJs(var1, "form");
JSONObject var6 = this.onlineService.queryOnlineFormObj(var3, var5);
if (!Objects.isNull(var3)) {
@@ -272,13 +272,13 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE
)
@GetMapping({"/getFormItemBytbname/{table}"})
public Result<JSONObject> a(@PathVariable("table") String var1, @RequestParam(name = "taskId", required = false) String var2) {
Result<JSONObject> var3 = new Result<>();
public Results<JSONObject> a(@PathVariable("table") String var1, @RequestParam(name = "taskId", required = false) String var2) {
Results<JSONObject> var3 = new Results<>();
LambdaQueryWrapper<OnlCgformHead> var4 = new LambdaQueryWrapper<>();
var4.eq(OnlCgformHead::getTableName, var1);
OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4);
if (var5 == null) {
Result.error("表不存在");
Results.error("表不存在");
}
JSONObject var6 = new JSONObject();
@@ -294,14 +294,14 @@ public class OnlCgformApiController {
@OnlineAuth("getEnhanceJs")
@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 = "";
OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhanceJs(var1, "form");
if (var4 != null && oConvertUtils.isNotEmpty(var4.getCgJs())) {
var3 = EnhanceJsUtil.b(var4.getCgJs(), (List) null);
}
return Result.OK(var3);
return Results.OK(var3);
}
@AutoLog(
@@ -309,34 +309,34 @@ public class OnlCgformApiController {
value = "online表单数据查询"
)
@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 {
Map<String, Object> var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
return Result.OK(CgformUtil.b(var3));
return Results.OK(CgformUtil.b(var3));
} catch (Exception 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}"})
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 {
Map<String, Object> var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
return Result.OK(CgformUtil.b(var3));
return Results.OK(CgformUtil.b(var3));
} catch (Exception 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}"})
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 {
return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
return Results.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
} catch (Exception 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
)
@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 {
LambdaQueryWrapper<OnlCgformHead> var3 = new LambdaQueryWrapper<>();
var3.eq(OnlCgformHead::getTableName, var1);
@@ -354,13 +354,13 @@ public class OnlCgformApiController {
if (var4 == null) {
throw new JeroBootException("OnlCgform tableName: " + var1 + " 不存在！");
} else {
Result<Map<String, Object>> var5 = this.b(var4.getId(), var2);
Results<Map<String, Object>> var5 = this.b(var4.getId(), var2);
var5.setOnlTable(var1);
return var5;
}
} catch (Exception 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")
@PostMapping({"/form/{code}"})
public Result<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) {
Result<String> var4 = new Result<>();
public Results<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) {
Results<String> var4 = new Results<>();
try {
String var5 = CgformUtil.a();
@@ -398,15 +398,15 @@ public class OnlCgformApiController {
)
@OnlineAuth("form")
@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 {
String var3 = this.onlCgformHeadService.editManyFormData(var1, var2);
Result<String> var4 = Result.OK("操作成功!");
Results<String> var4 = Results.OK("操作成功!");
var4.setOnlTable(var3);
return var4;
} catch (Exception 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")
@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);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
try {
getVar4(var1, var2, var3);
} catch (Exception 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());
return var13;
}
@@ -478,10 +478,10 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE
)
@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));
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
try {
if (var2.contains(",")) {
@@ -492,10 +492,10 @@ public class OnlCgformApiController {
}
} catch (Exception 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());
return var6;
}
@@ -503,28 +503,28 @@ public class OnlCgformApiController {
@OnlineAuth("getQueryInfo")
@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 {
List<Map<String, String>> var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1);
return Result.OK(var2);
return Results.OK(var2);
} catch (Exception var3) {
log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3);
return Result.error("查询失败");
return Results.error("查询失败");
}
}
@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 {
long var3 = System.currentTimeMillis();
this.onlCgformHeadService.doDbSynch(var1, var2);
log.info("==同步数据库消耗时间" + (System.currentTimeMillis() - var3) + "毫秒");
} catch (Exception 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")
@@ -625,15 +625,15 @@ public class OnlCgformApiController {
@OnlineAuth("importXls")
@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();
Result<T> var6 = new Result<>();
Results<T> var6 = new Results<>();
String var7 = "";
try {
OnlCgformHead var8 = this.onlCgformHeadService.getById(var1);
if (var8 == null) {
return Result.error("数据库不存在该表记录");
return Results.error("数据库不存在该表记录");
}
LambdaQueryWrapper<OnlCgformField> var9 = new LambdaQueryWrapper<>();
@@ -824,7 +824,7 @@ public class OnlCgformApiController {
}
@PostMapping({"/doButton"})
public Result<T> a(@RequestBody JSONObject var1) {
public Results<T> a(@RequestBody JSONObject var1) {
String var2 = var1.getString("formId");
String var3 = var1.getString("dataId");
String var4 = var1.getString("buttonCode");
@@ -833,10 +833,10 @@ public class OnlCgformApiController {
this.onlCgformHeadService.executeCustomerButton(var4, var2, var3);
} catch (Exception 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) {
@@ -952,25 +952,25 @@ public class OnlCgformApiController {
}
@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;
if (oConvertUtils.isEmpty(var2)) {
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));
if (oConvertUtils.isNotEmpty(var3)) {
return Result.OK(-1);
return Results.OK(-1);
}
} else {
var3 = this.onlCgformHeadService.getById(var2);
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
*/
@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);
List<String> list;
@@ -992,10 +992,10 @@ public class OnlCgformApiController {
list = this.onlCgformHeadService.generateOneToMany(onlGenerateModel);
}
return Result.OK(list);
return Results.OK(list);
} catch (Exception var5) {
var5.printStackTrace();
return Result.error(var5.getMessage());
return Results.error(var5.getMessage());
}
}
@@ -1054,11 +1054,11 @@ public class OnlCgformApiController {
)
@GetMapping({"/getTreeData/{code}"})
@PermissionData
public Result<Map<String, Object>> d(@PathVariable("code") String var1, HttpServletRequest var2) {
Result<Map<String, Object>> var3 = new Result<>();
public Results<Map<String, Object>> d(@PathVariable("code") String var1, HttpServletRequest var2) {
Results<Map<String, Object>> var3 = new Results<>();
OnlCgformHead var4 = this.onlCgformHeadService.getById(var1);
if (var4 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
try {
String var5 = var4.getTableName();
@@ -1079,7 +1079,7 @@ public class OnlCgformApiController {
var3.setResult(var11);
} catch (Exception var12) {
log.error(var12.getMessage(), var12);
return Result.error("数据库查询失败" + var12.getMessage());
return Results.error("数据库查询失败" + var12.getMessage());
}
var3.setOnlTable(var4.getTableName());
@@ -1093,8 +1093,8 @@ public class OnlCgformApiController {
}
@PostMapping({"/crazyForm/{name}"})
public Result<String> b(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
Result<String> var3 = new Result<>();
public Results<String> b(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
Results<String> var3 = new Results<>();
try {
String var4 = CgformUtil.a();
var2.put("id", var4);
@@ -1104,12 +1104,12 @@ public class OnlCgformApiController {
return var3;
} catch (Exception var5) {
log.error("OnlCgformApiController.formAddForDesigner()发生异常：" + var5.getMessage(), var5);
return Result.error("保存失败");
return Results.error("保存失败");
}
}
@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 {
var2.remove("create_by");
var2.remove("create_time");
@@ -1118,10 +1118,10 @@ public class OnlCgformApiController {
this.onlCgformHeadService.editCrazyFormData(var1, var2);
} catch (Exception var4) {
log.error("OnlCgformApiController.formEditForDesigner()发生异常：" + var4.getMessage(), var4);
return Result.error("保存失败");
return Results.error("保存失败");
}
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
@AutoLog(
@@ -1130,11 +1130,11 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE
)
@GetMapping({"/getErpColumns/{code}"})
public Result<Map<String, Object>> c(@PathVariable("code") String var1) {
Result<Map<String, Object>> var2 = new Result<>();
public Results<Map<String, Object>> c(@PathVariable("code") String var1) {
Results<Map<String, Object>> var2 = new Results<>();
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
HashMap<String, Object> var4 = new HashMap<>();
OnlComplexModel var5 = this.onlineService.queryOnlineConfig(var3);
@@ -1177,13 +1177,13 @@ public class OnlCgformApiController {
module = ModuleType.ONLINE
)
@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);
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);
var4.setResult(var5);
var4.setOnlTable(var3.getTableName());
@@ -1191,8 +1191,8 @@ public class OnlCgformApiController {
}
@GetMapping({"/querySelectOptions"})
public Result<List<TreeModel>> a(@ModelAttribute LinkDown var1) {
Result<List<TreeModel>> var2 = new Result<>();
public Results<List<TreeModel>> a(@ModelAttribute LinkDown var1) {
Results<List<TreeModel>> var2 = new Results<>();
List<TreeModel> var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1);
var2.setResult(var3);
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.metadata.IPage;
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.generater.modules.online.cgform.entity.OnlCgformButton;
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
@@ -33,8 +33,8 @@ public class OnlCgformButtonController {
@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) {
Result<IPage<OnlCgformButton>> var6 = new Result<>();
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) {
Results<IPage<OnlCgformButton>> var6 = new Results<>();
var1.setCgformHeadId(var5);
QueryWrapper<OnlCgformButton> var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformButton> var8 = new Page<>(var2, var3);
@@ -45,83 +45,83 @@ public class OnlCgformButtonController {
}
@PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformButton cgformButton) {
public Results<Object> add(@RequestBody OnlCgformButton cgformButton) {
try {
this.onlCgformButtonService.save(cgformButton);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/aitest"})
public Result<Object> aitest(@RequestBody JSONArray jsonArray) {
public Results<Object> aitest(@RequestBody JSONArray jsonArray) {
try {
for(int i = 0; i < jsonArray.size(); ++i) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
OnlCgformButton cgformButton = JSON.parseObject(jsonObject.toJSONString(), OnlCgformButton.class);
this.onlCgformButtonService.saveButton(cgformButton);
}
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformButton cgformButton) {
public Results<Object> edit(@RequestBody OnlCgformButton cgformButton) {
OnlCgformButton existCgformButton = this.onlCgformButtonService.getById(cgformButton.getId());
if (existCgformButton == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean flag = this.onlCgformButtonService.updateById(cgformButton);
if (flag) {
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
}
}
return Result.OK();
return Results.OK();
}
@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");
if(StringUtils.isEmpty(id)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id);
if (cgformButton == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean flag = this.onlCgformButtonService.removeById(id);
if (flag) {
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
}
return Result.OK();
return Results.OK();
}
@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");
if (ids != null && !"".equals(ids.trim())) {
this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!");
return Results.OK("删除成功!");
} else {
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
}
@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);
if (cgformButton == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} 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.metadata.IPage;
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.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
@@ -32,25 +32,25 @@ public class OnlCgformFieldController {
private static final String EN_IS_NULL = "未找到对应实体";
@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<>();
var2.eq(OnlCgformHead::getTableName, var1);
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"})
public Result<List<OnlCgformField>> b(@RequestParam("headId") String var1) {
public Results<List<OnlCgformField>> b(@RequestParam("headId") String var1) {
QueryWrapper<OnlCgformField> var2 = new QueryWrapper<>();
var2.eq("cgform_head_id", var1);
var2.orderByAsc("order_num");
List<OnlCgformField> var3 = this.onlCgformFieldService.list(var2);
return Result.OK(var3);
return Results.OK(var3);
}
@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) {
Result<IPage<OnlCgformField>> var5 = new Result<>();
public Results<IPage<OnlCgformField>> a(OnlCgformField var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Results<IPage<OnlCgformField>> var5 = new Results<>();
QueryWrapper<OnlCgformField> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformField> var7 = new Page<>(var2, var3);
IPage<OnlCgformField> var8 = this.onlCgformFieldService.page(var7, var6);
@@ -60,64 +60,64 @@ public class OnlCgformFieldController {
}
@PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformField var1) {
public Results<Object> add(@RequestBody OnlCgformField var1) {
try {
this.onlCgformFieldService.save(var1);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformField var1) {
public Results<Object> edit(@RequestBody OnlCgformField var1) {
OnlCgformField var3 = this.onlCgformFieldService.getById(var1.getId());
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean var4 = this.onlCgformFieldService.updateById(var1);
if (var4) {
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
}
return Result.OK();
return Results.OK();
}
@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");
OnlCgformField var3 = this.onlCgformFieldService.getById(var1);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean var4 = this.onlCgformFieldService.removeById(var1);
if (var4) {
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
}
return Result.OK();
return Results.OK();
}
@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");
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("删除成功!");
return Results.OK("删除成功!");
} else {
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
}
@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);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} 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.jero.codegenerate.database.DbReadTableUtil;
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.system.query.QueryGenerator;
import com.jero.common.system.util.JwtUtil;
@@ -61,8 +61,8 @@ public class OnlCgformHeadController {
@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) {
Result<IPage<OnlCgformHead>> var5 = new Result<>();
public Results<IPage<OnlCgformHead>> a(OnlCgformHead var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
Results<IPage<OnlCgformHead>> var5 = new Results<>();
QueryWrapper<OnlCgformHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgformHead> var7 = new Page<>(var2, var3);
IPage<OnlCgformHead> var8 = this.onlCgformHeadService.page(var7, var6);
@@ -76,295 +76,295 @@ public class OnlCgformHeadController {
}
@PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformHead var1) {
public Results<Object> add(@RequestBody OnlCgformHead var1) {
try {
this.onlCgformHeadService.save(var1);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformHead var1) {
public Results<Object> edit(@RequestBody OnlCgformHead var1) {
OnlCgformHead var3 = this.onlCgformHeadService.getById(var1.getId());
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean var4 = this.onlCgformHeadService.updateById(var1);
if (var4) {
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
}
}
return Result.OK();
return Results.OK();
}
@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");
if (id == null || "".equals(id.trim())) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
this.onlCgformHeadService.deleteRecordAndTable(id);
} catch (DBException | SQLException e) {
return Result.error("删除失败" + e.getMessage());
return Results.error("删除失败" + e.getMessage());
}
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
@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");
if (id == null || "".equals(id.trim())) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
this.onlCgformHeadService.deleteRecord(id);
} catch (DBException | SQLException e) {
return Result.error("移除失败" + e.getMessage());
return Results.error("移除失败" + e.getMessage());
}
return Result.OK("移除成功!");
return Results.OK("移除成功!");
}
@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 var2 = map.get("flag");
if (var2 == null || "".equals(var2.trim())) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformHeadService.deleteBatch(var1, var2);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
} else {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
}
@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);
if (cgformHead == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
return Result.OK(cgformHead);
return Results.OK(cgformHead);
}
}
@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<>();
String[] var3 = var1.split(",");
var2.in(OnlCgformHead::getTableName, Arrays.asList(var3));
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}"})
public Result<T> addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
public Results<T> addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
try {
var2.setCgformHeadId(var1);
this.onlCgformHeadService.saveEnhance(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@GetMapping({"/enhanceJs/{code}"})
public Result<OnlCgformEnhanceJs> getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) {
public Results<OnlCgformEnhanceJs> getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) {
try {
String var3 = var2.getParameter("type");
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) {
log.error(var5.getMessage(), var5);
return Result.error("查询失败!");
return Results.error("查询失败!");
}
}
@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 {
var2.setCgformHeadId(var1);
this.onlCgformHeadService.editEnhance(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@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 {
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) {
log.error(var4.getMessage(), var4);
return Result.error("查询失败!");
return Results.error("查询失败!");
}
}
@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);
return Result.OK(var3);
return Results.OK(var3);
}
@RequiresRoles({"admin"})
@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 {
var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.saveEnhanceSql(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} else {
return Result.error("保存失败,该按钮已存在增强配置!");
return Results.error("保存失败,该按钮已存在增强配置!");
}
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@RequiresRoles({"admin"})
@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 {
var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.updateEnhanceSql(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} else {
return Result.error("保存失败,该按钮已存在增强配置!");
return Results.error("保存失败,该按钮已存在增强配置!");
}
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@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");
if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
this.onlCgformEnhanceService.deleteEnhanceSql(var1);
return Result.OK("删除成功");
return Results.OK("删除成功");
} catch (Exception var3) {
log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR);
return Results.error(DEL_ERROR);
}
}
@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");
if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
List<String> var2 = Arrays.asList(var1.split(","));
this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2);
return Result.OK("删除成功");
return Results.OK("删除成功");
} catch (Exception var3) {
log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR);
return Results.error(DEL_ERROR);
}
}
@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);
return Result.OK(var3);
return Results.OK(var3);
}
@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 {
if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!");
return Results.error("类实例化失败，请检查!");
} else {
var2.setCgformHeadId(formId);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.saveEnhanceJava(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} else {
return Result.error("保存失败,配置重复了!");
return Results.error("保存失败,配置重复了!");
}
}
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@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 {
if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!");
return Results.error("类实例化失败，请检查!");
} else {
var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.updateEnhanceJava(var2);
return Result.OK(OP_SUCCESS);
return Results.OK(OP_SUCCESS);
} else {
return Result.error("保存失败,配置重复了!");
return Results.error("保存失败,配置重复了!");
}
}
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
return Result.error(SAVE_ERROR);
return Results.error(SAVE_ERROR);
}
}
@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");
if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
this.onlCgformEnhanceService.deleteEnhanceJava(var1);
return Result.OK("删除成功");
return Results.OK("删除成功");
} catch (Exception var3) {
log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR);
return Results.error(DEL_ERROR);
}
}
@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");
if (StringUtils.isBlank(var1)) {
return Result.error(PARAM_ERROR);
return Results.error(PARAM_ERROR);
}
try {
List<String> var2 = Arrays.asList(var1.split(","));
this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2);
return Result.OK("删除成功");
return Results.OK("删除成功");
} catch (Exception var3) {
log.error(var3.getMessage(), var3);
return Result.error(DEL_ERROR);
return Results.error(DEL_ERROR);
}
}
@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);
if (!"admin".equals(var5)) {
return Result.error("noadminauth");
return Results.error("noadminauth");
} else {
new ArrayList<>();
@@ -373,7 +373,7 @@ public class OnlCgformHeadController {
var6 = DbReadTableUtil.listTableName();
} catch (SQLException var12) {
log.error(var12.getMessage(), var12);
return Result.error("同步失败，未获取数据库表信息");
return Results.error("同步失败，未获取数据库表信息");
}
CgformUtil.b(var6);
@@ -391,20 +391,20 @@ public class OnlCgformHeadController {
}
}
return Result.OK(var8);
return Results.OK(var8);
}
}
@PostMapping({"/transTables/{tbnames}"})
@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);
if (!"admin".equals(var3)) {
return Result.error("noadminauth");
return Results.error("noadminauth");
} else if (oConvertUtils.isEmpty(var1)) {
return Result.error("未识别的表名信息");
return Results.error("未识别的表名信息");
} else if (c != null && c.equals(var1)) {
return Result.error("不允许重复生成!");
return Results.error("不允许重复生成!");
} else {
c = var1;
String[] var4 = var1.split(",");
@@ -420,7 +420,7 @@ public class OnlCgformHeadController {
}
c = null;
return Result.OK("同步完成!");
return Results.OK("同步完成!");
}
}
@@ -432,7 +432,7 @@ public class OnlCgformHeadController {
* @date 2021/4/6 11:20
*/
@GetMapping({"/rootFile"})
public Result<JSONArray> rootFile() {
public Results<JSONArray> rootFile() {
JSONArray jsonArray = new JSONArray();
File[] files = File.listRoots();
int var4 = files.length;
@@ -453,7 +453,7 @@ public class OnlCgformHeadController {
jsonArray.add(jsonObject);
}
return Result.OK(jsonArray);
return Results.OK(jsonArray);
}
/**
@@ -464,7 +464,7 @@ public class OnlCgformHeadController {
* @date 2021/4/6 11:20
*/
@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();
File file = new File(parentPath);
File[] files = file.listFiles();
@@ -486,14 +486,14 @@ public class OnlCgformHeadController {
}
}
return Result.OK(jsonArray);
return Results.OK(jsonArray);
}
@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);
if (onlCgformHead == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
HashMap<String, Object> map = new HashMap<>();
map.put("main", onlCgformHead);
@@ -507,7 +507,7 @@ public class OnlCgformHeadController {
List<Map<String, Object>> jspModelList = CgformEnum.getJspModelList(tableType);
map.put("jspModeList", jspModelList);
map.put("projectPath", CodeConfigProperties.getProjectPath());
return Result.OK(map);
return Results.OK(map);
}
}
@@ -546,11 +546,11 @@ public class OnlCgformHeadController {
}
@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 {
OnlCgformHead var2 = this.onlCgformHeadService.getById(var1);
if (var2 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
}
this.onlCgformHeadService.copyOnlineTableConfig(var2);
@@ -558,7 +558,7 @@ public class OnlCgformHeadController {
var3.printStackTrace();
}
return Result.OK();
return Results.OK();
}
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.metadata.IPage;
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.system.query.QueryGenerator;
import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
@@ -29,89 +29,89 @@ public class OnlCgformIndexController {
private static final String EN_IS_NULL = "未找到对应实体";
@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.eq("cgform_head_id", headId);
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
queryWrapper.orderByDesc("create_time");
List<OnlCgformIndex> cgformIndexList = this.onlCgformIndexService.list(queryWrapper);
return Result.OK(cgformIndexList);
return Results.OK(cgformIndexList);
}
@GetMapping({"/list"})
public Result<IPage<OnlCgformIndex>> list(OnlCgformIndex cgformIndex,
@RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
public Results<IPage<OnlCgformIndex>> list(OnlCgformIndex cgformIndex,
@RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
QueryWrapper<OnlCgformIndex> queryWrapper = QueryGenerator.initQueryWrapper(cgformIndex, request.getParameterMap());
Page<OnlCgformIndex> page = new Page<>(pageNo, pageSize);
IPage<OnlCgformIndex> cgformIndexPage = this.onlCgformIndexService.page(page, queryWrapper);
return Result.OK(cgformIndexPage);
return Results.OK(cgformIndexPage);
}
@PostMapping({"/add"})
public Result<Object> add(@RequestBody OnlCgformIndex cgformIndex) {
public Results<Object> add(@RequestBody OnlCgformIndex cgformIndex) {
try {
this.onlCgformIndexService.save(cgformIndex);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/edit"})
public Result<Object> edit(@RequestBody OnlCgformIndex cgformIndex) {
public Results<Object> edit(@RequestBody OnlCgformIndex cgformIndex) {
OnlCgformIndex existCgformIndex = this.onlCgformIndexService.getById(cgformIndex.getId());
if (existCgformIndex == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean flag = this.onlCgformIndexService.updateById(cgformIndex);
if (flag) {
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
}
return Result.OK();
return Results.OK();
}
@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");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(id);
if (cgformIndex == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
boolean flag = this.onlCgformIndexService.removeById(id);
if (flag) {
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
}
return Result.OK();
return Results.OK();
}
@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");
if (ids != null && !"".equals(ids.trim())) {
this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!");
return Results.OK("删除成功!");
} else {
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
}
@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);
if (cgformIndex == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} 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.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.generater.modules.online.cgform.entity.*;
import com.jero.generater.modules.online.cgform.model.OnlCgformModel;
@@ -21,9 +21,9 @@ import java.util.List;
import java.util.Map;
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;
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.onetomany.MainTableVo;
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.enums.CgformEnum;
import com.jero.common.exception.JeroBootException;
@@ -93,7 +93,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
@Transactional(
rollbackFor = {Exception.class}
)
public Result<T> addAll(OnlCgformModel model) {
public Results<T> addAll(OnlCgformModel model) {
String var2 = UUID.randomUUID().toString().replace("-", "");
OnlCgformHead var3 = model.getHead();
List<OnlCgformField> var4 = model.getFields();
@@ -128,21 +128,21 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl<OnlCgformHeadMapper, O
this.fieldService.saveBatch(var4);
this.indexService.saveBatch(var5);
this.a(var3, var4);
return Result.OK("添加成功");
return Results.OK("添加成功");
}
@Override
@Transactional(
rollbackFor = {Exception.class}
)
public Result<T> editAll(OnlCgformModel model) {
public Results<T> editAll(OnlCgformModel model) {
OnlCgformHead var2 = model.getHead();
OnlCgformHead var3 = super.getById(var2.getId());
if (var3 == null) {
return Result.error("未找到对应实体");
return Results.error("未找到对应实体");
} else {
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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
@@ -75,18 +75,18 @@ public class OnlCgreportAPI {
@GetMapping({"/getColumnsAndData/{code}"})
@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);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
return getMapResult(var1, var2, var3);
}
}
@NotNull
private Result<Map<String, Object>> getMapResult(@PathVariable("code") String var1, HttpServletRequest var2, OnlCgreportHead var3) {
Result<Map<String, Object>> var4 = this.b(var1, var2);
private Results<Map<String, Object>> getMapResult(@PathVariable("code") String var1, HttpServletRequest var2, OnlCgreportHead var3) {
Results<Map<String, Object>> var4 = this.b(var1, var2);
if (var4.getCode().equals(200)) {
JSONObject var5 = JSON.parseObject(JSON.toJSONString(var4.getResult()));
JSONArray var6 = var5.getJSONArray("records");
@@ -138,7 +138,7 @@ public class OnlCgreportAPI {
var19.put("fieldHrefSlots", var10);
var19.put("cgreportHeadName", var3.getName());
var19.put("isGroupTitle", var12);
return Result.OK(var19);
return Results.OK(var19);
} else {
return var4;
}
@@ -197,10 +197,10 @@ public class OnlCgreportAPI {
/** @deprecated */
@Deprecated
@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);
if (var2 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
QueryWrapper<OnlCgreportItem> var3 = new QueryWrapper<>();
var3.eq(CGR_HEAD_ID, var1);
@@ -232,7 +232,7 @@ public class OnlCgreportAPI {
var14.put(COLUMNS, var5);
var14.put(DICT_OPTIONS, var6);
var14.put("cgreportHeadName", var2.getName());
return Result.OK(var14);
return Results.OK(var14);
}
}
@@ -253,10 +253,10 @@ public class OnlCgreportAPI {
@GetMapping({"/getData/{code}"})
@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);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
String var4 = var3.getCgrSql().trim();
String var5 = var3.getDbSource();
@@ -273,35 +273,35 @@ public class OnlCgreportAPI {
var7 = this.onlCgreportHeadService.executeSelectSql(var4, var3.getId(), var6);
}
return Result.OK(var7);
return Results.OK(var7);
} catch (Exception var8) {
log.error(var8.getMessage(), var8);
return Result.error("SQL执行失败：" + var8.getMessage());
return Results.error("SQL执行失败：" + var8.getMessage());
}
}
}
@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 {
List<Map<String, String>> var2 = this.onlCgreportItemService.getAutoListQueryInfo(var1);
return Result.OK(var2);
return Results.OK(var2);
} catch (Exception var3) {
log.info(var3.getMessage(), var3);
return Result.error("查询失败");
return Results.error("查询失败");
}
}
@GetMapping({"/getParamsInfo/{code}"})
public Result<List<OnlCgreportParam>> c(@PathVariable("code") String var1) {
public Results<List<OnlCgreportParam>> c(@PathVariable("code") String var1) {
try {
LambdaQueryWrapper<OnlCgreportParam> var2 = new LambdaQueryWrapper<>();
var2.eq(OnlCgreportParam::getCgrheadId, var1);
List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2);
return Result.OK(var3);
return Results.OK(var3);
} catch (Exception 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");
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;
if (var8.getCode().equals(200)) {
Map<String, Object> var10 = var8.getResult();
@@ -481,12 +481,12 @@ public class OnlCgreportAPI {
}
@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<>();
var2.eq(OnlCgreportHead::getCode, var1);
OnlCgreportHead var3 = this.onlCgreportHeadService.getOne(var2);
if (var3 == null) {
return Result.error(EN_IS_NULL);
return Results.error(EN_IS_NULL);
} else {
QueryWrapper<OnlCgreportItem> var4 = new QueryWrapper<>();
var4.eq(CGR_HEAD_ID, var3.getId());
@@ -521,29 +521,29 @@ public class OnlCgreportAPI {
var14.put(DICT_OPTIONS, var7);
var14.put("cgRpConfigId", var3.getId());
var14.put("cgRpConfigName", var3.getName());
return Result.OK(var14);
return Results.OK(var14);
}
}
@PostMapping({"/testConnection"})
public Result<String> a(@RequestBody DynamicDataSourceModel var1) {
Result<String> var4;
public Results<String> a(@RequestBody DynamicDataSourceModel var1) {
Results<String> var4;
try (Connection var2 = DriverManager.getConnection(var1.getDbUrl(), var1.getDbUsername(), var1.getDbPassword())){
Class.forName(var1.getDbDriver());
Result<String> var3;
Results<String> var3;
if (var2 == null) {
var3 = Result.OK("数据库连接失败：错误未知");
var3 = Results.OK("数据库连接失败：错误未知");
return var3;
}
var3 = Result.OK("数据库连接成功");
var3 = Results.OK("数据库连接成功");
return var3;
} catch (ClassNotFoundException var17) {
log.error(var17.toString());
var4 = Result.error("数据库连接失败：驱动类不存在");
var4 = Results.error("数据库连接失败：驱动类不存在");
} catch (Exception var18) {
log.error(var18.toString());
var4 = Result.error("数据库连接失败：" + var18.getMessage());
var4 = Results.error("数据库连接失败：" + var18.getMessage());
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.metadata.IPage;
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.query.QueryGenerator;
import com.jero.common.system.vo.DynamicDataSourceModel;
@@ -43,11 +43,11 @@ public class OnlCgreportHeadController {
private BaseCommonService baseCommonService;
@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)) {
DynamicDataSourceModel var3 = this.sysBaseAPI.getDynamicDbSourceByCode(var2);
if (var3 == null) {
return Result.error("数据源不存在");
return Results.error("数据源不存在");
}
}
@@ -91,7 +91,7 @@ public class OnlCgreportHeadController {
var13.put("fields", var4);
var13.put("params", var5);
return Result.OK(var13);
return Results.OK(var13);
} catch (Exception var12) {
log.error(var12.getMessage(), var12);
String var9 = "解析失败，";
@@ -108,13 +108,13 @@ public class OnlCgreportHeadController {
var9 = var9 + "SQL语法错误.";
}
return Result.error(var9);
return Results.error(var9);
}
}
@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) {
Result<IPage<OnlCgreportHead>> var5 = new Result<>();
public Results<IPage<OnlCgreportHead>> a(OnlCgreportHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Results<IPage<OnlCgreportHead>> var5 = new Results<>();
QueryWrapper<OnlCgreportHead> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportHead> var7 = new Page<>(var2, var3);
IPage<OnlCgreportHead> var8 = this.onlCgreportHeadService.page(var7, var6);
@@ -124,7 +124,7 @@ public class OnlCgreportHeadController {
}
@PostMapping({"/add"})
public Result<String> add(@RequestBody OnlCgreportModel var1) {
public Results<String> add(@RequestBody OnlCgreportModel var1) {
try {
String var3 = CgformUtil.a();
OnlCgreportHead var4 = var1.getHead();
@@ -150,44 +150,44 @@ public class OnlCgreportHeadController {
this.onlCgreportHeadService.save(var4);
this.onlCgreportParamService.saveBatch(var5);
this.onlCgreportItemService.saveBatch(var6);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
} catch (Exception var9) {
log.error(var9.getMessage(), var9);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@PostMapping({"/editAll"})
public Result<String> editAll(@RequestBody OnlCgreportModel cgreportModel) {
public Results<String> editAll(@RequestBody OnlCgreportModel cgreportModel) {
try {
return this.onlCgreportHeadService.editAll(cgreportModel);
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@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");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
return this.onlCgreportHeadService.delete(id);
}
@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");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
return this.onlCgreportHeadService.bathDelete(ids.split(","));
}
@GetMapping({"/queryById"})
public Result<OnlCgreportHead> queryById(@RequestParam(name = "id",required = true) String id) {
Result<OnlCgreportHead> result = new Result<>();
public Results<OnlCgreportHead> queryById(@RequestParam(name = "id",required = true) String id) {
Results<OnlCgreportHead> result = new Results<>();
OnlCgreportHead cgreportHead = this.onlCgreportHeadService.getById(id);
result.setResult(cgreportHead);
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.metadata.IPage;
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.generater.modules.online.cgreport.entity.OnlCgreportItem;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
@@ -27,20 +27,20 @@ public class OnlCgreportItemController {
private IOnlCgreportItemService onlCgreportItemService;
@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<>();
var2.eq("cgrhead_id", var1);
var2.orderByAsc("order_num");
List<OnlCgreportItem> var3 = this.onlCgreportItemService.list(var2);
Result<List<OnlCgreportItem>> var4 = new Result<>();
Results<List<OnlCgreportItem>> var4 = new Results<>();
var4.setSuccess(true);
var4.setResult(var3);
return var4;
}
@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) {
Result<IPage<OnlCgreportItem>> var5 = new Result<>();
public Results<IPage<OnlCgreportItem>> a(OnlCgreportItem var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Results<IPage<OnlCgreportItem>> var5 = new Results<>();
QueryWrapper<OnlCgreportItem> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportItem> var7 = new Page<>(var2, var3);
IPage<OnlCgreportItem> var8 = this.onlCgreportItemService.page(var7, var6);
@@ -50,40 +50,40 @@ public class OnlCgreportItemController {
}
@PostMapping({"/add"})
public Result<String> a(@RequestBody OnlCgreportItem var1) {
public Results<String> a(@RequestBody OnlCgreportItem var1) {
this.onlCgreportItemService.save(var1);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
@PostMapping({"/edit"})
public Result<String> b(@RequestBody OnlCgreportItem var1) {
public Results<String> b(@RequestBody OnlCgreportItem var1) {
this.onlCgreportItemService.updateById(var1);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
@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");
if(StringUtils.isEmpty(var1)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
this.onlCgreportItemService.removeById(var1);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
@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");
if(StringUtils.isBlank(var1)){
return Result.error("参数不识别!");
return Results.error("参数不识别!");
}
this.onlCgreportItemService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("批量删除成功!");
return Results.OK("批量删除成功!");
}
@GetMapping({"/queryById"})
public Result<OnlCgreportItem> d(@RequestParam(name = "id",required = true) String var1) {
Result<OnlCgreportItem> var2 = new Result<>();
public Results<OnlCgreportItem> d(@RequestParam(name = "id",required = true) String var1) {
Results<OnlCgreportItem> var2 = new Results<>();
OnlCgreportItem var3 = this.onlCgreportItemService.getById(var1);
var2.setResult(var3);
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.metadata.IPage;
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.generater.modules.online.cgreport.entity.OnlCgreportParam;
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
@@ -28,20 +28,20 @@ public class OnlCgreportParamController {
@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<>();
var2.eq("cgrhead_id", var1);
var2.orderByAsc("order_num");
List<OnlCgreportParam> var3 = this.onlCgreportParamService.list(var2);
Result<List<OnlCgreportParam>> var4 = new Result<>();
Results<List<OnlCgreportParam>> var4 = new Results<>();
var4.setSuccess(true);
var4.setResult(var3);
return var4;
}
@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) {
Result<IPage<OnlCgreportParam>> var5 = new Result<>();
public Results<IPage<OnlCgreportParam>> a(OnlCgreportParam var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
Results<IPage<OnlCgreportParam>> var5 = new Results<>();
QueryWrapper<OnlCgreportParam> var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page<OnlCgreportParam> var7 = new Page<>(var2, var3);
IPage<OnlCgreportParam> var8 = this.onlCgreportParamService.page(var7, var6);
@@ -51,40 +51,40 @@ public class OnlCgreportParamController {
}
@PostMapping({"/add"})
public Result<String> a(@RequestBody OnlCgreportParam var1) {
public Results<String> a(@RequestBody OnlCgreportParam var1) {
this.onlCgreportParamService.save(var1);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
@PostMapping({"/edit"})
public Result<String> b(@RequestBody OnlCgreportParam var1) {
public Results<String> b(@RequestBody OnlCgreportParam var1) {
this.onlCgreportParamService.updateById(var1);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
@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");
if(StringUtils.isBlank(var1)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.onlCgreportParamService.removeById(var1);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
@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");
if(StringUtils.isBlank(var1)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.onlCgreportParamService.removeByIds(Arrays.asList(var1.split(",")));
return Result.OK("批量删除成功!");
return Results.OK("批量删除成功!");
}
@GetMapping({"/queryById"})
public Result<OnlCgreportParam> d(@RequestParam(name = "id", required = true) String var1) {
Result<OnlCgreportParam> var2 = new Result<>();
public Results<OnlCgreportParam> d(@RequestParam(name = "id", required = true) String var1) {
Results<OnlCgreportParam> var2 = new Results<>();
OnlCgreportParam var3 = this.onlCgreportParamService.getById(var1);
var2.setResult(var3);
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.util.List;
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.model.OnlCgreportModel;
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;
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.Pattern;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
@@ -209,11 +209,11 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Transactional(
rollbackFor = {Exception.class}
)
public Result<String> editAll(OnlCgreportModel values) {
public Results<String> editAll(OnlCgreportModel values) {
OnlCgreportHead var2 = values.getHead();
OnlCgreportHead var3 = super.getById(var2.getId());
if (var3 == null) {
return Result.error("未找到对应实体");
return Results.error("未找到对应实体");
} else {
super.updateById(var2);
LambdaQueryWrapper<OnlCgreportItem> var4 = new LambdaQueryWrapper<>();
@@ -238,7 +238,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
this.onlCgreportItemService.saveBatch(values.getItems());
this.onlCgreportParamService.saveBatch(values.getParams());
return Result.OK("全部修改成功");
return Results.OK("全部修改成功");
}
}
@@ -246,7 +246,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
@Transactional(
rollbackFor = {Exception.class}
)
public Result<String> delete(String id) {
public Results<String> delete(String id) {
boolean var2 = super.removeById(id);
if (var2) {
LambdaQueryWrapper<OnlCgreportItem> var3 = new LambdaQueryWrapper<>();
@@ -257,14 +257,14 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
this.onlCgreportParamService.remove(var4);
}
return Result.OK("删除成功");
return Results.OK("删除成功");
}
@Override
@Transactional(
rollbackFor = {Exception.class}
)
public Result<String> bathDelete(String[] ids) {
public Results<String> bathDelete(String[] ids) {
String[] var2 = ids;
int var3 = ids.length;
@@ -281,7 +281,7 @@ public class OnlCgreportHeadServiceImpl extends ServiceImpl<OnlCgreportHeadMappe
}
}
return Result.OK("删除成功");
return Results.OK("删除成功");
}
@Override