1/4 代码优化

src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.collect;
 
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -53,7 +55,7 @@ public class IoCollectLedGroupController extends BaseController {
 
 
     @PostMapping("/udiwms/basic/collect/ledGroup/filter")
-    public BaseResponse filterOrder(@RequestBody CollectLedGroupRequest collectLedGroupRequest) {
+    public BaseResponse filterLeds(@RequestBody CollectLedGroupRequest collectLedGroupRequest) {
         List<IoCollectLedGroupResponse> collectLedGroupResponseList = ioCollectLedGroupService.filterList(collectLedGroupRequest);
         PageInfo<IoCollectLedGroupResponse> pageInfo = new PageInfo<>(collectLedGroupResponseList);
         PageSimpleResponse<IoCollectLedGroupResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -106,4 +108,41 @@ public class IoCollectLedGroupController extends BaseController {
         return ResultVOUtils.success("确认成功！");
     }
 
+
+    @PostMapping("/udiwms/basic/collect/ledGroup/delete")
+    public BaseResponse deleteLed(@RequestBody IoCollectLedGroup ioCollectLedGroup) {
+        SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, ioCollectLedGroup.getMac()));
+        if (queue != null){
+            return ResultVOUtils.error(500,"当前灯组已被绑定出货槽，请先解除绑定");
+        }
+        ioCollectLedGroupService.removeById(ioCollectLedGroup);
+        return ResultVOUtils.success();
+    }
+
+
+    @PostMapping("/udiwms/basic/collect/ledGroup/save")
+    public BaseResponse saveLed(@RequestBody IoCollectLedGroup ioCollectLedGroup) {
+        IoCollectLedGroup ledGroupServiceOne = ioCollectLedGroupService.getOne(new LambdaQueryWrapper<IoCollectLedGroup>().eq(IoCollectLedGroup::getMac, ioCollectLedGroup.getMac()));
+        if (ledGroupServiceOne != null){
+            return ResultVOUtils.error(500,"当前灯组已存在");
+        }
+        ioCollectLedGroup.setId(IdUtil.getSnowflakeNextId());
+        ioCollectLedGroup.setLedMode(true);
+        ioCollectLedGroup.setRed(0l);
+        ioCollectLedGroup.setOrange(0l);
+        ioCollectLedGroup.setBlue(0l);
+        ioCollectLedGroup.setGreen(0l);
+        ioCollectLedGroup.setCreateTime(new Date());
+        ioCollectLedGroup.setCreateUser(getUserId()+"");
+        ioCollectLedGroup.setUpdateTime(new Date());
+        ioCollectLedGroup.setUpdateUser(getUserId() + "");
+        ioCollectLedGroupService.save(ioCollectLedGroup);
+        return ResultVOUtils.success();
+    }
+    @PostMapping("/udiwms/basic/collect/ledGroup/edit")
+    public BaseResponse editLed(@RequestBody IoCollectLedGroup ioCollectLedGroup) {
+        ioCollectLedGroupService.updateById(ioCollectLedGroup);
+        return ResultVOUtils.success();
+    }
+
 }

src/main/java/com/glxp/api/enums/led/LedColorStatusEnum.java

@@ -10,10 +10,10 @@ import lombok.Getter;
 
 @Getter
 public enum LedColorStatusEnum {
-    RED_FALSE(1, "红色为false"),
-    ORANGE_FALSE(2, "橘色为false"),
-    BLUE_FALSE(3, "蓝色为false"),
-    DEFAULT(4, "绿色为false");
+    RED_FALSE(1, "red"),
+    ORANGE_FALSE(2, "orange"),
+    BLUE_FALSE(3, "blue"),
+    DEFAULT(4, "green");
 
     private final int returnValue;
     private final String description;

src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java

@@ -34,22 +34,22 @@ public class IoCollectLedGroupResponse {
     /**
      * 红灯
      */
-    private Boolean red;
+    private Long red;
 
     /**
      * 橘灯
      */
-    private Boolean orange;
+    private Long orange;
 
     /**
      * 蓝色
      */
-    private Boolean blue;
+    private Long blue;
 
     /**
      * 绿色
      */
-    private Boolean green;
+    private Long green;
 
     /**
      * 备注

src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java

@@ -58,6 +58,9 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
 
+    @Resource
+    IoCollectOrderBizService collectOrderBizService;
+
     public BaseResponse<String> openLed(List<IoCollectOrderBiz> collectOrderBizs) {
         LedGroupRequest ledGroupRequest = new LedGroupRequest();
         for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
@@ -89,6 +92,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
             collectOrderBiz.setQueueCode(sysWorkplaceQueue.getCode());
             collectOrderBiz.setLedNum(collectLedGroupRequest.getLednum());
             ledGroupRequest.getData().add(collectLedGroupRequest);
+            collectOrderBizService.updateById(collectOrderBiz);
             updateById(one);
         }
 

src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml

@@ -71,6 +71,11 @@
                     bp.nameCode like concat('%', #{nameCode}, '%')
                     )
             </if>
+            <if test="mac != null and mac != ''">
+                AND (
+                io_collect_led_group.mac like concat('%', #{mac}, '%')
+                )
+            </if>
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND (
                 bp.cpmctymc like concat('%', #{cpmctymc}, '%')