From 8b0764c6bc0f232d0ffce04644f3f65201890dac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 21 五月 2021 15:16:14 +0800
Subject: [PATCH] #
---
src/main/java/basAgv.sql | 10
src/main/webapp/static/js/basAgv/basAgv.js | 401 ++++++++++++++++++++
src/main/webapp/views/basAgv/basAgv.html | 57 ++
src/main/java/com/zy/asrs/entity/BasAgv.java | 353 +++++++++++++++++
src/main/webapp/views/basAgv/basAgv_detail.html | 162 ++++++++
src/main/java/com/zy/asrs/service/BasAgvService.java | 8
src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java | 12
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/controller/BasAgvController.java | 128 ++++++
src/main/java/com/zy/asrs/mapper/BasAgvMapper.java | 12
src/main/resources/mapper/BasAgvMapper.xml | 24 +
11 files changed, 1,168 insertions(+), 1 deletions(-)
diff --git a/src/main/java/basAgv.sql b/src/main/java/basAgv.sql
new file mode 100644
index 0000000..bf632da
--- /dev/null
+++ b/src/main/java/basAgv.sql
@@ -0,0 +1,10 @@
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv/basAgv.html', N'鏃犱汉杞︾鐞�', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#view', N'鏌ヨ', '20396', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#btn-add', N'鏂板', '20396', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#btn-edit', N'缂栬緫', '20396', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#btn-delete', N'鍒犻櫎', '20396', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#btn-export', N'瀵煎嚭', '20396', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basAgv#btn-into', N'瀵煎叆', '20396', '3', '5', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasAgvController.java b/src/main/java/com/zy/asrs/controller/BasAgvController.java
new file mode 100644
index 0000000..8376cc8
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasAgvController.java
@@ -0,0 +1,128 @@
+package com.zy.asrs.controller;
+
+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.zy.asrs.entity.BasAgv;
+import com.zy.asrs.service.BasAgvService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.controller.AbstractBaseController;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasAgvController extends BaseController {
+
+ @Autowired
+ private BasAgvService basAgvService;
+
+ @RequestMapping(value = "/basAgv/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basAgvService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basAgv/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasAgv> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basAgvService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper 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 = "/basAgv/add/auth")
+ @ManagerAuth
+ public R add(BasAgv basAgv) {
+ basAgvService.insert(basAgv);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgv/update/auth")
+ @ManagerAuth
+ public R update(BasAgv basAgv){
+ if (Cools.isEmpty(basAgv) || null==basAgv.getAgvId()){
+ return R.error();
+ }
+ basAgvService.updateById(basAgv);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgv/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam String param){
+ List<BasAgv> list = JSONArray.parseArray(param, BasAgv.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (BasAgv entity : list){
+ basAgvService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basAgv/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasAgv> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basAgv"));
+ convert(map, wrapper);
+ List<BasAgv> list = basAgvService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basAgvQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasAgv> wrapper = new EntityWrapper<>();
+ wrapper.like("agv_id", condition);
+ Page<BasAgv> page = basAgvService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasAgv basAgv : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basAgv.getAgvId());
+ map.put("value", basAgv.getAgvId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basAgv/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasAgv> wrapper = new EntityWrapper<BasAgv>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basAgvService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasAgv.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgv.java b/src/main/java/com/zy/asrs/entity/BasAgv.java
new file mode 100644
index 0000000..12a2ee4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasAgv.java
@@ -0,0 +1,353 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("asr_bas_agv")
+public class BasAgv implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 灏忚溅缂栧彿
+ */
+ @ApiModelProperty(value= "灏忚溅缂栧彿")
+ @TableId(value = "agv_id", type = IdType.INPUT)
+ @TableField("agv_id")
+ private Integer agvId;
+
+ /**
+ * 鍙叆(checkBox)
+ */
+ @ApiModelProperty(value= "鍙叆(checkBox)")
+ @TableField("in_enable")
+ private String inEnable;
+
+ /**
+ * 鍙嚭(checkBox)
+ */
+ @ApiModelProperty(value= "鍙嚭(checkBox)")
+ @TableField("out_enable")
+ private String outEnable;
+
+ /**
+ * 鏄惁鍚敤 1: 鍚敤 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鏄惁鍚敤 1: 鍚敤 0: 绂佺敤 ")
+ @TableField("is_user")
+ private Integer isUser;
+
+ /**
+ * 褰撳墠浣嶇疆
+ */
+ @ApiModelProperty(value= "褰撳墠浣嶇疆")
+ @TableField("current_node")
+ private String currentNode;
+
+ /**
+ * 褰撳墠鐢甸噺
+ */
+ @ApiModelProperty(value= "褰撳墠鐢甸噺")
+ private String power;
+
+ /**
+ * 鐘舵�� 1: 鍓嶅線鍙栬揣鐐� 2: 鍙栬揣鐐瑰彇璐� 3: 鍓嶅線閫佽揣鐐� 4: 閫佽揣鐐规斁璐� 5: 浠诲姟瀹屾垚 6: 绌洪棽 7: 鏁呴殰 8: 鍏呯數涓� 9: 鎵嬪姩 10: 澶辫仈 11: 绂荤嚎 12: 琛岃蛋
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 鍓嶅線鍙栬揣鐐� 2: 鍙栬揣鐐瑰彇璐� 3: 鍓嶅線閫佽揣鐐� 4: 閫佽揣鐐规斁璐� 5: 浠诲姟瀹屾垚 6: 绌洪棽 7: 鏁呴殰 8: 鍏呯數涓� 9: 鎵嬪姩 10: 澶辫仈 11: 绂荤嚎 12: 琛岃蛋 ")
+ private Integer status;
+
+ /**
+ * 鏁呴殰鐮�
+ */
+ @ApiModelProperty(value= "鏁呴殰鐮�")
+ private String fault;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("task_code")
+ private String taskCode;
+
+ /**
+ * 浠诲姟鐐�
+ */
+ @ApiModelProperty(value= "浠诲姟鐐�")
+ @TableField("end_loc")
+ private String endLoc;
+
+ /**
+ * 浠诲姟绫诲瀷 1: 琛岃蛋 2: 鍙栬揣 3: 鏀捐揣 4: 鍏呯數
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 1: 琛岃蛋 2: 鍙栬揣 3: 鏀捐揣 4: 鍏呯數 ")
+ private Integer action;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public BasAgv() {}
+
+ public BasAgv(Integer agvId,String inEnable,String outEnable,Integer isUser,String currentNode,String power,Integer status,String fault,String taskCode,String endLoc,Integer action,Long modiUser,Date modiTime,String memo) {
+ this.inEnable = inEnable;
+ this.outEnable = outEnable;
+ this.isUser = isUser;
+ this.currentNode = currentNode;
+ this.power = power;
+ this.status = status;
+ this.fault = fault;
+ this.taskCode = taskCode;
+ this.endLoc = endLoc;
+ this.action = action;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ }
+
+// BasAgv basAgv = new BasAgv(
+// null, // 灏忚溅缂栧彿[闈炵┖]
+// null, // 鍙叆(checkBox)
+// null, // 鍙嚭(checkBox)
+// null, // 鏄惁鍚敤
+// null, // 褰撳墠浣嶇疆
+// null, // 褰撳墠鐢甸噺
+// null, // 鐘舵��
+// null, // 鏁呴殰鐮�
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鐐�
+// null, // 浠诲姟绫诲瀷
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public Integer getAgvId() {
+ return agvId;
+ }
+
+ public void setAgvId(Integer agvId) {
+ this.agvId = agvId;
+ }
+
+ public String getInEnable() {
+ return inEnable;
+ }
+
+ public void setInEnable(String inEnable) {
+ this.inEnable = inEnable;
+ }
+
+ public String getOutEnable() {
+ return outEnable;
+ }
+
+ public void setOutEnable(String outEnable) {
+ this.outEnable = outEnable;
+ }
+
+ public Integer getIsUser() {
+ return isUser;
+ }
+
+ public String getIsUser$(){
+ if (null == this.isUser){ return null; }
+ switch (this.isUser){
+ case 1:
+ return "鍚敤";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.isUser);
+ }
+ }
+
+ public void setIsUser(Integer isUser) {
+ this.isUser = isUser;
+ }
+
+ public String getCurrentNode() {
+ return currentNode;
+ }
+
+ public void setCurrentNode(String currentNode) {
+ this.currentNode = currentNode;
+ }
+
+ public String getPower() {
+ return power;
+ }
+
+ public void setPower(String power) {
+ this.power = power;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "鍓嶅線鍙栬揣鐐�";
+ case 2:
+ return "鍙栬揣鐐瑰彇璐�";
+ case 3:
+ return "鍓嶅線閫佽揣鐐�";
+ case 4:
+ return "閫佽揣鐐规斁璐�";
+ case 5:
+ return "浠诲姟瀹屾垚";
+ case 6:
+ return "绌洪棽";
+ case 7:
+ return "鏁呴殰";
+ case 8:
+ return "鍏呯數涓�";
+ case 9:
+ return "鎵嬪姩";
+ case 10:
+ return "澶辫仈";
+ case 11:
+ return "绂荤嚎";
+ case 12:
+ return "琛岃蛋";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getFault() {
+ return fault;
+ }
+
+ public void setFault(String fault) {
+ this.fault = fault;
+ }
+
+ public String getTaskCode() {
+ return taskCode;
+ }
+
+ public void setTaskCode(String taskCode) {
+ this.taskCode = taskCode;
+ }
+
+ public String getEndLoc() {
+ return endLoc;
+ }
+
+ public void setEndLoc(String endLoc) {
+ this.endLoc = endLoc;
+ }
+
+ public Integer getAction() {
+ return action;
+ }
+
+ public String getAction$(){
+ if (null == this.action){ return null; }
+ switch (this.action){
+ case 1:
+ return "琛岃蛋";
+ case 2:
+ return "鍙栬揣";
+ case 3:
+ return "鏀捐揣";
+ case 4:
+ return "鍏呯數";
+ default:
+ return String.valueOf(this.action);
+ }
+ }
+
+ public void setAction(Integer action) {
+ this.action = action;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvMapper.java
new file mode 100644
index 0000000..a2bddbd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasAgv;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasAgvMapper extends BaseMapper<BasAgv> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasAgvService.java b/src/main/java/com/zy/asrs/service/BasAgvService.java
new file mode 100644
index 0000000..a412369
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasAgvService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasAgv;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasAgvService extends IService<BasAgv> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
new file mode 100644
index 0000000..c1ab0d6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasAgvServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasAgvMapper;
+import com.zy.asrs.entity.BasAgv;
+import com.zy.asrs.service.BasAgvService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basAgvService")
+public class BasAgvServiceImpl extends ServiceImpl<BasAgvMapper, BasAgv> implements BasAgvService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index a2ab719..ed159a7 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,7 +18,7 @@
generator.url="127.0.0.1:1433;databasename=xtyasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_detl_log";
+ generator.table="asr_bas_agv";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/resources/mapper/BasAgvMapper.xml b/src/main/resources/mapper/BasAgvMapper.xml
new file mode 100644
index 0000000..91def73
--- /dev/null
+++ b/src/main/resources/mapper/BasAgvMapper.xml
@@ -0,0 +1,24 @@
+<?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.mapper.BasAgvMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasAgv">
+ <result column="agv_id" property="agvId" />
+ <result column="in_enable" property="inEnable" />
+ <result column="out_enable" property="outEnable" />
+ <result column="is_user" property="isUser" />
+ <result column="current_node" property="currentNode" />
+ <result column="power" property="power" />
+ <result column="status" property="status" />
+ <result column="fault" property="fault" />
+ <result column="task_code" property="taskCode" />
+ <result column="end_loc" property="endLoc" />
+ <result column="action" property="action" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basAgv/basAgv.js b/src/main/webapp/static/js/basAgv/basAgv.js
new file mode 100644
index 0000000..e0dc95c
--- /dev/null
+++ b/src/main/webapp/static/js/basAgv/basAgv.js
@@ -0,0 +1,401 @@
+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: '#basAgv',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basAgv/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+ ,{field: 'agvId', align: 'center',title: '灏忚溅缂栧彿'}
+ ,{field: 'inEnable', align: 'center',title: '鍙叆'}
+ ,{field: 'outEnable', align: 'center',title: '鍙嚭'}
+ ,{field: 'isUser$', align: 'center',title: '鏄惁鍚敤'}
+ ,{field: 'currentNode', align: 'center',title: '褰撳墠浣嶇疆'}
+ ,{field: 'power', align: 'center',title: '褰撳墠鐢甸噺'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'fault', align: 'center',title: '鏁呴殰鐮�'}
+ ,{field: 'taskCode', align: 'center',title: '浠诲姟鍙�'}
+ ,{field: 'endLoc', align: 'center',title: '浠诲姟鐐�'}
+ ,{field: 'action$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+
+ ,{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();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locMast)', 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(basAgv)', 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],
+ content: 'basAgv_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/basAgv/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ 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 = {
+ 'basAgv': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basAgv/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(basAgv)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'basAgv_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-save,#data-detail-submit-edit,#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');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'basAgv_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#agvId', index), true);
+ 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');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ agvId: $('#agvId').val(),
+ inEnable: $('#inEnable').val(),
+ outEnable: $('#outEnable').val(),
+ isUser: $('#isUser').val(),
+ currentNode: $('#currentNode').val(),
+ power: $('#power').val(),
+ status: $('#status').val(),
+ fault: $('#fault').val(),
+ taskCode: $('#taskCode').val(),
+ endLoc: $('#endLoc').val(),
+ action: $('#action').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ memo: $('#memo').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/basAgv/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#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('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ 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: '#modiTime\\$',
+ 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 + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ 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.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/views/basAgv/basAgv.html b/src/main/webapp/views/basAgv/basAgv.html
new file mode 100644
index 0000000..6e83738
--- /dev/null
+++ b/src/main/webapp/views/basAgv/basAgv.html
@@ -0,0 +1,57 @@
+<!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="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="agv_id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="basAgv" lay-filter="basAgv"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+</script>
+
+<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/basAgv/basAgv.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/basAgv/basAgv_detail.html b/src/main/webapp/views/basAgv/basAgv_detail.html
new file mode 100644
index 0000000..b260faf
--- /dev/null
+++ b/src/main/webapp/views/basAgv/basAgv_detail.html
@@ -0,0 +1,162 @@
+<!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="agvId" class="layui-input" type="text" onkeyup="check(this.id, 'basAgv')" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍙叆(checkBox)锛�</label>
+ <div class="layui-input-inline">
+ <input id="inEnable" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label" style="font-size: x-small">鍙嚭(checkBox)锛�</label>
+ <div class="layui-input-inline">
+ <input id="outEnable" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏄惁鍚敤锛�</label>
+ <div class="layui-input-inline">
+ <select id="isUser">
+ <option value="" style="display: none"></option>
+ <option value="1">鍚敤</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">褰撳墠浣嶇疆锛�</label>
+ <div class="layui-input-inline">
+ <input id="currentNode" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">褰撳墠鐢甸噺锛�</label>
+ <div class="layui-input-inline">
+ <input id="power" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐘躲��銆�鎬侊細</label>
+ <div class="layui-input-inline">
+ <select id="status">
+ <option value="" style="display: none"></option>
+ <option value="1">鍓嶅線鍙栬揣鐐�</option>
+ <option value="2">鍙栬揣鐐瑰彇璐�</option>
+ <option value="3">鍓嶅線閫佽揣鐐�</option>
+ <option value="4">閫佽揣鐐规斁璐�</option>
+ <option value="5">浠诲姟瀹屾垚</option>
+ <option value="6">绌洪棽</option>
+ <option value="7">鏁呴殰</option>
+ <option value="8">鍏呯數涓�</option>
+ <option value="9">鎵嬪姩</option>
+ <option value="10">澶辫仈</option>
+ <option value="11">绂荤嚎</option>
+ <option value="12">琛岃蛋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏁� 闅� 鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="fault" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">浠� 鍔� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="taskCode" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">浠� 鍔� 鐐癸細</label>
+ <div class="layui-input-inline">
+ <input id="endLoc" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">浠诲姟绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <select id="action">
+ <option value="" style="display: none"></option>
+ <option value="1">琛岃蛋</option>
+ <option value="2">鍙栬揣</option>
+ <option value="3">鏀捐揣</option>
+ <option value="4">鍏呯數</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">澶囥��銆�娉細</label>
+ <div class="layui-input-inline">
+ <input id="memo" class="layui-input" type="text">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" 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/basAgv/basAgv.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1