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

【修改】全局处理Result，去除已放弃的类型，去掉success统一改为OK

Browse Source 
【修改】系统公告无法查看的的问题处理
This commit is contained in:
zer0Black
2022-04-16 22:49:15 +08:00
parent 8dcbe6fd0c
commit d5c97fbd5c
38 changed files with 664 additions and 801 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
+18 -43
View File
@@ -35,7 +35,7 @@ public class Result<T> implements Serializable {
* 返回代码
*/
@ApiModelProperty(value = "返回代码")
private Integer code = 0;
private Integer code = 200;
/**
* 返回数据对象 data
@@ -52,40 +52,6 @@ public class Result<T> implements Serializable {
public Result() {
}
public Result<T> success(String message) {
this.message = message;
this.code = CommonConstant.SC_OK_200;
this.success = true;
return this;
}
@Deprecated
public static Result<Object> ok() {
Result<Object> r = new Result<Object>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage("成功");
return r;
}
@Deprecated
public static Result<Object> ok(String msg) {
Result<Object> r = new Result<Object>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage(msg);
return r;
}
@Deprecated
public static Result<Object> ok(Object data) {
Result<Object> r = new Result<Object>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setResult(data);
return r;
}
public static<T> Result<T> OK() {
Result<T> r = new Result<T>();
@@ -95,6 +61,14 @@ public class Result<T> implements Serializable {
return r;
}
public static<T> Result<T> OK(String message) {
Result<T> r = new Result<T>();
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<T>();
r.setSuccess(true);
@@ -121,23 +95,24 @@ public class Result<T> implements Serializable {
return r;
}
public static Result<Object> error(String msg) {
public static<T> Result<T> error(String msg) {
return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
}
public static Result<Object> error(int code, String msg) {
Result<Object> r = new Result<Object>();
public static<T> Result<T> error(int code, String msg) {
Result<T> r = new Result<T>();
r.setCode(code);
r.setMessage(msg);
r.setSuccess(false);
return r;
}
public Result<T> error500(String message) {
this.message = message;
this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
this.success = false;
return this;
public static<T> Result<T> error500(String message) {
Result<T> r = new Result<T>();
r.message = message;
r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
r.success = false;
return r;
}
/**
* 无权限访问返回结果
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java
+6
View File
@@ -309,4 +309,10 @@ public interface CommonConstant {
* 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用
*/
public final static String THIRD_LOGIN_CODE = "third_login_code";
public final static String ANNOUNCEMENT_SEND_STATUS_0 = "0";
/** 系统通告消息状态：1=已发布 */
public final static String ANNOUNCEMENT_SEND_STATUS_1 = "1";
/** 系统通告消息状态：2=已撤销 */
public final static String ANNOUNCEMENT_SEND_STATUS_2 = "2";
}
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SqlInjectionUtil.java
-1
View File
@@ -133,7 +133,6 @@ public class SqlInjectionUtil {
* @param value
* @return
*/
@Deprecated
public static void specialFilterContentForOnlineReport(String value) {
String specialXssStr = " exec | insert | delete | update | drop | chr | mid | master | truncate | char | declare |";
String[] xssArr = specialXssStr.split("\\|");
jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java
-2
View File
@@ -124,8 +124,6 @@ public class SubTableVo {
return this.originalForeignKeys;
}
/** @deprecated */
@Deprecated
public void setOriginalForeignKeys(String[] originalForeignKeys) {
this.originalForeignKeys = originalForeignKeys;
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java
+22 -33
View File
@@ -76,21 +76,19 @@ public class OnlCgformAuthController {
@PostMapping({"/authData"})
public Result<OnlAuthData> a(@RequestBody OnlAuthData paramOnlAuthData) {
Result<OnlAuthData> result = new Result();
public Result<Object> addAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
try {
this.onlAuthDataService.save(paramOnlAuthData);
result.success("添加成功！");
return Result.OK("添加成功！");
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
result.error500("操作失败");
return Result.error500("操作失败");
}
return result;
}
@PutMapping({"/authData"})
public Result<OnlAuthData> b(@RequestBody OnlAuthData paramOnlAuthData) {
public Result<OnlAuthData> editAuthData(@RequestBody OnlAuthData paramOnlAuthData) {
Result<OnlAuthData> result = new Result();
this.onlAuthDataService.updateById(paramOnlAuthData);
return result;
@@ -98,14 +96,14 @@ public class OnlCgformAuthController {
@DeleteMapping({"/authData/{id}"})
public Result<?> b(@PathVariable("id") String paramString) {
public Result<?> getAuthDataById(@PathVariable("id") String paramString) {
this.onlAuthDataService.deleteOne(paramString);
return Result.OK("删除成功!");
}
@GetMapping({"/authButton/{cgformId}"})
public Result<Map<String, Object>> c(@PathVariable("cgformId") String paramString) {
public Result<Map<String, Object>> getAuthButton(@PathVariable("cgformId") String paramString) {
Result<Map<String, Object>> result = new Result();
LambdaQueryWrapper<OnlCgformButton> buttonLambdaQueryWrapper = new LambdaQueryWrapper();
@@ -129,8 +127,7 @@ public class OnlCgformAuthController {
@PostMapping({"/authButton"})
public Result<OnlAuthPage> a(@RequestBody OnlAuthPage paramOnlAuthPage) {
Result<OnlAuthPage> result = new Result();
public Result<OnlAuthPage> addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) {
try {
String str = paramOnlAuthPage.getId();
boolean bool = false;
@@ -146,13 +143,11 @@ public class OnlCgformAuthController {
paramOnlAuthPage.setStatus(Integer.valueOf(1));
this.onlAuthPageService.save(paramOnlAuthPage);
}
result.setResult(paramOnlAuthPage);
result.success("操作成功！");
return Result.OK("操作成功！", paramOnlAuthPage);
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
result.error500("操作失败");
return Result.error500("操作失败");
}
return result;
}
@@ -219,41 +214,35 @@ public class OnlCgformAuthController {
@PutMapping({"/authColumn"})
public Result<?> a(@RequestBody AuthColumnVO paramAuthColumnVO) {
Result<?> result = new Result();
public Result<?> editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try {
if (paramAuthColumnVO.getStatus().intValue() == 1) {
this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO);
} else {
this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO);
}
result.success("操作成功！");
return Result.OK("操作成功！");
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
result.error500("操作失败");
return Result.error500("操作失败");
}
return result;
}
@PostMapping({"/authColumn"})
public Result<?> b(@RequestBody AuthColumnVO paramAuthColumnVO) {
Result<?> result = new Result();
public Result<?> addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) {
try {
this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO);
result.success("操作成功！");
return Result.OK("操作成功！");
} catch (Exception exception) {
log.error(exception.getMessage(), exception);
result.error500("操作失败");
return Result.error500("操作失败");
}
return result;
}
@GetMapping({"/authPage/{cgformId}/{type}"})
public Result<List<AuthPageVO>> a(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) {
public Result<List<AuthPageVO>> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) {
Result<List<AuthPageVO>> result = new Result();
List list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger.intValue());
result.setResult(list);
@@ -263,7 +252,7 @@ public class OnlCgformAuthController {
@GetMapping({"/validAuthData/{cgformId}"})
public Result<List<OnlAuthData>> f(@PathVariable("cgformId") String paramString) {
public Result<List<OnlAuthData>> validAuthData(@PathVariable("cgformId") String paramString) {
Result<List<OnlAuthData>> result = new Result();
LambdaQueryWrapper<OnlAuthData> lambdaQueryWrapper = new LambdaQueryWrapper();
@@ -279,7 +268,7 @@ public class OnlCgformAuthController {
@GetMapping({"/roleAuth"})
public Result<List<OnlAuthRelation>> a(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) {
public Result<List<OnlAuthRelation>> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) {
Result<List<OnlAuthRelation>> result = new Result();
LambdaQueryWrapper<OnlAuthRelation> lambdaQueryWrapper = new LambdaQueryWrapper();
@@ -296,7 +285,7 @@ public class OnlCgformAuthController {
@PostMapping({"/roleColumnAuth/{roleId}/{cgformId}"})
public Result<?> a(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
public Result<?> addRoleColumnAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
Result<?> result = new Result();
JSONArray jSONArray = paramJSONObject.getJSONArray("authId");
List list = jSONArray.toJavaList(String.class);
@@ -307,7 +296,7 @@ public class OnlCgformAuthController {
@PostMapping({"/roleButtonAuth/{roleId}/{cgformId}"})
public Result<?> b(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
public Result<?> addrRleButtonAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
Result<?> result = new Result();
JSONArray jSONArray = paramJSONObject.getJSONArray("authId");
List list = jSONArray.toJavaList(String.class);
@@ -318,7 +307,7 @@ public class OnlCgformAuthController {
@PostMapping({"/roleDataAuth/{roleId}/{cgformId}"})
public Result<?> c(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
public Result<?> addRoleDataAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) {
Result<?> result = new Result();
JSONArray jSONArray = paramJSONObject.getJSONArray("authId");
List list = jSONArray.toJavaList(String.class);
@@ -329,7 +318,7 @@ public class OnlCgformAuthController {
@GetMapping({"/getAuthColumn/{desformCode}"})
public Result<List<AuthColumnVO>> g(@PathVariable("desformCode") String paramString) {
public Result<List<AuthColumnVO>> getAuthColumn(@PathVariable("desformCode") String paramString) {
LambdaQueryWrapper<OnlCgformHead> cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper();
cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString);
OnlCgformHead onlCgformHead = (OnlCgformHead) this.onlCgformHeadService.getOne((Wrapper) (cgformHeadLambdaQueryWrapper));
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java
+43 -61
View File
@@ -36,7 +36,7 @@ public class OnlCgformButtonController {
}
@GetMapping({"/list/{code}"})
public Result<IPage<OnlCgformButton>> a(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) {
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 var6 = new Result();
var1.setCgformHeadId(var5);
QueryWrapper var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
@@ -48,96 +48,78 @@ public class OnlCgformButtonController {
}
@PostMapping({"/add"})
public Result<OnlCgformButton> a(@RequestBody OnlCgformButton var1) {
Result var2 = new Result();
try {
this.onlCgformButtonService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
public Result<Object> add(@RequestBody OnlCgformButton cgformButton) {
try {
this.onlCgformButtonService.save(cgformButton);
return Result.OK("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error500("操作失败");
}
return var2;
}
@PostMapping({"/aitest"})
public Result<OnlCgformButton> a(@RequestBody JSONArray var1) {
Result var2 = new Result();
public Result<Object> aitest(@RequestBody JSONArray jsonArray) {
try {
for(int var3 = 0; var3 < var1.size(); ++var3) {
JSONObject var4 = var1.getJSONObject(var3);
OnlCgformButton var5 = (OnlCgformButton)JSONObject.parseObject(var4.toJSONString(), OnlCgformButton.class);
this.onlCgformButtonService.saveButton(var5);
for(int i = 0; i < jsonArray.size(); ++i) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
OnlCgformButton cgformButton = (OnlCgformButton)JSONObject.parseObject(jsonObject.toJSONString(), OnlCgformButton.class);
this.onlCgformButtonService.saveButton(cgformButton);
}
var2.success("添加成功！");
} catch (Exception var6) {
log.error(var6.getMessage(), var6);
var2.error500("操作失败");
return Result.OK("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error500("操作失败");
}
return var2;
}
@PutMapping({"/edit"})
public Result<OnlCgformButton> b(@RequestBody OnlCgformButton var1) {
Result var2 = new Result();
OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1.getId());
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<Object> edit(@RequestBody OnlCgformButton cgformButton) {
OnlCgformButton existCgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(cgformButton.getId());
if (existCgformButton == null) {
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformButtonService.updateById(var1);
if (var4) {
var2.success("修改成功!");
boolean flag = this.onlCgformButtonService.updateById(cgformButton);
if (flag) {
return Result.OK("修改成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/delete"})
public Result<OnlCgformButton> a(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<Object> delete(@RequestParam(name = "id",required = true) String id) {
OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id);
if (cgformButton == null) {
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformButtonService.removeById(var1);
if (var4) {
var2.success("删除成功!");
boolean flag = this.onlCgformButtonService.removeById(id);
if (flag) {
return Result.OK("删除成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/deleteBatch"})
public Result<OnlCgformButton> b(@RequestParam(name = "ids",required = true) String var1) {
Result var2 = new Result();
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformButtonService.removeByIds(Arrays.asList(var1.split(",")));
var2.success("删除成功!");
public Result<Object> deleteBatch(@RequestParam(name = "ids",required = true) String ids) {
if (ids != null && !"".equals(ids.trim())) {
this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!");
} else {
var2.error500("参数不识别！");
return Result.error500("参数不识别！");
}
return var2;
}
@GetMapping({"/queryById"})
public Result<OnlCgformButton> c(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<OnlCgformButton> queryById(@RequestParam(name = "id",required = true) String id) {
OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id);
if (cgformButton == null) {
return Result.error500("未找到对应实体");
} else {
var2.setResult(var3);
var2.setSuccess(true);
return Result.OK(cgformButton);
}
return var2;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java
+17 -31
View File
@@ -66,76 +66,62 @@ public class OnlCgformFieldController {
}
@PostMapping({"/add"})
public Result<OnlCgformField> a(@RequestBody OnlCgformField var1) {
Result var2 = new Result();
public Result<Object> add(@RequestBody OnlCgformField var1) {
try {
this.onlCgformFieldService.save(var1);
var2.success("添加成功！");
return Result.OK("添加成功！");
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
return Result.error500("操作失败");
}
return var2;
}
@PutMapping({"/edit"})
public Result<OnlCgformField> b(@RequestBody OnlCgformField var1) {
Result var2 = new Result();
public Result<Object> edit(@RequestBody OnlCgformField var1) {
OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1.getId());
if (var3 == null) {
var2.error500("未找到对应实体");
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformFieldService.updateById(var1);
if (var4) {
var2.success("修改成功!");
return Result.OK("修改成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/delete"})
public Result<OnlCgformField> c(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
public Result<Object> delete(@RequestParam(name = "id",required = true) String var1) {
OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformFieldService.removeById(var1);
if (var4) {
var2.success("删除成功!");
return Result.OK("删除成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/deleteBatch"})
public Result<OnlCgformField> d(@RequestParam(name = "ids",required = true) String var1) {
Result var2 = new Result();
public Result<Object> deleteBatch(@RequestParam(name = "ids",required = true) String var1) {
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(",")));
var2.success("删除成功!");
return Result.OK("删除成功!");
} else {
var2.error500("参数不识别！");
return Result.error500("参数不识别！");
}
return var2;
}
@GetMapping({"/queryById"})
public Result<OnlCgformField> e(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
public Result<Object> queryById(@RequestParam(name = "id",required = true) String var1) {
OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
return Result.error500("未找到对应实体");
} else {
var2.setResult(var3);
var2.setSuccess(true);
return Result.OK(var3);
}
return var2;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java
+41 -53
View File
@@ -86,91 +86,79 @@ public class OnlCgformHeadController {
}
@PostMapping({"/add"})
public Result<OnlCgformHead> a(@RequestBody OnlCgformHead var1) {
Result var2 = new Result();
public Result<Object> add(@RequestBody OnlCgformHead var1) {
try {
this.onlCgformHeadService.save(var1);
var2.success("添加成功！");
return Result.OK("添加成功！");
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
return Result.error500("操作失败");
}
return var2;
}
@PutMapping({"/edit"})
public Result<OnlCgformHead> b(@RequestBody OnlCgformHead var1) {
Result var2 = new Result();
public Result<Object> edit(@RequestBody OnlCgformHead var1) {
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId());
if (var3 == null) {
var2.error500("未找到对应实体");
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformHeadService.updateById(var1);
if (var4) {
var2.success("修改成功!");
return Result.OK("修改成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/delete"})
public Result<?> a(@RequestParam(name = "id",required = true) String var1) {
public Result<?> delete(@RequestParam(name = "id",required = true) String id) {
try {
this.onlCgformHeadService.deleteRecordAndTable(var1);
} catch (DBException var3) {
return Result.error("删除失败" + var3.getMessage());
} catch (SQLException var4) {
return Result.error("删除失败" + var4.getMessage());
this.onlCgformHeadService.deleteRecordAndTable(id);
} catch (DBException e) {
return Result.error("删除失败" + e.getMessage());
} catch (SQLException e) {
return Result.error("删除失败" + e.getMessage());
}
return Result.OK("删除成功!");
}
@DeleteMapping({"/removeRecord"})
public Result<?> b(@RequestParam(name = "id",required = true) String var1) {
public Result<?> removeRecord(@RequestParam(name = "id",required = true) String id) {
try {
this.onlCgformHeadService.deleteRecord(var1);
} catch (DBException var3) {
return Result.error("移除失败" + var3.getMessage());
} catch (SQLException var4) {
return Result.error("移除失败" + var4.getMessage());
this.onlCgformHeadService.deleteRecord(id);
} catch (DBException e) {
return Result.error("移除失败" + e.getMessage());
} catch (SQLException e) {
return Result.error("移除失败" + e.getMessage());
}
return Result.OK("移除成功!");
}
@DeleteMapping({"/deleteBatch"})
public Result<OnlCgformHead> a(@RequestParam(name = "ids",required = true) String var1, @RequestParam(name = "flag") String var2) {
Result var3 = new Result();
public Result<Object> deleteBatch(@RequestParam(name = "ids",required = true) String var1, @RequestParam(name = "flag") String var2) {
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformHeadService.deleteBatch(var1, var2);
var3.success("删除成功!");
return Result.OK("删除成功!");
} else {
var3.error500("参数不识别！");
return Result.error500("参数不识别！");
}
return var3;
}
@GetMapping({"/queryById"})
public Result<OnlCgformHead> c(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<OnlCgformHead> queryById(@RequestParam(name = "id",required = true) String id) {
OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id);
if (cgformHead == null) {
return Result.error500("未找到对应实体");
} else {
var2.setResult(var3);
var2.setSuccess(true);
return Result.OK(cgformHead);
}
return var2;
}
@GetMapping({"/queryByTableNames"})
public Result<?> d(@RequestParam(name = "tableNames",required = true) String var1) {
public Result<?> queryByTableNames(@RequestParam(name = "tableNames",required = true) String var1) {
LambdaQueryWrapper<OnlCgformHead> var2 = new LambdaQueryWrapper();
String[] var3 = var1.split(",");
var2.in(OnlCgformHead::getTableName, Arrays.asList(var3));
@@ -179,7 +167,7 @@ public class OnlCgformHeadController {
}
@PostMapping({"/enhanceJs/{code}"})
public Result<?> a(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
public Result<?> addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
try {
var2.setCgformHeadId(var1);
this.onlCgformHeadService.saveEnhance(var2);
@@ -191,7 +179,7 @@ public class OnlCgformHeadController {
}
@GetMapping({"/enhanceJs/{code}"})
public Result<?> a(@PathVariable("code") String var1, HttpServletRequest var2) {
public Result<?> getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) {
try {
String var3 = var2.getParameter("type");
OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3);
@@ -203,7 +191,7 @@ public class OnlCgformHeadController {
}
@PutMapping({"/enhanceJs/{code}"})
public Result<?> b(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
public Result<?> editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) {
try {
var2.setCgformHeadId(var1);
this.onlCgformHeadService.editEnhance(var2);
@@ -215,7 +203,7 @@ public class OnlCgformHeadController {
}
@GetMapping({"/enhanceButton/{formId}"})
public Result<?> b(@PathVariable("formId") String var1, HttpServletRequest var2) {
public Result<?> getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) {
try {
List var3 = this.onlCgformHeadService.queryButtonList(var1);
return var3 != null && var3.size() != 0 ? Result.OK(var3) : Result.error("查询为空");
@@ -226,14 +214,14 @@ public class OnlCgformHeadController {
}
@GetMapping({"/enhanceSql/{formId}"})
public Result<?> c(@PathVariable("formId") String var1, HttpServletRequest var2) {
public Result<?> getEnhanceSql(@PathVariable("formId") String var1, HttpServletRequest var2) {
List var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1);
return Result.OK(var3);
}
@RequiresRoles({"admin"})
@PostMapping({"/enhanceSql/{formId}"})
public Result<?> a(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
public Result<?> addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
try {
var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
@@ -250,7 +238,7 @@ public class OnlCgformHeadController {
@RequiresRoles({"admin"})
@PutMapping({"/enhanceSql/{formId}"})
public Result<?> b(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
public Result<?> editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) {
try {
var2.setCgformHeadId(var1);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
@@ -266,7 +254,7 @@ public class OnlCgformHeadController {
}
@DeleteMapping({"/enhanceSql"})
public Result<?> e(@RequestParam(name = "id",required = true) String var1) {
public Result<?> deletenhanceSql(@RequestParam(name = "id",required = true) String var1) {
try {
this.onlCgformEnhanceService.deleteEnhanceSql(var1);
return Result.OK("删除成功");
@@ -277,7 +265,7 @@ public class OnlCgformHeadController {
}
@DeleteMapping({"/deletebatchEnhanceSql"})
public Result<?> f(@RequestParam(name = "ids",required = true) String var1) {
public Result<?> deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) {
try {
List var2 = Arrays.asList(var1.split(","));
this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2);
@@ -289,18 +277,18 @@ public class OnlCgformHeadController {
}
@GetMapping({"/enhanceJava/{formId}"})
public Result<?> a(@PathVariable("formId") String var1, OnlCgformEnhanceJava var2) {
List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(var1);
public Result<?> getEnhanceJava(@PathVariable("formId") String formId, OnlCgformEnhanceJava var2) {
List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId);
return Result.OK(var3);
}
@PostMapping({"/enhanceJava/{formId}"})
public Result<?> b(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) {
public Result<?> addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) {
try {
if (!CgformUtil.a(var2)) {
return Result.error("类实例化失败，请检查!");
} else {
var2.setCgformHeadId(var1);
var2.setCgformHeadId(formId);
if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) {
this.onlCgformEnhanceService.saveEnhanceJava(var2);
return Result.OK("保存成功!");
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java
+47 -60
View File
@@ -34,97 +34,84 @@ public class OnlCgformIndexController {
}
@GetMapping({"/listByHeadId"})
public Result<?> a(@RequestParam("headId") String var1) {
QueryWrapper var2 = new QueryWrapper();
var2.eq("cgform_head_id", var1);
var2.eq("del_flag", CommonConstant.DEL_FLAG_0);
var2.orderByDesc("create_time");
List var3 = this.onlCgformIndexService.list(var2);
return Result.OK(var3);
public Result<?> listByHeadId(@RequestParam("headId") String headId) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("cgform_head_id", headId);
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
queryWrapper.orderByDesc("create_time");
List cgformIndexList = this.onlCgformIndexService.list(queryWrapper);
return Result.OK(cgformIndexList);
}
@GetMapping({"/list"})
public Result<IPage<OnlCgformIndex>> a(OnlCgformIndex var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) {
Result var5 = new Result();
QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap());
Page var7 = new Page((long)var2, (long)var3);
IPage var8 = this.onlCgformIndexService.page(var7, var6);
var5.setSuccess(true);
var5.setResult(var8);
return var5;
public Result<IPage<OnlCgformIndex>> list(OnlCgformIndex cgformIndex,
@RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cgformIndex, request.getParameterMap());
Page page = new Page((long)pageNo, (long)pageSize);
IPage cgformIndexPage = this.onlCgformIndexService.page(page, queryWrapper);
return Result.OK(cgformIndexPage);
}
@PostMapping({"/add"})
public Result<OnlCgformIndex> a(@RequestBody OnlCgformIndex var1) {
Result var2 = new Result();
public Result<Object> add(@RequestBody OnlCgformIndex cgformIndex) {
try {
this.onlCgformIndexService.save(var1);
var2.success("添加成功！");
} catch (Exception var4) {
log.error(var4.getMessage(), var4);
var2.error500("操作失败");
this.onlCgformIndexService.save(cgformIndex);
return Result.OK("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error500("操作失败");
}
return var2;
}
@PutMapping({"/edit"})
public Result<OnlCgformIndex> b(@RequestBody OnlCgformIndex var1) {
Result var2 = new Result();
OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1.getId());
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<Object> edit(@RequestBody OnlCgformIndex cgformIndex) {
OnlCgformIndex existCgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(cgformIndex.getId());
if (existCgformIndex == null) {
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformIndexService.updateById(var1);
if (var4) {
var2.success("修改成功!");
boolean flag = this.onlCgformIndexService.updateById(cgformIndex);
if (flag) {
return Result.OK("修改成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/delete"})
public Result<OnlCgformIndex> b(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<Object> delete(@RequestParam(name = "id",required = true) String id) {
OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(id);
if (cgformIndex == null) {
return Result.error500("未找到对应实体");
} else {
boolean var4 = this.onlCgformIndexService.removeById(var1);
if (var4) {
var2.success("删除成功!");
boolean flag = this.onlCgformIndexService.removeById(id);
if (flag) {
return Result.OK("删除成功!");
}
}
return var2;
return Result.OK();
}
@DeleteMapping({"/deleteBatch"})
public Result<OnlCgformIndex> c(@RequestParam(name = "ids",required = true) String var1) {
Result var2 = new Result();
if (var1 != null && !"".equals(var1.trim())) {
this.onlCgformIndexService.removeByIds(Arrays.asList(var1.split(",")));
var2.success("删除成功!");
public Result<Object> deleteBatch(@RequestParam(name = "ids",required = true) String ids) {
if (ids != null && !"".equals(ids.trim())) {
this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!");
} else {
var2.error500("参数不识别！");
return Result.error500("参数不识别！");
}
return var2;
}
@GetMapping({"/queryById"})
public Result<OnlCgformIndex> d(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1);
if (var3 == null) {
var2.error500("未找到对应实体");
public Result<OnlCgformIndex> queryById(@RequestParam(name = "id",required = true) String var1) {
OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(var1);
if (cgformIndex == null) {
return Result.error500("未找到对应实体");
} else {
var2.setResult(var3);
var2.setSuccess(true);
return Result.OK(cgformIndex);
}
return var2;
}
}
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java
+16 -20
View File
@@ -137,9 +137,7 @@ public class OnlCgreportHeadController {
}
@PostMapping({"/add"})
public Result<?> a(@RequestBody OnlCgreportModel var1) {
Result var2 = new Result();
public Result<?> add(@RequestBody OnlCgreportModel var1) {
try {
String var3 = CgformUtil.a();
OnlCgreportHead var4 = var1.getHead();
@@ -166,40 +164,38 @@ public class OnlCgreportHeadController {
this.onlCgreportHeadService.save(var4);
this.onlCgreportParamService.saveBatch(var5);
this.onlCgreportItemService.saveBatch(var6);
var2.success("添加成功！");
return Result.OK("添加成功！");
} catch (Exception var9) {
log.error(var9.getMessage(), var9);
var2.error500("操作失败");
return Result.error500("操作失败");
}
return var2;
}
@PutMapping({"/editAll"})
public Result<?> b(@RequestBody OnlCgreportModel var1) {
public Result<?> editAll(@RequestBody OnlCgreportModel cgreportModel) {
try {
return this.onlCgreportHeadService.editAll(var1);
} catch (Exception var3) {
log.error(var3.getMessage(), var3);
return this.onlCgreportHeadService.editAll(cgreportModel);
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("操作失败");
}
}
@DeleteMapping({"/delete"})
public Result<?> a(@RequestParam(name = "id",required = true) String var1) {
return this.onlCgreportHeadService.delete(var1);
public Result<?> delete(@RequestParam(name = "id",required = true) String id) {
return this.onlCgreportHeadService.delete(id);
}
@DeleteMapping({"/deleteBatch"})
public Result<?> b(@RequestParam(name = "ids",required = true) String var1) {
return this.onlCgreportHeadService.bathDelete(var1.split(","));
public Result<?> deleteBatch(@RequestParam(name = "ids",required = true) String ids) {
return this.onlCgreportHeadService.bathDelete(ids.split(","));
}
@GetMapping({"/queryById"})
public Result<OnlCgreportHead> c(@RequestParam(name = "id",required = true) String var1) {
Result var2 = new Result();
OnlCgreportHead var3 = (OnlCgreportHead)this.onlCgreportHeadService.getById(var1);
var2.setResult(var3);
return var2;
public Result<OnlCgreportHead> queryById(@RequestParam(name = "id",required = true) String id) {
Result result = new Result();
OnlCgreportHead cgreportHead = (OnlCgreportHead)this.onlCgreportHeadService.getById(id);
result.setResult(cgreportHead);
return result;
}
}