From 20a5060f2054a63715522b7a25ab28a8d7b92ee7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 16 五月 2023 15:24:51 +0800
Subject: [PATCH] 堆垛机异常码
---
src/main/webapp/views/basCrnError/basCrnError.html | 56 +++++++++
src/main/java/com/zy/asrs/service/BasCrnErrorService.java | 8 +
src/main/java/com/zy/asrs/service/impl/BasCrnErrorServiceImpl.java | 12 ++
src/main/webapp/views/basCrnError/basCrnError_detail.html | 96 ++++++++++++++++
src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 132 ++++++++++++++++++++++
5 files changed, 304 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
new file mode 100644
index 0000000..d99ba7f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -0,0 +1,132 @@
+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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.service.BasCrnErrorService;
+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 BasCrnErrorController extends BaseController {
+
+ @Autowired
+ private BasCrnErrorService basCrnErrorService;
+
+ @RequestMapping(value = "/basCrnError/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") Long id) {
+ return R.ok(basCrnErrorService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basCrnError/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){
+ excludeTrash(param);
+ EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basCrnErrorService.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 = "/basCrnError/add/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞")
+ public R add(BasCrnError basCrnError) {
+ basCrnError.setModiUser(getUserId());
+ basCrnError.setModiTime(new Date());
+ basCrnError.setAppeUser(getUserId());
+ basCrnError.setAppeTime(new Date());
+ basCrnErrorService.insert(basCrnError);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnError/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼")
+ public R update(BasCrnError basCrnError){
+ if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
+ return R.error();
+ }
+ basCrnError.setModiUser(getUserId());
+ basCrnError.setModiTime(new Date());
+ basCrnErrorService.updateById(basCrnError);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnError/delete/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜鍒犻櫎")
+ public R delete(@RequestParam String param){
+ List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (BasCrnError entity : list){
+ basCrnErrorService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basCrnError/export/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜瀵煎嚭")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnError"));
+ convert(map, wrapper);
+ List<BasCrnError> list = basCrnErrorService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basCrnErrorQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
+ wrapper.like("err_name", condition);
+ Page<BasCrnError> page = basCrnErrorService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasCrnError basCrnError : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basCrnError.getErrorCode());
+ map.put("value", basCrnError.getErrName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basCrnError/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasCrnError> wrapper = new EntityWrapper<BasCrnError>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basCrnErrorService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasCrnError.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasCrnErrorService.java b/src/main/java/com/zy/asrs/service/BasCrnErrorService.java
new file mode 100644
index 0000000..5899639
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasCrnErrorService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasCrnError;
+
+public interface BasCrnErrorService extends IService<BasCrnError> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnErrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnErrorServiceImpl.java
new file mode 100644
index 0000000..dc6939f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnErrorServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.service.BasCrnErrorService;
+import org.springframework.stereotype.Service;
+
+@Service("basCrnErrorService")
+public class BasCrnErrorServiceImpl extends ServiceImpl<BasCrnErrorMapper, BasCrnError> implements BasCrnErrorService {
+
+}
diff --git a/src/main/webapp/views/basCrnError/basCrnError.html b/src/main/webapp/views/basCrnError/basCrnError.html
new file mode 100644
index 0000000..4531669
--- /dev/null
+++ b/src/main/webapp/views/basCrnError/basCrnError.html
@@ -0,0 +1,56 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/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="error_code" placeholder="寮傚父浠ｅ彿" autocomplete="off">
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <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="basCrnError" lay-filter="basCrnError"></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-xs btn-edit" lay-event="edit">缂栬緫</a>
+</script>
+
+<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/basCrnError/basCrnError.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/basCrnError/basCrnError_detail.html b/src/main/webapp/views/basCrnError/basCrnError_detail.html
new file mode 100644
index 0000000..970c7bc
--- /dev/null
+++ b/src/main/webapp/views/basCrnError/basCrnError_detail.html
@@ -0,0 +1,96 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form" style="text-align: center">
+ <!--
+ <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:80%;">
+ <label class="layui-form-label"><span class="not-null">*</span>寮傚父浠ｅ彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="errorCode" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnError')" lay-verify="required|number">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">寮傚父鎻忚堪锛�</label>
+ <div class="layui-input-inline">
+ <input id="errName" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" 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%;display: none">
+ <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%;display: none">
+ <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" type="text" style="display: none">
+ <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </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/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/basCrnError/basCrnError.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1