feat(order):列表添加鉴权;

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

@@ -250,6 +250,10 @@ public class RecycleCameraServiceImpl extends ServiceImpl<RecycleCameraMapper, R
             }
         }
 
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleCameraQueryWrapper.lambda().eq(RecycleCameraEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
+
         if ("0".equals(dataType)) {
             if ((total > 0 && AllIdList.size() > 0) || total == 0) {
                 Page<RecycleCameraEntity> page = new Page<>(recycleCameraPagination.getCurrentPage(), recycleCameraPagination.getPageSize());

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

@@ -5,18 +5,26 @@ import jnpf.mapper.SimCardMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.simcard.*;
+
 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.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,13 +33,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;
+
 /**
- *
  * SIM卡管理
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-06-21
  */
 @Service
-public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity> implements SimCardService{
+public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity> implements SimCardService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
@@ -47,320 +59,336 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
     private UserProvider userProvider;
 
     @Override
-    public List<SimCardEntity> getList(SimCardPagination simCardPagination){
-        return getTypeList(simCardPagination,simCardPagination.getDataType());
+    public List<SimCardEntity> getList(SimCardPagination simCardPagination) {
+        return getTypeList(simCardPagination, simCardPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
-    public List<SimCardEntity> getTypeList(SimCardPagination simCardPagination,String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        List<List<String>> intersectionList =new ArrayList<>();
+    public List<SimCardEntity> getTypeList(SimCardPagination simCardPagination, 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 ? SimCardConstant.getAppColumnData() : SimCardConstant.getColumnData();
         ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
         String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
 
-        int total=0;
-        int simCardNum =0;
-        QueryWrapper<SimCardEntity> simCardQueryWrapper=new QueryWrapper<>();
+        int total = 0;
+        int simCardNum = 0;
+        QueryWrapper<SimCardEntity> simCardQueryWrapper = new QueryWrapper<>();
         List<String> allSuperIDlist = new ArrayList<>();
-        String superOp ="";
-        if (ObjectUtil.isNotEmpty(simCardPagination.getSuperQueryJson())){
+        String superOp = "";
+        if (ObjectUtil.isNotEmpty(simCardPagination.getSuperQueryJson())) {
             List<String> allSuperList = new ArrayList<>();
-            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            List<List<String>> intersectionSuperList = new ArrayList<>();
             String queryJson = simCardPagination.getSuperQueryJson();
             SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
             int superNum = 0;
             QueryWrapper<SimCardEntity> simCardSuperWrapper = new QueryWrapper<>();
-            simCardSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(simCardSuperWrapper,SimCardEntity.class,queryJson,"0"));
+            simCardSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(simCardSuperWrapper, SimCardEntity.class, queryJson, "0"));
             int simCardNum1 = simCardSuperWrapper.getExpression().getNormal().size();
-            if (simCardNum1>0){
-                List<String> simCardList =this.list(simCardSuperWrapper).stream().map(SimCardEntity::getId).collect(Collectors.toList());
+            if (simCardNum1 > 0) {
+                List<String> simCardList = this.list(simCardSuperWrapper).stream().map(SimCardEntity::getId).collect(Collectors.toList());
                 allSuperList.addAll(simCardList);
                 intersectionSuperList.add(simCardList);
                 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<SimCardEntity> simCardSuperWrapper = new QueryWrapper<>();
-            simCardSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(simCardSuperWrapper,SimCardEntity.class,ruleJson,"0"));
+            simCardSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(simCardSuperWrapper, SimCardEntity.class, ruleJson, "0"));
             int simCardNum1 = simCardSuperWrapper.getExpression().getNormal().size();
-            if (simCardNum1>0){
-                List<String> simCardList =this.list(simCardSuperWrapper).stream().map(SimCardEntity::getId).collect(Collectors.toList());
+            if (simCardNum1 > 0) {
+                List<String> simCardList = this.list(simCardSuperWrapper).stream().map(SimCardEntity::getId).collect(Collectors.toList());
                 allRuleList.addAll(simCardList);
                 intersectionRuleList.add(simCardList);
                 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 simCardObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(simCardQueryWrapper,SimCardEntity.class,simCardPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(simCardObj)){
-        return new ArrayList<>();
-        } else {
-        simCardQueryWrapper = (QueryWrapper<SimCardEntity>)simCardObj;
-        if( simCardQueryWrapper.getExpression().getNormal().size()>0){
-        simCardNum++;
-        }
-        }
-    }
-    }
-    if(!isPc && appPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object simCardObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(simCardQueryWrapper,SimCardEntity.class,simCardPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(simCardObj)){
-        return new ArrayList<>();
-        } else {
-        simCardQueryWrapper = (QueryWrapper<SimCardEntity>)simCardObj;
-        if( simCardQueryWrapper.getExpression().getNormal().size()>0){
-        simCardNum++;
-        }
+        boolean pcPermission = true;
+        boolean appPermission = false;
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object simCardObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(simCardQueryWrapper, SimCardEntity.class, simCardPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(simCardObj)) {
+                    return new ArrayList<>();
+                } else {
+                    simCardQueryWrapper = (QueryWrapper<SimCardEntity>) simCardObj;
+                    if (simCardQueryWrapper.getExpression().getNormal().size() > 0) {
+                        simCardNum++;
+                    }
+                }
+            }
         }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object simCardObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(simCardQueryWrapper, SimCardEntity.class, simCardPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(simCardObj)) {
+                    return new ArrayList<>();
+                } else {
+                    simCardQueryWrapper = (QueryWrapper<SimCardEntity>) simCardObj;
+                    if (simCardQueryWrapper.getExpression().getNormal().size() > 0) {
+                        simCardNum++;
+                    }
+                }
 
 
-    }
-    }
-        if(isPc){
-            if(ObjectUtil.isNotEmpty(simCardPagination.getDeviceCode())){
-            simCardNum++;
-
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] deviceCode = JsonUtil.getJsonToBean(simCardPagination.getDeviceCode(),String[][].class);
-        for(int i=0;i<deviceCode.length;i++){
-        if(deviceCode[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> deviceCode = JsonUtil.getJsonToList(simCardPagination.getDeviceCode(),String.class);
-        if(deviceCode.size()>0){
-            idList.addAll(deviceCode);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(simCardPagination.getDeviceCode()));
-        }
+            }
         }
-        simCardQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(SimCardEntity::getDeviceCode, tt).or();
-        });
-        });
+        if (isPc) {
+            if (ObjectUtil.isNotEmpty(simCardPagination.getDeviceCode())) {
+                simCardNum++;
+
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] deviceCode = JsonUtil.getJsonToBean(simCardPagination.getDeviceCode(), String[][].class);
+                    for (int i = 0; i < deviceCode.length; i++) {
+                        if (deviceCode[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> deviceCode = JsonUtil.getJsonToList(simCardPagination.getDeviceCode(), String.class);
+                        if (deviceCode.size() > 0) {
+                            idList.addAll(deviceCode);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(simCardPagination.getDeviceCode()));
+                    }
+                }
+                simCardQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(SimCardEntity::getDeviceCode, tt).or();
+                    });
+                });
 
             }
 
-            if(ObjectUtil.isNotEmpty(simCardPagination.getIccid())){
-            simCardNum++;
+            if (ObjectUtil.isNotEmpty(simCardPagination.getIccid())) {
+                simCardNum++;
 
                 String value = simCardPagination.getIccid() instanceof List ?
-                    JsonUtil.getObjectToString(simCardPagination.getIccid()) :
-                    String.valueOf(simCardPagination.getIccid());
-                simCardQueryWrapper.lambda().like(SimCardEntity::getIccid,value);
+                        JsonUtil.getObjectToString(simCardPagination.getIccid()) :
+                        String.valueOf(simCardPagination.getIccid());
+                simCardQueryWrapper.lambda().like(SimCardEntity::getIccid, value);
 
             }
 
-            if(ObjectUtil.isNotEmpty(simCardPagination.getStatusType())){
-            simCardNum++;
+            if (ObjectUtil.isNotEmpty(simCardPagination.getStatusType())) {
+                simCardNum++;
 
-        simCardQueryWrapper.lambda().eq(SimCardEntity::getStatusType,simCardPagination.getStatusType());
+                simCardQueryWrapper.lambda().eq(SimCardEntity::getStatusType, simCardPagination.getStatusType());
 
             }
 
-            if(ObjectUtil.isNotEmpty(simCardPagination.getCarrier())){
-            simCardNum++;
+            if (ObjectUtil.isNotEmpty(simCardPagination.getCarrier())) {
+                simCardNum++;
 
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] carrier = JsonUtil.getJsonToBean(simCardPagination.getCarrier(),String[][].class);
-        for(int i=0;i<carrier.length;i++){
-        if(carrier[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(carrier[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> carrier = JsonUtil.getJsonToList(simCardPagination.getCarrier(),String.class);
-        if(carrier.size()>0){
-            idList.addAll(carrier);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(simCardPagination.getCarrier()));
-        }
-        }
-        simCardQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(SimCardEntity::getCarrier, tt).or();
-        });
-        });
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] carrier = JsonUtil.getJsonToBean(simCardPagination.getCarrier(), String[][].class);
+                    for (int i = 0; i < carrier.length; i++) {
+                        if (carrier[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(carrier[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> carrier = JsonUtil.getJsonToList(simCardPagination.getCarrier(), String.class);
+                        if (carrier.size() > 0) {
+                            idList.addAll(carrier);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(simCardPagination.getCarrier()));
+                    }
+                }
+                simCardQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(SimCardEntity::getCarrier, tt).or();
+                    });
+                });
 
             }
 
-            if(ObjectUtil.isNotEmpty(simCardPagination.getActive())){
-            simCardNum++;
+            if (ObjectUtil.isNotEmpty(simCardPagination.getActive())) {
+                simCardNum++;
 
-        simCardQueryWrapper.lambda().eq(SimCardEntity::getActive,simCardPagination.getActive());
+                simCardQueryWrapper.lambda().eq(SimCardEntity::getActive, simCardPagination.getActive());
 
             }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
-        if (total>0){
-            if (intersection.size()==0){
+        if (total > 0) {
+            if (intersection.size() == 0) {
                 intersection.add("jnpfNullList");
             }
             simCardQueryWrapper.lambda().in(SimCardEntity::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;
-            simCardQueryWrapper.lambda().and(t->t.in(SimCardEntity::getId, finalAllSuperIDlist));
+            simCardQueryWrapper.lambda().and(t -> t.in(SimCardEntity::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;
-            simCardQueryWrapper.lambda().and(t->t.in(SimCardEntity::getId, finalAllRuleIDlist));
+            simCardQueryWrapper.lambda().and(t -> t.in(SimCardEntity::getId, finalAllRuleIDlist));
         }
 
         //排序
-        if(StringUtil.isEmpty(simCardPagination.getSidx())){
+        if (StringUtil.isEmpty(simCardPagination.getSidx())) {
             simCardQueryWrapper.lambda().orderByDesc(SimCardEntity::getId);
-        }else{
+        } else {
             try {
                 String sidx = simCardPagination.getSidx();
-                String[] strs= sidx.split("_name");
+                String[] strs = sidx.split("_name");
                 SimCardEntity simCardEntity = new SimCardEntity();
                 Field declaredField = simCardEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                simCardQueryWrapper="asc".equals(simCardPagination.getSort().toLowerCase())?simCardQueryWrapper.orderByAsc(value):simCardQueryWrapper.orderByDesc(value);
+                simCardQueryWrapper = "asc".equals(simCardPagination.getSort().toLowerCase()) ? simCardQueryWrapper.orderByAsc(value) : simCardQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
 
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<SimCardEntity> page=new Page<>(simCardPagination.getCurrentPage(), simCardPagination.getPageSize());
-                IPage<SimCardEntity> userIPage=this.page(page, simCardQueryWrapper);
-                return simCardPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if (!userProvider.get().getIsAdministrator()) {
+            simCardQueryWrapper.lambda().eq(SimCardEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
+
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<SimCardEntity> page = new Page<>(simCardPagination.getCurrentPage(), simCardPagination.getPageSize());
+                IPage<SimCardEntity> userIPage = this.page(page, simCardQueryWrapper);
+                return simCardPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<SimCardEntity> list = new ArrayList();
                 return simCardPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(simCardQueryWrapper);
         }
     }
+
     @Override
-    public SimCardEntity getInfo(String id){
-        QueryWrapper<SimCardEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(SimCardEntity::getId,id);
+    public SimCardEntity getInfo(String id) {
+        QueryWrapper<SimCardEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SimCardEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
-    public void create(SimCardEntity entity){
+    public void create(SimCardEntity entity) {
         this.save(entity);
     }
+
     @Override
-    public boolean update(String id, SimCardEntity entity){
+    public boolean update(String id, SimCardEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(SimCardEntity entity){
-        if(entity!=null){
+    public void delete(SimCardEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
-    public String checkForm(SimCardForm form,int i) {
-        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
-        String id="";
+    public String checkForm(SimCardForm 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.isEmpty(form.getIccid())){
-                    return "SIM卡号不能为空";
-                }
-                if(StringUtil.isNotEmpty(form.getIccid())){
-                    form.setIccid(form.getIccid().trim());
-                    QueryWrapper<SimCardEntity> iccidWrapper=new QueryWrapper<>();
-                    iccidWrapper.lambda().eq(SimCardEntity::getIccid,form.getIccid());
-                    if (isUp){
-                        iccidWrapper.lambda().ne(SimCardEntity::getId, id);
-                    }
-                    if((int) this.count(iccidWrapper)>0){
-                        countRecover = "SIM卡号不能重复";
-                    }
-                }
-    if(StringUtil.isNotEmpty(form.getDataPlan())){
-        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataPlan())).matches()){
-        return "请输入正确的数字";
+        if (StringUtil.isEmpty(form.getIccid())) {
+            return "SIM卡号不能为空";
         }
-    }
-    if(StringUtil.isNotEmpty(form.getDataUsage())){
-        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataUsage())).matches()){
-        return "请输入正确的数字";
+        if (StringUtil.isNotEmpty(form.getIccid())) {
+            form.setIccid(form.getIccid().trim());
+            QueryWrapper<SimCardEntity> iccidWrapper = new QueryWrapper<>();
+            iccidWrapper.lambda().eq(SimCardEntity::getIccid, form.getIccid());
+            if (isUp) {
+                iccidWrapper.lambda().ne(SimCardEntity::getId, id);
+            }
+            if ((int) this.count(iccidWrapper) > 0) {
+                countRecover = "SIM卡号不能重复";
+            }
         }
-    }
-    if(StringUtil.isNotEmpty(form.getDataBalance())){
-        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataBalance())).matches()){
-        return "请输入正确的数字";
+        if (StringUtil.isNotEmpty(form.getDataPlan())) {
+            if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataPlan())).matches()) {
+                return "请输入正确的数字";
+            }
+        }
+        if (StringUtil.isNotEmpty(form.getDataUsage())) {
+            if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataUsage())).matches()) {
+                return "请输入正确的数字";
+            }
+        }
+        if (StringUtil.isNotEmpty(form.getDataBalance())) {
+            if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDataBalance())).matches()) {
+                return "请输入正确的数字";
+            }
         }
-    }
         return countRecover;
     }
+
     /**
-    * 新增修改数据(事务回滚)
-    * @param id
-    * @param simCardForm
-    * @return
-    */
+     * 新增修改数据(事务回滚)
+     *
+     * @param id
+     * @param simCardForm
+     * @return
+     */
     @Override
     @Transactional
-    public void saveOrUpdate(SimCardForm simCardForm,String id, boolean isSave) throws Exception{
-        UserInfo userInfo=userProvider.get();
+    public void saveOrUpdate(SimCardForm simCardForm, String id, boolean isSave) throws Exception {
+        UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         simCardForm = JsonUtil.getJsonToBean(
-        generaterSwapUtil.swapDatetime(SimCardConstant.getFormData(),simCardForm),SimCardForm.class);
+                generaterSwapUtil.swapDatetime(SimCardConstant.getFormData(), simCardForm), SimCardForm.class);
         SimCardEntity entity = JsonUtil.getJsonToBean(simCardForm, SimCardEntity.class);
 
-        if(isSave){
-            String mainId =  RandomUtil.uuId() ;
+        if (isSave) {
+            String mainId = RandomUtil.uuId();
             entity.setId(mainId);
-        }else{
+        } else {
         }
         this.saveOrUpdate(entity);
 
@@ -369,7 +397,7 @@ public class SimCardServiceImpl extends ServiceImpl<SimCardMapper, SimCardEntity
     @Override
     public SimCardEntity getByDeviceCode(String deviceCode) {
         QueryWrapper<SimCardEntity> query = new QueryWrapper<>();
-        query.lambda().eq(SimCardEntity::getDeviceCode,deviceCode);
+        query.lambda().eq(SimCardEntity::getDeviceCode, deviceCode);
         SimCardEntity simCard = this.getOne(query);
         return simCard;
     }

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

@@ -13,24 +13,31 @@ import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.recyclecamera.*;
 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.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;
 
 /**
  * RecycleCamera
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -38,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Slf4j
 @RestController
-@Tag(name = "RecycleCamera" , description = "scm")
+@Tag(name = "RecycleCamera", description = "scm")
 @RequestMapping("/api/scm/RecycleCamera")
 public class RecycleCameraController {
 
@@ -51,28 +58,30 @@ public class RecycleCameraController {
     @Autowired
     private RecycleCameraService recycleCameraService;
 
+    @Resource
+    private RecycleDeviceService recycleDeviceService;
 
 
     /**
-    * 列表
-    *
-    * @param recycleCameraPagination
-    * @return
-    */
+     * 列表
+     *
+     * @param recycleCameraPagination
+     * @return
+     */
     @Operation(summary = "获取列表")
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody RecycleCameraPagination recycleCameraPagination)throws IOException{
-        List<RecycleCameraEntity> list= recycleCameraService.getList(recycleCameraPagination);
-        List<Map<String, Object>> realList=new ArrayList<>();
+    public ActionResult list(@RequestBody RecycleCameraPagination recycleCameraPagination) throws IOException {
+        List<RecycleCameraEntity> list = recycleCameraService.getList(recycleCameraPagination);
+        List<Map<String, Object>> realList = new ArrayList<>();
         for (RecycleCameraEntity entity : list) {
-        Map<String, Object> recycleCameraMap=JsonUtil.entityToMap(entity);
-        recycleCameraMap.put("id", recycleCameraMap.get("id"));
-        //副表数据
-        //子表数据
+            Map<String, Object> recycleCameraMap = JsonUtil.entityToMap(entity);
+            recycleCameraMap.put("id", recycleCameraMap.get("id"));
+            //副表数据
+            //子表数据
             realList.add(recycleCameraMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, RecycleCameraConstant.getFormData(), RecycleCameraConstant.getColumnData(), recycleCameraPagination.getModuleId(),false);
+        realList = generaterSwapUtil.swapDataList(realList, RecycleCameraConstant.getFormData(), RecycleCameraConstant.getColumnData(), recycleCameraPagination.getModuleId(), false);
 
         //返回对象
         PageListVO vo = new PageListVO();
@@ -81,109 +90,130 @@ public class RecycleCameraController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
-    * 创建
-    *
-    * @param recycleCameraForm
-    * @return
-    */
+     * 创建
+     *
+     * @param recycleCameraForm
+     * @return
+     */
     @PostMapping()
     @Operation(summary = "创建")
     public ActionResult create(@RequestBody @Valid RecycleCameraForm recycleCameraForm) {
-        String b = recycleCameraService.checkForm(recycleCameraForm,0);
-        if (StringUtil.isNotEmpty(b)){
-            return ActionResult.fail(b );
+        String b = recycleCameraService.checkForm(recycleCameraForm, 0);
+        if (StringUtil.isNotEmpty(b)) {
+            return ActionResult.fail(b);
         }
-        try{
-            recycleCameraService.saveOrUpdate(recycleCameraForm, null ,true);
-        }catch(Exception e){
+        try {
+            //查询设备 所绑定的商户 赋值
+            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleCameraForm.getDeviceCode()));
+            if (CollectionUtils.isNotEmpty(companyId)) {
+                //只会查询出来一个
+                recycleCameraForm.setCompanyId(companyId.get(0));
+            }
+            recycleCameraService.saveOrUpdate(recycleCameraForm, null, true);
+        } catch (Exception e) {
             return ActionResult.fail("新增数据失败");
         }
         return ActionResult.success("创建成功");
     }
+
     /**
-    * 编辑
-    * @param id
-    * @param recycleCameraForm
-    * @return
-    */
+     * 编辑
+     *
+     * @param id
+     * @param recycleCameraForm
+     * @return
+     */
     @PutMapping("/{id}")
     @Operation(summary = "更新")
-    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleCameraForm recycleCameraForm,
-                                @RequestParam(value = "isImport", required = false) boolean isImport){
+    public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleCameraForm recycleCameraForm,
+                               @RequestParam(value = "isImport", required = false) boolean isImport) {
         recycleCameraForm.setId(id);
         if (!isImport) {
-            String b =  recycleCameraService.checkForm(recycleCameraForm,1);
-            if (StringUtil.isNotEmpty(b)){
-                return ActionResult.fail(b );
+            String b = recycleCameraService.checkForm(recycleCameraForm, 1);
+            if (StringUtil.isNotEmpty(b)) {
+                return ActionResult.fail(b);
             }
         }
-        RecycleCameraEntity entity= recycleCameraService.getInfo(id);
-        if(entity!=null){
-            try{
-                recycleCameraService.saveOrUpdate(recycleCameraForm,id,false);
-            }catch(Exception e){
+        RecycleCameraEntity entity = recycleCameraService.getInfo(id);
+        if (entity != null) {
+            try {
+                //查询设备 所绑定的商户 赋值
+                List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(recycleCameraForm.getDeviceCode()));
+                if (CollectionUtils.isNotEmpty(companyId)) {
+                    //只会查询出来一个
+                    recycleCameraForm.setCompanyId(companyId.get(0));
+                }
+                recycleCameraService.saveOrUpdate(recycleCameraForm, id, false);
+            } catch (Exception e) {
                 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){
-        RecycleCameraEntity entity= recycleCameraService.getInfo(id);
-        if(entity!=null){
+    public ActionResult delete(@PathVariable("id") String id) {
+        RecycleCameraEntity entity = recycleCameraService.getInfo(id);
+        if (entity != null) {
             //主表数据删除
             recycleCameraService.delete(entity);
         }
         return ActionResult.success("删除成功");
     }
+
     /**
-    * 表单信息(详情页)
-    * 详情页面使用-转换数据
-    * @param id
-    * @return
-    */
+     * 表单信息(详情页)
+     * 详情页面使用-转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "表单信息(详情页)")
     @GetMapping("/detail/{id}")
-    public ActionResult detailInfo(@PathVariable("id") String id){
-        RecycleCameraEntity entity= recycleCameraService.getInfo(id);
-        if(entity==null){
+    public ActionResult detailInfo(@PathVariable("id") String id) {
+        RecycleCameraEntity entity = recycleCameraService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleCameraMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleCameraMap = JsonUtil.entityToMap(entity);
         recycleCameraMap.put("id", recycleCameraMap.get("id"));
         //副表数据
         //子表数据
-        recycleCameraMap = generaterSwapUtil.swapDataDetail(recycleCameraMap,RecycleCameraConstant.getFormData(),"565814248073081093",false);
+        recycleCameraMap = generaterSwapUtil.swapDataDetail(recycleCameraMap, RecycleCameraConstant.getFormData(), "565814248073081093", false);
         return ActionResult.success(recycleCameraMap);
     }
+
     /**
-    * 获取详情(编辑页)
-    * 编辑页面使用-不转换数据
-    * @param id
-    * @return
-    */
+     * 获取详情(编辑页)
+     * 编辑页面使用-不转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "信息")
     @GetMapping("/{id}")
-    public ActionResult info(@PathVariable("id") String id){
-        RecycleCameraEntity entity= recycleCameraService.getInfo(id);
-        if(entity==null){
+    public ActionResult info(@PathVariable("id") String id) {
+        RecycleCameraEntity entity = recycleCameraService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleCameraMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleCameraMap = JsonUtil.entityToMap(entity);
         recycleCameraMap.put("id", recycleCameraMap.get("id"));
         //副表数据
         //子表数据
-        recycleCameraMap = generaterSwapUtil.swapDataForm(recycleCameraMap,RecycleCameraConstant.getFormData(),RecycleCameraConstant.TABLEFIELDKEY,RecycleCameraConstant.TABLERENAMES);
+        recycleCameraMap = generaterSwapUtil.swapDataForm(recycleCameraMap, RecycleCameraConstant.getFormData(), RecycleCameraConstant.TABLEFIELDKEY, RecycleCameraConstant.TABLERENAMES);
         return ActionResult.success(recycleCameraMap);
     }
 

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

@@ -13,24 +13,31 @@ import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.simcard.*;
 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.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;
 
 /**
  * SIM卡管理
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -38,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Slf4j
 @RestController
-@Tag(name = "SIM卡管理" , description = "scm")
+@Tag(name = "SIM卡管理", description = "scm")
 @RequestMapping("/api/scm/SimCard")
 public class SimCardController {
 
@@ -51,28 +58,30 @@ public class SimCardController {
     @Autowired
     private SimCardService simCardService;
 
+    @Resource
+    private RecycleDeviceService recycleDeviceService;
 
 
     /**
-    * 列表
-    *
-    * @param simCardPagination
-    * @return
-    */
+     * 列表
+     *
+     * @param simCardPagination
+     * @return
+     */
     @Operation(summary = "获取列表")
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody SimCardPagination simCardPagination)throws IOException{
-        List<SimCardEntity> list= simCardService.getList(simCardPagination);
-        List<Map<String, Object>> realList=new ArrayList<>();
+    public ActionResult list(@RequestBody SimCardPagination simCardPagination) throws IOException {
+        List<SimCardEntity> list = simCardService.getList(simCardPagination);
+        List<Map<String, Object>> realList = new ArrayList<>();
         for (SimCardEntity entity : list) {
-        Map<String, Object> simCardMap=JsonUtil.entityToMap(entity);
-        simCardMap.put("id", simCardMap.get("id"));
-        //副表数据
-        //子表数据
+            Map<String, Object> simCardMap = JsonUtil.entityToMap(entity);
+            simCardMap.put("id", simCardMap.get("id"));
+            //副表数据
+            //子表数据
             realList.add(simCardMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, SimCardConstant.getFormData(), SimCardConstant.getColumnData(), simCardPagination.getModuleId(),false);
+        realList = generaterSwapUtil.swapDataList(realList, SimCardConstant.getFormData(), SimCardConstant.getColumnData(), simCardPagination.getModuleId(), false);
 
         //返回对象
         PageListVO vo = new PageListVO();
@@ -81,109 +90,130 @@ public class SimCardController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
-    * 创建
-    *
-    * @param simCardForm
-    * @return
-    */
+     * 创建
+     *
+     * @param simCardForm
+     * @return
+     */
     @PostMapping()
     @Operation(summary = "创建")
     public ActionResult create(@RequestBody @Valid SimCardForm simCardForm) {
-        String b = simCardService.checkForm(simCardForm,0);
-        if (StringUtil.isNotEmpty(b)){
-            return ActionResult.fail(b );
+        String b = simCardService.checkForm(simCardForm, 0);
+        if (StringUtil.isNotEmpty(b)) {
+            return ActionResult.fail(b);
         }
-        try{
-            simCardService.saveOrUpdate(simCardForm, null ,true);
-        }catch(Exception e){
+        try {
+            //查询设备 所绑定的商户 赋值
+            List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(simCardForm.getDeviceCode()));
+            if (CollectionUtils.isNotEmpty(companyId)) {
+                //只会查询出来一个
+                simCardForm.setCompanyId(companyId.get(0));
+            }
+            simCardService.saveOrUpdate(simCardForm, null, true);
+        } catch (Exception e) {
             return ActionResult.fail("新增数据失败");
         }
         return ActionResult.success("创建成功");
     }
+
     /**
-    * 编辑
-    * @param id
-    * @param simCardForm
-    * @return
-    */
+     * 编辑
+     *
+     * @param id
+     * @param simCardForm
+     * @return
+     */
     @PutMapping("/{id}")
     @Operation(summary = "更新")
-    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SimCardForm simCardForm,
-                                @RequestParam(value = "isImport", required = false) boolean isImport){
+    public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid SimCardForm simCardForm,
+                               @RequestParam(value = "isImport", required = false) boolean isImport) {
         simCardForm.setId(id);
         if (!isImport) {
-            String b =  simCardService.checkForm(simCardForm,1);
-            if (StringUtil.isNotEmpty(b)){
-                return ActionResult.fail(b );
+            String b = simCardService.checkForm(simCardForm, 1);
+            if (StringUtil.isNotEmpty(b)) {
+                return ActionResult.fail(b);
             }
         }
-        SimCardEntity entity= simCardService.getInfo(id);
-        if(entity!=null){
-            try{
-                simCardService.saveOrUpdate(simCardForm,id,false);
-            }catch(Exception e){
+        SimCardEntity entity = simCardService.getInfo(id);
+        if (entity != null) {
+            try {
+                //查询设备 所绑定的商户 赋值
+                List<String> companyId = recycleDeviceService.getInfoByDeviceCode(Collections.singletonList(simCardForm.getDeviceCode()));
+                if (CollectionUtils.isNotEmpty(companyId)) {
+                    //只会查询出来一个
+                    simCardForm.setCompanyId(companyId.get(0));
+                }
+                simCardService.saveOrUpdate(simCardForm, id, false);
+            } catch (Exception e) {
                 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){
-        SimCardEntity entity= simCardService.getInfo(id);
-        if(entity!=null){
+    public ActionResult delete(@PathVariable("id") String id) {
+        SimCardEntity entity = simCardService.getInfo(id);
+        if (entity != null) {
             //主表数据删除
             simCardService.delete(entity);
         }
         return ActionResult.success("删除成功");
     }
+
     /**
-    * 表单信息(详情页)
-    * 详情页面使用-转换数据
-    * @param id
-    * @return
-    */
+     * 表单信息(详情页)
+     * 详情页面使用-转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "表单信息(详情页)")
     @GetMapping("/detail/{id}")
-    public ActionResult detailInfo(@PathVariable("id") String id){
-        SimCardEntity entity= simCardService.getInfo(id);
-        if(entity==null){
+    public ActionResult detailInfo(@PathVariable("id") String id) {
+        SimCardEntity entity = simCardService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> simCardMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> simCardMap = JsonUtil.entityToMap(entity);
         simCardMap.put("id", simCardMap.get("id"));
         //副表数据
         //子表数据
-        simCardMap = generaterSwapUtil.swapDataDetail(simCardMap,SimCardConstant.getFormData(),"562988941775480645",false);
+        simCardMap = generaterSwapUtil.swapDataDetail(simCardMap, SimCardConstant.getFormData(), "562988941775480645", false);
         return ActionResult.success(simCardMap);
     }
+
     /**
-    * 获取详情(编辑页)
-    * 编辑页面使用-不转换数据
-    * @param id
-    * @return
-    */
+     * 获取详情(编辑页)
+     * 编辑页面使用-不转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "信息")
     @GetMapping("/{id}")
-    public ActionResult info(@PathVariable("id") String id){
-        SimCardEntity entity= simCardService.getInfo(id);
-        if(entity==null){
+    public ActionResult info(@PathVariable("id") String id) {
+        SimCardEntity entity = simCardService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> simCardMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> simCardMap = JsonUtil.entityToMap(entity);
         simCardMap.put("id", simCardMap.get("id"));
         //副表数据
         //子表数据
-        simCardMap = generaterSwapUtil.swapDataForm(simCardMap,SimCardConstant.getFormData(),SimCardConstant.TABLEFIELDKEY,SimCardConstant.TABLERENAMES);
+        simCardMap = generaterSwapUtil.swapDataForm(simCardMap, SimCardConstant.getFormData(), SimCardConstant.TABLEFIELDKEY, SimCardConstant.TABLERENAMES);
         return ActionResult.success(simCardMap);
     }
 

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecamera/RecycleCameraForm.java

@@ -1,59 +1,95 @@
 package jnpf.model.recyclecamera;
 
 import lombok.Data;
+
 import java.util.List;
 import java.math.BigDecimal;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * RecycleCamera
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
  * @日期： 2024-05-30
  */
 @Data
-public class RecycleCameraForm  {
-    /** 主键 */
+public class RecycleCameraForm {
+    /**
+     * 主键
+     */
     private String id;
 
-    /** 设备编码 **/
+    /**
+     * 设备编码
+     **/
     @JsonProperty("deviceCode")
-    private Object deviceCode;
-    /** 摄像头编码 **/
+    private String deviceCode;
+    /**
+     * 摄像头编码
+     **/
     @JsonProperty("cameraCode")
     private String cameraCode;
-    /** 摄像头名称 **/
+    /**
+     * 摄像头名称
+     **/
     @JsonProperty("cameraName")
     private String cameraName;
-    /** IP地址 **/
+    /**
+     * IP地址
+     **/
     @JsonProperty("ipAddress")
     private String ipAddress;
-    /** 端口 **/
+    /**
+     * 端口
+     **/
     @JsonProperty("port")
     private BigDecimal port;
-    /** 用户名 **/
+    /**
+     * 用户名
+     **/
     @JsonProperty("username")
     private String username;
-    /** 密码 **/
+    /**
+     * 密码
+     **/
     @JsonProperty("pasword")
     private String pasword;
-    /** rtsp流地址 **/
+    /**
+     * rtsp流地址
+     **/
     @JsonProperty("rtspUrl")
     private String rtspUrl;
-    /** rtsp端口 **/
+    /**
+     * rtsp端口
+     **/
     @JsonProperty("rtspPort")
     private BigDecimal rtspPort;
-    /** 分辨率 **/
+    /**
+     * 分辨率
+     **/
     @JsonProperty("resolution")
     private String resolution;
-    /** 帧率 **/
+    /**
+     * 帧率
+     **/
     @JsonProperty("frameRate")
     private BigDecimal frameRate;
-    /** 录像模式 **/
+    /**
+     * 录像模式
+     **/
     @JsonProperty("recordingMode")
     private String recordingMode;
-    /** 租户 **/
+    /**
+     * 租户
+     **/
     @JsonProperty("tenantId")
     private Object tenantId;
+    /**
+     * 商户id
+     */
+    @JsonProperty("companyId")
+    private String companyId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/simcard/SimCardForm.java

@@ -1,56 +1,90 @@
 package jnpf.model.simcard;
 
 import lombok.Data;
+
 import java.util.List;
 import java.math.BigDecimal;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * SIM卡管理
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
  * @日期： 2024-06-21
  */
 @Data
-public class SimCardForm  {
-    /** 主键 */
+public class SimCardForm {
+    /**
+     * 主键
+     */
     private String id;
 
-    /** 关联设备 **/
+    /**
+     * 关联设备
+     **/
     @JsonProperty("deviceCode")
-    private Object deviceCode;
-    /** SIM卡号 **/
+    private String deviceCode;
+    /**
+     * SIM卡号
+     **/
     @JsonProperty("iccid")
     private String iccid;
-    /** msisdn **/
+    /**
+     * msisdn
+     **/
     @JsonProperty("msisdn")
     private String msisdn;
-    /** imsi **/
+    /**
+     * imsi
+     **/
     @JsonProperty("imsi")
     private String imsi;
-    /** 运营商 **/
+    /**
+     * 运营商
+     **/
     @JsonProperty("carrier")
     private Object carrier;
-    /** 卡状态 **/
+    /**
+     * 卡状态
+     **/
     @JsonProperty("statusType")
     private String statusType;
-    /** 激活状态 **/
+    /**
+     * 激活状态
+     **/
     @JsonProperty("active")
     private String active;
-    /** 套餐大小 **/
+    /**
+     * 套餐大小
+     **/
     @JsonProperty("dataPlan")
     private String dataPlan;
-    /** 已用流量 **/
+    /**
+     * 已用流量
+     **/
     @JsonProperty("dataUsage")
     private String dataUsage;
-    /** 剩余流量 **/
+    /**
+     * 剩余流量
+     **/
     @JsonProperty("dataBalance")
     private String dataBalance;
-    /** 同步日期 **/
+    /**
+     * 同步日期
+     **/
     @JsonProperty("updateTime")
     private String updateTime;
-    /** 服务期止 **/
+    /**
+     * 服务期止
+     **/
     @JsonProperty("expiryDate")
     private String expiryDate;
+    /**
+     * 商户id
+     */
+    @JsonProperty("companyId")
+    private String companyId;
 }