src/main/java/com/zy/asrs/controller/BasDevpController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/basDevp/basDevp.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/basDevp/basDevp.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.param.BasDevpInitParam; import com.zy.asrs.service.BasDevpService; import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; @@ -24,6 +25,30 @@ @Autowired private BasDevpService basDevpService; @RequestMapping(value = "/basDevp/init/auth") @ManagerAuth(memo = "初始化站点") public R init(BasDevpInitParam param) { List<BasDevp> list = new ArrayList<>(); for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){ BasDevp basDevp = basDevpService.selectById(devNo); if (Cools.isEmpty(basDevp)){ BasDevp basDevp1 = new BasDevp(); basDevp1.setDevNo(devNo); basDevp1.setInEnable("Y"); basDevp1.setOutEnable("Y"); basDevp1.setAutoing("Y"); basDevp1.setLoading("Y"); basDevp1.setCanining("Y"); basDevp1.setCanouting("Y"); basDevp1.setModiUser(getUserId()); basDevp1.setModiTime(new Date()); list.add(basDevp1); } } basDevpService.insertBatch(list); return R.ok("初始化成功"); } @RequestMapping(value = "/basDevp/{id}/auth") @ManagerAuth public R get(@PathVariable("id") Long id) { src/main/java/com/zy/asrs/entity/param/BasDevpInitParam.java
New file @@ -0,0 +1,41 @@ package com.zy.asrs.entity.param; import com.core.common.BaseRes; import com.core.exception.CoolException; /** * Created by vincent on 2020/6/13 */ public class BasDevpInitParam { // 站点号 // 起始站点号 private Integer startDev; // 终止站点号 private Integer endDev; public Integer getStartDev() { if (null == startDev) { throw new CoolException(BaseRes.PARAM); } return startDev; } public void setStartDev(Integer startDev) { this.startDev = startDev; } public Integer getEndDev() { if (null == endDev) { throw new CoolException(BaseRes.PARAM); } return endDev; } public void setEndDev(Integer endDev) { this.endDev = endDev; } } src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -127,25 +127,25 @@ LicenseCheck serverCheckModel = getServerInfos(); if(expectedCheckModel != null && serverCheckModel != null){ // //校验IP地址 // if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ // throw new LicenseContentException("当前服务器的IP没在授权范围内"); // } // // //校验Mac地址 // if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ // throw new LicenseContentException("当前服务器的Mac地址没在授权范围内"); // } // // //校验主板序列号 // if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ // throw new LicenseContentException("当前服务器的主板序列号没在授权范围内"); // } // // //校验CPU序列号 // if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ // throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内"); // } //校验IP地址 if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ throw new LicenseContentException("当前服务器的IP没在授权范围内"); } //校验Mac地址 if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ throw new LicenseContentException("当前服务器的Mac地址没在授权范围内"); } //校验主板序列号 if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ throw new LicenseContentException("当前服务器的主板序列号没在授权范围内"); } //校验CPU序列号 if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内"); } }else{ throw new LicenseContentException("不能获取服务器硬件信息"); } src/main/webapp/static/js/basDevp/basDevp.js
@@ -195,9 +195,31 @@ success: function(layero, index){ layer.getChildFrame('#autoing,#loading,#canining,#canouting,#inreq1,#inreq2,#wrkNo,#barcode,#ctnType,#grossWt', index).parent().parent().hide(); layer.getChildFrame('#data-detail-submit-edit', index).hide(); clearFormVal(layer.getChildFrame('#detail', 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 'init': layer.prompt({title: '请输入口令,并初始化站点', formType: 1, shadeClose: true}, function(pass, idx){ http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) { if (res.data) { layer.open({ type: 1, title: '初始化站点', area: ["400px"], maxmin: true, shadeClose: true, content: $("#resetLocDiv"), success: function (layero, index) { } }) } else { layer.msg("口令错误"); } layer.close(idx); }) }); break; case 'refreshData': @@ -275,6 +297,28 @@ } }); // 初始化保存 form.on('submit(initDo)', function (data) { $.ajax({ url: baseUrl+"/basDevp/init/auth", headers: {'token': localStorage.getItem('token')}, data: data.field, method: 'POST', async: false, success: function (res) { if (res.code === 200){ layer.msg(res.msg); layer.closeAll(); tableReload(false); } else if (res.code === 403){ parent.location.href = "/"; }else { layer.msg(res.msg) } } }) }); // 监听行工具事件 table.on('tool(basDevp)', function(obj){ var data = obj.data; @@ -324,36 +368,36 @@ if (param === undefined) { layer.msg("无数据"); } else { layer.open({ type: 2, title: '修改详情', maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, content: '../user/user_detail.html', success: function(layero, index){ $.ajax({ url: baseUrl+"/user/"+ param +"/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res) { if (res.code === 200){ setFormVal(layer.getChildFrame('#detail', index), res.data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide(); 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'); layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); } else if (res.code === 403){ parent.location.href = "/"; }else { layer.msg(res.msg) } } }) } }); layer.open({ type: 2, title: '修改详情', maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, content: '../user/user_detail.html', success: function(layero, index){ $.ajax({ url: baseUrl+"/user/"+ param +"/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res) { if (res.code === 200){ setFormVal(layer.getChildFrame('#detail', index), res.data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); layer.getChildFrame('#password,#createTime\\$,#status', index).parent().parent().hide(); 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'); layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); } else if (res.code === 403){ parent.location.href = "/"; }else { layer.msg(res.msg) } } }) } }); } break; case 'appeUser': @@ -361,35 +405,35 @@ if (param === undefined) { layer.msg("无数据"); } else { layer.open({ type: 2, title: '创详情', maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, content: '../user/user_detail.html', success: function(layero, index){ $.ajax({ url: baseUrl+"/user/"+ param +"/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res) { if (res.code === 200){ setFormVal(layer.getChildFrame('#detail', index), res.data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); layer.getChildFrame('#data-detail-submit', 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'); } else if (res.code === 403){ parent.location.href = "/"; }else { layer.msg(res.msg) } } }) } }); layer.open({ type: 2, title: '创详情', maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, content: '../user/user_detail.html', success: function(layero, index){ $.ajax({ url: baseUrl+"/user/"+ param +"/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res) { if (res.code === 200){ setFormVal(layer.getChildFrame('#detail', index), res.data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); layer.getChildFrame('#data-detail-submit', 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'); } else if (res.code === 403){ parent.location.href = "/"; }else { layer.msg(res.msg) } } }) } }); } break; src/main/webapp/views/basDevp/basDevp.html
@@ -35,6 +35,7 @@ <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-primary" id="btn-init" lay-event="init">初始化</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> @@ -53,6 +54,31 @@ <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> <!-- 重置站点弹窗 --> <div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none"> <div class="layui-form layui-form-pane"> <!-- 站点 --> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">起止站点</label> <div class="layui-input-inline" style="width: 100px;"> <input type="text" name="startDev" autocomplete="off" class="layui-input" lay-verify="required|number"> </div> <div class="layui-form-mid">-</div> <div class="layui-input-inline" style="width: 100px;"> <input type="text" name="endDev" autocomplete="off" class="layui-input" lay-verify="required|number"> </div> </div> </div> <div id="prompt" style="text-indent: 10px;"> <span class="not-null">初始化站点,请谨慎操作!</span> </div> <!-- 按钮 --> <div style="text-align: center; margin-top: 20px"> <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">确定</button> </div> </div> </div> </body> </html>