From 95a8a2bd5b418980860fcaac6a6f5293e9cd65f2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 16:44:37 +0800
Subject: [PATCH] #console 下发输送线和堆垛机命令
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 433 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 357 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 114310d..d56f44d 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,40 +1,75 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.ManagerAuth;
+import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.domain.dto.AxisBean;
+import com.zy.asrs.domain.dto.WorkChartAxis;
+import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.DeviceErrorService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
+import com.zy.core.Slave;
+import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.SiemensCrnThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
* Created by vincent on 2020-06-01
*/
+@Slf4j
@RestController
@RequestMapping("/console")
public class ConsoleController {
@Autowired
private SlaveProperties slaveProperties;
-
- public static AtomicInteger integer = new AtomicInteger();
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private LocMastMapper locMastMapper;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private DeviceErrorService deviceErrorService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -56,65 +91,9 @@
return R.error("鍙ｄ护閿欒");
}
}
- Thread.sleep(2000L);
+ Thread.sleep(200L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
- }
-
- @PostMapping("/site/detail")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam String siteId){
- if (Cools.isEmpty(siteId)){
- return R.parse(CodeRes.EMPTY);
- }
- SiteDetailVo vo = new SiteDetailVo();
- vo.setDevpNo(siteId);
- vo.setWorkNo("9998");
- vo.setWorkStatus("2.璁惧涓婄Щ鍔�");
- vo.setAutoing("Y");
- vo.setLoading("Y");
- vo.setCanining("N");
- vo.setCanouting("Y");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setSourceStock("");
- vo.setStock("");
- return R.ok().add(vo);
- }
-
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam String crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- vo.setCrnNo(crnNo);
- vo.setWorkNo("3387");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStock("");
- vo.setStock("05050040");
- vo.setCrnStatus("鍙栬揣涓�");
- vo.setError("0");
- return R.ok().add(vo);
- }
-
- @Deprecated
- @PostMapping("/site/update")
- @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
- return R.ok();
- }
-
- @Deprecated
- @PostMapping("/crn/update")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
- return R.ok();
}
/****************************************************************/
@@ -138,6 +117,7 @@
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+ vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
vos.add(vo);
}
return R.ok().add(vos);
@@ -147,11 +127,42 @@
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
public R crnLatestData(){
List<CrnLatestDataVo> vos = new ArrayList<>();
- for (int i =1; i<=2; i++){
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ continue;
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(i);
- vo.setOffset((double) new Random().nextInt(560));
+ vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+
+// Short totalBay = locMastMapper.selectTotalBay();
+
+ vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ /**
+ * 鍫嗗灈鏈虹姸鎬佸垽鏂�
+ */
+ if (crnProtocol.getAlarm1() > 0) {
+ vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
+ } else {
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
+ }
vos.add(vo);
+
}
return R.ok().add(vos);
}
@@ -159,19 +170,289 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
- integer.getAndIncrement();
List<BarcodeDataVo> list = new ArrayList<>();
- for (int i=1;i<=1;i++){
- BarcodeDataVo vo = new BarcodeDataVo();
- vo.setBarcodeId("1");
- if (integer.get()%5 != 0) {
- vo.setCodeValue("0");
- } else {
- vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
+ if (null == barcodeThread) {
+ continue;
}
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId(barcode.getId());
+ vo.setCodeValue(barcodeThread.getBarcode());
list.add(vo);
}
return R.ok().add(list);
}
+ @PostMapping("/latest/data/scale")
+ @ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
+ public R scaleLatestData(){
+ List<ScaleDataVo> list = new ArrayList<>();
+ for (Slave scale : slaveProperties.getScale()) {
+ ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, scale.getId());
+ if (null == scaleThread) {
+ continue;
+ }
+ ScaleDataVo vo = new ScaleDataVo();
+ vo.setScaleId(scale.getId());
+ vo.setValue(String.valueOf(Arith.multiplys(1, scaleThread.getScale(), 1)));
+ list.add(vo);
+ }
+ return R.ok().add(list);
+ }
+
+ /**
+ * 鑾峰彇璁惧璇︽儏
+ */
+ @GetMapping("/deviceInfo")
+ @ManagerAuth
+ public R getDeviceInfo() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ continue;
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "鍫嗗灈鏈�");
+ map.put("deviceId", crn.getId());
+ map.put("battery", "");
+ map.put("error", crnProtocol.getFault());
+ map.put("status", crnProtocol.getStatusType().desc);
+ list.add(map);
+ }
+
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("devp", devp.getId());
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "杈撻�佺嚎");
+ map.put("deviceId", devp.getId());
+ map.put("battery", "");
+ map.put("error", deviceError != null);
+ map.put("status", deviceError == null ? "" : deviceError.getMsg());
+ list.add(map);
+ }
+
+ for (Slave scale : slaveProperties.getScale()) {
+ DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("scale", scale.getId());
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("device", "纾呯Г");
+ map.put("deviceId", scale.getId());
+ map.put("battery", "");
+ map.put("error", deviceError != null);
+ map.put("status", deviceError == null ? "" : deviceError.getMsg());
+ list.add(map);
+ }
+
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("records", list);
+ return R.ok().add(hashMap);
+ }
+
+ /****************************************************************/
+ /************************** 璇︽儏鎿嶄綔 ******************************/
+ /****************************************************************/
+
+ @PostMapping("/site/detail")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
+ public R siteDetail(@RequestParam Integer siteId){
+ if (Cools.isEmpty(siteId)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ SiteDetailVo vo = new SiteDetailVo();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ StaProtocol staProtocol = devpThread.getStation().get(siteId);
+ if (staProtocol != null) {
+ BasDevp basDevp = basDevpService.selectById(siteId);
+ if (basDevp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+ vo.setSiteId(siteId); // 绔欑偣缂栧彿
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+
+ if (staProtocol.getWorkNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ if (wrkMast != null) {
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ }
+ }
+
+ vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+
+ vo.setCanining(basDevp.getCanining()); // 鑳藉叆
+ vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
+
+ return R.ok().add(vo);
+ }
+ }
+ }
+ return R.error();
+
+ }
+
+ @PostMapping("/crn/detail")
+ @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
+ public R crnDetail(@RequestParam Integer crnNo){
+ if (Cools.isEmpty(crnNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ CrnDetailVo vo = new CrnDetailVo();
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ if (crnSlave.getId().equals(crnNo)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (basCrnp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo(crnProtocol.getTaskNo());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+
+ if (crnProtocol.getAlarm1() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
+ }
+
+ if (crnProtocol.getTaskNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+ vo.setError(""); // todo
+ }
+ }
+ vo.setInEnable(basCrnp.getInEnable());//鍙叆
+ vo.setOutEnable(basCrnp.getOutEnable());//鍙嚭
+ return R.ok().add(vo);
+ }
+ }
+ return R.error();
+ }
+
+ @Deprecated
+ @PostMapping("/site/update")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
+ public R updateSite(){
+ return R.ok();
+ }
+
+ @Deprecated
+ @PostMapping("/crn/update")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
+ public R updateCrn(){
+ return R.ok();
+ }
+
+ @GetMapping("/barcode/output/site")
+ public R crnOutput(){
+ ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.SCALE);
+ jsonObjects.sort(new Comparator<JSONObject>() {
+ @Override
+ public int compare(JSONObject o1, JSONObject o2) {
+ Date o1Time = DateUtils.convert(o1.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ Date o2Time = DateUtils.convert(o2.getString("time"), DateUtils.yyyyMMddHHmmss_F);
+ return (int) (o2Time.getTime() - o1Time.getTime());
+ }
+ });
+ return R.ok().add(JSON.toJSONString(jsonObjects));
+ }
+
+ @PostMapping("loc/pie/charts")
+ public R dsa(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<ChartBean> list = new ArrayList<ChartBean>();
+
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ if(locUseRate!=null) {
+ ChartBean fqty = new ChartBean();
+ fqty.setName("鍦ㄥ簱搴撲綅");
+ fqty.setY(locUseRate.getFqty());
+ list.add(fqty);
+
+ ChartBean oqty = new ChartBean();
+ oqty.setName("绌哄簱浣�");
+ oqty.setY(locUseRate.getOqty());
+ list.add(oqty);
+
+ ChartBean uqty = new ChartBean();
+ uqty.setName("浣跨敤搴撲綅");
+ uqty.setY(locUseRate.getUqty());
+ list.add(uqty);
+
+ ChartBean xqty = new ChartBean();
+ xqty.setName("绂佺敤搴撲綅");
+ xqty.setY(locUseRate.getXqty());
+ list.add(xqty);
+ }
+ map.put("rows",list);
+ return R.ok(map);
+ }
+
+ @PostMapping("locIo/line/charts")
+ public R locIoLineCharts(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
+
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
+
+ if(listChart!=null) {
+ ArrayList<Integer> data1 = new ArrayList<Integer>();
+ ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -12);
+ for(int i=0;i<12;i++) {
+ boolean flag = true;
+ calendar.add(Calendar.DATE, 1);
+ String str = sf.format(calendar.getTime());
+ for(WorkChartAxis workChart : listChart) {
+ if(str.equals(workChart.getYmd())) {
+ data1.add(workChart.getInqty());
+ data2.add(workChart.getOutqty());
+ flag = false;
+ break;
+ }
+ }
+ if(flag) {
+ data1.add(0);
+ data2.add(0);
+ }
+ }
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鏁伴噺");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱鏁伴噺");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
+ }
+ map.put("rows",list);
+ return R.ok(map);
+ }
+
}
--
Gitblit v1.9.1