diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index e233bf2d..ff5edb87 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -2,15 +2,8 @@ package com.jero.generater.modules.online.auth.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.jero.common.api.vo.Result; import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.auth.entity.OnlAuthData; @@ -28,16 +21,12 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.*; @RestController("onlCgformAuthController") @@ -63,12 +52,17 @@ public class OnlCgformAuthController { @Autowired private IOnlCgformHeadService onlCgformHeadService; + private static final String OP_CONSTANT = "操作成功!"; + private static final String AUTH_ID_CONSTANT = "authId"; + private static final String NOT_INFO_CONSTANT = "未找到对应字段信息!"; + + @GetMapping({"/authData/{cgformId}"}) public Result> a(@PathVariable("cgformId") String paramString) { - Result> result = new Result(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + Result> result = new Result<>(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString); - List list = this.onlAuthDataService.list((Wrapper) lambdaQueryWrapper); + List list = this.onlAuthDataService.list(lambdaQueryWrapper); result.setResult(list); result.setSuccess(true); return result; @@ -79,7 +73,7 @@ public class OnlCgformAuthController { public Result addAuthData(@RequestBody OnlAuthData paramOnlAuthData) { try { this.onlAuthDataService.save(paramOnlAuthData); - return Result.OK("操作成功!"); + return Result.OK(OP_CONSTANT); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -89,14 +83,14 @@ public class OnlCgformAuthController { @PutMapping({"/authData"}) public Result editAuthData(@RequestBody OnlAuthData paramOnlAuthData) { - Result result = new Result(); + Result result = new Result<>(); this.onlAuthDataService.updateById(paramOnlAuthData); return result; } @DeleteMapping({"/authData/{id}"}) - public Result getAuthDataById(@PathVariable("id") String paramString) { + public Result getAuthDataById(@PathVariable("id") String paramString) { this.onlAuthDataService.deleteOne(paramString); return Result.OK("删除成功!"); } @@ -104,18 +98,18 @@ public class OnlCgformAuthController { @GetMapping({"/authButton/{cgformId}"}) public Result> getAuthButton(@PathVariable("cgformId") String paramString) { - Result> result = new Result(); + Result> result = new Result<>(); - LambdaQueryWrapper buttonLambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper buttonLambdaQueryWrapper = new LambdaQueryWrapper<>(); buttonLambdaQueryWrapper.eq(OnlCgformButton::getCgformHeadId, paramString) - .eq(OnlCgformButton::getButtonStatus, Integer.valueOf(1)) + .eq(OnlCgformButton::getButtonStatus, 1) .select(OnlCgformButton::getButtonCode, OnlCgformButton::getButtonName, OnlCgformButton::getButtonStyle); - List buttonList = this.onlCgformButtonService.list((Wrapper) buttonLambdaQueryWrapper); + List buttonList = this.onlCgformButtonService.list(buttonLambdaQueryWrapper); - LambdaQueryWrapper authPageLambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper authPageLambdaQueryWrapper = new LambdaQueryWrapper<>(); authPageLambdaQueryWrapper.eq(OnlAuthPage::getCgformId, paramString) - .eq(OnlAuthPage::getType, Integer.valueOf(2)); - List authPageList = this.onlAuthPageService.list((Wrapper) authPageLambdaQueryWrapper); + .eq(OnlAuthPage::getType, 2); + List authPageList = this.onlAuthPageService.list(authPageLambdaQueryWrapper); HashMap hashMap = new HashMap<>(); hashMap.put("buttonList", buttonList); @@ -132,18 +126,18 @@ public class OnlCgformAuthController { String str = paramOnlAuthPage.getId(); boolean bool = false; if (oConvertUtils.isNotEmpty(str)) { - OnlAuthPage onlAuthPage = (OnlAuthPage) this.onlAuthPageService.getById(str); + OnlAuthPage onlAuthPage = this.onlAuthPageService.getById(str); if (onlAuthPage != null) { bool = true; - onlAuthPage.setStatus(Integer.valueOf(1)); + onlAuthPage.setStatus(1); this.onlAuthPageService.updateById(onlAuthPage); } } if (!bool) { - paramOnlAuthPage.setStatus(Integer.valueOf(1)); + paramOnlAuthPage.setStatus(1); this.onlAuthPageService.save(paramOnlAuthPage); } - return Result.OK("操作成功!", paramOnlAuthPage); + return Result.OK(OP_CONSTANT, paramOnlAuthPage); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -152,59 +146,33 @@ public class OnlCgformAuthController { @PutMapping({"/authButton/{id}"}) - public Result d(@PathVariable("id") String paramString) { - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper(); - lambdaUpdateWrapper.eq(OnlAuthPage::getId, paramString).set(OnlAuthPage::getStatus, Integer.valueOf(0)); + public Result d(@PathVariable("id") String paramString) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(OnlAuthPage::getId, paramString).set(OnlAuthPage::getStatus, 0); - this.onlAuthPageService.update((Wrapper) lambdaUpdateWrapper); + this.onlAuthPageService.update(lambdaUpdateWrapper); return Result.OK("操作成功"); } @GetMapping({"/authColumn/{cgformId}"}) public Result> e(@PathVariable("cgformId") String paramString) { - Result> result = new Result(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + Result> result = new Result<>(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, paramString); lambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); - List list = this.onlCgformFieldService.list((Wrapper) lambdaQueryWrapper); - if (list == null || list.size() == 0) { - Result.error("未找到对应字段信息!"); + List list = this.onlCgformFieldService.list(lambdaQueryWrapper); + if (list == null || list.isEmpty()) { + return Result.error(NOT_INFO_CONSTANT); } - LambdaQueryWrapper pageLambdaQueryWrapper = new LambdaQueryWrapper(); - pageLambdaQueryWrapper.eq(OnlAuthPage::getCgformId, paramString).eq(OnlAuthPage::getType, Integer.valueOf(1)); - List pageList = this.onlAuthPageService.list((Wrapper) pageLambdaQueryWrapper); + LambdaQueryWrapper pageLambdaQueryWrapper = new LambdaQueryWrapper<>(); + pageLambdaQueryWrapper.eq(OnlAuthPage::getCgformId, paramString).eq(OnlAuthPage::getType, 1); + List pageList = this.onlAuthPageService.list(pageLambdaQueryWrapper); - ArrayList arrayList = new ArrayList(); + ArrayList arrayList = new ArrayList<>(); for (OnlCgformField onlCgformField : list) { - AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); - Integer integer = Integer.valueOf(0); - boolean bool1 = false, bool2 = false, bool3 = false; - - for (int b = 0; b < pageList.size(); b++) { - OnlAuthPage onlAuthPage = pageList.get(b); - - if (onlCgformField.getDbFieldName().equals(onlAuthPage.getCode())) { - integer = onlAuthPage.getStatus(); - if (onlAuthPage.getPage().intValue() == 3 && onlAuthPage.getControl().intValue() == 5) { - bool1 = true; - } - if (onlAuthPage.getPage().intValue() == 5) { - if (onlAuthPage.getControl().intValue() == 5) { - - bool2 = true; - } else if (onlAuthPage.getControl().intValue() == 3) { - - bool3 = true; - } - } - } - } - authColumnVO.setStatus(integer); - authColumnVO.setListShow(bool1); - authColumnVO.setFormShow(bool2); - authColumnVO.setFormEditable(bool3); + AuthColumnVO authColumnVO = getAuthColumnVO(pageList, onlCgformField); arrayList.add(authColumnVO); } result.setResult(arrayList); @@ -212,16 +180,50 @@ public class OnlCgformAuthController { return result; } + @NotNull + private AuthColumnVO getAuthColumnVO(List pageList, OnlCgformField onlCgformField) { + AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); + Integer integer = 0; + boolean bool1 = false; + boolean bool2 = false; + boolean bool3 = false; + + for (int b = 0; b < pageList.size(); b++) { + OnlAuthPage onlAuthPage = pageList.get(b); + + if (onlCgformField.getDbFieldName().equals(onlAuthPage.getCode())) { + integer = onlAuthPage.getStatus(); + if (onlAuthPage.getPage() == 3 && onlAuthPage.getControl() == 5) { + bool1 = true; + } + if (onlAuthPage.getPage() == 5) { + if (onlAuthPage.getControl() == 5) { + + bool2 = true; + } else if (onlAuthPage.getControl() == 3) { + + bool3 = true; + } + } + } + } + authColumnVO.setStatus(integer); + authColumnVO.setListShow(bool1); + authColumnVO.setFormShow(bool2); + authColumnVO.setFormEditable(bool3); + return authColumnVO; + } + @PutMapping({"/authColumn"}) - public Result editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { + public Result editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { - if (paramAuthColumnVO.getStatus().intValue() == 1) { + if (paramAuthColumnVO.getStatus() == 1) { this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO); } else { this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO); } - return Result.OK("操作成功!"); + return Result.OK(OP_CONSTANT); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -230,10 +232,10 @@ public class OnlCgformAuthController { @PostMapping({"/authColumn"}) - public Result addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { + public Result addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO); - return Result.OK("操作成功!"); + return Result.OK(OP_CONSTANT); } catch (Exception exception) { log.error(exception.getMessage(), exception); return Result.error("操作失败"); @@ -243,8 +245,8 @@ public class OnlCgformAuthController { @GetMapping({"/authPage/{cgformId}/{type}"}) public Result> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) { - Result> result = new Result(); - List list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger.intValue()); + Result> result = new Result<>(); + List list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger); result.setResult(list); result.setSuccess(true); return result; @@ -253,14 +255,14 @@ public class OnlCgformAuthController { @GetMapping({"/validAuthData/{cgformId}"}) public Result> validAuthData(@PathVariable("cgformId") String paramString) { - Result> result = new Result(); + Result> result = new Result<>(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlAuthData::getCgformId, paramString) - .eq(OnlAuthData::getStatus, Integer.valueOf(1)) + .eq(OnlAuthData::getStatus, 1) .select(OnlAuthData::getId, OnlAuthData::getRuleName); - List list = this.onlAuthDataService.list((Wrapper) lambdaQueryWrapper); + List list = this.onlAuthDataService.list(lambdaQueryWrapper); result.setResult(list); result.setSuccess(true); return result; @@ -269,15 +271,15 @@ public class OnlCgformAuthController { @GetMapping({"/roleAuth"}) public Result> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) { - Result> result = new Result(); + Result> result = new Result<>(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlAuthRelation::getRoleId, paramString1) .eq(OnlAuthRelation::getCgformId, paramString2) .eq(OnlAuthRelation::getType, paramInteger) .select(OnlAuthRelation::getAuthId); - List list = this.onlAuthRelationService.list((Wrapper) lambdaQueryWrapper); + List list = this.onlAuthRelationService.list(lambdaQueryWrapper); result.setResult(list); result.setSuccess(true); return result; @@ -285,88 +287,85 @@ public class OnlCgformAuthController { @PostMapping({"/roleColumnAuth/{roleId}/{cgformId}"}) - 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); + public Result addRoleColumnAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); + List list = json.toJavaList(String.class); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 1, list); - result.setSuccess(true); - return result; + return Result.OK(); } @PostMapping({"/roleButtonAuth/{roleId}/{cgformId}"}) - 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); + public Result addrRleButtonAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); + List list = json.toJavaList(String.class); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 2, list); - result.setSuccess(true); - return result; + return Result.OK(); } @PostMapping({"/roleDataAuth/{roleId}/{cgformId}"}) - 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); + public Result addRoleDataAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + JSONArray json = paramJSONObject.getJSONArray(AUTH_ID_CONSTANT); + List list = json.toJavaList(String.class); this.onlAuthRelationService.saveRoleAuth(paramString1, paramString2, 3, list); - result.setSuccess(true); - return result; + return Result.OK(); } @GetMapping({"/getAuthColumn/{desformCode}"}) public Result> getAuthColumn(@PathVariable("desformCode") String paramString) { - LambdaQueryWrapper cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper<>(); cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString); - OnlCgformHead onlCgformHead = (OnlCgformHead) this.onlCgformHeadService.getOne((Wrapper) (cgformHeadLambdaQueryWrapper)); + OnlCgformHead onlCgformHead = this.onlCgformHeadService.getOne(cgformHeadLambdaQueryWrapper); if (onlCgformHead == null) { - Result.error("未找到对应字段信息!"); + Result.error(NOT_INFO_CONSTANT); } - Result> result = new Result(); - LambdaQueryWrapper cgformFieldLambdaQueryWrapper = new LambdaQueryWrapper(); - cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId()); - cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); - List list = this.onlCgformFieldService.list((Wrapper) cgformFieldLambdaQueryWrapper); - if (list == null || list.size() == 0) { - Result.error("未找到对应字段信息!"); + Result> result = new Result<>(); + LambdaQueryWrapper cgformFieldLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if(!Objects.isNull(onlCgformHead)){ + cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId()); } - ArrayList arrayList = new ArrayList(); + cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); + List list = this.onlCgformFieldService.list(cgformFieldLambdaQueryWrapper); + if (list == null || list.isEmpty()) { + Result.error(NOT_INFO_CONSTANT); + } + ArrayList arrayList = new ArrayList<>(); for (OnlCgformField onlCgformField : list) { AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); - authColumnVO.setTableName(onlCgformHead.getTableName()); - authColumnVO.setTableNameTxt(onlCgformHead.getTableTxt()); + if(!Objects.isNull(onlCgformHead)){ + authColumnVO.setTableName(onlCgformHead.getTableName()); + authColumnVO.setTableNameTxt(onlCgformHead.getTableTxt()); + } arrayList.add(authColumnVO); } - if (oConvertUtils.isNotEmpty(onlCgformHead.getSubTableStr())) - for (String str : onlCgformHead.getSubTableStr().split(",")) { - OnlCgformHead onlCgformHead1 = (OnlCgformHead) this.onlCgformHeadService.getOne((Wrapper) ( - new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, str) - ); - if (onlCgformHead1 != null) { + if (!Objects.isNull(onlCgformHead) && oConvertUtils.isNotEmpty(onlCgformHead.getSubTableStr())) { + addArrayList(onlCgformHead, arrayList); + } + result.setResult(arrayList); + return result; + } - - LambdaQueryWrapper lambdaQueryWrapper1 = (LambdaQueryWrapper) ( - new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, onlCgformHead1.getId() - ); - List fieldList = this.onlCgformFieldService.list((Wrapper) lambdaQueryWrapper1); - if (fieldList != null) { - for (OnlCgformField onlCgformField : fieldList) { - AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); - authColumnVO.setTableName(onlCgformHead1.getTableName()); - authColumnVO.setTableNameTxt(onlCgformHead1.getTableTxt()); - arrayList.add(authColumnVO); - } + private void addArrayList(OnlCgformHead onlCgformHead, ArrayList arrayList) { + for (String str : onlCgformHead.getSubTableStr().split(",")) { + OnlCgformHead onlCgformHead1 = this.onlCgformHeadService.getOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, str)); + if (onlCgformHead1 != null) { + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(OnlCgformField::getCgformHeadId, onlCgformHead1.getId()); + List fieldList = this.onlCgformFieldService.list(lambdaQueryWrapper1); + if (fieldList != null) { + for (OnlCgformField onlCgformField : fieldList) { + AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); + authColumnVO.setTableName(onlCgformHead1.getTableName()); + authColumnVO.setTableNameTxt(onlCgformHead1.getTableTxt()); + arrayList.add(authColumnVO); } } } - result.setResult(arrayList); - Result.OK("加载字段权限数据完成"); - return result; + } } }