From 84026ccb613df98417ab3063a6e7ac2a9151487f Mon Sep 17 00:00:00 2001
From: DELL <DELL@qq.com>
Date: 星期五, 28 十一月 2025 15:16:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basStationOpt/basStationOpt.html | 174 ++++++++++
src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java | 12
src/main/webapp/views/basStationOpt/basStationOpt_detail.html | 142 ++++++++
src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java | 12
src/main/webapp/static/js/basStationOpt/basStationOpt.js | 268 +++++++++++++++
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 39 ++
src/main/java/com/zy/asrs/controller/BasStationOptController.java | 125 +++++++
src/main/java/com/zy/asrs/entity/BasStationOpt.java | 191 +++++++++++
src/main/java/com/zy/asrs/service/BasStationOptService.java | 8
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/resources/mapper/BasStationOptMapper.xml | 24 +
11 files changed, 995 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasStationOptController.java b/src/main/java/com/zy/asrs/controller/BasStationOptController.java
new file mode 100644
index 0000000..436c941
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasStationOptController.java
@@ -0,0 +1,125 @@
+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.BasStationOpt;
+import com.zy.asrs.service.BasStationOptService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+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 BasStationOptController extends BaseController {
+
+ @Autowired
+ private BasStationOptService basStationOptService;
+
+ @RequestMapping(value = "/basStationOpt/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basStationOptService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basStationOpt/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(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasStationOpt.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basStationOptService.selectPage(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 = "/basStationOpt/add/auth")
+ @ManagerAuth
+ public R add(BasStationOpt basStationOpt) {
+ basStationOptService.insert(basStationOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basStationOpt/update/auth")
+ @ManagerAuth
+ public R update(BasStationOpt basStationOpt){
+ if (Cools.isEmpty(basStationOpt) || null==basStationOpt.getId()){
+ return R.error();
+ }
+ basStationOptService.updateById(basStationOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basStationOpt/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Integer[] ids){
+ for (Integer id : ids){
+ basStationOptService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basStationOpt/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basStationOpt"));
+ convert(map, wrapper);
+ List<BasStationOpt> list = basStationOptService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basStationOptQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasStationOpt> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasStationOpt> page = basStationOptService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasStationOpt basStationOpt : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basStationOpt.getId());
+ map.put("value", basStationOpt.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basStationOpt/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasStationOpt> wrapper = new EntityWrapper<BasStationOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basStationOptService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasStationOpt.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasStationOpt.java b/src/main/java/com/zy/asrs/entity/BasStationOpt.java
new file mode 100644
index 0000000..666b0bd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasStationOpt.java
@@ -0,0 +1,191 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_station_opt")
+public class BasStationOpt implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("task_no")
+ private Integer taskNo;
+
+ /**
+ * 绔欑偣缂栧彿
+ */
+ @ApiModelProperty(value= "绔欑偣缂栧彿")
+ @TableField("station_id")
+ private Integer stationId;
+
+ /**
+ * 涓嬪彂鏃堕棿
+ */
+ @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 浣滀笟
+ */
+ @ApiModelProperty(value= "浣滀笟")
+ private String mode;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "婧愮珯鐐�")
+ @TableField("source_station_id")
+ private Integer sourceStationId;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty(value= "鐩爣绔欑偣")
+ @TableField("target_station_id")
+ private Integer targetStationId;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 鍛戒护
+ */
+ @ApiModelProperty(value= "鍛戒护")
+ private String command;
+
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
+ /**
+ * 涓嬪彂鐘舵�� 0: 鏈笅鍙� 1: 宸蹭笅鍙�
+ */
+ @ApiModelProperty(value= "涓嬪彂鐘舵�� 0: 鏈笅鍙� 1: 宸蹭笅鍙� ")
+ private Integer send;
+
+ /**
+ * 璇锋眰鍝嶅簲
+ */
+ @ApiModelProperty(value= "璇锋眰鍝嶅簲")
+ private String response;
+
+ public BasStationOpt() {}
+
+ public BasStationOpt(Integer taskNo,Integer stationId,Date sendTime,String mode,Integer sourceStationId,Integer targetStationId,Date updateTime,Long updateBy,String memo,String command,String systemStatus,Integer send,String response) {
+ this.taskNo = taskNo;
+ this.stationId = stationId;
+ this.sendTime = sendTime;
+ this.mode = mode;
+ this.sourceStationId = sourceStationId;
+ this.targetStationId = targetStationId;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ this.command = command;
+ this.systemStatus = systemStatus;
+ this.send = send;
+ this.response = response;
+ }
+
+// BasStationOpt basStationOpt = new BasStationOpt(
+// null, // 宸ヤ綔鍙�
+// null, // 绔欑偣缂栧彿
+// null, // 涓嬪彂鏃堕棿
+// null, // 浣滀笟
+// null, // 婧愮珯鐐�
+// null, // 鐩爣绔欑偣
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+// null, // 鍛戒护
+// null, // 绯荤粺鐘舵��
+// null, // 涓嬪彂鐘舵��
+// null // 璇锋眰鍝嶅簲
+// );
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getId());
+ }
+ return null;
+ }
+
+ public String getSend$(){
+ if (null == this.send){ return null; }
+ switch (this.send){
+ case 0:
+ return "鏈笅鍙�";
+ case 1:
+ return "宸蹭笅鍙�";
+ default:
+ return String.valueOf(this.send);
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java
new file mode 100644
index 0000000..7402006
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasStationOptMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasStationOpt;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasStationOptMapper extends BaseMapper<BasStationOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasStationOptService.java b/src/main/java/com/zy/asrs/service/BasStationOptService.java
new file mode 100644
index 0000000..19cf329
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasStationOptService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasStationOpt;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasStationOptService extends IService<BasStationOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java
new file mode 100644
index 0000000..3fb05ec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasStationOptServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasStationOptMapper;
+import com.zy.asrs.entity.BasStationOpt;
+import com.zy.asrs.service.BasStationOptService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basStationOptService")
+public class BasStationOptServiceImpl extends ServiceImpl<BasStationOptMapper, BasStationOpt> implements BasStationOptService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 40b463c..5d88634 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -12,10 +12,10 @@
CoolGenerator generator = new CoolGenerator();
// mysql
generator.sqlOsType = SqlOsType.MYSQL;
- generator.url="192.168.4.11:3306/wcs";
+ generator.url="127.0.0.1:3306/wcs";
generator.username="root";
generator.password="root";
- generator.table="asr_bas_rgv_opt";
+ generator.table="asr_bas_station_opt";
// sqlserver
// generator.sqlOsType = SqlOsType.SQL_SERVER;
// generator.url="127.0.0.1:1433;databasename=tzskasrs";
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index d54012a..ea8e40f 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -11,6 +11,8 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.DeviceDataLog;
+import com.zy.asrs.entity.BasStationOpt;
+import com.zy.asrs.service.BasStationOptService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.network.ZyStationConnectDriver;
import com.zy.core.cache.MessageQueue;
@@ -176,8 +178,41 @@
@Override
public CommandResponse sendCommand(StationCommand command) {
- CommandResponse commandResponse = zyStationConnectDriver.sendCommand(command);
- return commandResponse;
+ CommandResponse commandResponse = null;
+ try {
+ commandResponse = zyStationConnectDriver.sendCommand(command);
+ return commandResponse;
+ } finally {
+ BasStationOptService optService = SpringUtils.getBean(BasStationOptService.class);
+ List<ZyStationStatusEntity> statusListEntity = zyStationConnectDriver.getStatus();
+ ZyStationStatusEntity matched = null;
+ if (statusListEntity != null) {
+ for (ZyStationStatusEntity e : statusListEntity) {
+ if (e.getStationId() != null && e.getStationId().equals(command.getStationId())) {
+ matched = e;
+ break;
+ }
+ }
+ }
+ BasStationOpt basStationOpt = new BasStationOpt(
+ command.getTaskNo(),
+ command.getStationId(),
+ new Date(),
+ "MOVE",
+ command.getStationId(),
+ command.getTargetStaNo(),
+ null,
+ null,
+ null,
+ JSON.toJSONString(command),
+ JSON.toJSONString(matched),
+ 1,
+ JSON.toJSONString(commandResponse)
+ );
+ if (optService != null) {
+ optService.insert(basStationOpt);
+ }
+ }
}
@Override
diff --git a/src/main/resources/mapper/BasStationOptMapper.xml b/src/main/resources/mapper/BasStationOptMapper.xml
new file mode 100644
index 0000000..cf878a1
--- /dev/null
+++ b/src/main/resources/mapper/BasStationOptMapper.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.BasStationOptMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasStationOpt">
+ <id column="id" property="id" />
+ <result column="task_no" property="taskNo" />
+ <result column="station_id" property="stationId" />
+ <result column="send_time" property="sendTime" />
+ <result column="mode" property="mode" />
+ <result column="source_station_id" property="sourceStationId" />
+ <result column="target_station_id" property="targetStationId" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="memo" property="memo" />
+ <result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
+ <result column="send" property="send" />
+ <result column="response" property="response" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/basStationOpt/basStationOpt.js b/src/main/webapp/static/js/basStationOpt/basStationOpt.js
new file mode 100644
index 0000000..77ca7de
--- /dev/null
+++ b/src/main/webapp/static/js/basStationOpt/basStationOpt.js
@@ -0,0 +1,268 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basStationOpt',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basStationOpt/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'taskNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'stationId', align: 'center',title: '绔欑偣缂栧彿'}
+ ,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
+ ,{field: 'mode', align: 'center',title: '浣滀笟'}
+ ,{field: 'sourceStationId', align: 'center',title: '婧愮珯鐐�'}
+ ,{field: 'targetStationId', align: 'center',title: '鐩爣绔欑偣'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
+ ,{field: 'send$', align: 'center',title: '涓嬪彂鐘舵��'}
+ ,{field: 'response', align: 'center',title: '璇锋眰鍝嶅簲'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ 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(basStationOpt)', 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}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basStationOpt)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.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 = {
+ 'basStationOpt': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basStationOpt/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, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basStationOpt)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basStationOpt/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basStationOpt/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['sendTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/basStationOpt/basStationOpt.html b/src/main/webapp/views/basStationOpt/basStationOpt.html
new file mode 100644
index 0000000..ec3b64c
--- /dev/null
+++ b/src/main/webapp/views/basStationOpt/basStationOpt.html
@@ -0,0 +1,174 @@
+<!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/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <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"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basStationOpt" lay-filter="basStationOpt"></table>
+ </div>
+ </div>
+</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</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/basStationOpt/basStationOpt.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綔鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="taskNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绔欑偣缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="stationId" placeholder="璇疯緭鍏ョ珯鐐圭紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓嬪彂鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笅鍙戞椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浣滀笟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="mode" placeholder="璇疯緭鍏ヤ綔涓�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceStationId" placeholder="璇疯緭鍏ユ簮绔欑偣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔欑偣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="targetStationId" placeholder="璇疯緭鍏ョ洰鏍囩珯鐐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍛戒护: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="command" placeholder="璇疯緭鍏ュ懡浠�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绯荤粺鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="systemStatus" placeholder="璇疯緭鍏ョ郴缁熺姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓嬪彂鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="send">
+ <option value="">璇烽�夋嫨涓嬪彂鐘舵��</option>
+ <option value="0">鏈笅鍙�</option>
+ <option value="1">宸蹭笅鍙�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璇锋眰鍝嶅簲: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="response" placeholder="璇疯緭鍏ヨ姹傚搷搴�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basStationOpt/basStationOpt_detail.html b/src/main/webapp/views/basStationOpt/basStationOpt_detail.html
new file mode 100644
index 0000000..bff92d4
--- /dev/null
+++ b/src/main/webapp/views/basStationOpt/basStationOpt_detail.html
@@ -0,0 +1,142 @@
+<!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="id" class="layui-input" type="text" onkeyup="check(this.id, 'basStationOpt')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="taskNo" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">绔欑偣缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="stationId" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">涓嬪彂鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="sendTime$" 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="mode" 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="sourceStationId" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩爣绔欑偣锛�</label>
+ <div class="layui-input-inline">
+ <input id="targetStationId" class="layui-input" type="text" lay-verify="number" >
+ </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">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="updateBy" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" 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="memo" 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="command" 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="systemStatus" 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="send">
+ <option value="" style="display: none"></option>
+ <option value="0">鏈笅鍙�</option>
+ <option value="1">宸蹭笅鍙�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">璇锋眰鍝嶅簲锛�</label>
+ <div class="layui-input-inline">
+ <input id="response" 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/basStationOpt/basStationOpt.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1