规范接口格式

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/tianao/TianaoApiContoller.java

@@ -1,14 +1,17 @@
 package com.ruoyi.web.controller.warewms.tianao;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.tianao.domian.TianaoTask;
 import com.ruoyi.tianao.service.TianaoService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Created with IntelliJ IDEA.
@@ -38,8 +41,7 @@ public class TianaoApiContoller extends BaseController {
      * 4，任务队列：目前系统已实现，WMS下发任务后可进入wcs_task任务池。但暂不支持输送线的任务池。后面优化
      */
     @PostMapping(value = "/taskManage")
-    public AjaxResult addTestTask(@Validated @RequestBody TianaoTask tianaoTask) {
-
+    public JSONObject addTestTask(@Validated @RequestBody TianaoTask tianaoTask) {
         if ("0".equals(tianaoTask.getTaskType())){
             return  tianaoService.addTask(tianaoTask);
         }
@@ -49,7 +51,7 @@ public class TianaoApiContoller extends BaseController {
         if ("10".equals(tianaoTask.getTaskType())){
             return  tianaoService.cancelTask(tianaoTask);
         }
-        return AjaxResult.error("任务类型不存在");
+        return tianaoService.returnJson("e0001","任务取消出错","fail");
     }
 
 }

warewms-tianao/src/main/java/com/ruoyi/tianao/service/TianaoService.java

@@ -1,6 +1,6 @@
 package com.ruoyi.tianao.service;
 
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.tianao.domian.TianaoTask;
 
 /**
@@ -14,10 +14,11 @@ import com.ruoyi.tianao.domian.TianaoTask;
  **/
 public interface TianaoService {
 
-    AjaxResult addTask(TianaoTask tianaoTask) ;
+    JSONObject addTask(TianaoTask tianaoTask) ;
 
-    AjaxResult cancelTask(TianaoTask tianaoTask);
+    JSONObject cancelTask(TianaoTask tianaoTask);
 
-    AjaxResult updateTask(TianaoTask tianaoTask);
+    JSONObject updateTask(TianaoTask tianaoTask);
 
+    JSONObject returnJson(String code, String msg, String state);
 }

warewms-tianao/src/main/java/com/ruoyi/tianao/service/impl/TianaoServiceImpl.java

@@ -67,7 +67,7 @@ public class TianaoServiceImpl implements TianaoService {
 
 
     @Override
-    public AjaxResult addTask(TianaoTask tianaoTask) {
+    public JSONObject addTask(TianaoTask tianaoTask) {
 
         if (tianaoTask.getFromLocation().equals(tianaoTask.getToLocation())) {
             throw new BaseException("起始库位与目标库位不能相同");
@@ -96,30 +96,33 @@ public class TianaoServiceImpl implements TianaoService {
         wcsTask.setExt7(tianaoTask.getLcsTaskId());
         wcsTask.setExt8(tianaoTask.getContainerNo());
         if (wcsTaskService.insertWcsTask(wcsTask) ==1){
-            return AjaxResult.success("任务发起成功");
+            return returnJson("00000","任务发起成功","ok");
         }
-        return AjaxResult.error("任务发起出错") ;
+        return returnJson("e0001","任务发起出错","fail");
     }
 
     @Override
-    public AjaxResult cancelTask(TianaoTask tianaoTask) {
+    public JSONObject cancelTask(TianaoTask tianaoTask) {
         WcsTask wcsTask = wcsTaskMapper.selectWcsTaskByLcsTaskId(tianaoTask.getLcsTaskId());
         log.info(wcsTask.toString());
         if (ObjectUtil.isNull(wcsTask)) {
-          return  AjaxResult.error("任务查询不存在");
+          return  returnJson("e0001","任务查询不存在","fail");
         }
-        return wcsTaskService.cancelTask(wcsTask);
+        if (wcsTaskService.cancelTask(wcsTask).isSuccess()){
+            return returnJson("00000","任务取消成功","ok");
+        }
+        return returnJson("e0001","任务取消出错","fail");
     }
 
     @Override
     @Transactional
-    public AjaxResult updateTask(TianaoTask tianaoTask) {
+    public JSONObject updateTask(TianaoTask tianaoTask) {
         WcsTask wcsTask = wcsTaskMapper.selectWcsTaskByLcsTaskId(tianaoTask.getLcsTaskId());
         if (ObjectUtil.isNull(wcsTask)) {
-            return  AjaxResult.error("任务查询不存在");
+            return returnJson("e0001","任务查询不存在","fail");
         }
         if (statusLsit.contains(wcsTask.getState())){
-            return AjaxResult.error("当前任务无法修改卸货点");
+            return returnJson("e0001","当前任务无法修改卸货点","fail");
         }
         if (wcsTask.getState()!=9) {
             try {
@@ -127,25 +130,28 @@ public class TianaoServiceImpl implements TianaoService {
                 amsTask.setTaskNo(wcsTask.getTaskNo());
                 amsTask = amsTaskService.selectAmsTaskByModel(amsTask);
                 Integer carNo = Integer.getInteger(wcsTask.getAgvNo());
-                //TODO To志飞：这一步是做什么的？
-                statusUpdateService.confirmAnalysis(wcsTask.getTaskNo(), amsTask.getAciIndex(),carNo
-                        , "02", tianaoTask.getToLocation());
-                Thread.sleep(1000);
-                //TODO To志飞：这一步是做什么的？
-                statusUpdateService.confirmAnalysis(wcsTask.getTaskNo(),  amsTask.getAciIndex(), carNo
-                        , "10", "1");
-                Thread.sleep(1000);
-                //TODO To志飞：为什么要取消任务？
-                wcsTaskService.cancelTask(wcsTask);
+                if (ObjectUtil.isNotNull(carNo)){
+                    //TODO To志飞：这一步是做什么的？
+                    statusUpdateService.confirmAnalysis(wcsTask.getTaskNo(), amsTask.getAciIndex(),carNo
+                            , "02", tianaoTask.getToLocation());
+                    Thread.sleep(1000);
+                    //TODO To志飞：这一步是做什么的？
+                    statusUpdateService.confirmAnalysis(wcsTask.getTaskNo(),  amsTask.getAciIndex(), carNo
+                            , "10", "1");
+                    Thread.sleep(1000);
+                }
             }catch (Exception e){
                 log.info(e.getMessage());
-                return AjaxResult.error("任务修改卸货点失败");
+                return returnJson("e0001","任务修改卸货点失败","fail");
             }
         }
         BaseLocationInfo toAddress = iBaseLocationInfoService.selectBaseLocationInfoByIdOrNo(tianaoTask.getToLocation(), Constant.WAREHOUSE_ID);
         wcsTask.setAreaTo(toAddress.getZoneId().toString());
         wcsTask.setLocationTo(tianaoTask.getToLocation());
-        return AjaxResult.success("卸货点修改成功");
+        if(wcsTaskService.updateWcsTask(wcsTask)==1){
+            return returnJson("00000","卸货点修改成功","ok");
+        }
+        return returnJson("e0001","任务修改卸货点失败","fail");
     }
 
     @EventListener
@@ -168,11 +174,11 @@ public class TianaoServiceImpl implements TianaoService {
     public void tianaoCallBack(WcsTask wcsTask){
         if (StringUtils.isNotEmpty(wcsTask.getExt7())){
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("lcs_task_id", wcsTask.getExt7());
-            jsonObject.put("container_no", wcsTask.getExt8());
-            jsonObject.put("task_type", wcsTask.getBusinessType());
-            jsonObject.put("task_status", wcsTask.getState());
-            jsonObject.put("agv_no", wcsTask.getAgvNo());
+            jsonObject.put("lcsTaskId", wcsTask.getExt7());
+            jsonObject.put("containerNo", wcsTask.getExt8());
+            jsonObject.put("taskType", wcsTask.getBusinessType());
+            jsonObject.put("taskStatus", wcsTask.getState());
+            jsonObject.put("agvNo", wcsTask.getAgvNo());
             jsonObject.put("time", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
             String body = HttpRequest.post(taskBackUrl)
                     .form(jsonObject)
@@ -180,4 +186,13 @@ public class TianaoServiceImpl implements TianaoService {
             System.out.println(String.format("回调结果：%s", body));
         }
     }
+
+    @Override
+    public JSONObject returnJson(String code,String msg,String state){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code",code);
+        jsonObject.put("msg",msg);
+        jsonObject.put("state",state);
+        return jsonObject;
+    }
 }