diff --git a/src/main/java/com/glxp/api/req/collect/LedGroupRequest.java b/src/main/java/com/glxp/api/req/collect/LedGroupRequest.java new file mode 100644 index 000000000..aef4f2973 --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/LedGroupRequest.java @@ -0,0 +1,26 @@ +package com.glxp.api.req.collect; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : zhuzhu + * @date : 2024/12/31 9:39 + * @modyified By : + */ + +@Data +public class LedGroupRequest { + private List data = new ArrayList<>(); + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } +} + diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java index fc003191e..cefb32940 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -14,11 +14,13 @@ import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.enums.led.LedColorStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectLedGroupRequest; +import com.glxp.api.req.collect.LedGroupRequest; import com.glxp.api.res.collect.IoCollectLedGroupResponse; import com.glxp.api.util.OkHttpCli; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -50,21 +52,25 @@ public class IoCollectLedGroupService extends ServiceImpl openLed(IoCollectOrderBiz collectOrderBiz) { - IoCollectLedGroup one = getOne(new LambdaQueryWrapper().eq(IoCollectLedGroup::getRelId, collectOrderBiz.getRelId())); - if (one == null){ - throw new JsonException(500,"当前产品未绑定灯组"); + public BaseResponse openLed(List collectOrderBizs) { + LedGroupRequest ledGroupRequest = new LedGroupRequest(); + for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs){ + IoCollectLedGroup one = getOne(new LambdaQueryWrapper().eq(IoCollectLedGroup::getRelId, collectOrderBiz.getRelId())); + if (one == null){ + throw new JsonException(500,"当前产品未绑定灯组"); + } + CollectLedGroupRequest collectLedGroupRequest = new CollectLedGroupRequest(); + collectLedGroupRequest.setMac(one.getMac()); + collectLedGroupRequest.setTimeout(one.getTimeout()); + if (one.getLedMode()){ + collectLedGroupRequest.setLedmode(1); + }else { + collectLedGroupRequest.setLedmode(0); + } + collectLedGroupRequest.setLednum(setLedNum(one)); + ledGroupRequest.getData().add(collectLedGroupRequest); } - CollectLedGroupRequest collectLedGroupRequest = new CollectLedGroupRequest(); - collectLedGroupRequest.setMac(one.getMac()); - collectLedGroupRequest.setTimeout(one.getTimeout()); - if (one.getLedMode()){ - collectLedGroupRequest.setLedmode(1); - }else { - collectLedGroupRequest.setLedmode(0); - } - collectLedGroupRequest.setLednum(setLedNum(one)); - String json = JSONUtil.toJsonStr(collectLedGroupRequest); + String json = JSONUtil.toJsonStr(ledGroupRequest); String result = okHttpCli.doPostJson( "http://192.168.0.166:9099/wms/associate/lighttagsled", json); BaseResponse response = JSONObject.parseObject(result, new TypeReference>() { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index a38b25f28..9687ac9d2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -561,9 +561,8 @@ public class IoSplitCodeService extends ServiceImpl