From b3b4ee7c60259878a0a7df7c0ebfd2954da48d91 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 15:04:47 +0800
Subject: [PATCH] #
---
/dev/null | 79 -------
zy-asrs-common/src/main/java/com/zy/asrs/common/config/MybatisPlusConfig.java | 47 ++++
zy-asrs-wms/src/main/resources/application.yml | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 5
zy-asrs-wms/src/main/webapp/static/js/host/host.js | 353 +++++++++++++++++++++++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/BaseParam.java | 29 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/PageParam.java | 56 +++++
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java | 16 +
8 files changed, 506 insertions(+), 81 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/config/MybatisPlusConfig.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..05814ee
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/config/MybatisPlusConfig.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.common.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * MybatisPlus閰嶇疆
+ *
+ * @author vincent
+ * @since 2018-02-22 11:29:28
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+
+// // 澶氱鎴锋彃浠堕厤缃�
+// TenantLineHandler tenantLineHandler = new TenantLineHandler() {
+// @Override
+// public Expression getTenantId() {
+// return getLoginUserTenantId();
+// }
+//
+// @Override
+// public boolean ignoreTable(String tableName) {
+// return Arrays.asList(
+// "sys_tenant",
+// "sys_dictionary",
+// "sys_dictionary_data"
+// ).contains(tableName);
+// }
+// };
+// TenantLineInnerInterceptor tenantLineInnerInterceptor = new TenantLineInnerInterceptor(tenantLineHandler);
+// interceptor.addInnerInterceptor(tenantLineInnerInterceptor);
+
+ // 鍒嗛〉鎻掍欢閰嶇疆
+ PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+ interceptor.addInnerInterceptor(paginationInnerInterceptor);
+
+ return interceptor;
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/BaseParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/BaseParam.java
new file mode 100644
index 0000000..fbc8bbe
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/BaseParam.java
@@ -0,0 +1,29 @@
+package com.zy.asrs.common.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鏌ヨ鍙傛暟鍩烘湰瀛楁
+ *
+ * @author vincent
+ * @since 2021-08-26 22:14:43
+ */
+@Data
+public class BaseParam implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍒嗛〉鏌ヨ椤电爜")
+ private Long curr;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍒嗛〉鏌ヨ姣忛〉鏁伴噺")
+ private Long limit;
+
+ private String condition;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/PageParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/PageParam.java
new file mode 100644
index 0000000..3b7ede3
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/PageParam.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.common.domain;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * 鍒嗛〉銆佹帓搴忋�佹悳绱㈠弬鏁板皝瑁�
+ *
+ * @author vincent
+ * @since 2019-04-26 10:34:35
+ */
+public class PageParam<T, U extends BaseParam> extends Page<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 绉熸埛id瀛楁鍚嶇О
+ */
+ private static final String TENANT_ID_FIELD = "tenantId";
+
+ /**
+ * 鏌ヨ鏉′欢
+ */
+ private final U where;
+
+ /**
+ * 鏄惁鎶婂瓧娈靛悕绉伴┘宄拌浆涓嬪垝绾�
+ */
+ private final boolean isToUnderlineCase;
+
+ public PageParam() {
+ this(null);
+ }
+
+ public PageParam(U where) {
+ this(where, true);
+ }
+
+ public PageParam(U where, boolean isToUnderlineCase) {
+ super();
+ this.where = where;
+ this.isToUnderlineCase = isToUnderlineCase;
+ if (where != null) {
+ // 鑾峰彇鍒嗛〉椤电爜
+ if (where.getCurr() != null) {
+ setCurrent(where.getCurr());
+ }
+ // 鑾峰彇鍒嗛〉姣忛〉鏁伴噺
+ if (where.getLimit() != null) {
+ setSize(where.getLimit());
+ }
+ }
+ }
+
+
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java
index 39694a7..ab55ee0 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java
@@ -1,5 +1,9 @@
package com.zy.asrs.common.sys.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.domain.BaseParam;
+import com.zy.asrs.common.sys.entity.Host;
import com.zy.asrs.common.sys.service.HostService;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.framework.common.R;
@@ -20,5 +24,17 @@
return R.ok(hostService.getById(String.valueOf(id)));
}
+ @RequestMapping(value = "/host/page/auth")
+// @ManagerAuth
+ public R page(BaseParam param){
+ LambdaQueryWrapper<Host> wrapper = new LambdaQueryWrapper<>();
+ return R.ok().add(hostService.page(new Page<>(param.getCurr(), param.getLimit()), wrapper));
+ }
+
+ @RequestMapping(value = "/host/list/auth")
+// @ManagerAuth
+ public R list(){
+ return R.ok().add(hostService.list(new LambdaQueryWrapper<>()));
+ }
}
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 2615dcd..8254675 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
@@ -18,11 +18,14 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
+ generator.backendPrefixPath = "zy-asrs-common/";
+ generator.frontendPrefixPath = "zy-asrs-wms/";
+
generator.url="localhost:1433;databasename=jmasrs";
generator.username="sa";
generator.password="sa@123";
generator.table="man_pack";
- generator.packagePath="com.zy.rcs";
+ generator.packagePath="com.zy.asrs.common.wms";
generator.build();
}
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index bab83ef..b36b26d 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -26,7 +26,7 @@
# global-config:
# field-strategy: 0
configuration:
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
diff --git a/zy-asrs-wms/src/main/webapp/static/js/host/host.js b/zy-asrs-wms/src/main/webapp/static/js/host/host.js
new file mode 100644
index 0000000..308d785
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/host/host.js
@@ -0,0 +1,353 @@
+var pageCurr;
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#host',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/host/page/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox', fixed: 'left'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+ ,{field: 'name', align: 'center',title: '鍟嗘埛鍚嶇О'}
+ ,{field: 'flag', align: 'center',title: '鏍囪瘑'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(host)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(host)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'host_detail.html',
+ success: function(layero, index){
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'refreshData':
+ tableIns.reload({
+ page: {
+ curr: pageCurr
+ }
+ });
+ limit();
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ var ids=[];
+ data.map(function (track) {
+ ids.push(track.id);
+ });
+ if (ids.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(ids.length===1?'姝�':ids.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/host/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'host': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/host/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(host)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'host_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'host_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ }
+ });
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+ id: $('#id').val(),
+ name: $('#name').val(),
+ flag: $('#flag').val(),
+ createTime: top.strToDate($('#createTime\\$').val()),
+ updateTime: top.strToDate($('#updateTime\\$').val()),
+ status: $('#status').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/host/edit/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ tableReload(true);
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime'
+ });
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.9);
+ }
+ layer.style(index, {
+ top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+ $(".layui-layer-shade").remove();
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/zy-asrs-wms/src/main/webapp/views/host/host_detail.html b/zy-asrs-wms/src/main/webapp/views/host/host_detail.html
deleted file mode 100644
index 9aaead6..0000000
--- a/zy-asrs-wms/src/main/webapp/views/host/host_detail.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title></title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/css/common.css" media="all">
-</head>
-<body>
-
-<!-- 璇︽儏 -->
-<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鍟嗘埛鍚嶇О锛�</label>
- <div class="layui-input-inline">
- <input id="name" class="layui-input" type="text" lay-verify="required" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鏍囥��銆�璇嗭細</label>
- <div class="layui-input-inline">
- <input id="flag" class="layui-input" type="text" lay-verify="required" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="createTime$" class="layui-input" type="text" lay-verify="required" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">淇敼鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐘躲��銆�鎬侊細</label>
- <div class="layui-input-inline">
- <select id="status" lay-verify="required">
- <option value="" style="display: none"></option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
-
-
- <hr class="layui-bg-gray">
-
- <div id="data-detail-btn" class="layui-btn-container layui-form-item">
- <div id="data-detail-submit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇濆瓨</div>
- <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
- </div>
-
- <div id="prompt">
- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
- </div>
- </form>
-</div>
-</body>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/host/host.js" charset="utf-8"></script>
-</html>
-
--
Gitblit v1.9.1