{
/**
* 创建编码
- * @param form
+ * @param flag
+ * @param code
* @return
*/
- String codeDemo(Map form);
+ String codeDemo(String flag,String code);
/**
* 添加
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
index 5589dae7..515c285a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.java
@@ -2,6 +2,9 @@ package org.nl.wms.system_manage.service.coderule.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
+import org.nl.wms.system_manage.service.coderule.dao.SysCodeRuleDetail;
+
+import java.util.List;
/**
*
@@ -13,4 +16,6 @@ import org.nl.wms.system_manage.service.coderule.dao.SysCodeRule;
*/
public interface SysCodeRuleMapper extends BaseMapper {
+ List findBycode(String code);
+
}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
index 481a644c..c0f9c44b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/dao/mapper/SysCodeRuleMapper.xml
@@ -2,4 +2,9 @@
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
index 5c534faa..027003ba 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/SysCodeRuleServiceImpl.java
@@ -1,6 +1,7 @@
package org.nl.wms.system_manage.service.coderule.impl;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.MapOf;
@@ -22,10 +24,11 @@ import org.nl.wms.system_manage.service.coderule.dto.CodeRuleQuery;
import org.nl.wms.system_manage.service.coderule.utils.CodeRuleTypeEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -37,29 +40,27 @@ import java.util.Set;
* @since 2022-12-19
*/
@Service
-@RequiredArgsConstructor
public class SysCodeRuleServiceImpl extends ServiceImpl implements ISysCodeRuleService {
- private final SysCodeRuleMapper codeRuleMapper;
- private final SysCodeRuleDetailMapper codeRuleDetailMapper;
+ @Resource
+ private SysCodeRuleDetailMapper codeRuleDetailMapper;
@Override
public IPage queryAll(CodeRuleQuery form, PageQuery pageable) {
IPage page = this.page(pageable.build(SysCodeRule.class), form.build());
- page.getRecords().forEach(sysCodeRule -> sysCodeRule.setDemo(codeDemo(MapOf.of("flag", "0", "code", sysCodeRule.getCode()))));
+ page.getRecords().forEach(sysCodeRule -> sysCodeRule.setDemo(codeDemo("0",sysCodeRule.getCode())));
return page;
}
@Override
- public synchronized String codeDemo(Map form) {
- String code = (String) form.get("code");
- String id = codeRuleMapper.selectOne(new LambdaQueryWrapper().eq(SysCodeRule::getCode, code)).getId();
- // 如果flag = 1就执行更新数据库的操作
- String flag = (String) form.get("flag");
- List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id));
+ public String codeDemo(String flag, String code) {
+ List ruleDtl = this.baseMapper.findBycode(code);
+ if (CollectionUtils.isEmpty(ruleDtl)){
+ throw new BadRequestException("编码规则不存在"+code);
+ }
String demo = "";
boolean isSame = true;
- for(SysCodeRuleDetail detail : ruleDetails) {
+ for(SysCodeRuleDetail detail : ruleDtl) {
String value = "";
String type = detail.getType();
//固定直接取值
@@ -125,12 +126,11 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode()));
+ List sysCodeRules = this.baseMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode()));
if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在");
codeRule.setId(IdUtil.getSnowflake(1,1).nextIdStr());
codeRule.setCreate_id(currentUserId);
@@ -139,21 +139,20 @@ public class SysCodeRuleServiceImpl extends ServiceImpl ids) {
ids.forEach(id -> {
- codeRuleMapper.deleteById(id);
+ this.baseMapper.deleteById(id);
codeRuleDetailMapper.delete(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id));
});
}
@Override
public void updateCodeRule(SysCodeRule codeRule) {
- List sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper()
+ List sysCodeRules = this.baseMapper.selectList(new LambdaQueryWrapper()
.eq(SysCodeRule::getCode, codeRule.getCode())
.ne(SysCodeRule::getId, codeRule.getId()));
if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("该编码code已存在，请校验！");
@@ -163,7 +162,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl impl
@Override
public List buildTree(List menuDtos) {
- List trees = new ArrayList<>();
Set ids = new HashSet<>();
List collect = menuDtos.stream().filter(a -> a.getType().equals("2")).collect(Collectors.toList());
for (MenuDto menuDTO : collect) {
- if (menuDTO.getPid() == null) {
- trees.add(menuDTO);
- }
for (MenuDto it : menuDtos) {
if (menuDTO.getMenu_id().equals(it.getPid())) {
if (menuDTO.getChildren() == null) {
@@ -335,10 +331,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl
}
}
}
- if (trees.size() == 0) {
- trees = menuDtos.stream().filter(s -> !ids.contains(s.getMenu_id())).collect(Collectors.toList());
- }
- return trees;
+ return menuDtos;
}
@Override
@@ -414,41 +407,20 @@ public class SysMenuServiceImpl extends ServiceImpl impl
// 一级目录需要加斜杠，不然会报警告
menuVo.setPath(pid.equals(menuDTO.getPid())? "/" + menuDTO.getPath() : menuDTO.getPath());
menuVo.setHidden(menuDTO.getHidden());
+ menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
// 如果不是外链
if (!menuDTO.getIframe()) {
- if (pid.equals(menuDTO.getPid())) {
- menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "Layout" : menuDTO.getComponent());
- //"2".equals(menuDTO.getType() 判断是不是目录
- } else if (!pid.equals(menuDTO.getPid()) && "2".equals(menuDTO.getType())) {
- menuVo.setComponent(StrUtil.isEmpty(menuDTO.getComponent()) ? "ParentView" : menuDTO.getComponent());
-
- } else if (!StrUtil.isEmpty(menuDTO.getComponent())) {
+ if ("2".equals(menuDTO.getType())) {
+ menuVo.setComponent(pid.equals(menuDTO.getPid()) ? "Layout" : "ParentView");
+ } else {
menuVo.setComponent(menuDTO.getComponent());
}
}
- menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
if (menuDtoList != null && menuDtoList.size() != 0) {
menuVo.setAlwaysShow(true);
menuVo.setRedirect("noredirect");
menuVo.setChildren(buildMenus(menuDtoList,pid));
// 处理是一级菜单并且没有子菜单的情况
- } else if (StrUtil.isEmpty(menuDTO.getPid())) {
- MenuVo menuVo1 = new MenuVo();
- menuVo1.setMeta(menuVo.getMeta());
- // 非外链
- if (!menuDTO.getIframe()) {
- menuVo1.setPath("index");
- menuVo1.setName(menuVo.getName());
- menuVo1.setComponent(menuVo.getComponent());
- } else {
- menuVo1.setPath(menuDTO.getPath());
- }
- menuVo.setName(null);
- menuVo.setMeta(null);
- menuVo.setComponent("Layout");
- List list1 = new ArrayList<>();
- list1.add(menuVo1);
- menuVo.setChildren(list1);
}
list.add(menuVo);
}
diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
index 5f2f0780..4b88e08d 100644
--- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -9,7 +9,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
- password: ${DB_PWD:password}
+ password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
diff --git a/wms_pro/hd/nladmin-system/src/test/java/Test3.java b/wms_pro/hd/nladmin-system/src/test/java/Test3.java
deleted file mode 100644
index ce19a84c..00000000
--- a/wms_pro/hd/nladmin-system/src/test/java/Test3.java
+++ /dev/null
@@ -1,56 +0,0 @@
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class Test3 {
- public static void main(String[] args) {
- JSONArray array = new JSONArray();
-
- JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("name", "小三");
- jsonObject1.put("age", "12");
- array.add(jsonObject1);
-
- JSONObject jsonObject2 = new JSONObject();
- jsonObject2.put("name", "小二");
- jsonObject2.put("age", "17");
- array.add(jsonObject2);
-
- JSONObject jsonObject3 = new JSONObject();
- jsonObject3.put("name", "小二");
- jsonObject3.put("age", "17");
- array.add(jsonObject3);
-
- Set name = array.stream().map(row -> ((JSONObject) row)).collect(Collectors.toSet());
- HashMap name1 = array.stream().collect(HashMap::new, (k, v) -> k.put(((JSONObject) v).getString("name"), (JSONObject) v), HashMap::putAll);
- HashSet collect = array.stream().collect(HashSet::new, (k, v) -> k.add((JSONObject) v), HashSet::addAll);
- collect.stream().forEach(json -> a(json.getString("name")));
-
- List