From efa0a4cfe6296e3a4a65f8714f34694169eadea7 Mon Sep 17 00:00:00 2001 From: LSH <1> Date: 星期六, 18 五月 2024 17:24:03 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/StaDescController.java | 42 +++++++ src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java | 141 +++++++++++++++++++++++ src/main/webapp/static/js/staDesc/staDesc.js | 44 +++++++ src/main/webapp/views/staDesc/staDesc.html | 106 +++++++++++++++++ 4 files changed, 332 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java index 3381be0..a693113 100644 --- a/src/main/java/com/zy/asrs/controller/StaDescController.java +++ b/src/main/java/com/zy/asrs/controller/StaDescController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.zy.asrs.entity.StaDesc; +import com.zy.asrs.entity.param.StaDescInitParam; import com.zy.asrs.service.StaDescService; import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; @@ -24,6 +25,47 @@ @Autowired private StaDescService staDescService; + @RequestMapping(value = "/staDesc/init/auth") + @ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�") + public R init(StaDescInitParam param) { + try{ + if (param.getTypeDesc()==1){ + staDescService.delete(new EntityWrapper<>()); + } + String[] startStaList = param.getStartStaList().split(";"); + String[] endStaList = param.getEndStaList().split(";"); + List<StaDesc> staDescList = new ArrayList<>(); + for (String startSta : startStaList){ + for (String endSta : endStaList){ + for (Integer type:param.getType()){ + int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>() + .eq("type_no", type) + .eq("stn_no", Integer.parseInt(startSta)) + .eq("crn_no", param.getCrnNo()) + .eq("crn_stn", Integer.parseInt(endSta))); + if (sameRes > 0) { + continue; + } + StaDesc staDesc = new StaDesc(); + staDesc.setCrnNo(param.getCrnNo()); + staDesc.setTypeNo(type); + staDesc.setStnNo(Integer.parseInt(startSta)); + staDesc.setCrnStn(Integer.parseInt(endSta)); + staDesc.setModiUser(getUserId()); + staDesc.setModiTime(new Date()); + staDesc.setAppeUser(getUserId()); + staDesc.setAppeTime(new Date()); + staDescList.add(staDesc); + } + } + } + staDescService.insertBatch(staDescList); + }catch (Exception e){ + return R.error(); + } + + return R.ok("ok1").add("ok2"); + } @RequestMapping(value = "/staDesc/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { diff --git a/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java b/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java new file mode 100644 index 0000000..0d267a5 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java @@ -0,0 +1,141 @@ +package com.zy.asrs.entity.param; + +import com.core.common.BaseRes; +import com.core.exception.CoolException; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by vincent on 2020/6/13 + */ +public class StaDescInitParam { + + // 鍫嗗灈鏈哄彿 + private Integer crnNo; + + // 鏍煎紡鍖栧紑鍏筹紙鎵撳紑鍒犻櫎鑰佹暟鎹級 + private Integer typeDesc = 0; + // 鍏ュ簱 + private Integer typeDesc1 = 0; + // 绌烘澘鍏ュ簱 + private Integer typeDesc10 = 0; + // 鎷f枡鐩樼偣鍏ュ簱 + private Integer typeDesc53 = 0; + // 鍑哄簱 + private Integer typeDesc101 = 0; + // 绌烘澘鍑哄簱 + private Integer typeDesc110 = 0; + // 鎷f枡鐩樼偣鍑哄簱 + private Integer typeDesc103 = 0; + + private String startStaList = ""; + + private String endStaList = ""; + + public String getStartStaList() { + return startStaList; + } + + public void setStartStaList(String startStaList) { + this.startStaList = startStaList; + } + + public String getEndStaList() { + return endStaList; + } + + public void setEndStaList(String endStaList) { + this.endStaList = endStaList; + } + + public Integer getCrnNo() { + return crnNo; + } + + public void setCrnNo(Integer crnNo) { + this.crnNo = crnNo; + } + + public Integer getTypeDesc() { + return typeDesc; + } + + public void setTypeDesc(Integer typeDesc) { + this.typeDesc = typeDesc; + } + + public Integer getTypeDesc1() { + return typeDesc1; + } + + public void setTypeDesc1(Integer typeDesc1) { + this.typeDesc1 = typeDesc1; + } + + public Integer getTypeDesc10() { + return typeDesc10; + } + + public void setTypeDesc10(Integer typeDesc10) { + this.typeDesc10 = typeDesc10; + } + + public Integer getTypeDesc53() { + return typeDesc53; + } + + public void setTypeDesc53(Integer typeDesc53) { + this.typeDesc53 = typeDesc53; + } + + public Integer getTypeDesc101() { + return typeDesc101; + } + + public void setTypeDesc101(Integer typeDesc101) { + this.typeDesc101 = typeDesc101; + } + + public Integer getTypeDesc110() { + return typeDesc110; + } + + public void setTypeDesc110(Integer typeDesc110) { + this.typeDesc110 = typeDesc110; + } + + public Integer getTypeDesc103() { + return typeDesc103; + } + + public void setTypeDesc103(Integer typeDesc103) { + this.typeDesc103 = typeDesc103; + } + + public List<Integer> getType(){ + List<Integer> type = new ArrayList<>(); + if (this.typeDesc1==1){ + type.add(1); + } + if (this.typeDesc10==1){ + type.add(10); + } + if (this.typeDesc53==1){ + type.add(53); + type.add(57); + } + if (this.typeDesc101==1){ + type.add(101); + } + if (this.typeDesc110==1){ + type.add(110); + } + if (this.typeDesc103==1){ + type.add(103); + type.add(107); + } + return type; + } +} diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js index 8e38517..db50df2 100644 --- a/src/main/webapp/static/js/staDesc/staDesc.js +++ b/src/main/webapp/static/js/staDesc/staDesc.js @@ -208,9 +208,53 @@ }); }); 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: ["500px"], + maxmin: true, + shadeClose: true, + content: $("#resetLocDiv"), + success: function (layero, index) { + + } + }) + } else { + layer.msg("鍙d护閿欒"); + } + layer.close(idx); + }) + }); + break; } }); + // 鍒濆鍖栦繚瀛� + form.on('submit(initDo)', function (data) { + $.ajax({ + url: baseUrl+"/staDesc/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(staDesc)', function(obj){ var data = obj.data; diff --git a/src/main/webapp/views/staDesc/staDesc.html b/src/main/webapp/views/staDesc/staDesc.html index 5676ac8..cf6d981 100644 --- a/src/main/webapp/views/staDesc/staDesc.html +++ b/src/main/webapp/views/staDesc/staDesc.html @@ -73,6 +73,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> @@ -89,7 +90,110 @@ <script type="text/javascript" src="../../static/js/staDesc/staDesc.js" charset="utf-8"></script> <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="checkbox" name="typeDesc" lay-skin="switch" value="1" lay-text="鍒犻櫎|淇濈暀"> + </div> + </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 cool-auto-complete"> + <input id="crnNo" name="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none"> + <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + </div> + <!-- 鍫嗗灈鏈烘暟閲� --> + <div class="layui-form-item"> + <label class="layui-form-label">浣滀笟绔�</label> + <div class="layui-input-inline"> + <input type="text" name="startStaList" lay-verify="required" autocomplete="off" class="layui-input" placeholder="123;321"> + </div> + </div> + <!-- 鍫嗗灈鏈烘暟閲� --> + <div class="layui-form-item"> + <label class="layui-form-label">鍫嗗灈鏈虹珯</label> + <div class="layui-input-inline"> + <input type="text" name="endStaList" lay-verify="required" autocomplete="off" class="layui-input" placeholder="123;321"> + </div> + </div> + <!-- 鍏ュ簱 --> + <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="checkbox" name="typeDesc1" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </div> + </div> + </div> + <!-- 绌烘澘鍏ュ簱 --> + <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="checkbox" name="typeDesc10" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </div> + </div> + </div> + <!-- 鎷f枡銆佺洏鐐瑰啀鍏ュ簱 --> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">鎷f枡銆佺洏鐐瑰啀鍏ュ簱</label> + <div class="layui-input-inline" style="width: 100px;"> + <input type="checkbox" name="typeDesc53" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </div> + </div> + </div> + <!-- 鍑哄簱 --> + <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="checkbox" name="typeDesc101" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </div> + </div> + </div> + <!-- 绌烘澘鍑哄簱 --> + <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="checkbox" name="typeDesc110" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </div> + </div> + </div> + <!-- 鎷f枡銆佺洏鐐瑰嚭搴� --> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">鎷f枡銆佺洏鐐瑰嚭搴�</label> + <div class="layui-input-inline" style="width: 100px;"> + <input type="checkbox" name="typeDesc103" lay-skin="switch" value="1" lay-text="鎵撳紑|鍏抽棴"> + </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> -- Gitblit v1.9.1