From 7cda77435f479b7dcb837c2341a5ff8a87c36a00 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 15:58:11 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 2
zy-asrs-framework/src/main/resources/templates/Xml.txt | 5 -
zy-asrs-framework/src/main/resources/templates/Dao.txt | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java | 2
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java | 50 ++---------
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java | 2
zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt | 2
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java | 11 ++
zy-asrs-framework/src/main/resources/templates/Service.txt | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java | 2
zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml | 2
zy-asrs-framework/src/main/resources/templates/Controller.txt | 75 ++++--------------
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java | 2
zy-asrs-framework/src/main/resources/templates/Entity.txt | 10 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java | 2
27 files changed, 71 insertions(+), 124 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
similarity index 87%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
index ac56777..de58579 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Config;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java
similarity index 87%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java
index 3a3bb06..d540e59 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Host;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java
similarity index 96%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java
index 84a7dad..f160c67 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.OperateLog;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java
similarity index 87%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java
index 2a346e2..fa7efb4 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Resource;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java
similarity index 87%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java
index 0b0b505..c0c564c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Role;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
similarity index 95%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
index eb525d1..c85a382 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Resource;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java
similarity index 92%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java
index c1a7a27..912adbb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.UserLogin;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java
similarity index 87%
rename from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java
rename to zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java
index bf96ab4..22fb3c0 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.common.sys.dao;
+package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.User;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
index b9248b7..3dccb5c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Config;
-import com.zy.asrs.common.sys.dao.ConfigMapper;
+import com.zy.asrs.common.sys.mapper.ConfigMapper;
import com.zy.asrs.common.sys.service.ConfigService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java
index 5688537..8b9507b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.dao.HostMapper;
+import com.zy.asrs.common.sys.mapper.HostMapper;
import com.zy.asrs.common.sys.service.HostService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java
index 6ba3b4c..eb0401b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.OperateLog;
-import com.zy.asrs.common.sys.dao.OperateLogMapper;
+import com.zy.asrs.common.sys.mapper.OperateLogMapper;
import com.zy.asrs.common.sys.service.OperateLogService;
import com.zy.asrs.framework.common.Cools;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java
index 8f2019a..0651f20 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Resource;
-import com.zy.asrs.common.sys.dao.ResourceMapper;
+import com.zy.asrs.common.sys.mapper.ResourceMapper;
import com.zy.asrs.common.sys.service.ResourceService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java
index f6e72cd..58e65f6 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Resource;
import com.zy.asrs.common.sys.entity.RoleResource;
-import com.zy.asrs.common.sys.dao.RoleResourceMapper;
+import com.zy.asrs.common.sys.mapper.RoleResourceMapper;
import com.zy.asrs.common.sys.service.RoleResourceService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java
index ba74a96..cefdb22 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Role;
-import com.zy.asrs.common.sys.dao.RoleMapper;
+import com.zy.asrs.common.sys.mapper.RoleMapper;
import com.zy.asrs.common.sys.service.RoleService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java
index 234085b..8bf3fe6 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.UserLogin;
-import com.zy.asrs.common.sys.dao.UserLoginMapper;
+import com.zy.asrs.common.sys.mapper.UserLoginMapper;
import com.zy.asrs.common.sys.service.UserLoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java
index 67f3e53..f896b3d 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.dao.UserMapper;
+import com.zy.asrs.common.sys.mapper.UserMapper;
import com.zy.asrs.common.sys.service.UserService;
import org.springframework.stereotype.Service;
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml b/zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml
similarity index 71%
rename from zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml
rename to zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml
index d424d3c..c976c76 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.common.sys.dao.HostMapper">
+<mapper namespace="com.zy.asrs.common.sys.mapper.HostMapper">
</mapper>
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
index 9273d4a..3af09ac 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
@@ -71,6 +71,7 @@
private String majorColumn;
private String systemPackagePath;
private String systemPackage;
+ private String itemName;
public void build() throws Exception {
init();
@@ -108,7 +109,7 @@
break;
case "Xml":
pass = xml;
- directory = backendPrefixPath + XML_DIR;
+ directory = backendPrefixPath + XML_DIR + itemName + "/";
fileName = fullEntityName+"Mapper.xml";
break;
case "Sql":
@@ -140,7 +141,6 @@
fullEntityName = GeneratorUtils.getNameSpace(table);
simpleEntityName = fullEntityName.substring(0, 1).toLowerCase()+fullEntityName.substring(1);
entityContent = createEntityMsg();
- xmlContent = createXmlMsg();
htmlContent = createHtmlMsg();
htmlDialogContent = createHtmlDialogMsg();
jsTableContent = createJsTableMsg();
@@ -161,8 +161,8 @@
systemPackage = systemPackage + split[i-1] + ".";
}
}
-
}
+ itemName = packagePathSplit[packagePathSplit.length - 1];
}
private String readFile(String template){
@@ -185,6 +185,7 @@
if(!codeDirectory.exists()){
codeDirectory.mkdirs();
}
+
File writerFile=new File(directory+fileName);
if(!writerFile.exists()){
content=content.
@@ -195,7 +196,8 @@
.replaceAll("@\\{SIMPLEENTITYNAME}", simpleEntityName)
.replaceAll("@\\{UENTITYNAME}", simpleEntityName)
.replaceAll("@\\{COMPANYNAME}",packagePath)
- .replaceAll("@\\{XMLCONTENT}", xmlContent)
+ .replaceAll("@\\{ITEMNAME}",itemName)
+// .replaceAll("@\\{XMLCONTENT}", xmlContent)
.replaceAll("@\\{HTMLCONTENT}", htmlContent)
.replaceAll("@\\{HTMLDIALOGCONTENT}", htmlDialogContent)
.replaceAll("@\\{JSTABLECONTENT}", jsTableContent)
@@ -203,6 +205,7 @@
.replaceAll("@\\{JSDATECONTENT}", jsDateContent)
.replaceAll("@\\{JSPRIMARYKEYDOMS}", jsPrimaryKeyDoms)
.replaceAll("@\\{MAJORCOLUMN}", GeneratorUtils.humpToLine(majorColumn))
+ .replaceAll("@\\{MAJORCOLUMN0}", GeneratorUtils.firstCharConvert(majorColumn, false))
.replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(GeneratorUtils.humpToLine(majorColumn), false))
.replaceAll("@\\{PRIMARYKEYCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
.replaceAll("@\\{PRIMARYKEYCOLUMN0}", GeneratorUtils.firstCharConvert(primaryKeyColumn, true))
@@ -359,7 +362,7 @@
return null;
}
StringBuilder sb = new StringBuilder();
- StringBuilder entityIm = new StringBuilder("import com.core.common.Cools;");
+ StringBuilder entityIm = new StringBuilder();
boolean setTableField = true;
boolean setTableId = true;
boolean setDateTimeFormat = true;
@@ -387,11 +390,6 @@
// 涓婚敭淇グ
if (column.isMainKey()){
- if (setTableId){
- entityIm.append("import com.baomidou.mybatisplus.annotations.TableId;").append("\n")
- .append("import com.baomidou.mybatisplus.enums.IdType;").append("\n");
- setTableId = false;
- }
if (column.isOnly()){
sb.append(" ")
.append("@TableId(value = \"")
@@ -406,13 +404,6 @@
.append("\n");
}
- }
-
- // 澶栭敭淇グ
- if (!Cools.isEmpty(column.getForeignKeyMajor())){
- entityIm.append("import com.core.common.SpringUtils;\n")
- .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".service.").append(column.getForeignKey()).append("Service;\n")
- .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".entity.").append(column.getForeignKey()).append(";\n");
}
if ("Date".equals(column.getType())){
@@ -480,7 +471,7 @@
.append(column.getHumpName())
.append(");\n")
.append(" }\n\n");
- // 鏋氫妇瀛楁澧炲姞$鏍煎紡鍖�
+ // 鏋氫妇瀛楁澧炲姞$鏍煎紡鍖�
} else if (!Cools.isEmpty(column.getEnums())){
sb.append(" public String get")
.append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
@@ -505,7 +496,7 @@
sb.append(" public String get").append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)).append("\\$").append("(){\n")
.append(" ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(").append(column.getForeignKey()).append("Service.class);\n")
.append(" ").append(column.getForeignKey()).append(" ").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
- .append(" = service.selectById(this.").append(column.getHumpName()).append(");\n")
+ .append(" = service.getById(this.").append(column.getHumpName()).append(");\n")
.append(" if (!Cools.isEmpty(").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(")){\n")
.append(" return String.valueOf(").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(".get").append(column.getForeignKeyMajor()).append("());\n")
.append(" }\n")
@@ -552,25 +543,6 @@
}
}
return defaultMajor;
- }
-
- /**********************************************************************************************/
- /*************************************** Xml鍔ㄦ�佸瓧娈� ********************************************/
- /**********************************************************************************************/
-
- private String createXmlMsg(){
- StringBuilder sb = new StringBuilder();
- for (Column column : columns){
- sb.append(" ")
- .append("<")
- .append(column.isOnly()?"id":"result")
- .append(" column=\"")
- .append(column.getName())
- .append("\" property=\"")
- .append(column.getHumpName())
- .append("\" />\n");
- }
- return sb.toString();
}
/**********************************************************************************************/
@@ -751,7 +723,7 @@
sb.append(" layDate.render({\n")
.append(" elem: '#").append(column.getHumpName()).append("\\\\\\\\\\$',\n")
.append(" type: 'datetime',\n")
- .append(" value: data!==undefined?data['").append(column.getHumpName()).append("$'").append("]:null\n")
+ .append(" value: data!==undefined?data['").append(column.getHumpName()).append("\\\\\\\\\\$'").append("]:null\n")
.append(" });\n");
}
}
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java
index 362d04f..b691779 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java
@@ -2,6 +2,8 @@
import com.zy.asrs.framework.common.Cools;
+import java.util.ArrayList;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -12,6 +14,15 @@
*/
public class GeneratorUtils {
+ public static final List<String> FILTER_FIELD = new ArrayList<String>(){{
+ add("deleted");
+ add("tenantId");
+ add("createBy");
+ add("createTime");
+ add("updateBy");
+ add("updateTime");
+ }};
+
/**
* 涓嬪垝绾� ===>> 椹煎嘲鍛藉悕
* @param smallHump 灏忛┘宄板懡鍚�
diff --git a/zy-asrs-framework/src/main/resources/templates/Controller.txt b/zy-asrs-framework/src/main/resources/templates/Controller.txt
index ebe2755..7d3460e 100644
--- a/zy-asrs-framework/src/main/resources/templates/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Controller.txt
@@ -2,18 +2,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.core.domain.KeyValueVo;
-import @{SYSTEMPACKAGE}.common.web.BaseController;
+import com.zy.asrs.framework.annotations.ManagerAuth;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.domain.KeyValueVo;
+import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,7 +25,7 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(@{SIMPLEENTITYNAME}Service.selectById(String.valueOf(id)));
+ return R.ok(@{SIMPLEENTITYNAME}Service.getById(String.valueOf(id)));
}
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/page/auth")
@@ -39,31 +36,15 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(@{ENTITYNAME}.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(@{SIMPLEENTITYNAME}Service.selectPage(new Page<>(curr, limit), wrapper));
+ LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
+ return R.ok(@{SIMPLEENTITYNAME}Service.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/add/auth")
@ManagerAuth
public R add(@{ENTITYNAME} @{SIMPLEENTITYNAME}) {
- @{SIMPLEENTITYNAME}Service.insert(@{SIMPLEENTITYNAME});
+ @{SIMPLEENTITYNAME}Service.save(@{SIMPLEENTITYNAME});
return R.ok();
}
@@ -81,28 +62,17 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- @{SIMPLEENTITYNAME}Service.deleteById(id);
+ @{SIMPLEENTITYNAME}Service.removeById(id);
}
return R.ok();
- }
-
- @RequestMapping(value = "/@{SIMPLEENTITYNAME}/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("@{SIMPLEENTITYNAME}"));
- convert(map, wrapper);
- List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/@{SIMPLEENTITYNAME}Query/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
- wrapper.like("@{MAJORCOLUMN}", condition);
- Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(0, 10), wrapper);
+ LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
+ Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (@{ENTITYNAME} @{SIMPLEENTITYNAME} : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -113,22 +83,13 @@
return R.ok(result);
}
- @RequestMapping(value = "/@{SIMPLEENTITYNAME}/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != @{SIMPLEENTITYNAME}Service.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(@{ENTITYNAME}.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
@RequestMapping("/@{SIMPLEENTITYNAME}/all/get/kv")
@ManagerAuth
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
- Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().andNew().like("@{MAJORCOLUMN}", condition).orderBy("create_time", false);
- @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{MAJORCOLUMN_UP}()), item.get@{PRIMARYKEYCOLUMN}())));
+ LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
+ @{SIMPLEENTITYNAME}Service.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{MAJORCOLUMN0}()), item.get@{PRIMARYKEYCOLUMN}())));
return R.ok().add(vos);
}
diff --git a/zy-asrs-framework/src/main/resources/templates/Mapper.txt b/zy-asrs-framework/src/main/resources/templates/Dao.txt
similarity index 82%
rename from zy-asrs-framework/src/main/resources/templates/Mapper.txt
rename to zy-asrs-framework/src/main/resources/templates/Dao.txt
index 2188013..5815c97 100644
--- a/zy-asrs-framework/src/main/resources/templates/Mapper.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Dao.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/zy-asrs-framework/src/main/resources/templates/Entity.txt b/zy-asrs-framework/src/main/resources/templates/Entity.txt
index 69d0b41..7775b43 100644
--- a/zy-asrs-framework/src/main/resources/templates/Entity.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Entity.txt
@@ -1,10 +1,18 @@
package @{COMPANYNAME}.entity;
@{ENTITYIMPORT}
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("@{TABLENAME}")
diff --git a/zy-asrs-framework/src/main/resources/templates/Service.txt b/zy-asrs-framework/src/main/resources/templates/Service.txt
index ea76166..6129c08 100644
--- a/zy-asrs-framework/src/main/resources/templates/Service.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Service.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
-import com.baomidou.mybatisplus.service.IService;
public interface @{ENTITYNAME}Service extends IService<@{ENTITYNAME}> {
diff --git a/zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt b/zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt
index 732073e..63944cf 100644
--- a/zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt
+++ b/zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt
@@ -3,7 +3,7 @@
import @{COMPANYNAME}.mapper.@{ENTITYNAME}Mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("@{SIMPLEENTITYNAME}Service")
diff --git a/zy-asrs-framework/src/main/resources/templates/Xml.txt b/zy-asrs-framework/src/main/resources/templates/Xml.txt
index 6a8b3e5..94924d8 100644
--- a/zy-asrs-framework/src/main/resources/templates/Xml.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Xml.txt
@@ -2,9 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="@{COMPANYNAME}.mapper.@{ENTITYNAME}Mapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="@{COMPANYNAME}.entity.@{ENTITYNAME}">
-@{XMLCONTENT}
- </resultMap>
-
</mapper>
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
index 171c503..88e69a6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
@@ -5,7 +5,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
-@MapperScan("com.zy.**.dao")
+@MapperScan("com.zy.**.mapper")
@EnableScheduling
@SpringBootApplication
public class WmsBoot {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index 8254675..a7e7f3d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -24,7 +24,7 @@
generator.url="localhost:1433;databasename=jmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="man_pack";
+ generator.table="rcs_motion_sts";
generator.packagePath="com.zy.asrs.common.wms";
generator.build();
}
--
Gitblit v1.9.1