From 25148cf9b80e26599fbd32db29a327d1864d7578 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 21:24:42 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/Html.txt | 15 +++++----------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 8 ++++----
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java | 2 +-
zy-asrs-framework/src/main/resources/templates/Controller.txt | 17 +++++++++++++----
zy-asrs-framework/src/main/resources/templates/Entity.txt | 2 ++
5 files changed, 25 insertions(+), 19 deletions(-)
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 3af09ac..2b1c18c 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
@@ -206,7 +206,7 @@
.replaceAll("@\\{JSPRIMARYKEYDOMS}", jsPrimaryKeyDoms)
.replaceAll("@\\{MAJORCOLUMN}", GeneratorUtils.humpToLine(majorColumn))
.replaceAll("@\\{MAJORCOLUMN0}", GeneratorUtils.firstCharConvert(majorColumn, false))
- .replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(GeneratorUtils.humpToLine(majorColumn), false))
+ .replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(majorColumn, false))
.replaceAll("@\\{PRIMARYKEYCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
.replaceAll("@\\{PRIMARYKEYCOLUMN0}", GeneratorUtils.firstCharConvert(primaryKeyColumn, true))
.replaceAll("@\\{UPCASEMARJORCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
diff --git a/zy-asrs-framework/src/main/resources/templates/Controller.txt b/zy-asrs-framework/src/main/resources/templates/Controller.txt
index c26fd3f..5b40eb5 100644
--- a/zy-asrs-framework/src/main/resources/templates/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Controller.txt
@@ -10,6 +10,7 @@
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.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -30,11 +31,19 @@
@RequestMapping(value = "/@{SIMPLEENTITYNAME}/page/auth")
@ManagerAuth
- public R page(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R page(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false) String timeRange) {
LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
+ }
+ if (!Cools.isEmpty(timeRange)) {
+ String[] range = timeRange.split(RANGE_TIME_LINK);
+ wrapper.ge(@{ENTITYNAME}::getCreateTime, DateUtils.convert(range[0]));
+ wrapper.le(@{ENTITYNAME}::getCreateTime, DateUtils.convert(range[1]));
+ }
return R.ok(@{SIMPLEENTITYNAME}Service.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-framework/src/main/resources/templates/Entity.txt b/zy-asrs-framework/src/main/resources/templates/Entity.txt
index 7775b43..a1760a0 100644
--- a/zy-asrs-framework/src/main/resources/templates/Entity.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Entity.txt
@@ -10,6 +10,8 @@
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.service.UserService;
import java.io.Serializable;
import java.util.Date;
diff --git a/zy-asrs-framework/src/main/resources/templates/Html.txt b/zy-asrs-framework/src/main/resources/templates/Html.txt
index b671f55..dab76bc 100644
--- a/zy-asrs-framework/src/main/resources/templates/Html.txt
+++ b/zy-asrs-framework/src/main/resources/templates/Html.txt
@@ -19,19 +19,14 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
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 b28e7e1..c9ca30e 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
@@ -21,11 +21,11 @@
generator.backendPrefixPath = "zy-asrs-common/";
generator.frontendPrefixPath = "zy-asrs-wms/";
- generator.url="localhost:1433;databasename=jmasrs";
+ generator.url="47.97.1.152:51433;databasename=jkasrs";
generator.username="sa";
- generator.password="sa@123";
- generator.table="sys_operate_log";
- generator.packagePath="com.zy.asrs.common.sys";
+ generator.password="Zoneyung@zy56$";
+ generator.table="wms_loc_main";
+ generator.packagePath="com.zy.asrs.common.wms";
generator.build();
}
--
Gitblit v1.9.1