|
|
|
@ -1,61 +1,44 @@
|
|
|
|
|
package jnpf.controller;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.xuyanwu.spring.file.storage.FileInfo;
|
|
|
|
|
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.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.base.util.VisualUtils;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.entity.YysDeviceEntity;
|
|
|
|
|
import jnpf.entity.YysDeviceMaterialEntity;
|
|
|
|
|
import jnpf.model.visualJson.config.HeaderModel;
|
|
|
|
|
import jnpf.model.yysdevice.YysDeviceConstant;
|
|
|
|
|
import jnpf.model.yysdevice.YysDeviceForm;
|
|
|
|
|
import jnpf.model.yysdevice.YysDevicePagination;
|
|
|
|
|
import jnpf.service.YysDeviceMaterialService;
|
|
|
|
|
import jnpf.service.YysDeviceService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.model.yysdevice.*;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.annotation.JnpfField;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import jnpf.engine.entity.FlowTaskEntity;
|
|
|
|
|
import jnpf.exception.WorkFlowException;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
|
|
|
|
|
|
import jnpf.onlinedev.model.ExcelImFieldModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
|
|
|
|
|
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
|
|
|
|
|
import cn.xuyanwu.spring.file.storage.FileInfo;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import jnpf.model.visualJson.config.HeaderModel;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.base.util.VisualUtils;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* yysDevice
|
|
|
|
|
*
|
|
|
|
@ -328,8 +311,14 @@ public class YysDeviceController {
|
|
|
|
|
if (entity == null) {
|
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
|
}
|
|
|
|
|
//查询设备绑定物料信息
|
|
|
|
|
List<YysDeviceMaterialEntity> list1 = yysDeviceMaterialService.list();
|
|
|
|
|
Map<String, List<YysDeviceMaterialEntity>> collect = list1.stream().collect(Collectors.groupingBy(YysDeviceMaterialEntity::getDeviceCode));
|
|
|
|
|
Map<String, Object> yysDeviceMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
yysDeviceMap.put("id", yysDeviceMap.get("id"));
|
|
|
|
|
if (collect.containsKey(entity.getDeviceCode())) {
|
|
|
|
|
yysDeviceMap.put("data", collect.get(entity.getDeviceCode()));
|
|
|
|
|
}
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
yysDeviceMap = generaterSwapUtil.swapDataDetail(yysDeviceMap, YysDeviceConstant.getFormData(), "590172184530389125", false);
|
|
|
|
@ -350,8 +339,14 @@ public class YysDeviceController {
|
|
|
|
|
if (entity == null) {
|
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
|
}
|
|
|
|
|
//查询设备绑定物料信息
|
|
|
|
|
List<YysDeviceMaterialEntity> list1 = yysDeviceMaterialService.list();
|
|
|
|
|
Map<String, List<YysDeviceMaterialEntity>> collect = list1.stream().collect(Collectors.groupingBy(YysDeviceMaterialEntity::getDeviceCode));
|
|
|
|
|
Map<String, Object> yysDeviceMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
yysDeviceMap.put("id", yysDeviceMap.get("id"));
|
|
|
|
|
if (collect.containsKey(entity.getDeviceCode())) {
|
|
|
|
|
yysDeviceMap.put("data", collect.get(entity.getDeviceCode()));
|
|
|
|
|
}
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
yysDeviceMap = generaterSwapUtil.swapDataForm(yysDeviceMap, YysDeviceConstant.getFormData(), YysDeviceConstant.TABLEFIELDKEY, YysDeviceConstant.TABLERENAMES);
|
|
|
|
|