去除payload

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java

@@ -184,7 +184,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                     HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
                     if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
                         JSONObject resp = JSONObject.parseObject(httpResponse.body());
-                        if (resp.getJSONObject("payload").getInteger("status") == 200) {
+                        if (resp.getInteger("status") == 200) {
+//                      if (resp.getJSONObject("payload").getInteger("status") == 200) {
                             data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                             log.info("指令号:{},acs请求wms取货申请成功,wms允许agv申请取货,已反馈agv允许取货", inst.getInstruction_code());
                         } else {
@@ -249,7 +250,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                     HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
                     if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
                         JSONObject resp = JSONObject.parseObject(httpResponse.body());
-                        if (resp.getJSONObject("payload").getInteger("status") == 200) {
+                        if (resp.getInteger("status") == 200) {
+//                      if (resp.getJSONObject("payload").getInteger("status") == 200) {
                             data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                             log.info("指令号:{},acs反馈wms取货完成离开成功,wms允许agv取货完成离开,已反馈agv取货完成离开", inst.getInstruction_code());
                         } else {
@@ -311,7 +313,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                     HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
                     if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
                         JSONObject resp = JSONObject.parseObject(httpResponse.body());
-                        if (resp.getJSONObject("payload").getInteger("status") == 200) {
+                        if (resp.getInteger("status") == 200) {
+//                      if (resp.getJSONObject("payload").getInteger("status") == 200) {
                             data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                             log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code());
                         } else {
@@ -374,7 +377,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                     HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
                     if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
                         JSONObject resp = JSONObject.parseObject(httpResponse.body());
-                        if (resp.getJSONObject("payload").getInteger("status") == 200) {
+                        if (resp.getInteger("status") == 200) {
+//                      if (resp.getJSONObject("payload").getInteger("status") == 200) {
                             data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                             log.info("指令号:{},acs请求wms放货完成申请成功,wms允许agv放货完成,已反馈agv放货完成", inst.getInstruction_code());
                         } else {

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java

@@ -107,7 +107,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 String methods_url = addressDto.getMethods_url();
                 String url = wmsurl + methods_url;
                 Map<String, Object> map = new HashMap<>();
-                map.put("payload", JSON.toJSONString(data));
+//                map.put("payload", JSON.toJSONString(data));
                 try {
                     result = HttpRequest
                             .post(url)
@@ -566,7 +566,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             String url = wmsUrl + methods_url;
             HttpResponse result = null;
             Map<String, Object> map = new HashMap<>();
-            map.put("payload", JSON.toJSONString(from));
+//            map.put("payload", JSON.toJSONString(from));
             try {
                 result = HttpRequest.post(url)
                         .header("Content-Type", "application/json;charset=UTF-8")

acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -24,6 +24,13 @@ export default {
       required: true
     }
   },
+  data() {
+    return {
+      title: 'acs系统',
+      logo: Logo,
+      title_param: 'platform'
+    }
+  },
   computed: {
     variables() {
       return variables
@@ -32,13 +39,6 @@ export default {
       return this.$store.state.settings.sideTheme
     }
   },
-  data() {
-    return {
-      title: '诺力开发平台',
-      logo: Logo,
-      title_param: 'platform'
-    }
-  },
   created() {
     this.getValueByCode(this.title_param).then(res => {
       this.title = res.value

acs/nladmin-ui/src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        {{title}}</h3>
+        {{ title }}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -50,7 +50,7 @@ export default {
   name: 'Login',
   data() {
     return {
-      title: '诺力开发平台',
+      title: 'acs系统',
       title_param: 'platform',
       Background: Background,
       codeUrl: '',