From c41f0fa88d607ce73e65d6f80cf70c732997e0e4 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 26 Jun 2024 15:15:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AssociatedFormsController.java | 21 + .../mapper/CustomerFormViewMapper.java | 2 + .../lowcode/mapper/FieldRecordMapper.java | 15 + .../CustomerFormTableSingleFieldValue.java | 27 ++ .../com/hxgk/lowcode/model/entity/Option.java | 33 ++ .../lowcode/service/CustomerFormService.java | 5 +- .../service/impl/CustomerFormServiceImpl.java | 389 ++++++++++-------- .../lowcode/service/impl/UserServiceImpl.java | 71 ++-- src/main/resources/application-dev.yml | 6 + src/main/resources/application-prod.yml | 6 + .../mapper/CustomerFormvViewMapper.xml | 8 + .../resources/mapper/FieldRecordMapper.xml | 12 + 12 files changed, 388 insertions(+), 207 deletions(-) create mode 100644 src/main/java/com/hxgk/lowcode/mapper/FieldRecordMapper.java create mode 100644 src/main/java/com/hxgk/lowcode/model/entity/CustomerFormTableSingleFieldValue.java create mode 100644 src/main/java/com/hxgk/lowcode/model/entity/Option.java create mode 100644 src/main/resources/mapper/FieldRecordMapper.xml diff --git a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java index 256da8a..d81e0ee 100644 --- a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java +++ b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java @@ -1,5 +1,6 @@ package com.hxgk.lowcode.controller; +import com.hxgk.lowcode.model.entity.CustomerFormTableSingleFieldValue; import com.hxgk.lowcode.model.entity.Option; import com.hxgk.lowcode.model.entity.SystemRole; import com.hxgk.lowcode.model.entity.Tree; @@ -30,6 +31,9 @@ public class AssociatedFormsController { public JsonData getCustomerFormList(@RequestHeader(value = "User-Key") String key, @RequestHeader(value = "User-Token") String token) { Tree tree = customerFormService.getCustomerFormList(key, token); + if(tree==null){ + return JsonData.buildError("登录状态已失效,请退出重新登录"); + } return JsonData.buildSuccess(tree); } @@ -79,4 +83,21 @@ public class AssociatedFormsController { return JsonData.buildSuccess(options); } + + /*实现获取选项效果*/ + @RequestMapping(value = "AssociatedForms/getFieldRecord") + public JsonData getFieldRecord(@RequestHeader(value = "User-Key") String key, + @RequestHeader(value = "User-Token") String token, + @RequestBody Map requestBody) { + String optionsValue3Field = requestBody.get("optionsValue3Field"); + String[] optionsValue3FieldArray = optionsValue3Field.split(":"); + + ArrayList fieldList = customerFormService.getFieldRecord(key,token,optionsValue3FieldArray); + if(null==fieldList){ + return JsonData.buildError("非法请求"); + } + return JsonData.buildSuccess(fieldList); + + } + } diff --git a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java index c5d3bfd..268a590 100644 --- a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java +++ b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java @@ -12,4 +12,6 @@ public interface CustomerFormViewMapper { ArrayList getCustomerFormViewListByTablekey(ArrayList tablekeyList); ArrayList getCustomerFormViewListByGroupid(String groupid); + + CustomerFormView getTableNameByCfid(String formId); } diff --git a/src/main/java/com/hxgk/lowcode/mapper/FieldRecordMapper.java b/src/main/java/com/hxgk/lowcode/mapper/FieldRecordMapper.java new file mode 100644 index 0000000..688ccb1 --- /dev/null +++ b/src/main/java/com/hxgk/lowcode/mapper/FieldRecordMapper.java @@ -0,0 +1,15 @@ +package com.hxgk.lowcode.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hxgk.lowcode.model.entity.CustomerFormTableSingleFieldValue; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; + +@DS("tidbintranetcustomerform") +@Mapper +public interface FieldRecordMapper { + + ArrayList getFieldRecord(@Param("formIdOrTableKey") String formIdOrTableKey, @Param("fieldKey")String fieldKey); +} diff --git a/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormTableSingleFieldValue.java b/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormTableSingleFieldValue.java new file mode 100644 index 0000000..018f0f1 --- /dev/null +++ b/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormTableSingleFieldValue.java @@ -0,0 +1,27 @@ +package com.hxgk.lowcode.model.entity; + +import org.springframework.stereotype.Repository; + +@Repository +public class CustomerFormTableSingleFieldValue { + + private String value; + + private String label; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } +} diff --git a/src/main/java/com/hxgk/lowcode/model/entity/Option.java b/src/main/java/com/hxgk/lowcode/model/entity/Option.java new file mode 100644 index 0000000..65db490 --- /dev/null +++ b/src/main/java/com/hxgk/lowcode/model/entity/Option.java @@ -0,0 +1,33 @@ +package com.hxgk.lowcode.model.entity; + +import org.springframework.stereotype.Repository; + +@Repository +public class Option { + private String label; + private String value; + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Option() { + } + + public Option(String label, String value) { + this.label = label; + this.value = value; + } +} diff --git a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java b/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java index e54434b..31039c3 100644 --- a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java +++ b/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java @@ -1,8 +1,7 @@ package com.hxgk.lowcode.service; -import com.hxgk.lowcode.model.entity.CustomerFormView; -import com.hxgk.lowcode.model.entity.SystemRole; +import com.hxgk.lowcode.model.entity.CustomerFormTableSingleFieldValue; import com.hxgk.lowcode.model.entity.Tree; import java.util.ArrayList; @@ -13,4 +12,6 @@ public interface CustomerFormService { Tree getFieldTree(String key,String token,String cfid); Tree getRoleList(); + + ArrayList getFieldRecord(String key, String token, String[] optionsValue3FieldArray); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index a040fcf..8628455 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -1,16 +1,14 @@ package com.hxgk.lowcode.service.impl; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.hxgk.lowcode.mapper.CustomerFormMapper; import com.hxgk.lowcode.mapper.CustomerFormViewMapper; +import com.hxgk.lowcode.mapper.FieldRecordMapper; import com.hxgk.lowcode.model.entity.*; import com.hxgk.lowcode.service.CustomerFormService; import com.hxgk.lowcode.service.SystemRoleService; @@ -38,6 +36,9 @@ public class CustomerFormServiceImpl implements CustomerFormService { private SystemRoleService systemRoleService; @Autowired private CustomerFormViewMapper customerFormViewMapper; + @Autowired + private FieldRecordMapper fieldRecordMapper; + @Override //根据用户权限查询表单列表 public Tree getCustomerFormList(String key, String token) { @@ -51,209 +52,228 @@ public class CustomerFormServiceImpl implements CustomerFormService { keytokenmap.put("userkey",key); keytokenmap.put("usertoken",token); UserDetail userDetail = userService.getUserDetailFromRedis(keytokenmap); - - //得到所有启用的系统角色(state=1的) - ArrayList roleList = systemRoleService.getAllRole(); - - //根据权限算法过滤后的list - ArrayList customerFormList1 = new ArrayList<>(); - - Tree tree = new Tree(); - tree.setId("rootid"); - tree.setLabel("请选择表单"); - tree.setValue("rootvalue"); - //筛选出所有表单中,当前用户有权限的表单 - for(CustomerForm c:customerFormList){// - - //把权限相关字段字符串处理为数组 - - //可见人员 - String userpermitArrStr = c.getUserpermit(); - String[] userpermitArr = new String[0]; - if(!StringUtils.isBlank(userpermitArrStr)){ - if(userpermitArrStr.contains(",")){ - userpermitArr = userpermitArrStr.split(","); - }else{ - userpermitArr = new String[]{userpermitArrStr}; + if(userDetail==null){ + return null; + }else{ + //得到所有启用的系统角色(state=1的) + ArrayList roleList = systemRoleService.getAllRole(); + + //根据权限算法过滤后的list + ArrayList customerFormList1 = new ArrayList<>(); + + Tree tree = new Tree(); + tree.setId("rootid"); + tree.setLabel("请选择表单"); + tree.setValue("rootvalue"); + //筛选出所有表单中,当前用户有权限的表单 + for(CustomerForm c:customerFormList){// + + //把权限相关字段字符串处理为数组 + + //可见人员 + String userpermitArrStr = c.getUserpermit(); + String[] userpermitArr = new String[0]; + if(!StringUtils.isBlank(userpermitArrStr)){ + if(userpermitArrStr.contains(",")){ + userpermitArr = userpermitArrStr.split(","); + }else{ + userpermitArr = new String[]{userpermitArrStr}; + } } - } - //可见角色 - String postpermitArrStr = c.getPostpermit(); - String[] postpermitArr = new String[0]; - if(!StringUtils.isBlank(postpermitArrStr)){ - if(postpermitArrStr.contains(",")){ - postpermitArr = postpermitArrStr.split(","); - }else{ - postpermitArr = new String[]{postpermitArrStr}; + //可见角色 + String postpermitArrStr = c.getPostpermit(); + String[] postpermitArr = new String[0]; + if(!StringUtils.isBlank(postpermitArrStr)){ + if(postpermitArrStr.contains(",")){ + postpermitArr = postpermitArrStr.split(","); + }else{ + postpermitArr = new String[]{postpermitArrStr}; + } } - } - //授权范围 - String permitArrStr = c.getPermit(); - String[] permitArr = new String[0]; - //对本表单有权限的组织机构list - ArrayList permitArrList = new ArrayList<>(); - if(!StringUtils.isBlank(permitArrStr)){ - if(permitArrStr.contains("],[")) { - permitArr = StringUtils.splitByWholeSeparator(permitArrStr, "],["); - for(int i = 0; i < permitArr.length; i++){ - String[] arr = StringUtils.splitByWholeSeparator(permitArr[i],","); - for(int j = 0; j < arr.length; j++){ - if(j == arr.length-1){ - if(i == permitArr.length-1){ - String lastOrg = arr[j]; - lastOrg = lastOrg.split("]]")[0]; - permitArrList.add(lastOrg);// - }else{ - permitArrList.add(arr[j]); + //授权范围 + String permitArrStr = c.getPermit(); + String[] permitArr = new String[0]; + //对本表单有权限的组织机构list + ArrayList permitArrList = new ArrayList<>(); + if(!StringUtils.isBlank(permitArrStr)){ + if(permitArrStr.contains("],[")) { + permitArr = StringUtils.splitByWholeSeparator(permitArrStr, "],["); + for(int i = 0; i < permitArr.length; i++){ + String[] arr = StringUtils.splitByWholeSeparator(permitArr[i],","); + for(int j = 0; j < arr.length; j++){ + if(j == arr.length-1){ + if(i == permitArr.length-1){ + String lastOrg = arr[j]; + lastOrg = lastOrg.split("]]")[0]; + permitArrList.add(lastOrg);// + }else{ + permitArrList.add(arr[j]); + } } } } - } - }else{ - permitArr = StringUtils.splitByWholeSeparator(permitArrStr, ","); - for(int i = 0; i < permitArr.length; i++){ - if(i==permitArr.length-1){ - permitArrList.add(permitArr[i].split("]")[0]); + }else{ + permitArr = StringUtils.splitByWholeSeparator(permitArrStr, ","); + for(int i = 0; i < permitArr.length; i++){ + if(i==permitArr.length-1){ + permitArrList.add(permitArr[i].split("]")[0]); + } } } } - } - //StringUtils.isBlank() 判断null和"" - if(StringUtils.isBlank(c.getPermit())&&StringUtils.isBlank(c.getPermitstr())&&StringUtils.isBlank(c.getUserpermit())&&StringUtils.isBlank(c.getPostpermit())){ - //本表单所有用户都有权限 - customerFormList1.add(c); - }else if(StringUtils.isNotEmpty(c.getUserpermit())){ - //按照可见人员判断权限 cus - for (int i = 0; i < userpermitArr.length; i++) { - if(userpermitArr[i].equals(userDetail.getWmKey().toString())){ - customerFormList1.add(c); + //StringUtils.isBlank() 判断null和"" + if(StringUtils.isBlank(c.getPermit())&&StringUtils.isBlank(c.getPermitstr())&&StringUtils.isBlank(c.getUserpermit())&&StringUtils.isBlank(c.getPostpermit())){ + //本表单所有用户都有权限 + customerFormList1.add(c); + }else if(StringUtils.isNotEmpty(c.getUserpermit())){ + //按照可见人员判断权限 cus + for (int i = 0; i < userpermitArr.length; i++) { + if(userpermitArr[i].equals(userDetail.getWmKey().toString())){ + customerFormList1.add(c); + } } - } - }else if(StringUtils.isNotEmpty(c.getPostpermit())){ - //按照可见角色判断权限 - for (int i = 0; i < postpermitArr.length; i++) { - if(postpermitArr[i].equals(userDetail.getRoleId().toString())){ - customerFormList1.add(c); + }else if(StringUtils.isNotEmpty(c.getPostpermit())){ + //按照可见角色判断权限 + for (int i = 0; i < postpermitArr.length; i++) { + if(postpermitArr[i].equals(userDetail.getRoleId().toString())){ + customerFormList1.add(c); + } } - } - }else if(StringUtils.isNotEmpty(c.getPermit())){ - //按照授权范围(org)判断权限 - //userDetail.adminOrg在permitArrList中的话,则本用户对本表单有权限 - for(String item: permitArrList){ - if(item.equals(userDetail.getAdminorg().toString())){ - customerFormList1.add(c); + }else if(StringUtils.isNotEmpty(c.getPermit())){ + //按照授权范围(org)判断权限 + //userDetail.adminOrg在permitArrList中的话,则本用户对本表单有权限 + for(String item: permitArrList){ + if(item.equals(userDetail.getAdminorg().toString())){ + customerFormList1.add(c); + } } } } - } - //根据权限过滤完成customerFormList1 - ArrayList tablekeyList = new ArrayList<>(); - for(CustomerForm item:customerFormList1){ - tablekeyList.add(item.getTablename()); - } - ArrayList customerFormViewArrayList = customerFormViewMapper.getCustomerFormViewListByTablekey(tablekeyList); - ArrayList treeArrayList1 = new ArrayList<>(); - for(CustomerFormView item:customerFormViewArrayList){ - - Tree tree1 = new Tree(); - if(item.getClassify()==3){//app + //根据权限过滤完成customerFormList1 + ArrayList tablekeyList = new ArrayList<>(); + for(CustomerForm item:customerFormList1){ + tablekeyList.add(item.getTablename()); + } + ArrayList customerFormViewArrayList = customerFormViewMapper.getCustomerFormViewListByTablekey(tablekeyList); + ArrayList treeArrayList1 = new ArrayList<>(); + for(CustomerFormView item:customerFormViewArrayList){ + + Tree tree1 = new Tree(); + if(item.getClassify()==3){//app + /*String signCode = item.getSignCode(); + //调用GO接口获取App结构,过滤掉非表单和目录的数据 + //上线修改 + String url = "http://172.20.2.87:7777/app/gainAppEditPsge";//本地+内网 + //String url = "http://36.133.126.182:39250/app/gainAppEditPsge";//外网 + + JSONObject param = new JSONObject(); + param.put("id", signCode); + String post = null; + + try { + post = HttpUtils.send(url, param, HTTP.UTF_8, key, token); + System.out.println("post:"+post.toString()); + } catch (IOException e) { + e.printStackTrace(); + }*/ + + tree1.setId(item.getCfid()); + tree1.setParentId(tree.getId()); + tree1.setLabel("App-"+item.getName()); + tree1.setValue(item.getCfid()); + tree1.setDisabled(true); + + ArrayList appForms = customerFormViewMapper.getCustomerFormViewListByGroupid(item.getSignCode()); + if(appForms.size()>0){ + ArrayList treeArrayListx = new ArrayList<>(); + for(CustomerFormView itemx:appForms){ + Tree tree2 = new Tree(); + + tree2.setId(itemx.getCfid()); + tree2.setParentId(tree1.getId()); + tree2.setLabel("Form-"+itemx.getName()); + tree2.setValue(itemx.getCfid()); + HashMap treeAttrs = new HashMap<>(); + treeAttrs.put("version",itemx.getVersion().toString()); + tree2.setTreeAttrs(treeAttrs); + ArrayList treeArrayList = new ArrayList<>(); + if(!StringUtils.isBlank(itemx.getTableStructure())){ + + String tableStructure = itemx.getTableStructure(); + tableStructure = tableStructure.replace("{",""); + tableStructure = tableStructure.replace("}",""); + tableStructure = tableStructure.replace("\"",""); + String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); + + for(String item1:tableStructureArr){ + String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; + Tree tree3 = new Tree(); + tree3.setLabel("子表-"+l); + tree3.setParentId(tree2.getId()); + tree3.setId(tree2.getId()+":zibiaoid-"+l); + tree3.setValue(tree3.getId()); + treeArrayList.add(tree3); + } - tree1.setId(item.getCfid()); - tree1.setParentId(tree.getId()); - tree1.setLabel("App-"+item.getName()); - tree1.setValue(item.getCfid()); - tree1.setDisabled(true); + } + tree2.setChildren(treeArrayList); - ArrayList appForms = customerFormViewMapper.getCustomerFormViewListByGroupid(item.getSignCode()); - if(appForms.size()>0){ - ArrayList treeArrayListx = new ArrayList<>(); - for(CustomerFormView itemx:appForms){ - Tree tree2 = new Tree(); - tree2.setId(itemx.getCfid()); - tree2.setParentId(tree1.getId()); - tree2.setLabel("Form-"+itemx.getName()); - tree2.setValue(itemx.getCfid()); - HashMap treeAttrs = new HashMap<>(); - treeAttrs.put("version",itemx.getVersion().toString()); - tree2.setTreeAttrs(treeAttrs); - ArrayList treeArrayList = new ArrayList<>(); - if(!StringUtils.isBlank(itemx.getTableStructure())){ - - String tableStructure = itemx.getTableStructure(); - tableStructure = tableStructure.replace("{",""); - tableStructure = tableStructure.replace("}",""); - tableStructure = tableStructure.replace("\"",""); - String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); - - for(String item1:tableStructureArr){ - String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; - Tree tree3 = new Tree(); - tree3.setLabel("子表-"+l); - tree3.setParentId(tree2.getId()); - tree3.setId(tree2.getId()+":zibiaoid-"+l); - tree3.setValue(tree3.getId()); - treeArrayList.add(tree3); - } + treeArrayListx.add(tree2); } - tree2.setChildren(treeArrayList); - treeArrayListx.add(tree2); - + HashMap treeAttrs = new HashMap<>(); + treeAttrs.put("version",item.getVersion().toString()); + tree1.setChildren(treeArrayListx); + tree1.setTreeAttrs(treeAttrs); } - - + treeArrayList1.add(tree1); + }else{ + tree1.setId(item.getCfid()); + tree1.setParentId(tree.getId()); + tree1.setLabel("Form-"+item.getName()); + tree1.setValue(item.getCfid()); HashMap treeAttrs = new HashMap<>(); treeAttrs.put("version",item.getVersion().toString()); - tree1.setChildren(treeArrayListx); tree1.setTreeAttrs(treeAttrs); - - } - treeArrayList1.add(tree1); - }else{ - tree1.setId(item.getCfid()); - tree1.setParentId(tree.getId()); - tree1.setLabel("Form-"+item.getName()); - tree1.setValue(item.getCfid()); - HashMap treeAttrs = new HashMap<>(); - treeAttrs.put("version",item.getVersion().toString()); - tree1.setTreeAttrs(treeAttrs); - ArrayList treeArrayList = new ArrayList<>(); - if(!StringUtils.isBlank(item.getTableStructure())){ - - String tableStructure = item.getTableStructure(); - tableStructure = tableStructure.replace("{",""); - tableStructure = tableStructure.replace("}",""); - tableStructure = tableStructure.replace("\"",""); - String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); - - for(String item1:tableStructureArr){ - String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; - Tree tree2 = new Tree(); - tree2.setLabel("子表-"+l); - tree2.setParentId(tree1.getId()); - tree2.setId(tree1.getId()+":zibiaoid-"+l); - tree2.setValue(tree2.getId()); - treeArrayList.add(tree2); - } + ArrayList treeArrayList = new ArrayList<>(); + if(!StringUtils.isBlank(item.getTableStructure())){ + + String tableStructure = item.getTableStructure(); + tableStructure = tableStructure.replace("{",""); + tableStructure = tableStructure.replace("}",""); + tableStructure = tableStructure.replace("\"",""); + String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); + + for(String item1:tableStructureArr){ + String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; + Tree tree2 = new Tree(); + tree2.setLabel("子表-"+l); + tree2.setParentId(tree1.getId()); + tree2.setId(tree1.getId()+":zibiaoid-"+l); + tree2.setValue(tree2.getId()); + treeArrayList.add(tree2); + } + } + tree1.setChildren(treeArrayList); + treeArrayList1.add(tree1); } - tree1.setChildren(treeArrayList); - treeArrayList1.add(tree1); - } + } + tree.setChildren(treeArrayList1); + return tree; } - tree.setChildren(treeArrayList1); - return tree; + } @@ -490,7 +510,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { e.printStackTrace(); } - // + } @@ -519,5 +539,30 @@ public class CustomerFormServiceImpl implements CustomerFormService { return tree; } + @Override + public ArrayList getFieldRecord(String key, String token, String[] optionsValue3FieldArray) {//CustomerFormTableSingleFieldValueList + ArrayList stringArrayList = new ArrayList<>(); + if(!StringUtils.isBlank(key)&&!StringUtils.isBlank(token)){ + if(optionsValue3FieldArray.length==3){//formField:102:input1717743396622",不涉及子表 + String formId = optionsValue3FieldArray[1]; + //根据formId(cfid)查询表名 + String formName = customerFormViewMapper.getTableNameByCfid(formId).getTablekey(); + + String fieldKey = optionsValue3FieldArray[2]; + stringArrayList = fieldRecordMapper.getFieldRecord(formName,fieldKey); + }else if(optionsValue3FieldArray.length==4){//formField:5:table1718585442447:zhi2wu4",涉及到子表 + String formId = optionsValue3FieldArray[1]; + String tableKey = optionsValue3FieldArray[2]; + String fieldKey = optionsValue3FieldArray[3]; + stringArrayList = fieldRecordMapper.getFieldRecord(tableKey,fieldKey); + } + + return stringArrayList; + }else{ + System.out.println("非法请求!请先登录!"); + return null; + } + } + } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java index 3aea801..012f0aa 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/UserServiceImpl.java @@ -49,46 +49,51 @@ public class UserServiceImpl implements UserService { String userRedisHashKey = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_" + userkey; Object value1 = redisTemplate.boundHashOps(userRedisHashKey).get("key"); - //唯一识别码 - String key = value1.toString(); + if(value1==null){ + return null; + }else{ + //唯一识别码 + String key = value1.toString(); - //工号 - Object wmNumber = redisTemplate.boundHashOps(userRedisHashKey).get("usernumber"); + //工号 + Object wmNumber = redisTemplate.boundHashOps(userRedisHashKey).get("usernumber"); - String userDetailKey = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:UserCont_dev_" + wmNumber; + String userDetailKey = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:UserCont_dev_" + wmNumber; - HashOperations hashOps = redisTemplate.opsForHash(); - Map entries = hashOps.entries(userDetailKey); - for (Map.Entry entry : entries.entrySet()) { + HashOperations hashOps = redisTemplate.opsForHash(); + Map entries = hashOps.entries(userDetailKey); + for (Map.Entry entry : entries.entrySet()) { - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("idcardno")) { - userDetail.setIdcardno(entry.getValue()); - } - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("name")) { - userDetail.setName(entry.getValue()); - } - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("icon")) { - userDetail.setIcon(entry.getValue()); - } - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("number")) { - userDetail.setWmNumber(entry.getValue()); - } - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("key")) { - long l = Long.parseLong(entry.getValue()); - userDetail.setWmKey(l); - } - //role - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("role")) { - Integer l = Integer.parseInt(entry.getValue()); - userDetail.setRoleId(l); - } - if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("adminorg")) { - long adminorg = Long.parseLong(entry.getValue()); - userDetail.setAdminorg(adminorg); + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("idcardno")) { + userDetail.setIdcardno(entry.getValue()); + } + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("name")) { + userDetail.setName(entry.getValue()); + } + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("icon")) { + userDetail.setIcon(entry.getValue()); + } + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("number")) { + userDetail.setWmNumber(entry.getValue()); + } + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("key")) { + long l = Long.parseLong(entry.getValue()); + userDetail.setWmKey(l); + } + //role + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("role")) { + Integer l = Integer.parseInt(entry.getValue()); + userDetail.setRoleId(l); + } + if (StringUtils.isNotEmpty(entry.getKey()) && entry.getKey().equals("adminorg")) { + long adminorg = Long.parseLong(entry.getValue()); + userDetail.setAdminorg(adminorg); + } } + + return userDetail; } - return userDetail; } @DS("hrnew") @Override diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c670749..679d58b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -34,6 +34,12 @@ spring: password: 9z_Bu28r1*DZ3K6@+a url: jdbc:mysql://172.20.5.33:4000/system_empower?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false username: root + tidbintranetcustomerform: + driver-class-name: com.mysql.cj.jdbc.Driver + password: 9z_Bu28r1*DZ3K6@+a + #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false + url: jdbc:mysql://172.20.5.33:4000/customer_form?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false + username: root #数据源基础配置 druid: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index fc34e56..a443f67 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -34,6 +34,12 @@ spring: password: NTYni4L2mfxk5zZZ url: jdbc:mysql://127.0.0.1:3306/system_empower?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false username: system_empower + tidbintranetcustomerform: + driver-class-name: com.mysql.cj.jdbc.Driver + password: Mjh4msNtADGjiMaC + #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false + url: jdbc:mysql://127.0.0.1:3306/customer_form?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false + username: customer_form #数据源基础配置 druid: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml index 143708e..afa3b75 100644 --- a/src/main/resources/mapper/CustomerFormvViewMapper.xml +++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml @@ -26,4 +26,12 @@ order by id + + \ No newline at end of file diff --git a/src/main/resources/mapper/FieldRecordMapper.xml b/src/main/resources/mapper/FieldRecordMapper.xml new file mode 100644 index 0000000..c87da34 --- /dev/null +++ b/src/main/resources/mapper/FieldRecordMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file