feat():回收桶配置列表代码提交;

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

@@ -36,4 +36,11 @@ public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfig
 
     void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 查询统一配置
+     *
+     * @param companyIds 商户id
+     * @return map
+     */
+    Map<String, RecycleDeviceConfigEntity> getConfigs(List<String> companyIds);
 }

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

@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.recycledevice.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface RecycleDeviceService extends IService<RecycleDeviceEntity> {
     List<RecycleDeviceEntity> getList(RecycleDevicePagination recycleDevicePagination);
 
-    List<RecycleDeviceEntity> getTypeList(RecycleDevicePagination recycleDevicePagination,String dataType);
+    List<RecycleDeviceEntity> getTypeList(RecycleDevicePagination recycleDevicePagination, String dataType);
 
     RecycleDeviceEntity getInfo(String id);
 
@@ -30,8 +32,14 @@ public interface RecycleDeviceService extends IService<RecycleDeviceEntity> {
 
     //子表方法
     //副表数据方法
-	String checkForm(RecycleDeviceForm form,int i);
+    String checkForm(RecycleDeviceForm form, int i);
 
-    void saveOrUpdate(RecycleDeviceForm recycleDeviceForm,String id, boolean isSave) throws Exception;
+    void saveOrUpdate(RecycleDeviceForm recycleDeviceForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 根据设备编码查询信息
+     *
+     * @param deviceCodes 设备编码
+     */
+    List<String> getInfoByDeviceCode(List<String> deviceCodes);
 }

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

@@ -1,23 +1,34 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.RecycleDeviceConfigMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.recycledeviceconfig.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.util.function.Function;
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -25,13 +36,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * 投递柜配置
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -47,193 +62,198 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
     private UserProvider userProvider;
 
     @Override
-    public List<RecycleDeviceConfigEntity> getList(RecycleDeviceConfigPagination recycleDeviceConfigPagination){
-        return getTypeList(recycleDeviceConfigPagination,recycleDeviceConfigPagination.getDataType());
+    public List<RecycleDeviceConfigEntity> getList(RecycleDeviceConfigPagination recycleDeviceConfigPagination) {
+        return getTypeList(recycleDeviceConfigPagination, recycleDeviceConfigPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
-    public List<RecycleDeviceConfigEntity> getTypeList(RecycleDeviceConfigPagination recycleDeviceConfigPagination,String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        List<List<String>> intersectionList =new ArrayList<>();
+    public List<RecycleDeviceConfigEntity> getTypeList(RecycleDeviceConfigPagination recycleDeviceConfigPagination, String dataType) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         String columnData = !isPc ? RecycleDeviceConfigConstant.getAppColumnData() : RecycleDeviceConfigConstant.getColumnData();
         ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
         String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
 
-        int total=0;
-        int recycleDeviceConfigNum =0;
-        QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigQueryWrapper=new QueryWrapper<>();
+        int total = 0;
+        int recycleDeviceConfigNum = 0;
+        QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigQueryWrapper = new QueryWrapper<>();
         List<String> allSuperIDlist = new ArrayList<>();
-        String superOp ="";
-        if (ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getSuperQueryJson())){
+        String superOp = "";
+        if (ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getSuperQueryJson())) {
             List<String> allSuperList = new ArrayList<>();
-            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            List<List<String>> intersectionSuperList = new ArrayList<>();
             String queryJson = recycleDeviceConfigPagination.getSuperQueryJson();
             SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
             int superNum = 0;
             QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigSuperWrapper = new QueryWrapper<>();
-            recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper,RecycleDeviceConfigEntity.class,queryJson,"0"));
+            recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper, RecycleDeviceConfigEntity.class, queryJson, "0"));
             int recycleDeviceConfigNum1 = recycleDeviceConfigSuperWrapper.getExpression().getNormal().size();
-            if (recycleDeviceConfigNum1>0){
-                List<String> recycleDeviceConfigList =this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
+            if (recycleDeviceConfigNum1 > 0) {
+                List<String> recycleDeviceConfigList = this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
                 allSuperList.addAll(recycleDeviceConfigList);
                 intersectionSuperList.add(recycleDeviceConfigList);
                 superNum++;
             }
             superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
             //and or
-            if(superOp.equalsIgnoreCase("and")){
+            if (superOp.equalsIgnoreCase("and")) {
                 allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
-            }else{
+            } else {
                 allSuperIDlist = allSuperList;
             }
         }
         List<String> allRuleIDlist = new ArrayList<>();
-        String ruleOp ="";
-        if (ObjectUtil.isNotEmpty(ruleJson)){
+        String ruleOp = "";
+        if (ObjectUtil.isNotEmpty(ruleJson)) {
             List<String> allRuleList = new ArrayList<>();
-            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            List<List<String>> intersectionRuleList = new ArrayList<>();
             SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
             int ruleNum = 0;
             QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigSuperWrapper = new QueryWrapper<>();
-            recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper,RecycleDeviceConfigEntity.class,ruleJson,"0"));
+            recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper, RecycleDeviceConfigEntity.class, ruleJson, "0"));
             int recycleDeviceConfigNum1 = recycleDeviceConfigSuperWrapper.getExpression().getNormal().size();
-            if (recycleDeviceConfigNum1>0){
-                List<String> recycleDeviceConfigList =this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
+            if (recycleDeviceConfigNum1 > 0) {
+                List<String> recycleDeviceConfigList = this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
                 allRuleList.addAll(recycleDeviceConfigList);
                 intersectionRuleList.add(recycleDeviceConfigList);
                 ruleNum++;
             }
             ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
             //and or
-            if(ruleOp.equalsIgnoreCase("and")){
+            if (ruleOp.equalsIgnoreCase("and")) {
                 allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
-            }else{
+            } else {
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = true;
-    boolean appPermission = false;
-    if(isPc && pcPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleDeviceConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper,RecycleDeviceConfigEntity.class,recycleDeviceConfigPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleDeviceConfigObj)){
-        return new ArrayList<>();
-        } else {
-        recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>)recycleDeviceConfigObj;
-        if( recycleDeviceConfigQueryWrapper.getExpression().getNormal().size()>0){
-        recycleDeviceConfigNum++;
-        }
-        }
-    }
-    }
-    if(!isPc && appPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleDeviceConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper,RecycleDeviceConfigEntity.class,recycleDeviceConfigPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleDeviceConfigObj)){
-        return new ArrayList<>();
-        } else {
-        recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>)recycleDeviceConfigObj;
-        if( recycleDeviceConfigQueryWrapper.getExpression().getNormal().size()>0){
-        recycleDeviceConfigNum++;
-        }
+        boolean pcPermission = true;
+        boolean appPermission = false;
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleDeviceConfigObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper, RecycleDeviceConfigEntity.class, recycleDeviceConfigPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleDeviceConfigObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>) recycleDeviceConfigObj;
+                    if (recycleDeviceConfigQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleDeviceConfigNum++;
+                    }
+                }
+            }
         }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleDeviceConfigObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper, RecycleDeviceConfigEntity.class, recycleDeviceConfigPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleDeviceConfigObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>) recycleDeviceConfigObj;
+                    if (recycleDeviceConfigQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleDeviceConfigNum++;
+                    }
+                }
 
 
-    }
-    }
-        if(isPc){
-            if(ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getOrganizeJsonId())){
-            recycleDeviceConfigNum++;
-
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] organizeJsonId = JsonUtil.getJsonToBean(recycleDeviceConfigPagination.getOrganizeJsonId(),String[][].class);
-        for(int i=0;i<organizeJsonId.length;i++){
-        if(organizeJsonId[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(organizeJsonId[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> organizeJsonId = JsonUtil.getJsonToList(recycleDeviceConfigPagination.getOrganizeJsonId(),String.class);
-        if(organizeJsonId.size()>0){
-            idList.add(organizeJsonId.get(organizeJsonId.size()-1));
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(recycleDeviceConfigPagination.getOrganizeJsonId()));
-        }
+            }
         }
-        recycleDeviceConfigQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(RecycleDeviceConfigEntity::getOrganizeJsonId, tt).or();
-        });
-        });
+        if (isPc) {
+            if (ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getOrganizeJsonId())) {
+                recycleDeviceConfigNum++;
+
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] organizeJsonId = JsonUtil.getJsonToBean(recycleDeviceConfigPagination.getOrganizeJsonId(), String[][].class);
+                    for (int i = 0; i < organizeJsonId.length; i++) {
+                        if (organizeJsonId[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(organizeJsonId[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> organizeJsonId = JsonUtil.getJsonToList(recycleDeviceConfigPagination.getOrganizeJsonId(), String.class);
+                        if (organizeJsonId.size() > 0) {
+                            idList.add(organizeJsonId.get(organizeJsonId.size() - 1));
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(recycleDeviceConfigPagination.getOrganizeJsonId()));
+                    }
+                }
+                recycleDeviceConfigQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(RecycleDeviceConfigEntity::getOrganizeJsonId, tt).or();
+                    });
+                });
 
             }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
-        if (total>0){
-            if (intersection.size()==0){
+        if (total > 0) {
+            if (intersection.size() == 0) {
                 intersection.add("jnpfNullList");
             }
             recycleDeviceConfigQueryWrapper.lambda().in(RecycleDeviceConfigEntity::getId, intersection);
         }
-    //是否有高级查询
-        if (StringUtil.isNotEmpty(superOp)){
-            if (allSuperIDlist.size()==0){
+        //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)) {
+            if (allSuperIDlist.size() == 0) {
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            recycleDeviceConfigQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigEntity::getId, finalAllSuperIDlist));
+            recycleDeviceConfigQueryWrapper.lambda().and(t -> t.in(RecycleDeviceConfigEntity::getId, finalAllSuperIDlist));
         }
-    //是否有数据过滤查询
-        if (StringUtil.isNotEmpty(ruleOp)){
-            if (allRuleIDlist.size()==0){
+        //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)) {
+            if (allRuleIDlist.size() == 0) {
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            recycleDeviceConfigQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigEntity::getId, finalAllRuleIDlist));
+            recycleDeviceConfigQueryWrapper.lambda().and(t -> t.in(RecycleDeviceConfigEntity::getId, finalAllRuleIDlist));
         }
 
         //排序
-        if(StringUtil.isEmpty(recycleDeviceConfigPagination.getSidx())){
+        if (StringUtil.isEmpty(recycleDeviceConfigPagination.getSidx())) {
             recycleDeviceConfigQueryWrapper.lambda().orderByDesc(RecycleDeviceConfigEntity::getId);
-        }else{
+        } else {
             try {
                 String sidx = recycleDeviceConfigPagination.getSidx();
-                String[] strs= sidx.split("_name");
+                String[] strs = sidx.split("_name");
                 RecycleDeviceConfigEntity recycleDeviceConfigEntity = new RecycleDeviceConfigEntity();
                 Field declaredField = recycleDeviceConfigEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                recycleDeviceConfigQueryWrapper="asc".equals(recycleDeviceConfigPagination.getSort().toLowerCase())?recycleDeviceConfigQueryWrapper.orderByAsc(value):recycleDeviceConfigQueryWrapper.orderByDesc(value);
+                recycleDeviceConfigQueryWrapper = "asc".equals(recycleDeviceConfigPagination.getSort().toLowerCase()) ? recycleDeviceConfigQueryWrapper.orderByAsc(value) : recycleDeviceConfigQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
 
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<RecycleDeviceConfigEntity> page=new Page<>(recycleDeviceConfigPagination.getCurrentPage(), recycleDeviceConfigPagination.getPageSize());
-                IPage<RecycleDeviceConfigEntity> userIPage=this.page(page, recycleDeviceConfigQueryWrapper);
-                return recycleDeviceConfigPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<RecycleDeviceConfigEntity> page = new Page<>(recycleDeviceConfigPagination.getCurrentPage(), recycleDeviceConfigPagination.getPageSize());
+                IPage<RecycleDeviceConfigEntity> userIPage = this.page(page, recycleDeviceConfigQueryWrapper);
+                return recycleDeviceConfigPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<RecycleDeviceConfigEntity> list = new ArrayList();
                 return recycleDeviceConfigPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(recycleDeviceConfigQueryWrapper);
         }
     }
+
     @Override
-    public RecycleDeviceConfigEntity getInfo(String id){
-        QueryWrapper<RecycleDeviceConfigEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(RecycleDeviceConfigEntity::getId,id);
+    public RecycleDeviceConfigEntity getInfo(String id) {
+        QueryWrapper<RecycleDeviceConfigEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RecycleDeviceConfigEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(RecycleDeviceConfigEntity entity){
         String organizeJsonId = entity.getOrganizeJsonId();
@@ -243,96 +263,101 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
         }
         this.save(entity);
     }
+
     @Override
-    public boolean update(String id, RecycleDeviceConfigEntity entity){
+    public boolean update(String id, RecycleDeviceConfigEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(RecycleDeviceConfigEntity entity){
-        if(entity!=null){
+    public void delete(RecycleDeviceConfigEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
-    public String checkForm(RecycleDeviceConfigForm form,int i) {
-        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
-        String id="";
+    public String checkForm(RecycleDeviceConfigForm form, int i) {
+        boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id = "";
         String countRecover = "";
-        if (isUp){
+        if (isUp) {
             id = form.getId();
         }
         //主表字段验证
-    if(StringUtil.isNotEmpty(form.getDeliveryPrice())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getDeliveryPrice())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getDeliveryPrice())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getDeliveryPrice())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket1Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket1Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket1Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket1Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket2Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket2Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket2Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket2Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket3Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket3Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket3Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket3Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket4Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket4Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket4Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket4Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket5Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket5Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket5Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket5Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket6Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket6Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket6Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket6Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket7Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket7Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket7Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket7Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket8Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket8Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket8Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket8Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket9Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket9Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket9Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket9Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket10Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket10Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket10Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket10Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket11Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket11Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket11Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket11Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getBucket12Price())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket12Price())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isNotEmpty(form.getBucket12Price())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getBucket12Price())).matches()) {
+                return "请输入正确的金额";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getWarningWeight())){
-        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getWarningWeight())).matches()){
-        return "请输入正确的重量";
+        if (StringUtil.isNotEmpty(form.getWarningWeight())) {
+            if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getWarningWeight())).matches()) {
+                return "请输入正确的重量";
+            }
         }
-    }
         return countRecover;
     }
 
@@ -348,36 +373,47 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
     }
 
     /**
-    * 新增修改数据(事务回滚)
-    * @param id
-    * @param recycleDeviceConfigForm
-    * @return
-    */
+     * 新增修改数据(事务回滚)
+     *
+     * @param id
+     * @param recycleDeviceConfigForm
+     * @return
+     */
     @Override
     @Transactional
-    public void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm,String id, boolean isSave) throws Exception{
-        UserInfo userInfo=userProvider.get();
+    public void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm, String id, boolean isSave) throws Exception {
+        UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleDeviceConfigForm = JsonUtil.getJsonToBean(
-        generaterSwapUtil.swapDatetime(RecycleDeviceConfigConstant.getFormData(),recycleDeviceConfigForm),RecycleDeviceConfigForm.class);
+                generaterSwapUtil.swapDatetime(RecycleDeviceConfigConstant.getFormData(), recycleDeviceConfigForm), RecycleDeviceConfigForm.class);
         RecycleDeviceConfigEntity entity = JsonUtil.getJsonToBean(recycleDeviceConfigForm, RecycleDeviceConfigEntity.class);
 
-        if(isSave){
-            String mainId =  RandomUtil.uuId() ;
-        entity.setLastModifyUserId(null);
-        entity.setLastModifyTime(null);
-        entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setDepartmentId(userEntity.getPositionId());
+        if (isSave) {
+            String mainId = RandomUtil.uuId();
+            entity.setLastModifyUserId(null);
+            entity.setLastModifyTime(null);
+            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setDepartmentId(userEntity.getPositionId());
             entity.setId(mainId);
-        }else{
-        entity.setLastModifyUserId(null);
-        entity.setLastModifyTime(null);
-        entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setDepartmentId(userEntity.getPositionId());
+        } else {
+            entity.setLastModifyUserId(null);
+            entity.setLastModifyTime(null);
+            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setDepartmentId(userEntity.getPositionId());
         }
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public Map<String, RecycleDeviceConfigEntity> getConfigs(List<String> companyIds) {
+        List<RecycleDeviceConfigEntity> list = this.list(new LambdaQueryWrapper<>(RecycleDeviceConfigEntity.class)
+                .in(RecycleDeviceConfigEntity::getCompanyId, companyIds));
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyMap();
+        }
+        return list.stream().collect(Collectors.toMap(RecycleDeviceConfigEntity::getCompanyId, Function.identity()));
+    }
 }

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

@@ -1,5 +1,12 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import jnpf.entity.*;
+import jnpf.mapper.RecycleDeviceMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.recycledevice.*;
+import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
@@ -7,6 +14,14 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import java.util.*;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,10 +43,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.stream.Collectors;
 /**
  *
@@ -381,4 +392,14 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
         return data;
 
     }
+
+    @Override
+    public List<String> getInfoByDeviceCode(List<String> deviceCodes) {
+        List<RecycleDeviceEntity> list = this.list(new LambdaQueryWrapper<>(RecycleDeviceEntity.class)
+                .in(RecycleDeviceEntity::getDeviceCode, deviceCodes));
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(RecycleDeviceEntity::getBeLongCompanyId).collect(Collectors.toList());
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/pom.xml

@@ -18,6 +18,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.3</version>
+        </dependency>
         <dependency>
             <groupId>com.jnpf</groupId>
             <artifactId>jnpf-scm-biz</artifactId>

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

@@ -12,25 +12,34 @@ import jnpf.service.*;
 import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.recyclebucket.*;
+import jnpf.utils.CompareUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.*;
+
 import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.base.entity.ProvinceEntity;
+
 import java.io.IOException;
 import java.util.stream.Collectors;
+
 import jnpf.engine.entity.FlowTaskEntity;
 import jnpf.exception.WorkFlowException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 回收桶配置
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -38,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Slf4j
 @RestController
-@Tag(name = "回收桶配置" , description = "scm")
+@Tag(name = "回收桶配置", description = "scm")
 @RequestMapping("/api/scm/RecycleBucket")
 public class RecycleBucketController {
 
@@ -51,28 +60,52 @@ public class RecycleBucketController {
     @Autowired
     private RecycleBucketService recycleBucketService;
 
+    @Resource
+    private RecycleDeviceService recycleDeviceService;
+
+    @Resource
+    private RecycleDeviceConfigService recycleDeviceConfigService;
 
 
     /**
-    * 列表
-    *
-    * @param recycleBucketPagination
-    * @return
-    */
+     * 列表
+     *
+     * @param recycleBucketPagination
+     * @return
+     */
     @Operation(summary = "获取列表")
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody RecycleBucketPagination recycleBucketPagination)throws IOException{
-        List<RecycleBucketEntity> list= recycleBucketService.getList(recycleBucketPagination);
-        List<Map<String, Object>> realList=new ArrayList<>();
+    public ActionResult list(@RequestBody RecycleBucketPagination recycleBucketPagination) throws IOException {
+        List<RecycleBucketEntity> list = recycleBucketService.getList(recycleBucketPagination);
+        if (CollectionUtils.isEmpty(list)) {
+            return ActionResult.success();
+        }
+        List<String> companyIds = list.stream().map(RecycleBucketEntity::getCompanyId).collect(Collectors.toList());
+        //查询统一配置
+        Map<String, RecycleDeviceConfigEntity> configCollect = recycleDeviceConfigService.getConfigs(companyIds);
+        List<Map<String, Object>> realList = new ArrayList<>();
         for (RecycleBucketEntity entity : list) {
-        Map<String, Object> recycleBucketMap=JsonUtil.entityToMap(entity);
-        recycleBucketMap.put("id", recycleBucketMap.get("id"));
-        //副表数据
-        //子表数据
+            if (configCollect.containsKey(entity.getCompanyId())) {
+                RecycleDeviceConfigEntity deviceConfig = configCollect.get(entity.getCompanyId());
+                //如果为空 则获取公共配置
+                if (Objects.isNull(entity.getPrice())) {
+                    entity.setPrice(CompareUtil.compareBigDecimal(entity.getDoorNum(), deviceConfig));
+                }
+                if (entity.getFullSet() == -1) {
+                    entity.setFullSet(Integer.valueOf(deviceConfig.getFullSet()));
+                }
+                if (entity.getSmogSet() == -1) {
+                    entity.setSmogSet(Integer.valueOf(deviceConfig.getSmogSet()));
+                }
+            }
+            Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(entity);
+            recycleBucketMap.put("id", recycleBucketMap.get("id"));
+            //副表数据
+            //子表数据
             realList.add(recycleBucketMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, RecycleBucketConstant.getFormData(), RecycleBucketConstant.getColumnData(), recycleBucketPagination.getModuleId(),false);
+        realList = generaterSwapUtil.swapDataList(realList, RecycleBucketConstant.getFormData(), RecycleBucketConstant.getColumnData(), recycleBucketPagination.getModuleId(), false);
 
         //返回对象
         PageListVO vo = new PageListVO();
@@ -81,111 +114,132 @@ public class RecycleBucketController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
-    * 创建
-    *
-    * @param recycleBucketForm
-    * @return
-    */
+     * 创建
+     *
+     * @param recycleBucketForm
+     * @return
+     */
     @PostMapping()
     @Operation(summary = "创建")
     public ActionResult create(@RequestBody @Valid RecycleBucketForm recycleBucketForm) {
-        String b = recycleBucketService.checkForm(recycleBucketForm,0);
-        if (StringUtil.isNotEmpty(b)){
-            return ActionResult.fail(b );
+        String b = recycleBucketService.checkForm(recycleBucketForm, 0);
+        if (StringUtil.isNotEmpty(b)) {
+            return ActionResult.fail(b);
         }
-        try{
-            recycleBucketService.saveOrUpdate(recycleBucketForm, null ,true);
-        }catch(Exception e){
+        try {
+            //查询设备 所绑定的商户 赋值
+            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleBucketForm.getDeviceCode()));
+            if (CollectionUtils.isNotEmpty(companyId)) {
+                //只会查询出来一个
+                recycleBucketForm.setCompanyId(companyId.get(0));
+            }
+            recycleBucketService.saveOrUpdate(recycleBucketForm, null, true);
+        } catch (Exception e) {
             e.printStackTrace();
             return ActionResult.fail("新增数据失败");
         }
         return ActionResult.success("创建成功");
     }
+
     /**
-    * 编辑
-    * @param id
-    * @param recycleBucketForm
-    * @return
-    */
+     * 编辑
+     *
+     * @param id
+     * @param recycleBucketForm
+     * @return
+     */
     @PutMapping("/{id}")
     @Operation(summary = "更新")
-    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleBucketForm recycleBucketForm,
-                                @RequestParam(value = "isImport", required = false) boolean isImport){
+    public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleBucketForm recycleBucketForm,
+                               @RequestParam(value = "isImport", required = false) boolean isImport) {
         recycleBucketForm.setId(id);
         if (!isImport) {
-            String b =  recycleBucketService.checkForm(recycleBucketForm,1);
-            if (StringUtil.isNotEmpty(b)){
-                return ActionResult.fail(b );
+            String b = recycleBucketService.checkForm(recycleBucketForm, 1);
+            if (StringUtil.isNotEmpty(b)) {
+                return ActionResult.fail(b);
             }
         }
-        RecycleBucketEntity entity= recycleBucketService.getInfo(id);
-        if(entity!=null){
-            try{
-                recycleBucketService.saveOrUpdate(recycleBucketForm,id,false);
-            }catch(Exception e){
+        RecycleBucketEntity entity = recycleBucketService.getInfo(id);
+        if (entity != null) {
+            //查询设备 所绑定的商户 赋值
+            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleBucketForm.getDeviceCode()));
+            if (CollectionUtils.isNotEmpty(companyId)) {
+                //只会查询出来一个
+                recycleBucketForm.setCompanyId(companyId.get(0));
+            }
+            try {
+                recycleBucketService.saveOrUpdate(recycleBucketForm, id, false);
+            } catch (Exception e) {
                 e.printStackTrace();
                 return ActionResult.fail("修改数据失败");
             }
             return ActionResult.success("更新成功");
-        }else{
+        } else {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
     /**
-    * 删除
-    * @param id
-    * @return
-    */
+     * 删除
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "删除")
     @DeleteMapping("/{id}")
     @Transactional
-    public ActionResult delete(@PathVariable("id") String id){
-        RecycleBucketEntity entity= recycleBucketService.getInfo(id);
-        if(entity!=null){
+    public ActionResult delete(@PathVariable("id") String id) {
+        RecycleBucketEntity entity = recycleBucketService.getInfo(id);
+        if (entity != null) {
             //主表数据删除
             recycleBucketService.delete(entity);
         }
         return ActionResult.success("删除成功");
     }
+
     /**
-    * 表单信息(详情页)
-    * 详情页面使用-转换数据
-    * @param id
-    * @return
-    */
+     * 表单信息(详情页)
+     * 详情页面使用-转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "表单信息(详情页)")
     @GetMapping("/detail/{id}")
-    public ActionResult detailInfo(@PathVariable("id") String id){
-        RecycleBucketEntity entity= recycleBucketService.getInfo(id);
-        if(entity==null){
+    public ActionResult detailInfo(@PathVariable("id") String id) {
+        RecycleBucketEntity entity = recycleBucketService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleBucketMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(entity);
         recycleBucketMap.put("id", recycleBucketMap.get("id"));
         //副表数据
         //子表数据
-        recycleBucketMap = generaterSwapUtil.swapDataDetail(recycleBucketMap,RecycleBucketConstant.getFormData(),"564718669121203589",false);
+        recycleBucketMap = generaterSwapUtil.swapDataDetail(recycleBucketMap, RecycleBucketConstant.getFormData(), "564718669121203589", false);
         return ActionResult.success(recycleBucketMap);
     }
+
     /**
-    * 获取详情(编辑页)
-    * 编辑页面使用-不转换数据
-    * @param id
-    * @return
-    */
+     * 获取详情(编辑页)
+     * 编辑页面使用-不转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "信息")
     @GetMapping("/{id}")
-    public ActionResult info(@PathVariable("id") String id){
-        RecycleBucketEntity entity= recycleBucketService.getInfo(id);
-        if(entity==null){
+    public ActionResult info(@PathVariable("id") String id) {
+        RecycleBucketEntity entity = recycleBucketService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleBucketMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleBucketMap = JsonUtil.entityToMap(entity);
         recycleBucketMap.put("id", recycleBucketMap.get("id"));
         //副表数据
         //子表数据
-        recycleBucketMap = generaterSwapUtil.swapDataForm(recycleBucketMap,RecycleBucketConstant.getFormData(),RecycleBucketConstant.TABLEFIELDKEY,RecycleBucketConstant.TABLERENAMES);
+        recycleBucketMap = generaterSwapUtil.swapDataForm(recycleBucketMap, RecycleBucketConstant.getFormData(), RecycleBucketConstant.TABLEFIELDKEY, RecycleBucketConstant.TABLERENAMES);
         return ActionResult.success(recycleBucketMap);
     }
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/utils/CompareUtil.java

@@ -0,0 +1,62 @@
+package jnpf.utils;
+
+import jnpf.entity.RecycleDeviceConfigEntity;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * 对比工具类
+ *
+ * @author jiyufei
+ */
+public class CompareUtil {
+    //判断属于几号桶价格
+    public static BigDecimal compareBigDecimal(int doorNum, RecycleDeviceConfigEntity config) {
+        BigDecimal result;
+        switch (doorNum) {
+            case 1:
+                result = config.getBucket1Price();
+                break;
+            case 2:
+                result = config.getBucket2Price();
+                break;
+            case 3:
+                result = config.getBucket3Price();
+                break;
+            case 4:
+                result = config.getBucket4Price();
+                break;
+            case 5:
+                result = config.getBucket5Price();
+                break;
+            case 6:
+                result = config.getBucket6Price();
+                break;
+            case 7:
+                result = config.getBucket7Price();
+                break;
+            case 8:
+                result = config.getBucket8Price();
+                break;
+            case 9:
+                result = config.getBucket9Price();
+                break;
+            case 10:
+                result = config.getBucket10Price();
+                break;
+            case 11:
+                result = config.getBucket11Price();
+                break;
+            case 12:
+                result = config.getBucket12Price();
+                break;
+            default:
+                result = new BigDecimal(0);
+        }
+        if (Objects.isNull(result)) {
+            return config.getDeliveryPrice();
+        }
+        return result;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketForm.java

@@ -86,4 +86,7 @@ public class RecycleBucketForm  {
     /** 租户 **/
     @JsonProperty("tenantId")
     private Object tenantId;
+    /** 商户 **/
+    @JsonProperty("companyId")
+    private String companyId;
 }