From 0d08a0c569e76042a8b8814432b94414a7e048c2 Mon Sep 17 00:00:00 2001 From: vincent <1341870251@qq.com> Date: 星期一, 01 六月 2020 18:30:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/client/domain/CrnLatestDataVo.java | 30 +++++++ src/main/java/com/zy/client/entity/SiteStatusType.java | 11 ++ src/main/webapp/views/console.html | 67 +++++++++++++++- src/main/java/com/zy/client/domain/SiteLatestDataVo.java | 43 ++++++++++ src/main/java/com/zy/client/entity/CrnStatusType.java | 18 ++++ src/main/resources/application.yml | 16 ++-- src/main/java/com/zy/client/controller/ConsoleController.java | 29 ++++++- 7 files changed, 196 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java index 6175796..78d4204 100644 --- a/src/main/java/com/zy/client/controller/ConsoleController.java +++ b/src/main/java/com/zy/client/controller/ConsoleController.java @@ -2,9 +2,16 @@ import com.core.annotations.ManagerAuth; import com.core.common.R; +import com.zy.client.domain.CrnLatestDataVo; +import com.zy.client.domain.SiteLatestDataVo; +import com.zy.client.entity.SiteStatusType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; /** * 涓绘帶鍥炬帴鍙� @@ -17,15 +24,29 @@ @PostMapping("/latest/data/site") @ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁") public R siteLatestData(){ - - return R.ok(); + List<SiteLatestDataVo> vos = new ArrayList<>(); + for (int i = 1; i<=32; i++){ + SiteLatestDataVo vo = new SiteLatestDataVo(); + vo.setSiteId(String.valueOf(i)); + vo.setWorkNo("9998"); + SiteStatusType type = SiteStatusType.values()[new Random().nextInt(SiteStatusType.values().length)]; + vo.setSiteStatus(type); + vos.add(vo); + } + return R.ok().add(vos); } @PostMapping("/latest/data/crn") @ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�") public R crnLatestData(){ - - return R.ok(); + List<CrnLatestDataVo> vos = new ArrayList<>(); + for (int i =1; i<=2; i++){ + CrnLatestDataVo vo = new CrnLatestDataVo(); + vo.setCrnId(i); + vo.setOffset((double) new Random().nextInt(560)); + vos.add(vo); + } + return R.ok().add(vos); } @PostMapping("/latest/data/barcode") diff --git a/src/main/java/com/zy/client/domain/CrnLatestDataVo.java b/src/main/java/com/zy/client/domain/CrnLatestDataVo.java new file mode 100644 index 0000000..400fa4f --- /dev/null +++ b/src/main/java/com/zy/client/domain/CrnLatestDataVo.java @@ -0,0 +1,30 @@ +package com.zy.client.domain; + +/** + * 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞� + * Created by vincent on 2020-06-01 + */ +public class CrnLatestDataVo { + + // 鍫嗗灈鏈虹紪鍙� + private Integer crnId; + + // 鍋忕Щ閲� + private Double offset; + + public Integer getCrnId() { + return crnId; + } + + public void setCrnId(Integer crnId) { + this.crnId = crnId; + } + + public Double getOffset() { + return offset; + } + + public void setOffset(Double offset) { + this.offset = offset; + } +} diff --git a/src/main/java/com/zy/client/domain/SiteLatestDataVo.java b/src/main/java/com/zy/client/domain/SiteLatestDataVo.java new file mode 100644 index 0000000..dbbfed9 --- /dev/null +++ b/src/main/java/com/zy/client/domain/SiteLatestDataVo.java @@ -0,0 +1,43 @@ +package com.zy.client.domain; + +import com.zy.client.entity.SiteStatusType; + +/** + * 绔欑偣鏈�鏂版暟鎹鍥惧璞� + * Created by vincent on 2020-06-01 + */ +public class SiteLatestDataVo { + + // 绔欑偣缂栧彿 + private String siteId; + + // 宸ヤ綔鍙� + private String workNo; + + // 绔欑偣鐘舵�� + private SiteStatusType siteStatus; + + public String getSiteId() { + return siteId; + } + + public void setSiteId(String siteId) { + this.siteId = siteId; + } + + public String getWorkNo() { + return workNo; + } + + public void setWorkNo(String workNo) { + this.workNo = workNo; + } + + public String getSiteStatus() { + return siteStatus.toString().toLowerCase().replaceAll("_", "-"); + } + + public void setSiteStatus(SiteStatusType siteStatus) { + this.siteStatus = siteStatus; + } +} diff --git a/src/main/java/com/zy/client/entity/CrnStatusType.java b/src/main/java/com/zy/client/entity/CrnStatusType.java index 95c4b82..c024702 100644 --- a/src/main/java/com/zy/client/entity/CrnStatusType.java +++ b/src/main/java/com/zy/client/entity/CrnStatusType.java @@ -5,4 +5,22 @@ */ public enum CrnStatusType { + // 鍏ュ簱 + PUT, + // 鍑哄簱 + TAKE, + // 搴撳埌搴� + STOCK_MOVE, + // 绔欏埌绔� + SITE_MOVE, + // p to p + P_MOVE, + // 寮傚父 + ERROR, + // 鑷姩 + AUTO, + // 闈炶嚜鍔�/鎵嬪姩 + UN_AUTO, + ; + } diff --git a/src/main/java/com/zy/client/entity/SiteStatusType.java b/src/main/java/com/zy/client/entity/SiteStatusType.java index d68e396..8c52867 100644 --- a/src/main/java/com/zy/client/entity/SiteStatusType.java +++ b/src/main/java/com/zy/client/entity/SiteStatusType.java @@ -6,6 +6,17 @@ */ public enum SiteStatusType { + // 鑷姩 + SITE_AUTO, + // 闈炶嚜鍔�/鏀跺埌 + SITE_UNAUTO, + // 鑷姩+鏈夌墿+ID + SITE_AUTO_RUN_ID, + // 鑷姩+鏈夌墿 + SITE_AUTO_RUN, + // 鑷姩+鏈夌墿+ID + SITE_AUTO_ID, + ; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3b37c4fc..b30c196 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,15 +7,15 @@ name: datasource: # mysql -# driver-class-name: com.mysql.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/zy_wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai -# username: root -# password: xltys1995 + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/zy_wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: xltys1995 # sql-server - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.1.108:1433;databasename=cool - username: sa - password: sa@123 +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://192.168.1.108:1433;databasename=cool +# username: sa +# password: sa@123 mvc: static-path-pattern: /** redis: diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 7457191..8b0fb49 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -11,6 +11,7 @@ <link rel="stylesheet" type="text/css" href="../static/css/common.css"> <link rel="stylesheet" type="text/css" href="../static/css/console.css"> <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script> + <script type="text/javascript" src="../static/js/common.js"></script> <script type="text/javascript" src="../static/js/layer/layer.js"></script> <style> @@ -88,7 +89,7 @@ <div class="site-row site-row-2"> <div id="site-32" class="site" style="width: 80px; height: 50px;line-height: 50px">32</div> <div id="site-31" class="site" >31</div> - <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px; background-color: red;">30</div> + <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px;">30</div> <div id="site-23" class="site" >23</div> <div id="site-22" class="site" style="width: 80px; height: 50px;line-height: 50px">22</div> <div id="site-20" class="site" >20</div> @@ -400,15 +401,65 @@ </div> <!-- 鍙宠緭閫佺嚎 --> - + <!--<input id="val" type="text">--> + <!--<button id="animate">animate</button>--> </main> </body> <script> + var crn1Position = 0; var crn2Position = 0; - $('#animate').click(function () { - crnAnimate(1, $('#val').val()); - }); + // 鍒濆鍖� + getSitesInfo(); + getCrnInfo(); + // 瀹炴椂璁块棶 + setInterval(function () { + getSitesInfo(); + getCrnInfo(); + }, 1000); + + // 杈撻�佽澶囧疄鏃舵暟鎹幏鍙� + function getSitesInfo(){ + $.ajax({ + url: baseUrl+ "/console/latest/data/site", + headers: {'token': localStorage.getItem('token')}, + method: 'POST', + success: function (res) { + if (res.code === 200){ + var sites = res.data; + for (var i = 0; i < sites.length; i++){ + $("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus); + } + } else if (res.code === 403){ + top.location.href = baseUrl+"/login"; + } else { + alert(res.msg); + } + } + }); + } + + // 鍫嗗灈鏈哄疄鏃舵暟鎹幏鍙� + function getCrnInfo(){ + $.ajax({ + url: baseUrl+ "/console/latest/data/crn", + headers: {'token': localStorage.getItem('token')}, + method: 'POST', + success: function (res) { + if (res.code === 200){ + var crns = res.data; + console.log(crns); + for (var i = 0; i < crns.length; i++){ + crnAnimate(crns[i].crnId, crns[i].offset); + } + } else if (res.code === 403){ + top.location.href = baseUrl+"/login"; + } else { + alert(res.msg); + } + } + }); + } // 鍫嗗灈鏈哄亸绉诲姩鐢� function crnAnimate(id, leftVal) { @@ -426,13 +477,17 @@ } } + $('.item').on('click', function () { layer.open({ type: 1, shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞� content: 'text' }); - }) + }); + $('#animate').click(function () { + crnAnimate(1, $('#val').val()); + }); </script> </html> \ No newline at end of file -- Gitblit v1.9.1