From 1a24bc85c7dbd80a4460ace64dd88846ff1af654 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期日, 03 十一月 2024 09:48:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MobileController.java | 85 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 79 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 99d9852..ab6bfab 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -1,30 +1,30 @@ package com.zy.asrs.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.*; -import com.zy.asrs.entity.param.CombParam; -import com.zy.asrs.entity.param.GDYKConfirmGoodsParam; -import com.zy.asrs.entity.param.MobileAdjustParam; -import com.zy.asrs.entity.param.OffSaleParam; +import com.zy.asrs.entity.param.*; import com.zy.asrs.entity.result.MobileAdjustResult; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.common.model.WrkDto; import com.zy.common.service.CommonService; +import com.zy.common.utils.HttpHandler; import com.zy.common.web.BaseController; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.*; -import java.util.List; /** * 绉诲姩绔帴鍙f帶鍒跺櫒 @@ -32,6 +32,7 @@ */ @RestController @RequestMapping("mobile") +@Slf4j public class MobileController extends BaseController { @Autowired @@ -61,6 +62,78 @@ @Autowired private CommonService commonService; + @PostMapping("/agv/start") + @ManagerAuth + public R pdaAgvStart(@RequestBody Map<String,Object> map){ + + if (Cools.isEmpty(map.get("sta"))) { + return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�"); + } else if (Cools.isEmpty(map.get("inSta"))) { + return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖"); + } +// HashMap<String, String> map1 = new HashMap<>(); +// map1.put("agv0001","sta0001"); +// String sta = map.get("sta").toString(); +// +// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam(); +// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta)); +// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask"); +// if ("SUCCESS".equals(request)) { +// return R.ok(); +// } + String sta = (String) map.get("sta"); // 鏆傚瓨浣� + String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣 + + return mobileService.inLocCallAgv(sta, inSta); + + } + + private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){ + List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList( + //璧峰浣� + new ForwardAGVTaskParam.PositionCodePaths(agv,"05"), + //鐩爣浣� + new ForwardAGVTaskParam.PositionCodePaths(sta,"05") + ); + Date date = new Date(); + DecimalFormat df = new DecimalFormat("0000"); + String wrkNo = "Crn"+date.getTime()/1000; + agvTaskCreateParam.setReqCode(wrkNo); + agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + agvTaskCreateParam.setTaskTyp("GT1"); + agvTaskCreateParam.setCtnrCode("00000000"); + agvTaskCreateParam.setPositionCodePath(agvTaskParamList); + agvTaskCreateParam.setCtnrTyp("1"); + agvTaskCreateParam.setTaskCode(wrkNo); + + } + + private String forwardAGVHttpRequest(Object requestParam, String url, String path){ + String response = ""; + String success = "error"; + try { + response = new HttpHandler.Builder() + .setUri(url) +// .setHttps(true) + .setPath(path) + .setJson(JSONObject.toJSONString(requestParam)) + .build() + .doPost(); + JSONObject jsonObject = JSON.parseObject(response); + + String message = jsonObject.get("code").toString(); + if(("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)){ + success = "SUCCESS"; + }else { + success = message; + } + log.info("杞彂agv浠诲姟锛氳姹備綋:"+JSONObject.toJSONString(requestParam)+",杩斿洖鍊�:"+jsonObject); + }catch (Exception e){ + + } + return success; + } + @RequestMapping("/select/workDetl/barcode") @ManagerAuth public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) { -- Gitblit v1.9.1