yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():设备信息

Browse Source
master
jiyufei 2 months ago
parent c96c89bbfe
commit d04fe0af2b
2 changed files with 54 additions and 81 deletions
Show Stats Download Patch File Download Diff File

56
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
Unescape View File

@ -1,56 +1,34 @@
package jnpf.service.impl; package jnpf.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import jnpf.base.ActionResult; import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.mapper.YysDayWorkMapper; import jnpf.mapper.YysDayWorkMapper;
import jnpf.service.*; import jnpf.model.QueryModel;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysdaywork.*; import jnpf.model.yysdaywork.*;
import jnpf.permission.entity.UserEntity;
import java.math.BigDecimal; import jnpf.service.*;
import jnpf.util.*;
import cn.hutool.core.util.ObjectUtil; import org.apache.commons.collections4.CollectionUtils;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import org.springframework.beans.factory.annotation.Autowired;
import jnpf.util.GeneraterSwapUtil; import org.springframework.stereotype.Service;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import org.springframework.transaction.annotation.Transactional;
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.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
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 java.util.*;
import java.util.stream.Collectors;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/** /**
* yysDayWork * yysDayWork

79
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceController.java
Unescape View File

@ -1,61 +1,44 @@
package jnpf.controller; package jnpf.controller;
import cn.hutool.core.util.ObjectUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.exception.DataException; import jnpf.base.model.ColumnDataModel;
import jnpf.permission.entity.UserEntity; import jnpf.base.util.VisualUtils;
import jnpf.service.*; import jnpf.base.vo.DownloadVO;
import jnpf.entity.*; 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.util.*;
import jnpf.model.yysdevice.*; import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j; 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.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; 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.io.IOException;
import java.util.*;
import java.util.stream.Collectors; 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 * yysDevice
* *
@ -328,8 +311,14 @@ public class YysDeviceController {
if (entity == null) { if (entity == null) {
return ActionResult.fail("表单数据不存在！"); 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); Map<String, Object> yysDeviceMap = JsonUtil.entityToMap(entity);
yysDeviceMap.put("id", yysDeviceMap.get("id")); 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); yysDeviceMap = generaterSwapUtil.swapDataDetail(yysDeviceMap, YysDeviceConstant.getFormData(), "590172184530389125", false);
@ -350,8 +339,14 @@ public class YysDeviceController {
if (entity == null) { if (entity == null) {
return ActionResult.fail("表单数据不存在！"); 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); Map<String, Object> yysDeviceMap = JsonUtil.entityToMap(entity);
yysDeviceMap.put("id", yysDeviceMap.get("id")); 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); yysDeviceMap = generaterSwapUtil.swapDataForm(yysDeviceMap, YysDeviceConstant.getFormData(), YysDeviceConstant.TABLEFIELDKEY, YysDeviceConstant.TABLERENAMES);

Write Preview
Loading…
Cancel
Save