feat(bucket):同一设备只能绑定两台回收桶;

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleBucketService.java

@@ -34,6 +34,6 @@ public interface RecycleBucketService extends IService<RecycleBucketEntity> {
     //副表数据方法
     String checkForm(RecycleBucketForm form, int i);
 
-    void saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) throws Exception;
+    String saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave);
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.RecycleBucketMapper;
 import jnpf.service.*;
@@ -26,6 +27,7 @@ import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
 
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -333,11 +335,18 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
      */
     @Override
     @Transactional
-    public void saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) throws Exception {
+    public String saveOrUpdate(RecycleBucketForm recycleBucketForm, String id, boolean isSave) {
         recycleBucketForm = JsonUtil.getJsonToBean(
                 generaterSwapUtil.swapDatetime(RecycleBucketConstant.getFormData(), recycleBucketForm), RecycleBucketForm.class);
         RecycleBucketEntity entity = JsonUtil.getJsonToBean(recycleBucketForm, RecycleBucketEntity.class);
-
+        //同一设备最多只能绑定俩回收桶
+        LambdaQueryWrapper<RecycleBucketEntity> wrapper = new LambdaQueryWrapper<>(RecycleBucketEntity.class)
+                .eq(RecycleBucketEntity::getDeviceCode, recycleBucketForm.getDeviceCode())
+                .isNull(RecycleBucketEntity::getDeleteMark);
+        List<RecycleBucketEntity> list = this.list(wrapper);
+        if (list.size() >= 2) {
+            return "该设备已存在两台回收桶!";
+        }
         if (isSave) {
             String mainId = RandomUtil.uuId();
             entity.setBucketCode(generaterSwapUtil.getBillNumber("bucketCode", false));
@@ -345,8 +354,11 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
         } else {
             entity.setBucketCode(generaterSwapUtil.getBillNumber("bucketCode", false));
         }
-        this.saveOrUpdate(entity);
+        boolean back = this.saveOrUpdate(entity);
-
+        if (back) {
+            return "操作成功";
+        }
+        return "操作失败";
     }
 
     @Override

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java

@@ -387,7 +387,6 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
     @Override
     @Transactional
     public String saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) {
-        String result;
         UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleDeviceConfigForm = JsonUtil.getJsonToBean(
@@ -399,8 +398,7 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
         List<RecycleDeviceConfigEntity> list = this.list(wrapper);
         if (isSave) {
             if (CollectionUtils.isNotEmpty(list)) {
-                result = "已存在该组织架构！";
+                return "已存在该组织架构！";
-                return result;
             }
             String mainId = RandomUtil.uuId();
             entity.setLastModifyUserId(null);
@@ -418,11 +416,9 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
         }
         boolean saveOrUpdate = this.saveOrUpdate(entity);
         if (saveOrUpdate) {
-            result = "新增成功";
+            return "新增成功";
-            return result;
         }
-        result = "新增失败";
+        return "新增失败";
-        return result;
     }
 
     @Override

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java

@@ -109,19 +109,13 @@ public class RecycleBucketController {
         if (StringUtil.isNotEmpty(b)) {
             return ActionResult.fail(b);
         }
-        try {
+        //查询设备 所绑定的商户 赋值
-            //查询设备 所绑定的商户 赋值
+        List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleBucketForm.getDeviceCode()));
-            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleBucketForm.getDeviceCode()));
+        if (CollectionUtils.isNotEmpty(companyId)) {
-            if (CollectionUtils.isNotEmpty(companyId)) {
+            //只会查询出来一个
-                //只会查询出来一个
+            recycleBucketForm.setCompanyId(companyId.get(0));
-                recycleBucketForm.setCompanyId(companyId.get(0));
-            }
-            recycleBucketService.saveOrUpdate(recycleBucketForm, null, true);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ActionResult.fail("新增数据失败");
         }
-        return ActionResult.success("创建成功");
+        return ActionResult.success(recycleBucketService.saveOrUpdate(recycleBucketForm, null, true));
     }
 
     /**