设备库存，园区设备管理，设备保修信息提交

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EquipmentMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.EquipmentEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Equipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-15
+ */
+public interface EquipmentMapper extends BaseMapper<EquipmentEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EquipmentRepairRecordsMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.EquipmentRepairRecordsEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * EquipmentRepairRecords
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+public interface EquipmentRepairRecordsMapper extends BaseMapper<EquipmentRepairRecordsEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ParkEquipmentMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.ParkEquipmentEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * ParkEquipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+public interface ParkEquipmentMapper extends BaseMapper<ParkEquipmentEntity> {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EquipmentRepairRecordsService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.equipmentrepairrecords.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * EquipmentRepairRecords
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+public interface EquipmentRepairRecordsService extends IService<EquipmentRepairRecordsEntity> {
+    List<EquipmentRepairRecordsEntity> getList(EquipmentRepairRecordsPagination equipmentRepairRecordsPagination);
+
+    List<EquipmentRepairRecordsEntity> getTypeList(EquipmentRepairRecordsPagination equipmentRepairRecordsPagination,String dataType);
+
+    EquipmentRepairRecordsEntity getInfo(String id);
+
+    void delete(EquipmentRepairRecordsEntity entity);
+
+    void create(EquipmentRepairRecordsEntity entity);
+
+    boolean update(String id, EquipmentRepairRecordsEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(EquipmentRepairRecordsForm form,int i);
+
+    void saveOrUpdate(EquipmentRepairRecordsForm equipmentRepairRecordsForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EquipmentService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.equipment.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * Equipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-15
+ */
+public interface EquipmentService extends IService<EquipmentEntity> {
+    List<EquipmentEntity> getList(EquipmentPagination equipmentPagination);
+
+    List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination,String dataType);
+
+    EquipmentEntity getInfo(String id);
+
+    void delete(EquipmentEntity entity);
+
+    void create(EquipmentEntity entity);
+
+    boolean update(String id, EquipmentEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(EquipmentForm form,int i);
+
+    void saveOrUpdate(EquipmentForm equipmentForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ParkEquipmentService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.parkequipment.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * ParkEquipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+public interface ParkEquipmentService extends IService<ParkEquipmentEntity> {
+    List<ParkEquipmentEntity> getList(ParkEquipmentPagination parkEquipmentPagination);
+
+    List<ParkEquipmentEntity> getTypeList(ParkEquipmentPagination parkEquipmentPagination,String dataType);
+
+    ParkEquipmentEntity getInfo(String id);
+
+    void delete(ParkEquipmentEntity entity);
+
+    void create(ParkEquipmentEntity entity);
+
+    boolean update(String id, ParkEquipmentEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(ParkEquipmentForm form,int i);
+
+    void saveOrUpdate(ParkEquipmentForm parkEquipmentForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EquipmentRepairRecordsServiceImpl.java

@@ -0,0 +1,364 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.EquipmentRepairRecordsMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.equipmentrepairrecords.*;
+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;
+import jnpf.database.model.superQuery.SuperJsonModel;
+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;
+/**
+ *
+ * EquipmentRepairRecords
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+@Service
+public class EquipmentRepairRecordsServiceImpl extends ServiceImpl<EquipmentRepairRecordsMapper, EquipmentRepairRecordsEntity> implements EquipmentRepairRecordsService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<EquipmentRepairRecordsEntity> getList(EquipmentRepairRecordsPagination equipmentRepairRecordsPagination){
+        return getTypeList(equipmentRepairRecordsPagination,equipmentRepairRecordsPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<EquipmentRepairRecordsEntity> getTypeList(EquipmentRepairRecordsPagination equipmentRepairRecordsPagination,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 ? EquipmentRepairRecordsConstant.getAppColumnData() : EquipmentRepairRecordsConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int equipmentRepairRecordsNum =0;
+        QueryWrapper<EquipmentRepairRecordsEntity> equipmentRepairRecordsQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = equipmentRepairRecordsPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<EquipmentRepairRecordsEntity> equipmentRepairRecordsSuperWrapper = new QueryWrapper<>();
+            equipmentRepairRecordsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentRepairRecordsSuperWrapper,EquipmentRepairRecordsEntity.class,queryJson,"0"));
+            int equipmentRepairRecordsNum1 = equipmentRepairRecordsSuperWrapper.getExpression().getNormal().size();
+            if (equipmentRepairRecordsNum1>0){
+                List<String> equipmentRepairRecordsList =this.list(equipmentRepairRecordsSuperWrapper).stream().map(EquipmentRepairRecordsEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(equipmentRepairRecordsList);
+                intersectionSuperList.add(equipmentRepairRecordsList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<EquipmentRepairRecordsEntity> equipmentRepairRecordsSuperWrapper = new QueryWrapper<>();
+            equipmentRepairRecordsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentRepairRecordsSuperWrapper,EquipmentRepairRecordsEntity.class,ruleJson,"0"));
+            int equipmentRepairRecordsNum1 = equipmentRepairRecordsSuperWrapper.getExpression().getNormal().size();
+            if (equipmentRepairRecordsNum1>0){
+                List<String> equipmentRepairRecordsList =this.list(equipmentRepairRecordsSuperWrapper).stream().map(EquipmentRepairRecordsEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(equipmentRepairRecordsList);
+                intersectionRuleList.add(equipmentRepairRecordsList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object equipmentRepairRecordsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentRepairRecordsQueryWrapper,EquipmentRepairRecordsEntity.class,equipmentRepairRecordsPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(equipmentRepairRecordsObj)){
+        return new ArrayList<>();
+        } else {
+        equipmentRepairRecordsQueryWrapper = (QueryWrapper<EquipmentRepairRecordsEntity>)equipmentRepairRecordsObj;
+        if( equipmentRepairRecordsQueryWrapper.getExpression().getNormal().size()>0){
+        equipmentRepairRecordsNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object equipmentRepairRecordsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentRepairRecordsQueryWrapper,EquipmentRepairRecordsEntity.class,equipmentRepairRecordsPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(equipmentRepairRecordsObj)){
+        return new ArrayList<>();
+        } else {
+        equipmentRepairRecordsQueryWrapper = (QueryWrapper<EquipmentRepairRecordsEntity>)equipmentRepairRecordsObj;
+        if( equipmentRepairRecordsQueryWrapper.getExpression().getNormal().size()>0){
+        equipmentRepairRecordsNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getEquipmentNumber())){
+            equipmentRepairRecordsNum++;
+
+                String value = equipmentRepairRecordsPagination.getEquipmentNumber() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentRepairRecordsPagination.getEquipmentNumber()) :
+                    String.valueOf(equipmentRepairRecordsPagination.getEquipmentNumber());
+                equipmentRepairRecordsQueryWrapper.lambda().like(EquipmentRepairRecordsEntity::getEquipmentNumber,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getEquipmentName())){
+            equipmentRepairRecordsNum++;
+
+                String value = equipmentRepairRecordsPagination.getEquipmentName() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentRepairRecordsPagination.getEquipmentName()) :
+                    String.valueOf(equipmentRepairRecordsPagination.getEquipmentName());
+                equipmentRepairRecordsQueryWrapper.lambda().like(EquipmentRepairRecordsEntity::getEquipmentName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getSpaceId())){
+            equipmentRepairRecordsNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] spaceId = JsonUtil.getJsonToBean(equipmentRepairRecordsPagination.getSpaceId(),String[][].class);
+        for(int i=0;i<spaceId.length;i++){
+        if(spaceId[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(spaceId[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> spaceId = JsonUtil.getJsonToList(equipmentRepairRecordsPagination.getSpaceId(),String.class);
+        if(spaceId.size()>0){
+            idList.addAll(spaceId);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(equipmentRepairRecordsPagination.getSpaceId()));
+        }
+        }
+        equipmentRepairRecordsQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(EquipmentRepairRecordsEntity::getSpaceId, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getRepairName())){
+            equipmentRepairRecordsNum++;
+
+                String value = equipmentRepairRecordsPagination.getRepairName() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentRepairRecordsPagination.getRepairName()) :
+                    String.valueOf(equipmentRepairRecordsPagination.getRepairName());
+                equipmentRepairRecordsQueryWrapper.lambda().like(EquipmentRepairRecordsEntity::getRepairName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentRepairRecordsPagination.getUrgent())){
+            equipmentRepairRecordsNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] urgent = JsonUtil.getJsonToBean(equipmentRepairRecordsPagination.getUrgent(),String[][].class);
+        for(int i=0;i<urgent.length;i++){
+        if(urgent[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(urgent[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> urgent = JsonUtil.getJsonToList(equipmentRepairRecordsPagination.getUrgent(),String.class);
+        if(urgent.size()>0){
+            idList.addAll(urgent);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(equipmentRepairRecordsPagination.getUrgent()));
+        }
+        }
+        equipmentRepairRecordsQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(EquipmentRepairRecordsEntity::getUrgent, tt).or();
+        });
+        });
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            equipmentRepairRecordsQueryWrapper.lambda().in(EquipmentRepairRecordsEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            equipmentRepairRecordsQueryWrapper.lambda().and(t->t.in(EquipmentRepairRecordsEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            equipmentRepairRecordsQueryWrapper.lambda().and(t->t.in(EquipmentRepairRecordsEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        equipmentRepairRecordsQueryWrapper.lambda().isNull(EquipmentRepairRecordsEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(equipmentRepairRecordsPagination.getSidx())){
+            equipmentRepairRecordsQueryWrapper.lambda().orderByDesc(EquipmentRepairRecordsEntity::getId);
+        }else{
+            try {
+                String sidx = equipmentRepairRecordsPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                EquipmentRepairRecordsEntity equipmentRepairRecordsEntity = new EquipmentRepairRecordsEntity();
+                Field declaredField = equipmentRepairRecordsEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                equipmentRepairRecordsQueryWrapper="asc".equals(equipmentRepairRecordsPagination.getSort().toLowerCase())?equipmentRepairRecordsQueryWrapper.orderByAsc(value):equipmentRepairRecordsQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<EquipmentRepairRecordsEntity> page=new Page<>(equipmentRepairRecordsPagination.getCurrentPage(), equipmentRepairRecordsPagination.getPageSize());
+                IPage<EquipmentRepairRecordsEntity> userIPage=this.page(page, equipmentRepairRecordsQueryWrapper);
+                return equipmentRepairRecordsPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<EquipmentRepairRecordsEntity> list = new ArrayList();
+                return equipmentRepairRecordsPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(equipmentRepairRecordsQueryWrapper);
+        }
+    }
+    @Override
+    public EquipmentRepairRecordsEntity getInfo(String id){
+        QueryWrapper<EquipmentRepairRecordsEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(EquipmentRepairRecordsEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(EquipmentRepairRecordsEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, EquipmentRepairRecordsEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(EquipmentRepairRecordsEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(EquipmentRepairRecordsForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+                if(StringUtil.isEmpty(form.getEquipmentName())){
+                    return "设备名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getRepairName())){
+                    return "报修人不能为空";
+                }
+                if(StringUtil.isEmpty(form.getContractInformation())){
+                    return "联系方式不能为空";
+                }
+    if(StringUtil.isNotEmpty(form.getContractInformation())){
+        if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getContractInformation())).matches()){
+        return "请输入正确的联系方式";
+        }
+    }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param equipmentRepairRecordsForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(EquipmentRepairRecordsForm equipmentRepairRecordsForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        equipmentRepairRecordsForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(EquipmentRepairRecordsConstant.getFormData(),equipmentRepairRecordsForm),EquipmentRepairRecordsForm.class);
+        EquipmentRepairRecordsEntity entity = JsonUtil.getJsonToBean(equipmentRepairRecordsForm, EquipmentRepairRecordsEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+        entity.setRepairNumber(generaterSwapUtil.getBillNumber("baoxiudanhao", false));
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        entity.setRepairNumber(generaterSwapUtil.getBillNumber("baoxiudanhao", false));
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EquipmentServiceImpl.java

@@ -0,0 +1,347 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.EquipmentMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.equipment.*;
+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;
+import jnpf.database.model.superQuery.SuperJsonModel;
+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;
+/**
+ *
+ * Equipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-15
+ */
+@Service
+public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, EquipmentEntity> implements EquipmentService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<EquipmentEntity> getList(EquipmentPagination equipmentPagination){
+        return getTypeList(equipmentPagination,equipmentPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination,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 ? EquipmentConstant.getAppColumnData() : EquipmentConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int equipmentNum =0;
+        QueryWrapper<EquipmentEntity> equipmentQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(equipmentPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = equipmentPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<EquipmentEntity> equipmentSuperWrapper = new QueryWrapper<>();
+            equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper,EquipmentEntity.class,queryJson,"0"));
+            int equipmentNum1 = equipmentSuperWrapper.getExpression().getNormal().size();
+            if (equipmentNum1>0){
+                List<String> equipmentList =this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(equipmentList);
+                intersectionSuperList.add(equipmentList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<EquipmentEntity> equipmentSuperWrapper = new QueryWrapper<>();
+            equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper,EquipmentEntity.class,ruleJson,"0"));
+            int equipmentNum1 = equipmentSuperWrapper.getExpression().getNormal().size();
+            if (equipmentNum1>0){
+                List<String> equipmentList =this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(equipmentList);
+                intersectionRuleList.add(equipmentList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object equipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper,EquipmentEntity.class,equipmentPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(equipmentObj)){
+        return new ArrayList<>();
+        } else {
+        equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>)equipmentObj;
+        if( equipmentQueryWrapper.getExpression().getNormal().size()>0){
+        equipmentNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object equipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper,EquipmentEntity.class,equipmentPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(equipmentObj)){
+        return new ArrayList<>();
+        } else {
+        equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>)equipmentObj;
+        if( equipmentQueryWrapper.getExpression().getNormal().size()>0){
+        equipmentNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(equipmentPagination.getType())){
+            equipmentNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] type = JsonUtil.getJsonToBean(equipmentPagination.getType(),String[][].class);
+        for(int i=0;i<type.length;i++){
+        if(type[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(type[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> type = JsonUtil.getJsonToList(equipmentPagination.getType(),String.class);
+        if(type.size()>0){
+            idList.addAll(type);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(equipmentPagination.getType()));
+        }
+        }
+        equipmentQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(EquipmentEntity::getType, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentPagination.getBrand())){
+            equipmentNum++;
+
+                String value = equipmentPagination.getBrand() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentPagination.getBrand()) :
+                    String.valueOf(equipmentPagination.getBrand());
+                equipmentQueryWrapper.lambda().like(EquipmentEntity::getBrand,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentPagination.getName())){
+            equipmentNum++;
+
+                String value = equipmentPagination.getName() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentPagination.getName()) :
+                    String.valueOf(equipmentPagination.getName());
+                equipmentQueryWrapper.lambda().like(EquipmentEntity::getName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(equipmentPagination.getCode())){
+            equipmentNum++;
+
+                String value = equipmentPagination.getCode() instanceof List ?
+                    JsonUtil.getObjectToString(equipmentPagination.getCode()) :
+                    String.valueOf(equipmentPagination.getCode());
+                equipmentQueryWrapper.lambda().like(EquipmentEntity::getCode,value);
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            equipmentQueryWrapper.lambda().in(EquipmentEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            equipmentQueryWrapper.lambda().and(t->t.in(EquipmentEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            equipmentQueryWrapper.lambda().and(t->t.in(EquipmentEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        equipmentQueryWrapper.lambda().isNull(EquipmentEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(equipmentPagination.getSidx())){
+            equipmentQueryWrapper.lambda().orderByDesc(EquipmentEntity::getId);
+        }else{
+            try {
+                String sidx = equipmentPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                EquipmentEntity equipmentEntity = new EquipmentEntity();
+                Field declaredField = equipmentEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                equipmentQueryWrapper="asc".equals(equipmentPagination.getSort().toLowerCase())?equipmentQueryWrapper.orderByAsc(value):equipmentQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<EquipmentEntity> page=new Page<>(equipmentPagination.getCurrentPage(), equipmentPagination.getPageSize());
+                IPage<EquipmentEntity> userIPage=this.page(page, equipmentQueryWrapper);
+                return equipmentPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<EquipmentEntity> list = new ArrayList();
+                return equipmentPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(equipmentQueryWrapper);
+        }
+    }
+    @Override
+    public EquipmentEntity getInfo(String id){
+        QueryWrapper<EquipmentEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(EquipmentEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(EquipmentEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, EquipmentEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(EquipmentEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(EquipmentForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+                if(StringUtil.isEmpty(form.getBrand())){
+                    return "设备品牌不能为空";
+                }
+                if(StringUtil.isEmpty(form.getModel())){
+                    return "设备型号不能为空";
+                }
+                if(StringUtil.isEmpty(form.getBatchNumber())){
+                    return "批次号不能为空";
+                }
+                if(StringUtil.isEmpty(form.getSupplier())){
+                    return "供应商不能为空";
+                }
+                if(StringUtil.isEmpty(form.getSupplierPhone())){
+                    return "供应商联系电话不能为空";
+                }
+    if(StringUtil.isNotEmpty(form.getSupplierPhone())){
+        if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getSupplierPhone())).matches()){
+        return "请输入正确的联系方式";
+        }
+    }
+                if(StringUtil.isEmpty(form.getDefectsLiabilityPeriod())){
+                    return "保修期不能为空";
+                }
+    if(StringUtil.isNotEmpty(form.getDefectsLiabilityPeriod())){
+        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDefectsLiabilityPeriod())).matches()){
+        return "请输入正确的数字";
+        }
+    }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param equipmentForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(EquipmentForm equipmentForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        equipmentForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(EquipmentConstant.getFormData(),equipmentForm),EquipmentForm.class);
+        EquipmentEntity entity = JsonUtil.getJsonToBean(equipmentForm, EquipmentEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ParkEquipmentServiceImpl.java

@@ -0,0 +1,388 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.ParkEquipmentMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.parkequipment.*;
+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;
+import jnpf.database.model.superQuery.SuperJsonModel;
+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;
+/**
+ *
+ * ParkEquipment
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-16
+ */
+@Service
+public class ParkEquipmentServiceImpl extends ServiceImpl<ParkEquipmentMapper, ParkEquipmentEntity> implements ParkEquipmentService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<ParkEquipmentEntity> getList(ParkEquipmentPagination parkEquipmentPagination){
+        return getTypeList(parkEquipmentPagination,parkEquipmentPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<ParkEquipmentEntity> getTypeList(ParkEquipmentPagination parkEquipmentPagination,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 ? ParkEquipmentConstant.getAppColumnData() : ParkEquipmentConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int parkEquipmentNum =0;
+        QueryWrapper<ParkEquipmentEntity> parkEquipmentQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(parkEquipmentPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = parkEquipmentPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<ParkEquipmentEntity> parkEquipmentSuperWrapper = new QueryWrapper<>();
+            parkEquipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(parkEquipmentSuperWrapper,ParkEquipmentEntity.class,queryJson,"0"));
+            int parkEquipmentNum1 = parkEquipmentSuperWrapper.getExpression().getNormal().size();
+            if (parkEquipmentNum1>0){
+                List<String> parkEquipmentList =this.list(parkEquipmentSuperWrapper).stream().map(ParkEquipmentEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(parkEquipmentList);
+                intersectionSuperList.add(parkEquipmentList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<ParkEquipmentEntity> parkEquipmentSuperWrapper = new QueryWrapper<>();
+            parkEquipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(parkEquipmentSuperWrapper,ParkEquipmentEntity.class,ruleJson,"0"));
+            int parkEquipmentNum1 = parkEquipmentSuperWrapper.getExpression().getNormal().size();
+            if (parkEquipmentNum1>0){
+                List<String> parkEquipmentList =this.list(parkEquipmentSuperWrapper).stream().map(ParkEquipmentEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(parkEquipmentList);
+                intersectionRuleList.add(parkEquipmentList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object parkEquipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(parkEquipmentQueryWrapper,ParkEquipmentEntity.class,parkEquipmentPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(parkEquipmentObj)){
+        return new ArrayList<>();
+        } else {
+        parkEquipmentQueryWrapper = (QueryWrapper<ParkEquipmentEntity>)parkEquipmentObj;
+        if( parkEquipmentQueryWrapper.getExpression().getNormal().size()>0){
+        parkEquipmentNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object parkEquipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(parkEquipmentQueryWrapper,ParkEquipmentEntity.class,parkEquipmentPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(parkEquipmentObj)){
+        return new ArrayList<>();
+        } else {
+        parkEquipmentQueryWrapper = (QueryWrapper<ParkEquipmentEntity>)parkEquipmentObj;
+        if( parkEquipmentQueryWrapper.getExpression().getNormal().size()>0){
+        parkEquipmentNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getEquipmentType())){
+            parkEquipmentNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] equipmentType = JsonUtil.getJsonToBean(parkEquipmentPagination.getEquipmentType(),String[][].class);
+        for(int i=0;i<equipmentType.length;i++){
+        if(equipmentType[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(equipmentType[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> equipmentType = JsonUtil.getJsonToList(parkEquipmentPagination.getEquipmentType(),String.class);
+        if(equipmentType.size()>0){
+            idList.addAll(equipmentType);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(parkEquipmentPagination.getEquipmentType()));
+        }
+        }
+        parkEquipmentQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(ParkEquipmentEntity::getEquipmentType, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getEquipmentBrand())){
+            parkEquipmentNum++;
+
+                String value = parkEquipmentPagination.getEquipmentBrand() instanceof List ?
+                    JsonUtil.getObjectToString(parkEquipmentPagination.getEquipmentBrand()) :
+                    String.valueOf(parkEquipmentPagination.getEquipmentBrand());
+                parkEquipmentQueryWrapper.lambda().like(ParkEquipmentEntity::getEquipmentBrand,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getEquipmentCoding())){
+            parkEquipmentNum++;
+
+                String value = parkEquipmentPagination.getEquipmentCoding() instanceof List ?
+                    JsonUtil.getObjectToString(parkEquipmentPagination.getEquipmentCoding()) :
+                    String.valueOf(parkEquipmentPagination.getEquipmentCoding());
+                parkEquipmentQueryWrapper.lambda().like(ParkEquipmentEntity::getEquipmentCoding,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getDeviceName())){
+            parkEquipmentNum++;
+
+                String value = parkEquipmentPagination.getDeviceName() instanceof List ?
+                    JsonUtil.getObjectToString(parkEquipmentPagination.getDeviceName()) :
+                    String.valueOf(parkEquipmentPagination.getDeviceName());
+                parkEquipmentQueryWrapper.lambda().like(ParkEquipmentEntity::getDeviceName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getState())){
+            parkEquipmentNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] state = JsonUtil.getJsonToBean(parkEquipmentPagination.getState(),String[][].class);
+        for(int i=0;i<state.length;i++){
+        if(state[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(state[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> state = JsonUtil.getJsonToList(parkEquipmentPagination.getState(),String.class);
+        if(state.size()>0){
+            idList.addAll(state);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(parkEquipmentPagination.getState()));
+        }
+        }
+        parkEquipmentQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(ParkEquipmentEntity::getState, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(parkEquipmentPagination.getRegionId())){
+            parkEquipmentNum++;
+
+                String value = parkEquipmentPagination.getRegionId() instanceof List ?
+                    JsonUtil.getObjectToString(parkEquipmentPagination.getRegionId()) :
+                    String.valueOf(parkEquipmentPagination.getRegionId());
+                parkEquipmentQueryWrapper.lambda().like(ParkEquipmentEntity::getRegionId,value);
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            parkEquipmentQueryWrapper.lambda().in(ParkEquipmentEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            parkEquipmentQueryWrapper.lambda().and(t->t.in(ParkEquipmentEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            parkEquipmentQueryWrapper.lambda().and(t->t.in(ParkEquipmentEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        parkEquipmentQueryWrapper.lambda().isNull(ParkEquipmentEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(parkEquipmentPagination.getSidx())){
+            parkEquipmentQueryWrapper.lambda().orderByDesc(ParkEquipmentEntity::getId);
+        }else{
+            try {
+                String sidx = parkEquipmentPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                ParkEquipmentEntity parkEquipmentEntity = new ParkEquipmentEntity();
+                Field declaredField = parkEquipmentEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                parkEquipmentQueryWrapper="asc".equals(parkEquipmentPagination.getSort().toLowerCase())?parkEquipmentQueryWrapper.orderByAsc(value):parkEquipmentQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<ParkEquipmentEntity> page=new Page<>(parkEquipmentPagination.getCurrentPage(), parkEquipmentPagination.getPageSize());
+                IPage<ParkEquipmentEntity> userIPage=this.page(page, parkEquipmentQueryWrapper);
+                return parkEquipmentPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<ParkEquipmentEntity> list = new ArrayList();
+                return parkEquipmentPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(parkEquipmentQueryWrapper);
+        }
+    }
+    @Override
+    public ParkEquipmentEntity getInfo(String id){
+        QueryWrapper<ParkEquipmentEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(ParkEquipmentEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(ParkEquipmentEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, ParkEquipmentEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(ParkEquipmentEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(ParkEquipmentForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+                if(StringUtil.isEmpty(form.getEquipmentCoding())){
+                    return "设备编码不能为空";
+                }
+                if(StringUtil.isEmpty(form.getDeviceName())){
+                    return "设备名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getEquipmentBrand())){
+                    return "设备品牌不能为空";
+                }
+    if(StringUtil.isNotEmpty(form.getSupplierPhone())){
+        if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getSupplierPhone())).matches()){
+        return "请输入正确的联系方式";
+        }
+    }
+    if(StringUtil.isNotEmpty(form.getEquipmentWarranty())){
+        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getEquipmentWarranty())).matches()){
+        return "请输入正确的数字";
+        }
+    }
+                if(StringUtil.isEmpty(form.getDeviceMacAddress())){
+                    return "设备MAC地址不能为空";
+                }
+    if(StringUtil.isNotEmpty(form.getDeviceMacAddress())){
+        if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDeviceMacAddress())).matches()){
+        return "请输入正确的数字";
+        }
+    }
+                if(StringUtil.isEmpty(form.getRegionId())){
+                    return "所属区域不能为空";
+                }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param parkEquipmentForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(ParkEquipmentForm parkEquipmentForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        parkEquipmentForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(ParkEquipmentConstant.getFormData(),parkEquipmentForm),ParkEquipmentForm.class);
+        ParkEquipmentEntity entity = JsonUtil.getJsonToBean(parkEquipmentForm, ParkEquipmentEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentController.java

@@ -0,0 +1,191 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.equipment.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+/**
+ * Equipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-15
+ */
+@Slf4j
+@RestController
+@Tag(name = "Equipment" , description = "example")
+@RequestMapping("/api/example/Equipment")
+public class EquipmentController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private EquipmentService equipmentService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param equipmentPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody EquipmentPagination equipmentPagination)throws IOException{
+        List<EquipmentEntity> list= equipmentService.getList(equipmentPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (EquipmentEntity entity : list) {
+        Map<String, Object> equipmentMap=JsonUtil.entityToMap(entity);
+        equipmentMap.put("id", equipmentMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(equipmentMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, EquipmentConstant.getFormData(), EquipmentConstant.getColumnData(), equipmentPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(equipmentPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param equipmentForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid EquipmentForm equipmentForm) {
+        String b = equipmentService.checkForm(equipmentForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            equipmentService.saveOrUpdate(equipmentForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param equipmentForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EquipmentForm equipmentForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        equipmentForm.setId(id);
+        if (!isImport) {
+            String b =  equipmentService.checkForm(equipmentForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        EquipmentEntity entity= equipmentService.getInfo(id);
+        if(entity!=null){
+            try{
+                equipmentService.saveOrUpdate(equipmentForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        EquipmentEntity entity= equipmentService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            equipmentService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        EquipmentEntity entity= equipmentService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> equipmentMap=JsonUtil.entityToMap(entity);
+        equipmentMap.put("id", equipmentMap.get("id"));
+        //副表数据
+        //子表数据
+        equipmentMap = generaterSwapUtil.swapDataDetail(equipmentMap,EquipmentConstant.getFormData(),"582551166336897669",false);
+        return ActionResult.success(equipmentMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        EquipmentEntity entity= equipmentService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> equipmentMap=JsonUtil.entityToMap(entity);
+        equipmentMap.put("id", equipmentMap.get("id"));
+        //副表数据
+        //子表数据
+        equipmentMap = generaterSwapUtil.swapDataForm(equipmentMap,EquipmentConstant.getFormData(),EquipmentConstant.TABLEFIELDKEY,EquipmentConstant.TABLERENAMES);
+        return ActionResult.success(equipmentMap);
+    }
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentRepairRecordsController.java

@@ -0,0 +1,191 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.equipmentrepairrecords.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+/**
+ * EquipmentRepairRecords
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Slf4j
+@RestController
+@Tag(name = "EquipmentRepairRecords" , description = "example")
+@RequestMapping("/api/example/EquipmentRepairRecords")
+public class EquipmentRepairRecordsController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private EquipmentRepairRecordsService equipmentRepairRecordsService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param equipmentRepairRecordsPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody EquipmentRepairRecordsPagination equipmentRepairRecordsPagination)throws IOException{
+        List<EquipmentRepairRecordsEntity> list= equipmentRepairRecordsService.getList(equipmentRepairRecordsPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (EquipmentRepairRecordsEntity entity : list) {
+        Map<String, Object> equipmentRepairRecordsMap=JsonUtil.entityToMap(entity);
+        equipmentRepairRecordsMap.put("id", equipmentRepairRecordsMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(equipmentRepairRecordsMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, EquipmentRepairRecordsConstant.getFormData(), EquipmentRepairRecordsConstant.getColumnData(), equipmentRepairRecordsPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(equipmentRepairRecordsPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param equipmentRepairRecordsForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid EquipmentRepairRecordsForm equipmentRepairRecordsForm) {
+        String b = equipmentRepairRecordsService.checkForm(equipmentRepairRecordsForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            equipmentRepairRecordsService.saveOrUpdate(equipmentRepairRecordsForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param equipmentRepairRecordsForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EquipmentRepairRecordsForm equipmentRepairRecordsForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        equipmentRepairRecordsForm.setId(id);
+        if (!isImport) {
+            String b =  equipmentRepairRecordsService.checkForm(equipmentRepairRecordsForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        EquipmentRepairRecordsEntity entity= equipmentRepairRecordsService.getInfo(id);
+        if(entity!=null){
+            try{
+                equipmentRepairRecordsService.saveOrUpdate(equipmentRepairRecordsForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        EquipmentRepairRecordsEntity entity= equipmentRepairRecordsService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            equipmentRepairRecordsService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        EquipmentRepairRecordsEntity entity= equipmentRepairRecordsService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> equipmentRepairRecordsMap=JsonUtil.entityToMap(entity);
+        equipmentRepairRecordsMap.put("id", equipmentRepairRecordsMap.get("id"));
+        //副表数据
+        //子表数据
+        equipmentRepairRecordsMap = generaterSwapUtil.swapDataDetail(equipmentRepairRecordsMap,EquipmentRepairRecordsConstant.getFormData(),"582885544460025925",false);
+        return ActionResult.success(equipmentRepairRecordsMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        EquipmentRepairRecordsEntity entity= equipmentRepairRecordsService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> equipmentRepairRecordsMap=JsonUtil.entityToMap(entity);
+        equipmentRepairRecordsMap.put("id", equipmentRepairRecordsMap.get("id"));
+        //副表数据
+        //子表数据
+        equipmentRepairRecordsMap = generaterSwapUtil.swapDataForm(equipmentRepairRecordsMap,EquipmentRepairRecordsConstant.getFormData(),EquipmentRepairRecordsConstant.TABLEFIELDKEY,EquipmentRepairRecordsConstant.TABLERENAMES);
+        return ActionResult.success(equipmentRepairRecordsMap);
+    }
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ParkEquipmentController.java

@@ -0,0 +1,191 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.parkequipment.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+/**
+ * ParkEquipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Slf4j
+@RestController
+@Tag(name = "ParkEquipment" , description = "example")
+@RequestMapping("/api/example/ParkEquipment")
+public class ParkEquipmentController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private ParkEquipmentService parkEquipmentService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param parkEquipmentPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody ParkEquipmentPagination parkEquipmentPagination)throws IOException{
+        List<ParkEquipmentEntity> list= parkEquipmentService.getList(parkEquipmentPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (ParkEquipmentEntity entity : list) {
+        Map<String, Object> parkEquipmentMap=JsonUtil.entityToMap(entity);
+        parkEquipmentMap.put("id", parkEquipmentMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(parkEquipmentMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, ParkEquipmentConstant.getFormData(), ParkEquipmentConstant.getColumnData(), parkEquipmentPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(parkEquipmentPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param parkEquipmentForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid ParkEquipmentForm parkEquipmentForm) {
+        String b = parkEquipmentService.checkForm(parkEquipmentForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            parkEquipmentService.saveOrUpdate(parkEquipmentForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param parkEquipmentForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ParkEquipmentForm parkEquipmentForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        parkEquipmentForm.setId(id);
+        if (!isImport) {
+            String b =  parkEquipmentService.checkForm(parkEquipmentForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        ParkEquipmentEntity entity= parkEquipmentService.getInfo(id);
+        if(entity!=null){
+            try{
+                parkEquipmentService.saveOrUpdate(parkEquipmentForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        ParkEquipmentEntity entity= parkEquipmentService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            parkEquipmentService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        ParkEquipmentEntity entity= parkEquipmentService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> parkEquipmentMap=JsonUtil.entityToMap(entity);
+        parkEquipmentMap.put("id", parkEquipmentMap.get("id"));
+        //副表数据
+        //子表数据
+        parkEquipmentMap = generaterSwapUtil.swapDataDetail(parkEquipmentMap,ParkEquipmentConstant.getFormData(),"582564179701929029",false);
+        return ActionResult.success(parkEquipmentMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        ParkEquipmentEntity entity= parkEquipmentService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> parkEquipmentMap=JsonUtil.entityToMap(entity);
+        parkEquipmentMap.put("id", parkEquipmentMap.get("id"));
+        //副表数据
+        //子表数据
+        parkEquipmentMap = generaterSwapUtil.swapDataForm(parkEquipmentMap,ParkEquipmentConstant.getFormData(),ParkEquipmentConstant.TABLEFIELDKEY,ParkEquipmentConstant.TABLERENAMES);
+        return ActionResult.success(parkEquipmentMap);
+    }
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/EquipmentEntity.java

@@ -0,0 +1,71 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-15
+ */
+@Data
+@TableName("yq_equipment")
+public class EquipmentEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String code;
+    @TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String name;
+    @TableField(value = "TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String type;
+    @TableField(value = "BRAND" , updateStrategy = FieldStrategy.IGNORED)
+    private String brand;
+    @TableField(value = "MODEL" , updateStrategy = FieldStrategy.IGNORED)
+    private String model;
+    @TableField(value = "SUPPLIER" , updateStrategy = FieldStrategy.IGNORED)
+    private String supplier;
+    @TableField(value = "SUPPLIER_PHONE" , updateStrategy = FieldStrategy.IGNORED)
+    private String supplierPhone;
+    @TableField(value = "WARRANTY_START_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date warrantyStartTime;
+    @TableField(value = "WARRANTY_END_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date warrantyEndTime;
+    @TableField(value = "DEFECTS_LIABILITY_PERIOD" , updateStrategy = FieldStrategy.IGNORED)
+    private String defectsLiabilityPeriod;
+    @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String batchNumber;
+    @TableField(value = "DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
+    private String description;
+    @TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private String status;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+    @TableField("ORGANIZE_JSON_ID")
+    private String organizeJsonId;
+    @TableField("F_VERSION")
+    private Integer version;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/EquipmentRepairRecordsEntity.java

@@ -0,0 +1,83 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 设备报修记录										
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+@TableName("yq_equipment_repair_records")
+public class EquipmentRepairRecordsEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "REPAIR_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String repairNumber;
+    @TableField(value = "REPAIR_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String repairName;
+    @TableField("REPAIR_DATE")
+    private Date repairDate;
+    @TableField("EQUIPMENT_ID")
+    private String equipmentId;
+    @TableField(value = "EQUIPMENT_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentNumber;
+    @TableField(value = "EQUIPMENT_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentName;
+    @TableField("REGION_ID")
+    private String regionId;
+    @TableField("REGION_NAME")
+    private String regionName;
+    @TableField("REPAIR_ORDER_ID")
+    private String repairOrderId;
+    @TableField("REPAIR_ORDER_NUMBER")
+    private String repairOrderNumber;
+    @TableField(value = "CAUSE_OF_MALFUNCTION" , updateStrategy = FieldStrategy.IGNORED)
+    private String causeOmalfunction;
+    @TableField(value = "CONTRACT_INFORMATION" , updateStrategy = FieldStrategy.IGNORED)
+    private String contractInformation;
+    @TableField(value = "URGENT" , updateStrategy = FieldStrategy.IGNORED)
+    private String urgent;
+    @TableField(value = "REPAIR_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date repairTime;
+    @TableField(value = "FAULT_PHOTOS" , updateStrategy = FieldStrategy.IGNORED)
+    private String faultPhotos;
+    @TableField(value = "MESSAGE_STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private String messageStatus;
+    @TableField("REPLY_MESSAGE")
+    private String replyMessage;
+    @TableField(value = "SPACE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String spaceId;
+    @TableField("SPACE_NAME")
+    private String spaceName;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+    @TableField("ORGANIZE_JSON_ID")
+    private String organizeJsonId;
+    @TableField("F_VERSION")
+    private Integer version;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ParkEquipmentEntity.java

@@ -0,0 +1,111 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 园区设备清单
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+@TableName("yq_park_equipment")
+public class ParkEquipmentEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("CREATE_BY")
+    private String createBy;
+    @TableField("CREATION_TIME")
+    private Date creationTime;
+    @TableField("UPDATE_BY")
+    private String updateBy;
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+    @TableField(value = "EQUIPMENT_CODING" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentCoding;
+    @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceName;
+    @TableField(value = "EQUIPMENT_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentType;
+    @TableField(value = "EQUIPMENT_BRAND" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentBrand;
+    @TableField("EQUIPMENT_MODEL")
+    private String equipmentModel;
+    @TableField(value = "SUPPLIER" , updateStrategy = FieldStrategy.IGNORED)
+    private String supplier;
+    @TableField(value = "SUPPLIER_PHONE" , updateStrategy = FieldStrategy.IGNORED)
+    private String supplierPhone;
+    @TableField("INSTALLATION_TIME")
+    private Date installationTime;
+    @TableField("PERSON_IN_CHARGE")
+    private String personInCharge;
+    @TableField("CHARGE_PHONE")
+    private String chargePhone;
+    @TableField(value = "DEVICE_STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceStatus;
+    @TableField(value = "WARRANTY_START_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date warrantyStartTime;
+    @TableField(value = "WARRANTY_END_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date warrantyEndTime;
+    @TableField(value = "SPACE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String spaceId;
+    @TableField("SPACE_NAME")
+    private String spaceName;
+    @TableField(value = "REGION_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String regionId;
+    @TableField("REGION_NAME")
+    private String regionName;
+    @TableField(value = "EQUIPMENT_WARRANTY" , updateStrategy = FieldStrategy.IGNORED)
+    private String equipmentWarranty;
+    @TableField(value = "DEVICE_DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceDescription;
+    @TableField(value = "DEVICE_MAC_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceMacAddress;
+    @TableField(value = "STATE" , updateStrategy = FieldStrategy.IGNORED)
+    private String state;
+    @TableField("EQUIPMENT_WARRANTY_PERIOD")
+    private String equipmentWarrantyPeriod;
+    @TableField("EQUIPMENT_CODE")
+    private String equipmentCode;
+    @TableField("REMARKS")
+    private String remarks;
+    @TableField("OPTIMISTIC_LOCK")
+    private Integer optimisticLock;
+    @TableField("CELETE_TAGS")
+    private Integer celeteTags;
+    @TableField("COMPANY")
+    private String company;
+    @TableField("DEPARTMENT")
+    private String department;
+    @TableField("ORGANIZATION")
+    private String organization;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+    @TableField("ORGANIZE_JSON_ID")
+    private String organizeJsonId;
+    @TableField("F_VERSION")
+    private Integer version;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/ContractForm.java

@@ -0,0 +1,26 @@
+package jnpf.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ *
+ *
+ * 版本: V3.0.0
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者： JNPF开发平台组
+ * 日期： 2020-12-31
+ */
+@Data
+public class ContractForm  {
+
+    @Schema(description = "姓名")
+    private String contractName;
+
+    @Schema(description = "手机号")
+    private String mytelePhone;
+
+    @Schema(description = "文件")
+    private String fileJson;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/ContractInfoVO.java

@@ -0,0 +1,27 @@
+package jnpf.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ *
+ *
+ * 版本: V3.0.0
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者： JNPF开发平台组
+ * 日期： 2020-12-31
+ */
+@Data
+public class ContractInfoVO  {
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "姓名")
+    private String contractName;
+
+    @Schema(description = "手机号")
+    private String mytelePhone;
+
+    @Schema(description = "文件")
+    private String fileJson;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/ContractListVO.java

@@ -0,0 +1,16 @@
+package jnpf.model;
+
+import lombok.Data;
+
+/**
+ *
+ *
+ * 版本: V3.0.0
+ * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
+ * 作者： JNPF开发平台组
+ * 日期： 2020-12-31
+ */
+@Data
+public class ContractListVO extends ContractInfoVO {
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentForm.java

@@ -0,0 +1,62 @@
+package jnpf.model.equipment;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Equipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-15
+ */
+@Data
+public class EquipmentForm  {
+    /** 主键 */
+    private String id;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 设备编码 **/
+    @JsonProperty("code")
+    private String code;
+    /** 设备名称 **/
+    @JsonProperty("name")
+    private String name;
+    /** 设备类型 **/
+    @JsonProperty("type")
+    private Object type;
+    /** 设备品牌 **/
+    @JsonProperty("brand")
+    private String brand;
+    /** 设备型号 **/
+    @JsonProperty("model")
+    private String model;
+    /** 批次号 **/
+    @JsonProperty("batchNumber")
+    private String batchNumber;
+    /** 供应商 **/
+    @JsonProperty("supplier")
+    private String supplier;
+    /** 供应商联系电话 **/
+    @JsonProperty("supplierPhone")
+    private String supplierPhone;
+    /** 设备状态 **/
+    @JsonProperty("status")
+    private Object status;
+    /** 保修期 **/
+    @JsonProperty("defectsLiabilityPeriod")
+    private String defectsLiabilityPeriod;
+    /** 保修开始时间 **/
+    @JsonProperty("warrantyStartTime")
+    private String warrantyStartTime;
+    /** 保修结束时间 **/
+    @JsonProperty("warrantyEndTime")
+    private String warrantyEndTime;
+    /** 设备描述 **/
+    @JsonProperty("description")
+    private String description;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java

@@ -0,0 +1,42 @@
+package jnpf.model.equipment;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * Equipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-15
+ */
+@Data
+public class EquipmentPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+    /** 设备类型 */
+    @JsonProperty("type")
+    private Object type;
+    /** 设备品牌 */
+    @JsonProperty("brand")
+    private Object brand;
+    /** 设备名称 */
+    @JsonProperty("name")
+    private Object name;
+    /** 设备编码 */
+    @JsonProperty("code")
+    private Object code;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipmentrepairrecords/EquipmentRepairRecordsForm.java

@@ -0,0 +1,56 @@
+package jnpf.model.equipmentrepairrecords;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * EquipmentRepairRecords
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+public class EquipmentRepairRecordsForm  {
+    /** 主键 */
+    private String id;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 报修单号 **/
+    @JsonProperty("repairNumber")
+    private String repairNumber;
+    /** 空间 **/
+    @JsonProperty("spaceId")
+    private Object spaceId;
+    /** 设备编码 **/
+    @JsonProperty("equipmentNumber")
+    private String equipmentNumber;
+    /** 设备名称 **/
+    @JsonProperty("equipmentName")
+    private String equipmentName;
+    /** 报修人 **/
+    @JsonProperty("repairName")
+    private String repairName;
+    /** 联系方式 **/
+    @JsonProperty("contractInformation")
+    private String contractInformation;
+    /** 期望维修时间 **/
+    @JsonProperty("repairTime")
+    private String repairTime;
+    /** 是否紧急 **/
+    @JsonProperty("urgent")
+    private Object urgent;
+    /** 消息状态 **/
+    @JsonProperty("messageStatus")
+    private Object messageStatus;
+    /** 故障原因 **/
+    @JsonProperty("causeOmalfunction")
+    private String causeOmalfunction;
+    /** 故障照片 **/
+    @JsonProperty("faultPhotos")
+    private Object faultPhotos;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipmentrepairrecords/EquipmentRepairRecordsPagination.java

@@ -0,0 +1,45 @@
+package jnpf.model.equipmentrepairrecords;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * EquipmentRepairRecords
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+public class EquipmentRepairRecordsPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+    /** 设备编码 */
+    @JsonProperty("equipmentNumber")
+    private Object equipmentNumber;
+    /** 设备名称 */
+    @JsonProperty("equipmentName")
+    private Object equipmentName;
+    /** 空间 */
+    @JsonProperty("spaceId")
+    private Object spaceId;
+    /** 报修人 */
+    @JsonProperty("repairName")
+    private Object repairName;
+    /** 是否紧急 */
+    @JsonProperty("urgent")
+    private Object urgent;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentForm.java

@@ -0,0 +1,68 @@
+package jnpf.model.parkequipment;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * ParkEquipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+public class ParkEquipmentForm  {
+    /** 主键 */
+    private String id;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 设备编码 **/
+    @JsonProperty("equipmentCoding")
+    private String equipmentCoding;
+    /** 设备名称 **/
+    @JsonProperty("deviceName")
+    private String deviceName;
+    /** 设备类型 **/
+    @JsonProperty("equipmentType")
+    private Object equipmentType;
+    /** 设备品牌 **/
+    @JsonProperty("equipmentBrand")
+    private String equipmentBrand;
+    /** 供应商 **/
+    @JsonProperty("supplier")
+    private String supplier;
+    /** 供应商联系电话 **/
+    @JsonProperty("supplierPhone")
+    private String supplierPhone;
+    /** 设备保修期 **/
+    @JsonProperty("equipmentWarranty")
+    private String equipmentWarranty;
+    /** 保修开始时间 **/
+    @JsonProperty("warrantyStartTime")
+    private String warrantyStartTime;
+    /** 保修结束时间 **/
+    @JsonProperty("warrantyEndTime")
+    private String warrantyEndTime;
+    /** 状态 **/
+    @JsonProperty("state")
+    private Object state;
+    /** 设备状态(正常、异常) **/
+    @JsonProperty("deviceStatus")
+    private Object deviceStatus;
+    /** 设备MAC地址 **/
+    @JsonProperty("deviceMacAddress")
+    private String deviceMacAddress;
+    /** 空间 **/
+    @JsonProperty("spaceId")
+    private String spaceId;
+    /** 所属区域 **/
+    @JsonProperty("regionId")
+    private String regionId;
+    /** 设备描述 **/
+    @JsonProperty("deviceDescription")
+    private String deviceDescription;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/parkequipment/ParkEquipmentPagination.java

@@ -0,0 +1,48 @@
+package jnpf.model.parkequipment;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * ParkEquipment
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-16
+ */
+@Data
+public class ParkEquipmentPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+    /** 设备类型 */
+    @JsonProperty("equipmentType")
+    private Object equipmentType;
+    /** 设备品牌 */
+    @JsonProperty("equipmentBrand")
+    private Object equipmentBrand;
+    /** 设备编码 */
+    @JsonProperty("equipmentCoding")
+    private Object equipmentCoding;
+    /** 设备名称 */
+    @JsonProperty("deviceName")
+    private Object deviceName;
+    /** 状态 */
+    @JsonProperty("state")
+    private Object state;
+    /** 所属区域 */
+    @JsonProperty("regionId")
+    private Object regionId;
+}

jnpf-java-boot/jnpf-web/src/views/scm/equipment/Detail.vue

@@ -0,0 +1,179 @@
+<template>
+<el-dialog title="详情"
+           :close-on-click-modal="false" append-to-body
+           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+           width="1000px">
+<el-row :gutter="15" class="">
+<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备编码"  
+ prop="code"  >
+                        <p>{{dataForm.code}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备名称"  
+ prop="name"  >
+                        <p>{{dataForm.name}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备类型"  
+ prop="type"  >
+                         <p>{{ dataForm.type }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备品牌"  
+ prop="brand"  >
+                        <p>{{dataForm.brand}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备型号"  
+ prop="model"  >
+                        <p>{{dataForm.model}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="批次号"  
+ prop="batchNumber"  >
+                        <p>{{dataForm.batchNumber}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="供应商"  
+ prop="supplier"  >
+                        <p>{{dataForm.supplier}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="供应商联系电话"  
+ prop="supplierPhone"  >
+                        <p>{{dataForm.supplierPhone}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备状态"  
+ prop="status"  >
+                         <p>{{ dataForm.status }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="保修期"  
+ prop="defectsLiabilityPeriod"  >
+                        <p>{{dataForm.defectsLiabilityPeriod}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="保修开始时间"  
+ prop="warrantyStartTime"  >
+                        <p>{{dataForm.warrantyStartTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="保修结束时间"  
+ prop="warrantyEndTime"  >
+                        <p>{{dataForm.warrantyEndTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="设备描述"  
+ prop="description"  >
+                        <p>{{dataForm.description}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import jnpf from '@/utils/jnpf'
+    import Detail from '@/views/basic/dynamicModel/list/detail'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { Detail},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                detailVisible: false,
+                loading: false,
+
+            dataForm: {
+                id :'',
+                            code : '',
+                            name : '',
+                            type : "",
+                            brand : '',
+                            model : '',
+                            batchNumber : '',
+                            supplier : '',
+                            supplierPhone : '',
+                            status : "1",
+                            defectsLiabilityPeriod : '',
+                            warrantyStartTime : '',
+                            warrantyEndTime : '',
+                            description : '',
+            },
+                            typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                        typeProps:{"label":"fullName","value":"id"  },
+                            statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}],
+                        statusProps:{"label":"fullName","value":"id"  },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.detailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.Detail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+            },
+
+            init(id) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/Equipment/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/equipment/form.vue

@@ -0,0 +1,589 @@
+
+
+
+    <template>
+        <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
+                   :close-on-click-modal="false" append-to-body
+                   :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+                   width="1000px">
+        <el-row :gutter="15" class="">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+        <!-- 具体表单 -->
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备编码"   prop="code" >
+        <JnpfInput   v-model="dataForm.code" @change="changeData('code',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备名称"   prop="name" >
+        <JnpfInput   v-model="dataForm.name" @change="changeData('name',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备类型"   prop="type" >
+        <JnpfSelect   v-model="dataForm.type" @change="changeData('type',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="typeOptions" :props="typeProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备品牌"   prop="brand" >
+        <JnpfInput   v-model="dataForm.brand" @change="changeData('brand',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备型号"   prop="model" >
+        <JnpfInput   v-model="dataForm.model" @change="changeData('model',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="批次号"   prop="batchNumber" >
+        <JnpfInput   v-model="dataForm.batchNumber" @change="changeData('batchNumber',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="供应商"   prop="supplier" >
+        <JnpfInput   v-model="dataForm.supplier" @change="changeData('supplier',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="供应商联系电话"   prop="supplierPhone" >
+        <JnpfInput   v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备状态"   prop="status" >
+        <JnpfSelect   v-model="dataForm.status" @change="changeData('status',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="statusOptions" :props="statusProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="保修期"   prop="defectsLiabilityPeriod" >
+        <JnpfInput   v-model="dataForm.defectsLiabilityPeriod" @change="changeData('defectsLiabilityPeriod',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="保修开始时间"   prop="warrantyStartTime" >
+        <JnpfDatePicker   v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="保修结束时间"   prop="warrantyEndTime" >
+        <JnpfDatePicker   v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24" >
+        <jnpf-form-tip-item
+ label="设备描述"   prop="description" >
+        <JnpfTextarea   v-model="dataForm.description" @change="changeData('description',-1)" 
+ placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
+    </JnpfTextarea>
+    </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    </el-form>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+                    <div class="upAndDown-button" v-if="dataForm.id">
+                <el-button @click="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-button>
+                <el-button @click="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-button>
+              </div>
+                <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
+            {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
+              <el-button @click="visible = false"> 取 消</el-button>
+              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
+        </span>
+    </el-dialog>
+    </template>
+
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { },
+        props: [],
+        data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting:{},
+            eventType: '',
+            userBoxVisible:false,
+            selectDialogVisible: false,
+            currTableConf:{},
+            dataValueAll:{},
+            addTableConf:{
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                code : undefined,
+                                name : undefined,
+                                    type : undefined,
+                                brand : undefined,
+                                model : undefined,
+                                batchNumber : undefined,
+                                supplier : undefined,
+                                supplierPhone : undefined,
+                                    status : "1",
+                                defectsLiabilityPeriod : undefined,
+                                warrantyStartTime : undefined,
+                                warrantyEndTime : undefined,
+                                description : undefined,
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            type: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            brand: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            model: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            batchNumber: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            supplier: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            supplierPhone: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                                    {
+                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+                                        message: '请输入正确的联系方式',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            defectsLiabilityPeriod: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                                    {
+                                        pattern: /^\d+$/,
+                                        message: '请输入正确的数字',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            warrantyStartTime: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            warrantyEndTime: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+            },
+                            typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                            typeProps:{"label":"fullName","value":"id"  },
+                            statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}],
+                            statusProps:{"label":"fullName","value":"id"  },
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        code:[] ,
+                        name:[] ,
+                        type:[] ,
+                        brand:[] ,
+                        model:[] ,
+                        batchNumber:[] ,
+                        supplier:[] ,
+                        supplierPhone:[] ,
+                        status:[] ,
+                        defectsLiabilityPeriod:[] ,
+                        warrantyStartTime:[] ,
+                        warrantyEndTime:[] ,
+                        description:[] ,
+            },
+        }
+        },
+        computed: {
+            ...mapGetters(['userInfo'])
+        },
+        watch: {},
+        created() {
+            this.dataAll()
+            this.initDefaultData()
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            prev() {
+                this.index--
+                if (this.index === 0) {
+                    this.prevDis = true
+                }
+                this.nextDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            next() {
+                this.index++
+                if (this.index === this.allList.length - 1) {
+                    this.nextDis = true
+                }
+                this.prevDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            getInfo(id) {
+                request({
+                    url: '/api/example/Equipment/'+ id,
+                    method: 'get'
+                }).then(res => {
+                    this.dataInfo(res.data)
+                });
+            },
+            goBack() {
+                this.visible = false
+                this.$emit('refreshDataList', true)
+            },
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            changeDataFormData(type, data, model,index,defaultValue) {
+                if(!this.isEdit) {
+                    if (type == 2) {
+                        for (let i = 0; i < this.dataForm[data].length; i++) {
+                            if (index == -1) {
+                                this.dataForm[data][i][model] = defaultValue
+                            } else if (index == i) {
+                                this.dataForm[data][i][model] = defaultValue
+                            }
+                        }
+                    } else {
+                        this.dataForm[data] = defaultValue
+                    }
+                }
+            },
+            dataAll(){
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            init(id,isDetail,allList) {
+                this.prevDis = false
+                this.nextDis = false
+                this.allList = allList || []
+                if (allList.length) {
+                    this.index = this.allList.findIndex(item => item.id === id)
+                    if (this.index == 0) {
+                        this.prevDis = true
+                    }
+                    if (this.index == this.allList.length - 1) {
+                        this.nextDis = true
+                    }
+                } else {
+                    this.prevDis = true
+                    this.nextDis = true
+                }
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/Equipment/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                        this.clearData()
+                        this.initDefaultData()
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+            // 表单提交
+            dataFormSubmit(type) {
+                this.dataFormSubmitType = type ? type : 0
+                this.$refs['formRef'].validate((valid) => {
+                    if (valid) {
+                        this.request()
+                    }
+                })
+            },
+            request() {
+                let _data =this.dataList()
+                if (this.dataFormSubmitType == 2) {
+                    this.continueBtnLoading = true
+                } else {
+                    this.btnLoading = true
+                }
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/example/Equipment',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) {
+                                    this.$nextTick(() => {
+                                        this.clearData()
+                                        this.initDefaultData()
+                                    })
+                                    this.continueBtnLoading = false
+                                    return
+                                }
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }else{
+                    request({
+                        url: '/api/example/Equipment/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }
+            },
+            openSelectDialog(key) {
+                this.currTableConf=this.addTableConf[key]
+                this.currVmodel=key
+                this.selectDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.selectDialog.init()
+                })
+            },
+            addForSelect(data) {
+                for (let i = 0; i < data.length; i++) {
+                    let t = data[i]
+                    if(this['get'+this.currVmodel]){
+                        this['get'+this.currVmodel](t)
+                    }
+                }
+            },
+            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+                let timeDataValue = null;
+                let timeValue = Number(timeValueData)
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = new Date().getTime()
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getBeforeData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                        }
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getLaterData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                        }
+                    }
+                }
+                return timeDataValue;
+            },
+            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+                let timeDataValue = null
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue || '00:00:00'
+                        if (timeDataValue.split(':').length == 3) {
+                            timeDataValue = timeDataValue
+                        } else {
+                            timeDataValue = timeDataValue + ':00'
+                        }
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = this.jnpf.toDate(new Date(), format)
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        previousDate = getBeforeTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        previousDate = getLaterTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    }
+                }
+                return timeDataValue;
+            },
+            dataList(){
+                var _data = this.dataForm;
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+                this.isEdit = true
+                this.dataAll()
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/equipment/index.vue

@@ -0,0 +1,534 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="设备类型">
+                                        <JnpfSelect v-model="query.type" placeholder="请选择" clearable
+                                                    :options="typeOptions"
+                                                    :props="typeProps"  multiple >
+                                        </JnpfSelect>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备品牌">
+                                        <el-input v-model="query.brand" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备名称">
+                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="设备编码">
+                                                <el-input v-model="query.code" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                        </template>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                                    展开
+                                </el-button>
+                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                                    收起
+                                </el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="code"
+ label="设备编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="name"
+ label="设备名称"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="设备状态"  prop="status" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.status}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="batchNumber"
+ label="批次号"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="设备类型"  prop="type" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.type}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="brand"
+ label="设备品牌"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="model"
+ label="设备型号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="supplier"
+ label="供应商"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="supplierPhone"
+ label="供应商联系电话"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="warrantyStartTime"
+ label="保修开始时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="warrantyEndTime"
+ label="保修结束时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="defectsLiabilityPeriod"
+ label="保修期"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="description"
+ label="设备描述"  align="left"
+ >
+                                                </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    showAll: false,
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        type:undefined,
+                        brand:undefined,
+                        name:undefined,
+                        code:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                                typeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                        typeProps:{"label":"fullName","value":"id"  },
+                            statusOptions:[{"fullName":"可用","id":"1"},{"fullName":"已租","id":"2"},{"fullName":"报废","id":"3"}],
+                        statusProps:{"label":"fullName","value":"id"  },
+            interfaceRes: {
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'582551166336897669',
+                    type:1,
+                };
+                request({
+                    url: `/api/example/Equipment/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/Equipment/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","example/Equipment")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/Equipment/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx=""
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/Detail.vue

@@ -0,0 +1,169 @@
+<template>
+<el-dialog title="详情"
+           :close-on-click-modal="false" append-to-body
+           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+           width="1000px">
+<el-row :gutter="15" class="">
+<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="报修单号"  
+ prop="repairNumber"  >
+                        <p>{{dataForm.repairNumber}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="空间"  
+ prop="spaceId"  >
+                        <p>{{dataForm.spaceId}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备编码"  
+ prop="equipmentNumber"  >
+                        <p>{{dataForm.equipmentNumber}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备名称"  
+ prop="equipmentName"  >
+                        <p>{{dataForm.equipmentName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="报修人"  
+ prop="repairName"  >
+                        <p>{{dataForm.repairName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="联系方式"  
+ prop="contractInformation"  >
+                        <p>{{dataForm.contractInformation}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="期望维修时间"  
+ prop="repairTime"  >
+                        <p>{{dataForm.repairTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="是否紧急"  
+ prop="urgent"  >
+                         <p>{{ dataForm.urgent }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="消息状态"  
+ prop="messageStatus"  >
+                         <p>{{ dataForm.messageStatus }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="故障原因"  
+ prop="causeOmalfunction"  >
+                        <p>{{dataForm.causeOmalfunction}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="故障照片"  
+ prop="faultPhotos"  >
+                    <JnpfUploadImg    v-model="dataForm.faultPhotos"
+ disabled
+ detailed  :fileSize="10"  sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  >
+                </JnpfUploadImg>
+                </jnpf-form-tip-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import jnpf from '@/utils/jnpf'
+    import Detail from '@/views/basic/dynamicModel/list/detail'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { Detail},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                detailVisible: false,
+                loading: false,
+
+            dataForm: {
+                id :'',
+                            repairNumber : '',
+                            spaceId : "3",
+                            equipmentNumber : '',
+                            equipmentName : '',
+                            repairName : '',
+                            contractInformation : '',
+                            repairTime : '',
+                            urgent : "1",
+                            messageStatus : "2",
+                            causeOmalfunction : '',
+                            faultPhotos : [],
+            },
+                        spaceIdProps:{"label":"name","value":"id"  },
+                            urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}],
+                        urgentProps:{"label":"fullName","value":"id"  },
+                            messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}],
+                        messageStatusProps:{"label":"fullName","value":"id"  },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.detailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.Detail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+            },
+
+            init(id) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/EquipmentRepairRecords/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/form.vue

@@ -0,0 +1,584 @@
+
+
+
+    <template>
+        <el-dialog :title="!dataForm.id ? '新建' :'编辑'"
+                   :close-on-click-modal="false" append-to-body
+                   :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+                   width="1000px">
+        <el-row :gutter="15" class="">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+        <!-- 具体表单 -->
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="报修单号"   prop="repairNumber" >
+        <JnpfInput   v-model="dataForm.repairNumber" @change="changeData('repairNumber',-1)" 
+ placeholder="系统自动生成"  readonly  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="空间"   prop="spaceId" >
+        <JnpfSelect   v-model="dataForm.spaceId" @change="changeData('spaceId',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="spaceIdOptions" :props="spaceIdProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备编码"   prop="equipmentNumber" >
+        <JnpfInput   v-model="dataForm.equipmentNumber" @change="changeData('equipmentNumber',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备名称"   prop="equipmentName" >
+        <JnpfInput   v-model="dataForm.equipmentName" @change="changeData('equipmentName',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="报修人"   prop="repairName" >
+        <JnpfInput   v-model="dataForm.repairName" @change="changeData('repairName',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="联系方式"   prop="contractInformation" >
+        <JnpfInput   v-model="dataForm.contractInformation" @change="changeData('contractInformation',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="期望维修时间"   prop="repairTime" >
+        <JnpfDatePicker   v-model="dataForm.repairTime" @change="changeData('repairTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="是否紧急"   prop="urgent" >
+        <JnpfSelect   v-model="dataForm.urgent" @change="changeData('urgent',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="urgentOptions" :props="urgentProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="消息状态"   prop="messageStatus" >
+        <JnpfSelect   v-model="dataForm.messageStatus" @change="changeData('messageStatus',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="messageStatusOptions" :props="messageStatusProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24" >
+        <jnpf-form-tip-item
+ label="故障原因"   prop="causeOmalfunction" >
+        <JnpfTextarea   v-model="dataForm.causeOmalfunction" @change="changeData('causeOmalfunction',-1)" 
+ placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
+    </JnpfTextarea>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="故障照片"   prop="faultPhotos" >
+        <JnpfUploadImg   v-model="dataForm.faultPhotos" @change="changeData('faultPhotos',-1)" 
+ :fileSize="10" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0" >
+    </JnpfUploadImg>
+    </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    </el-form>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+                    <div class="upAndDown-button" v-if="dataForm.id">
+                <el-button @click="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-button>
+                <el-button @click="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-button>
+              </div>
+                <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
+            {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
+              <el-button @click="visible = false"> 取 消</el-button>
+              <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
+        </span>
+    </el-dialog>
+    </template>
+
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { },
+        props: [],
+        data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting:{},
+            eventType: '',
+            userBoxVisible:false,
+            selectDialogVisible: false,
+            currTableConf:{},
+            dataValueAll:{},
+            addTableConf:{
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                repairNumber : undefined,
+                                    spaceId : "3",
+                                equipmentNumber : undefined,
+                                equipmentName : undefined,
+                                repairName : undefined,
+                                contractInformation : undefined,
+                                repairTime : undefined,
+                                    urgent : "1",
+                                    messageStatus : "2",
+                                causeOmalfunction : undefined,
+                                    faultPhotos : [],
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            spaceId: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+                            equipmentName: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            repairName: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            contractInformation: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                                    {
+                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+                                        message: '请输入正确的联系方式',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            urgent: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+                            messageStatus: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+                            causeOmalfunction: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            faultPhotos: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
+                        ],
+            },
+                    spaceIdOptions:[],
+                            spaceIdProps:{"label":"name","value":"id"  },
+                            urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}],
+                            urgentProps:{"label":"fullName","value":"id"  },
+                            messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}],
+                            messageStatusProps:{"label":"fullName","value":"id"  },
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        repairNumber:[] ,
+                        spaceId:[] ,
+                        equipmentNumber:[] ,
+                        equipmentName:[] ,
+                        repairName:[] ,
+                        contractInformation:[] ,
+                        repairTime:[] ,
+                        urgent:[] ,
+                        messageStatus:[] ,
+                        causeOmalfunction:[] ,
+                        faultPhotos:[] ,
+            },
+        }
+        },
+        computed: {
+            ...mapGetters(['userInfo'])
+        },
+        watch: {},
+        created() {
+            this.dataAll()
+            this.initDefaultData()
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            prev() {
+                this.index--
+                if (this.index === 0) {
+                    this.prevDis = true
+                }
+                this.nextDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            next() {
+                this.index++
+                if (this.index === this.allList.length - 1) {
+                    this.nextDis = true
+                }
+                this.prevDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            getInfo(id) {
+                request({
+                    url: '/api/example/EquipmentRepairRecords/'+ id,
+                    method: 'get'
+                }).then(res => {
+                    this.dataInfo(res.data)
+                });
+            },
+            goBack() {
+                this.visible = false
+                this.$emit('refreshDataList', true)
+            },
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            changeDataFormData(type, data, model,index,defaultValue) {
+                if(!this.isEdit) {
+                    if (type == 2) {
+                        for (let i = 0; i < this.dataForm[data].length; i++) {
+                            if (index == -1) {
+                                this.dataForm[data][i][model] = defaultValue
+                            } else if (index == i) {
+                                this.dataForm[data][i][model] = defaultValue
+                            }
+                        }
+                    } else {
+                        this.dataForm[data] = defaultValue
+                    }
+                }
+            },
+            dataAll(){
+                        this.getspaceIdOptions();
+            },
+                    getspaceIdOptions() {
+                    const index = this.childIndex
+                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.spaceId))
+                    for (let i = 0; i < templateJsonList.length; i++) {
+                        let json = templateJsonList[i];
+                        if(json.relationField){
+                            let relationFieldAll = json.relationField.split("-");
+                            let val = json.defaultValue;
+                            if(relationFieldAll.length>1 && index>-1){
+                                val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
+                            }else {
+                                val = this.dataForm[relationFieldAll]
+                            }
+                            json.defaultValue = val
+                        }
+                    }
+                    let template ={
+                        paramList:templateJsonList
+                    }
+                    getDataInterfaceRes('582825768971670725',template).then(res => {
+                        let data = res.data
+                        this.spaceIdOptions = data
+                        this.changeDataFormData(1,'spaceId','spaceId',index,'3')
+                    })
+                },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            init(id,isDetail,allList) {
+                this.prevDis = false
+                this.nextDis = false
+                this.allList = allList || []
+                if (allList.length) {
+                    this.index = this.allList.findIndex(item => item.id === id)
+                    if (this.index == 0) {
+                        this.prevDis = true
+                    }
+                    if (this.index == this.allList.length - 1) {
+                        this.nextDis = true
+                    }
+                } else {
+                    this.prevDis = true
+                    this.nextDis = true
+                }
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/EquipmentRepairRecords/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                        this.clearData()
+                        this.initDefaultData()
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+            // 表单提交
+            dataFormSubmit(type) {
+                this.dataFormSubmitType = type ? type : 0
+                this.$refs['formRef'].validate((valid) => {
+                    if (valid) {
+                        this.request()
+                    }
+                })
+            },
+            request() {
+                let _data =this.dataList()
+                if (this.dataFormSubmitType == 2) {
+                    this.continueBtnLoading = true
+                } else {
+                    this.btnLoading = true
+                }
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/example/EquipmentRepairRecords',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) {
+                                    this.$nextTick(() => {
+                                        this.clearData()
+                                        this.initDefaultData()
+                                    })
+                                    this.continueBtnLoading = false
+                                    return
+                                }
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }else{
+                    request({
+                        url: '/api/example/EquipmentRepairRecords/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }
+            },
+            openSelectDialog(key) {
+                this.currTableConf=this.addTableConf[key]
+                this.currVmodel=key
+                this.selectDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.selectDialog.init()
+                })
+            },
+            addForSelect(data) {
+                for (let i = 0; i < data.length; i++) {
+                    let t = data[i]
+                    if(this['get'+this.currVmodel]){
+                        this['get'+this.currVmodel](t)
+                    }
+                }
+            },
+            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+                let timeDataValue = null;
+                let timeValue = Number(timeValueData)
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = new Date().getTime()
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getBeforeData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                        }
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getLaterData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                        }
+                    }
+                }
+                return timeDataValue;
+            },
+            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+                let timeDataValue = null
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue || '00:00:00'
+                        if (timeDataValue.split(':').length == 3) {
+                            timeDataValue = timeDataValue
+                        } else {
+                            timeDataValue = timeDataValue + ':00'
+                        }
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = this.jnpf.toDate(new Date(), format)
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        previousDate = getBeforeTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        previousDate = getLaterTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    }
+                }
+                return timeDataValue;
+            },
+            dataList(){
+                var _data = this.dataForm;
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+                this.isEdit = true
+                this.dataAll()
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/equipmentrepairrecords/index.vue

@@ -0,0 +1,537 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="设备编码">
+                                        <el-input v-model="query.equipmentNumber" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备名称">
+                                        <el-input v-model="query.equipmentName" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="空间">
+                                        <JnpfSelect v-model="query.spaceId" placeholder="请选择" clearable
+                                                    :options="spaceIdOptions"
+                                                    :props="spaceIdProps"  multiple >
+                                        </JnpfSelect>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="报修人">
+                                                <el-input v-model="query.repairName" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="是否紧急">
+                                                <JnpfSelect v-model="query.urgent" placeholder="请选择" clearable
+                                                            :options="urgentOptions"
+                                                            :props="urgentProps"  multiple >
+                                                </JnpfSelect>
+                                        </el-form-item>
+                                    </el-col>
+                        </template>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                                    展开
+                                </el-button>
+                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                                    收起
+                                </el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="repairNumber"
+ label="报修单号"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="equipmentNumber"
+ label="设备编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="equipmentName"
+ label="设备名称"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="spaceId"
+ label="空间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="causeOmalfunction"
+ label="故障原因"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="repairName"
+ label="报修人"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="contractInformation"
+ label="联系方式"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="是否紧急"  prop="urgent" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.urgent}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="repairTime"
+ label="期望维修时间"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="消息状态"  prop="messageStatus" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.messageStatus}}
+                                            </template>
+                                        </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    showAll: false,
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        equipmentNumber:undefined,
+                        equipmentName:undefined,
+                        spaceId:undefined,
+                        repairName:undefined,
+                        urgent:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                                spaceIdOptions:[],
+                        spaceIdProps:{"label":"name","value":"id"  },
+                            urgentOptions:[{"fullName":"非紧急","id":"1"},{"fullName":"紧急","id":"2"}],
+                        urgentProps:{"label":"fullName","value":"id"  },
+                            messageStatusOptions:[{"fullName":"已读","id":"1"},{"fullName":"未读","id":"2"}],
+                        messageStatusProps:{"label":"fullName","value":"id"  },
+            interfaceRes: {
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+                    this.getspaceIdOptions();
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+                    getspaceIdOptions() {
+                        getDataInterfaceRes('582825768971670725').then(res => {
+                            let data = res.data
+                            this.spaceIdOptions = data
+                        })
+                    },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'582885544460025925',
+                    type:1,
+                };
+                request({
+                    url: `/api/example/EquipmentRepairRecords/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/EquipmentRepairRecords/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","example/EquipmentRepairRecords")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/EquipmentRepairRecords/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx=""
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/Detail.vue

@@ -0,0 +1,201 @@
+<template>
+<transition name="el-zoom-in-center">
+<div class="JNPF-preview-main">
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+    <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack"
+                        content="详情"/>
+        <div class="options">
+            <el-button @click="goBack">取 消</el-button>
+        </div>
+    </div>
+<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备编码"  
+ prop="equipmentCoding"  >
+                        <p>{{dataForm.equipmentCoding}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备名称"  
+ prop="deviceName"  >
+                        <p>{{dataForm.deviceName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备类型"  
+ prop="equipmentType"  >
+                         <p>{{ dataForm.equipmentType }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备品牌"  
+ prop="equipmentBrand"  >
+                        <p>{{dataForm.equipmentBrand}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="供应商"  
+ prop="supplier"  >
+                        <p>{{dataForm.supplier}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="供应商联系电话"  
+ prop="supplierPhone"  >
+                        <p>{{dataForm.supplierPhone}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备保修期"  
+ prop="equipmentWarranty"  >
+                        <p>{{dataForm.equipmentWarranty}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="保修开始时间"  
+ prop="warrantyStartTime"  >
+                        <p>{{dataForm.warrantyStartTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="保修结束时间"  
+ prop="warrantyEndTime"  >
+                        <p>{{dataForm.warrantyEndTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="状态"  
+ prop="state"  >
+                         <p>{{ dataForm.state }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备状态(正常、异常)"  
+ prop="deviceStatus"  >
+                         <p>{{ dataForm.deviceStatus }} </p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="设备MAC地址"  
+ prop="deviceMacAddress"  >
+                        <p>{{dataForm.deviceMacAddress}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="空间"  
+ prop="spaceId"  >
+                        <p>{{dataForm.spaceId}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8"  >
+                <jnpf-form-tip-item  label="所属区域"  
+ prop="regionId"  >
+                        <p>{{dataForm.regionId}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="设备描述"  
+ prop="deviceDescription"  >
+                        <p>{{dataForm.deviceDescription}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    </div>
+</transition>
+</template>
+<script>
+    import request from '@/utils/request'
+
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import jnpf from '@/utils/jnpf'
+    import Detail from '@/views/basic/dynamicModel/list/detail'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { Detail},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                detailVisible: false,
+                loading: false,
+
+            dataForm: {
+                id :'',
+                            equipmentCoding : '',
+                            deviceName : '',
+                            equipmentType : "",
+                            equipmentBrand : '',
+                            supplier : '',
+                            supplierPhone : '',
+                            equipmentWarranty : '',
+                            warrantyStartTime : '',
+                            warrantyEndTime : '',
+                            state : "1",
+                            deviceStatus : "1",
+                            deviceMacAddress : '',
+                            spaceId : "",
+                            regionId : '',
+                            deviceDescription : '',
+            },
+                            equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                        equipmentTypeProps:{"label":"fullName","value":"id"  },
+                            stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
+                        stateProps:{"label":"fullName","value":"id"  },
+                            deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
+                        deviceStatusProps:{"label":"fullName","value":"id"  },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.detailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.Detail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+            },
+
+                goBack() {
+                    this.$emit('refresh')
+                },
+            init(id) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/ParkEquipment/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/form.vue

@@ -0,0 +1,621 @@
+
+
+
+    <template>
+            <transition name="el-zoom-in-center">
+            <div class="JNPF-preview-main">
+                <div class="JNPF-common-page-header">
+                    <el-page-header @back="goBack"
+                                    :content="!dataForm.id ? '新建':'编辑'"/>
+                    <div class="options">
+                            <el-dropdown class="dropdown" placement="bottom">
+                                <el-button style="width:70px">
+                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                                </el-button>
+                                <el-dropdown-menu slot="dropdown">
+                                        <template v-if="dataForm.id">
+                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                                {{'上一条'}}
+                                            </el-dropdown-item>
+                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                                {{'下一条'}}
+                                            </el-dropdown-item>
+                                        </template>
+                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
+                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown>
+                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
+                        <el-button @click="goBack"> 取 消</el-button>
+                    </div>
+                </div>
+            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+        <!-- 具体表单 -->
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备编码"   prop="equipmentCoding" >
+        <JnpfInput   v-model="dataForm.equipmentCoding" @change="changeData('equipmentCoding',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备名称"   prop="deviceName" >
+        <JnpfInput   v-model="dataForm.deviceName" @change="changeData('deviceName',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备类型"   prop="equipmentType" >
+        <JnpfSelect   v-model="dataForm.equipmentType" @change="changeData('equipmentType',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="equipmentTypeOptions" :props="equipmentTypeProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备品牌"   prop="equipmentBrand" >
+        <JnpfInput   v-model="dataForm.equipmentBrand" @change="changeData('equipmentBrand',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="供应商"   prop="supplier" >
+        <JnpfInput   v-model="dataForm.supplier" @change="changeData('supplier',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="供应商联系电话"   prop="supplierPhone" >
+        <JnpfInput   v-model="dataForm.supplierPhone" @change="changeData('supplierPhone',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备保修期"   prop="equipmentWarranty" >
+        <JnpfInput   v-model="dataForm.equipmentWarranty" @change="changeData('equipmentWarranty',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="保修开始时间"   prop="warrantyStartTime" >
+        <JnpfDatePicker   v-model="dataForm.warrantyStartTime" @change="changeData('warrantyStartTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="保修结束时间"   prop="warrantyEndTime" >
+        <JnpfDatePicker   v-model="dataForm.warrantyEndTime" @change="changeData('warrantyEndTime',-1)" 
+ :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
+    </JnpfDatePicker>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="状态"   prop="state" >
+        <JnpfSelect   v-model="dataForm.state" @change="changeData('state',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="stateOptions" :props="stateProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备状态(正常、异常)"   prop="deviceStatus" >
+        <JnpfSelect   v-model="dataForm.deviceStatus" @change="changeData('deviceStatus',-1)" 
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="deviceStatusOptions" :props="deviceStatusProps" >
+    </JnpfSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="设备MAC地址"   prop="deviceMacAddress" >
+        <JnpfInput   v-model="dataForm.deviceMacAddress" @change="changeData('deviceMacAddress',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="空间"   prop="spaceId" >
+        <JnpfPopupSelect   v-model="dataForm.spaceId" @change="changeData('spaceId',-1)" 
+ :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.spaceId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='spaceId'  interfaceId="582825768971670725"  :pageSize="20"  :columnOptions="spaceIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
+    </JnpfPopupSelect>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="8" >
+        <jnpf-form-tip-item
+ label="所属区域"   prop="regionId" >
+        <JnpfInput   v-model="dataForm.regionId" @change="changeData('regionId',-1)" 
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+    </JnpfInput>
+    </jnpf-form-tip-item>
+        </el-col>
+        <el-col :span="24" >
+        <jnpf-form-tip-item
+ label="设备描述"   prop="deviceDescription" >
+        <JnpfTextarea   v-model="dataForm.deviceDescription" @change="changeData('deviceDescription',-1)" 
+ placeholder="请输入"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
+    </JnpfTextarea>
+    </jnpf-form-tip-item>
+        </el-col>
+        <!-- 表单结束 -->
+    </template>
+    </el-form>
+    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
+    </el-row>
+    </div>
+    </transition>
+    </template>
+
+
+<script>
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+    export default {
+        components: { },
+        props: [],
+        data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting:{},
+            eventType: '',
+            userBoxVisible:false,
+            selectDialogVisible: false,
+            currTableConf:{},
+            dataValueAll:{},
+            addTableConf:{
+            },
+            //可选范围默认值
+            ableAll:{
+            },
+        tableRows:{
+        },
+            Vmodel:"",
+            currVmodel:"",
+            dataForm: {
+                                equipmentCoding : undefined,
+                                deviceName : undefined,
+                                    equipmentType : undefined,
+                                equipmentBrand : undefined,
+                                supplier : undefined,
+                                supplierPhone : undefined,
+                                equipmentWarranty : undefined,
+                                warrantyStartTime : undefined,
+                                warrantyEndTime : undefined,
+                                    state : "1",
+                                    deviceStatus : "1",
+                                deviceMacAddress : undefined,
+                                    spaceId : undefined,
+                                regionId : undefined,
+                                deviceDescription : undefined,
+                    version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                            equipmentCoding: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            deviceName: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            equipmentType: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            equipmentBrand: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            supplierPhone: [
+                                    {
+                                        pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+                                        message: '请输入正确的联系方式',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            equipmentWarranty: [
+                                    {
+                                        pattern: /^\d+$/,
+                                        message: '请输入正确的数字',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            deviceMacAddress: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                                    {
+                                        pattern: /^\d+$/,
+                                        message: '请输入正确的数字',
+                                        trigger: 'blur'
+                                    },
+                        ],
+                            spaceId: [
+                                {
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
+                                },
+                        ],
+                            regionId: [
+                                {
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
+                                },
+                        ],
+            },
+                            equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                            equipmentTypeProps:{"label":"fullName","value":"id"  },
+                            stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
+                            stateProps:{"label":"fullName","value":"id"  },
+                            deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
+                            deviceStatusProps:{"label":"fullName","value":"id"  },
+                    spaceIdcolumnOptions:[ {"label":"园区编码","value":"code"}, {"label":"园区名称","value":"name"}, {"label":"空间面积","value":"space_area"}, {"label":"空间类型","value":"space_type"}, {"label":"租赁开始时间","value":"lease_start_time"}, {"label":"租赁结束时间","value":"lease_end_ime"},],
+            childIndex:-1,
+                    isEdit:false,
+                    interfaceRes: {
+                        equipmentCoding:[] ,
+                        deviceName:[] ,
+                        equipmentType:[] ,
+                        equipmentBrand:[] ,
+                        supplier:[] ,
+                        supplierPhone:[] ,
+                        equipmentWarranty:[] ,
+                        warrantyStartTime:[] ,
+                        warrantyEndTime:[] ,
+                        state:[] ,
+                        deviceStatus:[] ,
+                        deviceMacAddress:[] ,
+                        spaceId:[] ,
+                        regionId:[] ,
+                        deviceDescription:[] ,
+            },
+        }
+        },
+        computed: {
+            ...mapGetters(['userInfo'])
+        },
+        watch: {},
+        created() {
+            this.dataAll()
+            this.initDefaultData()
+            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        },
+        mounted() {},
+        methods: {
+            prev() {
+                this.index--
+                if (this.index === 0) {
+                    this.prevDis = true
+                }
+                this.nextDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            next() {
+                this.index++
+                if (this.index === this.allList.length - 1) {
+                    this.nextDis = true
+                }
+                this.prevDis = false
+                for (let index = 0; index < this.allList.length; index++) {
+                    const element = this.allList[index];
+                    if (this.index == index) {
+                        this.getInfo(element.id)
+                    }
+                }
+            },
+            getInfo(id) {
+                request({
+                    url: '/api/example/ParkEquipment/'+ id,
+                    method: 'get'
+                }).then(res => {
+                    this.dataInfo(res.data)
+                });
+            },
+            goBack() {
+                this.visible = false
+                this.$emit('refreshDataList', true)
+            },
+            changeData(model, index) {
+                this.isEdit = false
+                this.childIndex = index
+                let modelAll = model.split("-");
+                let faceMode = "";
+                for (let i = 0; i < modelAll.length; i++) {
+                    faceMode += modelAll[i];
+                }
+                for (let key in this.interfaceRes) {
+                    if (key != faceMode) {
+                        let faceReList = this.interfaceRes[key]
+                        for (let i = 0; i < faceReList.length; i++) {
+                            if (faceReList[i].relationField == model) {
+                                let options = 'get' + key + 'Options';
+                                if(this[options]){
+                                    this[options]()
+                                }
+                                this.changeData(key, index)
+                            }
+                        }
+                    }
+                }
+            },
+            changeDataFormData(type, data, model,index,defaultValue) {
+                if(!this.isEdit) {
+                    if (type == 2) {
+                        for (let i = 0; i < this.dataForm[data].length; i++) {
+                            if (index == -1) {
+                                this.dataForm[data][i][model] = defaultValue
+                            } else if (index == i) {
+                                this.dataForm[data][i][model] = defaultValue
+                            }
+                        }
+                    } else {
+                        this.dataForm[data] = defaultValue
+                    }
+                }
+            },
+            dataAll(){
+            },
+                goBack() {
+                this.$emit('refresh')
+            },
+            clearData(){
+                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+            },
+            init(id,isDetail,allList) {
+                this.prevDis = false
+                this.nextDis = false
+                this.allList = allList || []
+                if (allList.length) {
+                    this.index = this.allList.findIndex(item => item.id === id)
+                    if (this.index == 0) {
+                        this.prevDis = true
+                    }
+                    if (this.index == this.allList.length - 1) {
+                        this.nextDis = true
+                    }
+                } else {
+                    this.prevDis = true
+                    this.nextDis = true
+                }
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.$nextTick(() => {
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/ParkEquipment/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                        this.clearData()
+                        this.initDefaultData()
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            //初始化默认数据
+            initDefaultData() {
+
+            },
+            // 表单提交
+            dataFormSubmit(type) {
+                this.dataFormSubmitType = type ? type : 0
+                this.$refs['formRef'].validate((valid) => {
+                    if (valid) {
+                        this.request()
+                    }
+                })
+            },
+            request() {
+                let _data =this.dataList()
+                if (this.dataFormSubmitType == 2) {
+                    this.continueBtnLoading = true
+                } else {
+                    this.btnLoading = true
+                }
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/example/ParkEquipment',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) {
+                                    this.$nextTick(() => {
+                                        this.clearData()
+                                        this.initDefaultData()
+                                    })
+                                    this.continueBtnLoading = false
+                                    return
+                                }
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }else{
+                    request({
+                        url: '/api/example/ParkEquipment/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                                this.visible = false
+                                this.btnLoading = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    }).catch(()=>{
+                        this.btnLoading = false
+                        this.continueBtnLoading = false
+                    })
+                }
+            },
+            openSelectDialog(key) {
+                this.currTableConf=this.addTableConf[key]
+                this.currVmodel=key
+                this.selectDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.selectDialog.init()
+                })
+            },
+            addForSelect(data) {
+                for (let i = 0; i < data.length; i++) {
+                    let t = data[i]
+                    if(this['get'+this.currVmodel]){
+                        this['get'+this.currVmodel](t)
+                    }
+                }
+            },
+            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+                let timeDataValue = null;
+                let timeValue = Number(timeValueData)
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = new Date().getTime()
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getBeforeData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                        }
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        if (timeTarget == 1 || timeTarget == 2) {
+                            previousDate = getDateDay(timeTarget, timeType, timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else if (timeTarget == 3) {
+                            previousDate = getLaterData(timeValue)
+                            timeDataValue = new Date(previousDate).getTime()
+                        } else {
+                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                        }
+                    }
+                }
+                return timeDataValue;
+            },
+            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+                let timeDataValue = null
+                if (timeRule) {
+                    if (timeType == 1) {
+                        timeDataValue = timeValue || '00:00:00'
+                        if (timeDataValue.split(':').length == 3) {
+                            timeDataValue = timeDataValue
+                        } else {
+                            timeDataValue = timeDataValue + ':00'
+                        }
+                    } else if (timeType == 2) {
+                        timeDataValue = dataValue
+                    } else if (timeType == 3) {
+                        timeDataValue = this.jnpf.toDate(new Date(), format)
+                    } else if (timeType == 4) {
+                        let previousDate = '';
+                        previousDate = getBeforeTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    } else if (timeType == 5) {
+                        let previousDate = '';
+                        previousDate = getLaterTime(timeTarget, timeValue)
+                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                    }
+                }
+                return timeDataValue;
+            },
+            dataList(){
+                var _data = this.dataForm;
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                this.dataForm = _dataAll
+                this.isEdit = true
+                this.dataAll()
+                this.childIndex=-1
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/scm/parkequipment/index.vue

@@ -0,0 +1,563 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="设备类型">
+                                        <JnpfSelect v-model="query.equipmentType" placeholder="请选择" clearable
+                                                    :options="equipmentTypeOptions"
+                                                    :props="equipmentTypeProps"  multiple >
+                                        </JnpfSelect>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备品牌">
+                                        <el-input v-model="query.equipmentBrand" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备编码">
+                                        <el-input v-model="query.equipmentCoding" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="设备名称">
+                                                <el-input v-model="query.deviceName" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="状态">
+                                                <JnpfSelect v-model="query.state" placeholder="请选择" clearable
+                                                            :options="stateOptions"
+                                                            :props="stateProps"  multiple >
+                                                </JnpfSelect>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="所属区域">
+                                                <el-input v-model="query.regionId" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                        </template>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                                    展开
+                                </el-button>
+                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                                    收起
+                                </el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="equipmentCoding"
+ label="设备编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceName"
+ label="设备名称"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="状态"  prop="state" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.state}}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="设备类型"  prop="equipmentType" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.equipmentType}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="equipmentBrand"
+ label="设备品牌"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="supplier"
+ label="供应商"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="supplierPhone"
+ label="供应商联系电话"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="设备状态(正常、异常)"  prop="deviceStatus" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.deviceStatus}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="equipmentWarranty"
+ label="设备保修期"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="warrantyStartTime"
+ label="保修开始时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="warrantyEndTime"
+ label="保修结束时间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceMacAddress"
+ label="设备MAC地址"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="spaceId"
+ label="空间"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="regionId"
+ label="所属区域"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceDescription"
+ label="设备描述"  align="left"
+ >
+                                                </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    showAll: false,
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        equipmentType:undefined,
+                        equipmentBrand:undefined,
+                        equipmentCoding:undefined,
+                        deviceName:undefined,
+                        state:undefined,
+                        regionId:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                                equipmentTypeOptions:[{"fullName":"类型1","id":"10"},{"fullName":"类型2","id":"20"}],
+                        equipmentTypeProps:{"label":"fullName","value":"id"  },
+                            stateOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
+                        stateProps:{"label":"fullName","value":"id"  },
+                            deviceStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
+                        deviceStatusProps:{"label":"fullName","value":"id"  },
+            interfaceRes: {
+                        spaceId:[] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'582564179701929029',
+                    type:1,
+                };
+                request({
+                    url: `/api/example/ParkEquipment/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/ParkEquipment/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","example/ParkEquipment")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/ParkEquipment/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx=""
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>