Merge branch 'master' of http://222.71.165.188:3000/yunxi/yueyueshu

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,279 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysDeviceWarnMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yysdevicewarn.*;
+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;
+/**
+ *
+ * yysDeviceWarn
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-09
+ */
+@Service
+public class YysDeviceWarnServiceImpl extends ServiceImpl<YysDeviceWarnMapper, YysDeviceWarnEntity> implements YysDeviceWarnService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<YysDeviceWarnEntity> getList(YysDeviceWarnPagination yysDeviceWarnPagination){
+        return getTypeList(yysDeviceWarnPagination,yysDeviceWarnPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<YysDeviceWarnEntity> getTypeList(YysDeviceWarnPagination yysDeviceWarnPagination,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 ? YysDeviceWarnConstant.getAppColumnData() : YysDeviceWarnConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int yysDeviceWarnNum =0;
+        QueryWrapper<YysDeviceWarnEntity> yysDeviceWarnQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(yysDeviceWarnPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = yysDeviceWarnPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<YysDeviceWarnEntity> yysDeviceWarnSuperWrapper = new QueryWrapper<>();
+            yysDeviceWarnSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDeviceWarnSuperWrapper,YysDeviceWarnEntity.class,queryJson,"0"));
+            int yysDeviceWarnNum1 = yysDeviceWarnSuperWrapper.getExpression().getNormal().size();
+            if (yysDeviceWarnNum1>0){
+                List<String> yysDeviceWarnList =this.list(yysDeviceWarnSuperWrapper).stream().map(YysDeviceWarnEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(yysDeviceWarnList);
+                intersectionSuperList.add(yysDeviceWarnList);
+                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<YysDeviceWarnEntity> yysDeviceWarnSuperWrapper = new QueryWrapper<>();
+            yysDeviceWarnSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDeviceWarnSuperWrapper,YysDeviceWarnEntity.class,ruleJson,"0"));
+            int yysDeviceWarnNum1 = yysDeviceWarnSuperWrapper.getExpression().getNormal().size();
+            if (yysDeviceWarnNum1>0){
+                List<String> yysDeviceWarnList =this.list(yysDeviceWarnSuperWrapper).stream().map(YysDeviceWarnEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(yysDeviceWarnList);
+                intersectionRuleList.add(yysDeviceWarnList);
+                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 yysDeviceWarnObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDeviceWarnQueryWrapper,YysDeviceWarnEntity.class,yysDeviceWarnPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDeviceWarnObj)){
+        return new ArrayList<>();
+        } else {
+        yysDeviceWarnQueryWrapper = (QueryWrapper<YysDeviceWarnEntity>)yysDeviceWarnObj;
+        if( yysDeviceWarnQueryWrapper.getExpression().getNormal().size()>0){
+        yysDeviceWarnNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysDeviceWarnObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDeviceWarnQueryWrapper,YysDeviceWarnEntity.class,yysDeviceWarnPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDeviceWarnObj)){
+        return new ArrayList<>();
+        } else {
+        yysDeviceWarnQueryWrapper = (QueryWrapper<YysDeviceWarnEntity>)yysDeviceWarnObj;
+        if( yysDeviceWarnQueryWrapper.getExpression().getNormal().size()>0){
+        yysDeviceWarnNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(yysDeviceWarnPagination.getProductionLine())){
+            yysDeviceWarnNum++;
+
+                String value = yysDeviceWarnPagination.getProductionLine() instanceof List ?
+                    JsonUtil.getObjectToString(yysDeviceWarnPagination.getProductionLine()) :
+                    String.valueOf(yysDeviceWarnPagination.getProductionLine());
+                yysDeviceWarnQueryWrapper.lambda().like(YysDeviceWarnEntity::getProductionLine,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysDeviceWarnPagination.getCreatorTime())){
+            yysDeviceWarnNum++;
+
+                List CreatorTimeList =  JsonUtil.getJsonToList(yysDeviceWarnPagination.getCreatorTime(),String.class);
+                    String fir = String.valueOf(CreatorTimeList.get(0));
+                    String sec = String.valueOf(CreatorTimeList.get(1));
+                    yysDeviceWarnQueryWrapper.lambda().ge(YysDeviceWarnEntity::getCreatorTime, fir)
+                    .le(YysDeviceWarnEntity::getCreatorTime, sec);
+
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            yysDeviceWarnQueryWrapper.lambda().in(YysDeviceWarnEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            yysDeviceWarnQueryWrapper.lambda().and(t->t.in(YysDeviceWarnEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            yysDeviceWarnQueryWrapper.lambda().and(t->t.in(YysDeviceWarnEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(yysDeviceWarnPagination.getSidx())){
+            yysDeviceWarnQueryWrapper.lambda().orderByDesc(YysDeviceWarnEntity::getId);
+        }else{
+            try {
+                String sidx = yysDeviceWarnPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                YysDeviceWarnEntity yysDeviceWarnEntity = new YysDeviceWarnEntity();
+                Field declaredField = yysDeviceWarnEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                yysDeviceWarnQueryWrapper="asc".equals(yysDeviceWarnPagination.getSort().toLowerCase())?yysDeviceWarnQueryWrapper.orderByAsc(value):yysDeviceWarnQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<YysDeviceWarnEntity> page=new Page<>(yysDeviceWarnPagination.getCurrentPage(), yysDeviceWarnPagination.getPageSize());
+                IPage<YysDeviceWarnEntity> userIPage=this.page(page, yysDeviceWarnQueryWrapper);
+                return yysDeviceWarnPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<YysDeviceWarnEntity> list = new ArrayList();
+                return yysDeviceWarnPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(yysDeviceWarnQueryWrapper);
+        }
+    }
+    @Override
+    public YysDeviceWarnEntity getInfo(String id){
+        QueryWrapper<YysDeviceWarnEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysDeviceWarnEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(YysDeviceWarnEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, YysDeviceWarnEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(YysDeviceWarnEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(YysDeviceWarnForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param yysDeviceWarnForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(YysDeviceWarnForm yysDeviceWarnForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        yysDeviceWarnForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(YysDeviceWarnConstant.getFormData(),yysDeviceWarnForm),YysDeviceWarnForm.class);
+        YysDeviceWarnEntity entity = JsonUtil.getJsonToBean(yysDeviceWarnForm, YysDeviceWarnEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

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

@@ -0,0 +1,280 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.YysDeviceWarnStatisticsMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.yysdevicewarnstatistics.*;
+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;
+/**
+ *
+ * yysDeviceWarnStatistics
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-08-09
+ */
+@Service
+public class YysDeviceWarnStatisticsServiceImpl extends ServiceImpl<YysDeviceWarnStatisticsMapper, YysDeviceWarnStatisticsEntity> implements YysDeviceWarnStatisticsService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<YysDeviceWarnStatisticsEntity> getList(YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination){
+        return getTypeList(yysDeviceWarnStatisticsPagination,yysDeviceWarnStatisticsPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<YysDeviceWarnStatisticsEntity> getTypeList(YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination,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 ? YysDeviceWarnStatisticsConstant.getAppColumnData() : YysDeviceWarnStatisticsConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int yysDeviceWarnStatisticsNum =0;
+        QueryWrapper<YysDeviceWarnStatisticsEntity> yysDeviceWarnStatisticsQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(yysDeviceWarnStatisticsPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = yysDeviceWarnStatisticsPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<YysDeviceWarnStatisticsEntity> yysDeviceWarnStatisticsSuperWrapper = new QueryWrapper<>();
+            yysDeviceWarnStatisticsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDeviceWarnStatisticsSuperWrapper,YysDeviceWarnStatisticsEntity.class,queryJson,"0"));
+            int yysDeviceWarnStatisticsNum1 = yysDeviceWarnStatisticsSuperWrapper.getExpression().getNormal().size();
+            if (yysDeviceWarnStatisticsNum1>0){
+                List<String> yysDeviceWarnStatisticsList =this.list(yysDeviceWarnStatisticsSuperWrapper).stream().map(YysDeviceWarnStatisticsEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(yysDeviceWarnStatisticsList);
+                intersectionSuperList.add(yysDeviceWarnStatisticsList);
+                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<YysDeviceWarnStatisticsEntity> yysDeviceWarnStatisticsSuperWrapper = new QueryWrapper<>();
+            yysDeviceWarnStatisticsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDeviceWarnStatisticsSuperWrapper,YysDeviceWarnStatisticsEntity.class,ruleJson,"0"));
+            int yysDeviceWarnStatisticsNum1 = yysDeviceWarnStatisticsSuperWrapper.getExpression().getNormal().size();
+            if (yysDeviceWarnStatisticsNum1>0){
+                List<String> yysDeviceWarnStatisticsList =this.list(yysDeviceWarnStatisticsSuperWrapper).stream().map(YysDeviceWarnStatisticsEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(yysDeviceWarnStatisticsList);
+                intersectionRuleList.add(yysDeviceWarnStatisticsList);
+                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 yysDeviceWarnStatisticsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDeviceWarnStatisticsQueryWrapper,YysDeviceWarnStatisticsEntity.class,yysDeviceWarnStatisticsPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDeviceWarnStatisticsObj)){
+        return new ArrayList<>();
+        } else {
+        yysDeviceWarnStatisticsQueryWrapper = (QueryWrapper<YysDeviceWarnStatisticsEntity>)yysDeviceWarnStatisticsObj;
+        if( yysDeviceWarnStatisticsQueryWrapper.getExpression().getNormal().size()>0){
+        yysDeviceWarnStatisticsNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object yysDeviceWarnStatisticsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDeviceWarnStatisticsQueryWrapper,YysDeviceWarnStatisticsEntity.class,yysDeviceWarnStatisticsPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(yysDeviceWarnStatisticsObj)){
+        return new ArrayList<>();
+        } else {
+        yysDeviceWarnStatisticsQueryWrapper = (QueryWrapper<YysDeviceWarnStatisticsEntity>)yysDeviceWarnStatisticsObj;
+        if( yysDeviceWarnStatisticsQueryWrapper.getExpression().getNormal().size()>0){
+        yysDeviceWarnStatisticsNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(yysDeviceWarnStatisticsPagination.getProductionLine())){
+            yysDeviceWarnStatisticsNum++;
+
+                String value = yysDeviceWarnStatisticsPagination.getProductionLine() instanceof List ?
+                    JsonUtil.getObjectToString(yysDeviceWarnStatisticsPagination.getProductionLine()) :
+                    String.valueOf(yysDeviceWarnStatisticsPagination.getProductionLine());
+                yysDeviceWarnStatisticsQueryWrapper.lambda().like(YysDeviceWarnStatisticsEntity::getProductionLine,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(yysDeviceWarnStatisticsPagination.getCreatTime())){
+            yysDeviceWarnStatisticsNum++;
+
+                List CreatTimeList =  JsonUtil.getJsonToList(yysDeviceWarnStatisticsPagination.getCreatTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(CreatTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(CreatTimeList.get(1)));
+
+                    yysDeviceWarnStatisticsQueryWrapper.lambda().ge(YysDeviceWarnStatisticsEntity::getCreatTime, new Date(fir))
+                    .le(YysDeviceWarnStatisticsEntity::getCreatTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            yysDeviceWarnStatisticsQueryWrapper.lambda().in(YysDeviceWarnStatisticsEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            yysDeviceWarnStatisticsQueryWrapper.lambda().and(t->t.in(YysDeviceWarnStatisticsEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            yysDeviceWarnStatisticsQueryWrapper.lambda().and(t->t.in(YysDeviceWarnStatisticsEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(yysDeviceWarnStatisticsPagination.getSidx())){
+            yysDeviceWarnStatisticsQueryWrapper.lambda().orderByDesc(YysDeviceWarnStatisticsEntity::getId);
+        }else{
+            try {
+                String sidx = yysDeviceWarnStatisticsPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                YysDeviceWarnStatisticsEntity yysDeviceWarnStatisticsEntity = new YysDeviceWarnStatisticsEntity();
+                Field declaredField = yysDeviceWarnStatisticsEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                yysDeviceWarnStatisticsQueryWrapper="asc".equals(yysDeviceWarnStatisticsPagination.getSort().toLowerCase())?yysDeviceWarnStatisticsQueryWrapper.orderByAsc(value):yysDeviceWarnStatisticsQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<YysDeviceWarnStatisticsEntity> page=new Page<>(yysDeviceWarnStatisticsPagination.getCurrentPage(), yysDeviceWarnStatisticsPagination.getPageSize());
+                IPage<YysDeviceWarnStatisticsEntity> userIPage=this.page(page, yysDeviceWarnStatisticsQueryWrapper);
+                return yysDeviceWarnStatisticsPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<YysDeviceWarnStatisticsEntity> list = new ArrayList();
+                return yysDeviceWarnStatisticsPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(yysDeviceWarnStatisticsQueryWrapper);
+        }
+    }
+    @Override
+    public YysDeviceWarnStatisticsEntity getInfo(String id){
+        QueryWrapper<YysDeviceWarnStatisticsEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(YysDeviceWarnStatisticsEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(YysDeviceWarnStatisticsEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, YysDeviceWarnStatisticsEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(YysDeviceWarnStatisticsEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(YysDeviceWarnStatisticsForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param yysDeviceWarnStatisticsForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(YysDeviceWarnStatisticsForm yysDeviceWarnStatisticsForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        yysDeviceWarnStatisticsForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(YysDeviceWarnStatisticsConstant.getFormData(),yysDeviceWarnStatisticsForm),YysDeviceWarnStatisticsForm.class);
+        YysDeviceWarnStatisticsEntity entity = JsonUtil.getJsonToBean(yysDeviceWarnStatisticsForm, YysDeviceWarnStatisticsEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

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

@@ -0,0 +1,190 @@
+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.yysdevicewarn.*;
+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;
+
+/**
+ * yysDeviceWarn
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Slf4j
+@RestController
+@Tag(name = "yysDeviceWarn" , description = "example")
+@RequestMapping("/api/example/YysDeviceWarn")
+public class YysDeviceWarnController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysDeviceWarnService yysDeviceWarnService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param yysDeviceWarnPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody YysDeviceWarnPagination yysDeviceWarnPagination)throws IOException{
+        List<YysDeviceWarnEntity> list= yysDeviceWarnService.getList(yysDeviceWarnPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysDeviceWarnEntity entity : list) {
+        Map<String, Object> yysDeviceWarnMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnMap.put("id", yysDeviceWarnMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysDeviceWarnMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysDeviceWarnConstant.getFormData(), YysDeviceWarnConstant.getColumnData(), yysDeviceWarnPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(yysDeviceWarnPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param yysDeviceWarnForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid YysDeviceWarnForm yysDeviceWarnForm) {
+        String b = yysDeviceWarnService.checkForm(yysDeviceWarnForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            yysDeviceWarnService.saveOrUpdate(yysDeviceWarnForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param yysDeviceWarnForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysDeviceWarnForm yysDeviceWarnForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        yysDeviceWarnForm.setId(id);
+        if (!isImport) {
+            String b =  yysDeviceWarnService.checkForm(yysDeviceWarnForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        YysDeviceWarnEntity entity= yysDeviceWarnService.getInfo(id);
+        if(entity!=null){
+            try{
+                yysDeviceWarnService.saveOrUpdate(yysDeviceWarnForm,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){
+        YysDeviceWarnEntity entity= yysDeviceWarnService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            yysDeviceWarnService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        YysDeviceWarnEntity entity= yysDeviceWarnService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDeviceWarnMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnMap.put("id", yysDeviceWarnMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDeviceWarnMap = generaterSwapUtil.swapDataDetail(yysDeviceWarnMap,YysDeviceWarnConstant.getFormData(),"591591713051513413",false);
+        return ActionResult.success(yysDeviceWarnMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        YysDeviceWarnEntity entity= yysDeviceWarnService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDeviceWarnMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnMap.put("id", yysDeviceWarnMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDeviceWarnMap = generaterSwapUtil.swapDataForm(yysDeviceWarnMap,YysDeviceWarnConstant.getFormData(),YysDeviceWarnConstant.TABLEFIELDKEY,YysDeviceWarnConstant.TABLERENAMES);
+        return ActionResult.success(yysDeviceWarnMap);
+    }
+
+}

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

@@ -0,0 +1,190 @@
+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.yysdevicewarnstatistics.*;
+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;
+
+/**
+ * yysDeviceWarnStatistics
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Slf4j
+@RestController
+@Tag(name = "yysDeviceWarnStatistics" , description = "example")
+@RequestMapping("/api/example/YysDeviceWarnStatistics")
+public class YysDeviceWarnStatisticsController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private YysDeviceWarnStatisticsService yysDeviceWarnStatisticsService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param yysDeviceWarnStatisticsPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination)throws IOException{
+        List<YysDeviceWarnStatisticsEntity> list= yysDeviceWarnStatisticsService.getList(yysDeviceWarnStatisticsPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (YysDeviceWarnStatisticsEntity entity : list) {
+        Map<String, Object> yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(yysDeviceWarnStatisticsMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, YysDeviceWarnStatisticsConstant.getFormData(), YysDeviceWarnStatisticsConstant.getColumnData(), yysDeviceWarnStatisticsPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(yysDeviceWarnStatisticsPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param yysDeviceWarnStatisticsForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid YysDeviceWarnStatisticsForm yysDeviceWarnStatisticsForm) {
+        String b = yysDeviceWarnStatisticsService.checkForm(yysDeviceWarnStatisticsForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            yysDeviceWarnStatisticsService.saveOrUpdate(yysDeviceWarnStatisticsForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param yysDeviceWarnStatisticsForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysDeviceWarnStatisticsForm yysDeviceWarnStatisticsForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        yysDeviceWarnStatisticsForm.setId(id);
+        if (!isImport) {
+            String b =  yysDeviceWarnStatisticsService.checkForm(yysDeviceWarnStatisticsForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id);
+        if(entity!=null){
+            try{
+                yysDeviceWarnStatisticsService.saveOrUpdate(yysDeviceWarnStatisticsForm,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){
+        YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            yysDeviceWarnStatisticsService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataDetail(yysDeviceWarnStatisticsMap,YysDeviceWarnStatisticsConstant.getFormData(),"591593765148299845",false);
+        return ActionResult.success(yysDeviceWarnStatisticsMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity);
+        yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id"));
+        //副表数据
+        //子表数据
+        yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataForm(yysDeviceWarnStatisticsMap,YysDeviceWarnStatisticsConstant.getFormData(),YysDeviceWarnStatisticsConstant.TABLEFIELDKEY,YysDeviceWarnStatisticsConstant.TABLERENAMES);
+        return ActionResult.success(yysDeviceWarnStatisticsMap);
+    }
+
+}

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

@@ -0,0 +1,55 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+@TableName("yys_device_warn")
+public class YysDeviceWarnEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "PRODUCTION_LINE" , updateStrategy = FieldStrategy.IGNORED)
+    private String productionLine;
+    @TableField(value = "PRODUCTION_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date productionTime;
+    @TableField(value = "CLASSES" , updateStrategy = FieldStrategy.IGNORED)
+    private String classes;
+    @TableField(value = "WARN_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String warnName;
+    @TableField(value = "WARN_DETAILS" , updateStrategy = FieldStrategy.IGNORED)
+    private String warnDetails;
+    @TableField(value = "WARN_NUMS" , updateStrategy = FieldStrategy.IGNORED)
+    private String warnNums;
+    @TableField(value = "F_CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    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_DELETE_MARK")
+    private Integer deleteMark;
+    @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_FLOW_ID")
+    private String flowId;
+}

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

@@ -0,0 +1,59 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+@TableName("yys_device_warn_statistics")
+public class YysDeviceWarnStatisticsEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "CLASSES" , updateStrategy = FieldStrategy.IGNORED)
+    private String classes;
+    @TableField(value = "CREAT_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date creatTime;
+    @TableField(value = "PRODUCTION_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    private Date productionTime;
+    @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceName;
+    @TableField(value = "REGISTER_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
+    private String registerAddress;
+    @TableField(value = "WARN_DETAILS" , updateStrategy = FieldStrategy.IGNORED)
+    private String warnDetails;
+    @TableField(value = "WARN_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String warnType;
+    @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_DELETE_MARK")
+    private Integer deleteMark;
+    @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_FLOW_ID")
+    private String flowId;
+    @TableField(value = "PRODUCTION_LINE" , updateStrategy = FieldStrategy.IGNORED)
+    private String productionLine;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdevicewarn/YysDeviceWarnForm.java

@@ -0,0 +1,41 @@
+package jnpf.model.yysdevicewarn;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * yysDeviceWarn
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+public class YysDeviceWarnForm  {
+    /** 主键 */
+    private String id;
+
+    /** 产线 **/
+    @JsonProperty("productionLine")
+    private String productionLine;
+    /** 生产时间 **/
+    @JsonProperty("productionTime")
+    private String productionTime;
+    /** 班次 **/
+    @JsonProperty("classes")
+    private String classes;
+    /** 报警名称 **/
+    @JsonProperty("warnName")
+    private String warnName;
+    /** 报警内容 **/
+    @JsonProperty("warnDetails")
+    private String warnDetails;
+    /** 异常次数 **/
+    @JsonProperty("warnNums")
+    private BigDecimal warnNums;
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdevicewarn/YysDeviceWarnPagination.java

@@ -0,0 +1,36 @@
+package jnpf.model.yysdevicewarn;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * yysDeviceWarn
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+public class YysDeviceWarnPagination 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("productionLine")
+    private Object productionLine;
+    /** 创建时间 */
+    @JsonProperty("creatorTime")
+    private Object creatorTime;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdevicewarnstatistics/YysDeviceWarnStatisticsForm.java

@@ -0,0 +1,44 @@
+package jnpf.model.yysdevicewarnstatistics;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * yysDeviceWarnStatistics
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+public class YysDeviceWarnStatisticsForm  {
+    /** 主键 */
+    private String id;
+
+    /** 班次 **/
+    @JsonProperty("classes")
+    private String classes;
+    /** 创建时间 **/
+    @JsonProperty("creatTime")
+    private String creatTime;
+    /** 生产时间 **/
+    @JsonProperty("productionTime")
+    private String productionTime;
+    /** 设备名称 **/
+    @JsonProperty("deviceName")
+    private String deviceName;
+    /** 寄存器地址 **/
+    @JsonProperty("registerAddress")
+    private String registerAddress;
+    /** 报警内容 **/
+    @JsonProperty("warnDetails")
+    private String warnDetails;
+    /** 报警类型 **/
+    @JsonProperty("warnType")
+    private String warnType;
+    /** 产线 **/
+    @JsonProperty("productionLine")
+    private String productionLine;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdevicewarnstatistics/YysDeviceWarnStatisticsPagination.java

@@ -0,0 +1,36 @@
+package jnpf.model.yysdevicewarnstatistics;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * yysDeviceWarnStatistics
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-08-09
+ */
+@Data
+public class YysDeviceWarnStatisticsPagination 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("productionLine")
+    private Object productionLine;
+    /** 创建时间 */
+    @JsonProperty("creatTime")
+    private Object creatTime;
+}

jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/Detail.vue

@@ -0,0 +1,130 @@
+<template>
+<el-dialog title="详情"
+           :close-on-click-modal="false" append-to-body
+           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+           width="600px">
+<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="24"  >
+                <jnpf-form-tip-item  label="产线"  
+ prop="productionLine"  >
+                        <p>{{dataForm.productionLine}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="生产时间"  
+ prop="productionTime"  >
+                        <p>{{dataForm.productionTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="班次"  
+ prop="classes"  >
+                        <p>{{dataForm.classes}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="报警名称"  
+ prop="warnName"  >
+                        <p>{{dataForm.warnName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="报警内容"  
+ prop="warnDetails"  >
+                        <p>{{dataForm.warnDetails}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="异常次数"  
+ prop="warnNums"  >
+                    <JnpfNumber    v-model="dataForm.warnNums"
+ placeholder="数字文本"  disabled
+ :step="1"  >
+                </JnpfNumber>
+                </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 :'',
+                            productionLine : '',
+                            productionTime : "",
+                            classes : '',
+                            warnName : '',
+                            warnDetails : '',
+                            warnNums : '',
+                            creatorTime : "",
+            },
+
+        }
+        },
+        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/YysDeviceWarn/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarn/form.vue

@@ -0,0 +1,436 @@
+<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="600px">
+        <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="24">
+                        <jnpf-form-tip-item label="产线" prop="productionLine">
+                            <JnpfInput v-model="dataForm.productionLine" @change="changeData('productionLine', -1)"
+                                placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="生产时间" prop="productionTime">
+                            <JnpfDatePicker v-model="dataForm.productionTime" @change="changeData('productionTime', -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="classes">
+                            <JnpfInput v-model="dataForm.classes" @change="changeData('classes', -1)" placeholder="请输入"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="报警名称" prop="warnName">
+                            <JnpfInput v-model="dataForm.warnName" @change="changeData('warnName', -1)" placeholder="请输入"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="报警内容" prop="warnDetails">
+                            <JnpfInput v-model="dataForm.warnDetails" @change="changeData('warnDetails', -1)"
+                                placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="异常次数" prop="warnNums">
+                            <JnpfInputNumber v-model="dataForm.warnNums" @change="changeData('warnNums', -1)"
+                                placeholder="数字文本" :step="1">
+                            </JnpfInputNumber>
+                        </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: {
+                productionLine: undefined,
+                productionTime: undefined,
+                classes: undefined,
+                warnName: undefined,
+                warnDetails: undefined,
+                warnNums: undefined,
+                creatorTime: undefined,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+            },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                productionLine: [],
+                productionTime: [],
+                classes: [],
+                warnName: [],
+                warnDetails: [],
+                warnNums: [],
+                creatorTime: [],
+            },
+        }
+    },
+    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/YysDeviceWarn/' + 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/YysDeviceWarn/' + 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() {
+            this.dataForm.productionTime = new Date().getTime()
+            this.dataForm.creatorTime = this.jnpf.toDate(new Date(), "HH:mm:ss")
+
+        },
+        // 表单提交
+        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/YysDeviceWarn',
+                    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/YysDeviceWarn/' + 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/yys/yysdevicewarn/index.vue

@@ -0,0 +1,446 @@
+<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.productionLine" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="创建时间">
+                            <el-time-picker v-model="query.creatorTime" startPlaceholder="开始时间" endPlaceholder="结束时间"
+                                is-range value-format="HH:mm:ss" clearable format="HH:mm:ss" />
+                        </el-form-item>
+                    </el-col>
+                    <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-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" border>
+                    <el-table-column prop="productionLine" label="产线" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productionTime" label="生产时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="classes" label="班次" align="center">
+                    </el-table-column>
+                    <el-table-column prop="warnName" label="报警名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="warnDetails" label="报警内容" align="center">
+                    </el-table-column>
+                    <el-table-column prop="warnNums" label="异常次数" align="center">
+                        <template slot-scope="scope" v-if="scope.row.warnNums">
+                            <JnpfNumber v-model="scope.row.warnNums" :thousands="false" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="creatorTime" label="创建时间" align="center">
+                    </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,
+
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                productionLine: undefined,
+                creatorTime: 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,
+            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: '591591713051513413',
+                type: 1,
+            };
+            request({
+                url: `/api/example/YysDeviceWarn/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/YysDeviceWarn/${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/YysDeviceWarn")
+            })
+        },
+        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/YysDeviceWarn/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/yys/yysdevicewarnstatistics/Detail.vue

@@ -0,0 +1,134 @@
+<template>
+<el-dialog title="详情"
+           :close-on-click-modal="false" append-to-body
+           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+           width="600px">
+<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="24"  >
+                <jnpf-form-tip-item  label="班次"  
+ prop="classes"  >
+                        <p>{{dataForm.classes}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="创建时间"  
+ prop="creatTime"  >
+                        <p>{{dataForm.creatTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="生产时间"  
+ prop="productionTime"  >
+                        <p>{{dataForm.productionTime}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="设备名称"  
+ prop="deviceName"  >
+                        <p>{{dataForm.deviceName}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="寄存器地址"  
+ prop="registerAddress"  >
+                        <p>{{dataForm.registerAddress}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="报警内容"  
+ prop="warnDetails"  >
+                        <p>{{dataForm.warnDetails}}</p>
+                </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24"  >
+                <jnpf-form-tip-item  label="报警类型"  
+ prop="warnType"  >
+                        <p>{{dataForm.warnType}}</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 :'',
+                            classes : '',
+                            creatTime : "",
+                            productionTime : "",
+                            deviceName : '',
+                            registerAddress : '',
+                            warnDetails : '',
+                            warnType : '',
+                            productionLine : '',
+            },
+
+        }
+        },
+        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/YysDeviceWarnStatistics/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

jnpf-java-boot/jnpf-web/src/views/yys/yysdevicewarnstatistics/form.vue

@@ -0,0 +1,447 @@
+<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="600px">
+        <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="24">
+                        <jnpf-form-tip-item label="班次" prop="classes">
+                            <JnpfInput v-model="dataForm.classes" @change="changeData('classes', -1)" placeholder="请输入"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="创建时间" prop="creatTime">
+                            <JnpfDatePicker v-model="dataForm.creatTime" @change="changeData('creatTime', -1)"
+                                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                                placeholder="请选择" clearable :style='{ "width": "100%" }' type="datetime"
+                                format="yyyy-MM-dd HH:mm:ss">
+                            </JnpfDatePicker>
+                        </jnpf-form-tip-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="生产时间" prop="productionTime">
+                            <JnpfDatePicker v-model="dataForm.productionTime" @change="changeData('productionTime', -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="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="24">
+                        <jnpf-form-tip-item label="寄存器地址" prop="registerAddress">
+                            <JnpfInput v-model="dataForm.registerAddress" @change="changeData('registerAddress', -1)"
+                                placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="报警内容" prop="warnDetails">
+                            <JnpfInput v-model="dataForm.warnDetails" @change="changeData('warnDetails', -1)"
+                                placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item label="报警类型" prop="warnType">
+                            <JnpfInput v-model="dataForm.warnType" @change="changeData('warnType', -1)" placeholder="请输入"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </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: {
+                classes: undefined,
+                creatTime: undefined,
+                productionTime: undefined,
+                deviceName: undefined,
+                registerAddress: undefined,
+                warnDetails: undefined,
+                warnType: undefined,
+                productionLine: undefined,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+            },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                classes: [],
+                creatTime: [],
+                productionTime: [],
+                deviceName: [],
+                registerAddress: [],
+                warnDetails: [],
+                warnType: [],
+                productionLine: [],
+            },
+        }
+    },
+    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/YysDeviceWarnStatistics/' + 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/YysDeviceWarnStatistics/' + 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() {
+            this.dataForm.creatTime = new Date().getTime()
+            this.dataForm.productionTime = new Date().getTime()
+
+        },
+        // 表单提交
+        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/YysDeviceWarnStatistics',
+                    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/YysDeviceWarnStatistics/' + 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/yys/yysdevicewarnstatistics/index.vue

@@ -0,0 +1,444 @@
+<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.productionLine" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="创建时间">
+                            <JnpfDateRangePicker v-model="query.creatTime" format="yyyy-MM-dd HH:mm:ss"
+                                startPlaceholder="开始日期" endPlaceholder="结束日期">
+                            </JnpfDateRangePicker>
+                        </el-form-item>
+                    </el-col>
+                    <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-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" border>
+                    <el-table-column prop="classes" label="班次" align="center">
+                    </el-table-column>
+                    <el-table-column prop="creatTime" label="创建时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="productionTime" label="生产时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="deviceName" label="设备名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="registerAddress" label="寄存器地址" align="center">
+                    </el-table-column>
+                    <el-table-column prop="warnDetails" label="报警内容" align="center">
+                    </el-table-column>
+                    <el-table-column prop="warnType" label="报警类型" align="center">
+                    </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,
+
+            superQueryVisible: false,
+            superQueryJson,
+            uploadBoxVisible: false,
+            detailVisible: false,
+            query: {
+                productionLine: undefined,
+                creatTime: 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,
+            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: '591593765148299845',
+                type: 1,
+            };
+            request({
+                url: `/api/example/YysDeviceWarnStatistics/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/YysDeviceWarnStatistics/${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/YysDeviceWarnStatistics")
+            })
+        },
+        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/YysDeviceWarnStatistics/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>