diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java index 3a284b060847a0bc7c1538f4cc6a6d8e20e95101..33d9c88b42f96afb2f5c865a95a5fc0dda3c5313 100644 --- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java +++ b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java @@ -373,8 +373,10 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ApiResp<String> resp = messageService.sendThirdParty(UrlBuilder.of(phpInUrl).addPath(thirdPartyPath).build(), deviceReq); log.info("sendThirty resp ==>{}", JSON.toJSONString(resp)); - if (resp.getCode() == YesNoEnum.YES.getValue()) { + if (!ObjectUtils.isEmpty(resp)&&resp.getCode() == YesNoEnum.YES.getValue()) { return Rest.ok("鎴愬姛锛�"); + }else { + return Rest.fail("鍙戦€佸け璐�"); } } diff --git a/device-manager/src/main/resources/config/mybatis-sqlmap-config.xml b/device-manager/src/main/resources/config/mybatis-sqlmap-config.xml index 468f75d7ca63d7fe3f63eb38c865cdca6f2c772b..6fc59dfa8ea15be41e804d4fcc20e1c6e2bff0f6 100644 --- a/device-manager/src/main/resources/config/mybatis-sqlmap-config.xml +++ b/device-manager/src/main/resources/config/mybatis-sqlmap-config.xml @@ -19,7 +19,7 @@ <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> <property name="enableExecutorTime" value="true" /> - <property name="showSql" value="false" /> + <property name="showSql" value="true" /> </plugin> </plugins> </configuration> \ No newline at end of file diff --git a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceStatController.http b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceStatController.http index d6ff108039389ecd2c686e04edff8653ad30ffe0..edeb20abc7be5b7fb934a724d0d871bd0b1e277d 100644 --- a/device-manager/src/test/java/com/mortals/httpclient/device/DeviceStatController.http +++ b/device-manager/src/test/java/com/mortals/httpclient/device/DeviceStatController.http @@ -21,7 +21,7 @@ Content-Type: application/json "page":1, "size":10, "siteId": 1, - "selected": 2 + "selected": 0 }