diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/dataUtil/MasterDataService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/dataUtil/MasterDataService.java new file mode 100644 index 0000000..69c4533 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/dataUtil/MasterDataService.java @@ -0,0 +1,168 @@ +package jnpf.dataUtil; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jnpf.entity.*; +import jnpf.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@DS("master") +public class MasterDataService { + + @Autowired + private YysSupplierInformationService yysSupplierInformationService; + + @Autowired + private YysSupplierClassService yysSupplierClassService; + + @Autowired + private YysMaterialInformationService yysMaterialInformationService; + + @Autowired + private YysMaterialClassService yysMaterialClassService; + + @Autowired + private YysUnitInformationService yysUnitInformationService; + + @Autowired + private YysBillMaterialService yysBillMaterialService; + + @Autowired + private YysSubsetMaterialService yysSubsetMaterialService; + + @Autowired + private YysInventoryQueryService yysInventoryQueryService; + + + @Autowired + private YysDeviceDataService yysDeviceDataService; + + @Autowired + private YysDeviceWarnStatisticsService yysDeviceWarnStatisticsService; + + @Autowired + private YysDeviceWarnService yysDeviceWarnService; + + /** + * 供应商查询 + **/ + public List getSupplierIds() { + return yysSupplierInformationService.list(new LambdaQueryWrapper<>(YysSupplierInformationEntity.class).isNull(YysSupplierInformationEntity::getDeleteMark)) + .stream().map(YysSupplierInformationEntity::getSupplierId).collect(Collectors.toList()); + } + + public boolean saveSupplierBatch(List result) { + return yysSupplierInformationService.saveBatch(result); + } + + /** + * 供应商分类查询 + **/ + public List getSupplierClassIds() { + return yysSupplierClassService.list(new LambdaQueryWrapper<>(YysSupplierClassEntity.class).isNull(YysSupplierClassEntity::getDeleteMark)) + .stream().map(YysSupplierClassEntity::getClassId).collect(Collectors.toList()); + } + + public boolean saveSupplierClassBatch(List result) { + return yysSupplierClassService.saveBatch(result); + } + + /** + * 物料信息查询 + **/ + public List getMaterialInfoIds() { + return yysMaterialInformationService.list(new LambdaQueryWrapper<>(YysMaterialInformationEntity.class).isNull(YysMaterialInformationEntity::getDeleteMark)) + .stream().map(YysMaterialInformationEntity::getMaterialId).collect(Collectors.toList()); + } + + public boolean saveMaterialInfoBatch(List result) { + return yysMaterialInformationService.saveBatch(result); + } + + /** + * 物料分类查询 + **/ + public List getMaterialClassIds() { + return yysMaterialClassService.list(new LambdaQueryWrapper<>(YysMaterialClassEntity.class).isNull(YysMaterialClassEntity::getDeleteMark)) + .stream().map(YysMaterialClassEntity::getClassId).collect(Collectors.toList()); + } + + public boolean saveMaterialClassBatch(List result) { + return yysMaterialClassService.saveBatch(result); + } + + /** + * 单位查询 + **/ + public List getUnitIds() { + return yysUnitInformationService.list(new LambdaQueryWrapper<>(YysUnitInformationEntity.class).isNull(YysUnitInformationEntity::getDeleteMark)) + .stream().map(YysUnitInformationEntity::getUnitId).collect(Collectors.toList()); + } + + public boolean saveUnitBatch(List result) { + return yysUnitInformationService.saveBatch(result); + } + + /** + * 物料清单 + **/ + public List getBillIds() { + return yysBillMaterialService.list(new LambdaQueryWrapper<>(YysBillMaterialEntity.class).isNull(YysBillMaterialEntity::getDeleteMark)) + .stream().map(YysBillMaterialEntity::getId).collect(Collectors.toList()); + } + + public boolean saveBillBatch(List result) { + return yysBillMaterialService.saveBatch(result); + } + + public boolean saveSubsetBatch(List result) { + return yysSubsetMaterialService.saveBatch(result); + } + + + /** + * 库存查询 + **/ + public List getInventoryIds() { + return yysInventoryQueryService.list(new LambdaQueryWrapper<>(YysInventoryQueryEntity.class).isNull(YysInventoryQueryEntity::getDeleteMark)) + .stream().map(YysInventoryQueryEntity::getId).collect(Collectors.toList()); + } + + public boolean saveInventoryBatch(List result) { + return yysInventoryQueryService.saveBatch(result); + } + + /***********************************分割线 数采专用*********************************************/ + public List getSCDeviceDataIds() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceDataEntity.class); + wrapper.isNull(YysDeviceDataEntity::getDeleteMark); + List list1 = yysDeviceDataService.list(wrapper); + return list1.stream().map(YysDeviceDataEntity::getSyncId).collect(Collectors.toList()); + } + + public void saveSCDeviceDataBatch(List result) { + yysDeviceDataService.saveBatch(result); + } + + + public List getSCDeviceWarnIds() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceWarnStatisticsEntity.class); + wrapper.isNull(YysDeviceWarnStatisticsEntity::getDeleteMark); + List list1 = yysDeviceWarnStatisticsService.list(wrapper); + return list1.stream().map(YysDeviceWarnStatisticsEntity::getSyncId).collect(Collectors.toList()); + } + + public boolean saveSCDeviceWarnBatch(List result) { + return yysDeviceWarnStatisticsService.saveBatch(result); + } + + public void syncCount(List collect) { + yysDeviceWarnService.syncCount(collect); + } + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceDataService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceDataService.java index e6736e2..f27b647 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceDataService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceDataService.java @@ -2,7 +2,9 @@ package jnpf.service; import jnpf.model.yysdevicedata.*; import jnpf.entity.*; + import java.util.*; + import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; public interface YysDeviceDataService extends IService { List getList(YysDeviceDataPagination yysDeviceDataPagination); - List getTypeList(YysDeviceDataPagination yysDeviceDataPagination,String dataType); + List getTypeList(YysDeviceDataPagination yysDeviceDataPagination, String dataType); YysDeviceDataEntity getInfo(String id); @@ -28,11 +30,10 @@ public interface YysDeviceDataService extends IService { //子表方法 //副表数据方法 - String checkForm(YysDeviceDataForm form,int i); + String checkForm(YysDeviceDataForm form, int i); - void saveOrUpdate(YysDeviceDataForm yysDeviceDataForm,String id, boolean isSave) throws Exception; + void saveOrUpdate(YysDeviceDataForm yysDeviceDataForm, String id, boolean isSave) throws Exception; - List syncData(List syncIds); + void syncData(); - List zxcv(); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceWarnStatisticsService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceWarnStatisticsService.java index b40d302..9d063a9 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceWarnStatisticsService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceWarnStatisticsService.java @@ -34,6 +34,6 @@ public interface YysDeviceWarnStatisticsService extends IService syncData(List syncIds); + void syncData(); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java index c2981a6..3ffdd0b 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java @@ -12,6 +12,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import jnpf.base.UserInfo; import jnpf.base.model.ColumnDataModel; +import jnpf.dataUtil.MasterDataService; import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.entity.YysBillMaterialEntity; import jnpf.entity.YysSubsetMaterialEntity; @@ -61,6 +62,9 @@ public class YysBillMaterialServiceImpl extends ServiceImpl getList(YysBillMaterialPagination yysBillMaterialPagination) { return getTypeList(yysBillMaterialPagination, yysBillMaterialPagination.getDataType()); @@ -329,8 +333,7 @@ public class YysBillMaterialServiceImpl extends ServiceImpl syncList = this.list(new LambdaQueryWrapper<>(YysBillMaterialEntity.class).isNull(YysBillMaterialEntity::getDeleteMark)) - .stream().map(YysBillMaterialEntity::getId).collect(Collectors.toList()); + List syncList = masterDataService.getBillIds(); //母件物料 RowMapper rowMapper = new BeanPropertyRowMapper<>(SyncMaterial.class); String sql = "select * from v_bom_parent_rpt"; @@ -398,8 +401,8 @@ public class YysBillMaterialServiceImpl extends ServiceImpl getList(YysDeviceDataPagination yysDeviceDataPagination) { @@ -316,7 +320,8 @@ public class YysDeviceDataServiceImpl extends ServiceImpl syncData(List syncIds) { + public void syncData() { + List syncIds = masterDataService.getSCDeviceDataIds(); List result = Lists.newArrayList(); String[] lines = new String[]{"1", "2", "3", "4"}; for (String line : lines) { @@ -326,24 +331,35 @@ public class YysDeviceDataServiceImpl extends ServiceImpl !syncIds.contains(obj.getId())).collect(Collectors.toList()); - } + result = result.stream().filter(obj -> !syncIds.contains(obj.getId())).collect(Collectors.toList()); - @Override - @DS("slave_1") - public List zxcv() { - List result = Lists.newArrayList(); - String[] lines = new String[]{"1", "2", "3", "4"}; - for (String line : lines) { - String childTable = "eqmt_collect_data_sc_" + line; - String sql = "select b.*," + line + " as line from " + childTable + " a left join eqmt_collect_pub_data b on a.eqmt_id = b.eqmt_id"; - RowMapper rowMapper = new BeanPropertyRowMapper<>(EqmtCollectPubDataEntity.class); - result.addAll(this.jdbcTemplate.query(sql, rowMapper)); - } - //过滤出已经生成的 - return result; + List collect = result.stream().map(obj -> { + String mainId = RandomUtil.uuId(); + YysDeviceDataEntity entity = new YysDeviceDataEntity(); + entity.setId(mainId); + entity.setProductionLine(obj.getLine()); + entity.setProductionTime(obj.getGmtCreate()); + entity.setCreatorTime(obj.getCreateTime()); + entity.setProductionModels(obj.getProductType()); + entity.setProductionName(obj.getProductTypeName()); + entity.setProductionSpeed(String.valueOf(obj.getSpeed())); + entity.setProductionNum(String.valueOf(obj.getTotalProductQty())); + entity.setDayNum(String.valueOf(obj.getIntradayProductQty())); + entity.setDayQualifiedNum(String.valueOf(obj.getIntradayOkQty())); + entity.setDayBadNum(String.valueOf(obj.getIntradayNgQty())); + entity.setDayPassRate(obj.getIntradayYieldRate()); + entity.setDayOnTime(String.valueOf(obj.getIntradayEqmtRunTime())); + entity.setDayLoadingTime(String.valueOf(obj.getIntradayEqmtWorkTime())); + entity.setDayStopTime(String.valueOf(obj.getIntradayEqmtStopTime())); + entity.setDayStopNum(String.valueOf(obj.getIntradayEqmtStopTimes())); + entity.setOee(obj.getOee()); + entity.setSyncId(obj.getId()); + entity.setCreatorUserId(userProvider.get().getUserId()); + return entity; + }).collect(Collectors.toList()); + //批量存储 + masterDataService.saveSCDeviceDataBatch(collect); } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceWarnStatisticsServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceWarnStatisticsServiceImpl.java index f9f46c3..90aa3e5 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceWarnStatisticsServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceWarnStatisticsServiceImpl.java @@ -2,6 +2,7 @@ package jnpf.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.google.common.collect.Lists; +import jnpf.dataUtil.MasterDataService; import jnpf.entity.*; import jnpf.mapper.YysDeviceWarnStatisticsMapper; import jnpf.service.*; @@ -21,6 +22,7 @@ import java.lang.reflect.Field; import com.baomidou.mybatisplus.annotation.TableField; +import java.util.concurrent.CompletableFuture; import java.util.regex.Pattern; import jnpf.model.QueryModel; @@ -67,6 +69,9 @@ public class YysDeviceWarnStatisticsServiceImpl extends ServiceImpl getList(YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination) { return getTypeList(yysDeviceWarnStatisticsPagination, yysDeviceWarnStatisticsPagination.getDataType()); @@ -313,7 +318,9 @@ public class YysDeviceWarnStatisticsServiceImpl extends ServiceImpl syncData(List syncIds) { + public void syncData() { + List syncIds = masterDataService.getSCDeviceWarnIds(); + List result = Lists.newArrayList(); String[] lines = new String[]{"1", "2", "3", "4"}; for (String line : lines) { @@ -323,9 +330,30 @@ public class YysDeviceWarnStatisticsServiceImpl extends ServiceImpl !syncIds.contains(obj.getId())).collect(Collectors.toList()); + result = result.stream().filter(obj -> !syncIds.contains(obj.getId())).collect(Collectors.toList()); + + List collect = result.stream().map(obj -> { + String mainId = RandomUtil.uuId(); + YysDeviceWarnStatisticsEntity entity = new YysDeviceWarnStatisticsEntity(); + entity.setId(mainId); + entity.setDeviceName(obj.getLine()); + entity.setProductionTime(obj.getGmtCreate()); + entity.setCreatorTime(obj.getCreateTime()); + entity.setRegisterAddress(obj.getRegistorAddress()); + entity.setWarnDetails(obj.getExceptMessage()); + entity.setWarnType(obj.getExceptTypeName()); + entity.setSyncId(obj.getId()); + entity.setCreatorUserId(userProvider.get().getUserId()); + return entity; + }).collect(Collectors.toList()); + //批量存储 + boolean b = masterDataService.saveSCDeviceWarnBatch(collect); + //存储成功之后 统计数量 + if (b) { + CompletableFuture.runAsync(() -> masterDataService.syncCount(collect)); + } } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysInventoryQueryServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysInventoryQueryServiceImpl.java index 6be928b..09c90a5 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysInventoryQueryServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysInventoryQueryServiceImpl.java @@ -1,8 +1,8 @@ package jnpf.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.TableField; -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; @@ -11,6 +11,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import jnpf.base.UserInfo; import jnpf.base.model.ColumnDataModel; +import jnpf.dataUtil.MasterDataService; import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.entity.YysInventoryQueryEntity; import jnpf.mapper.YysInventoryQueryMapper; @@ -57,6 +58,9 @@ public class YysInventoryQueryServiceImpl extends ServiceImpl getList(YysInventoryQueryPagination yysInventoryQueryPagination) { return getTypeList(yysInventoryQueryPagination, yysInventoryQueryPagination.getDataType()); @@ -309,15 +313,17 @@ public class YysInventoryQueryServiceImpl extends ServiceImpl syncList = this.list(new LambdaQueryWrapper<>(YysInventoryQueryEntity.class).isNull(YysInventoryQueryEntity::getDeleteMark)) - .stream().map(YysInventoryQueryEntity::getId).collect(Collectors.toList()); + List syncList = masterDataService.getInventoryIds(); RowMapper rowMapper = new BeanPropertyRowMapper<>(SyncInventoryQuery.class); String sql = "select * from CurrentStock"; List query = this.jdbcTemplate.query(sql, rowMapper); if (CollectionUtils.isEmpty(query)) { return "远程库存信息为空"; } + //过滤出同步过的 + query = query.stream().filter(obj -> !syncList.contains(obj.getAutoId())).collect(Collectors.toList()); //物料表数据 不从自己库取数据，防止自己库未同步，从而取不到数据 RowMapper materialMapper = new BeanPropertyRowMapper<>(MaterialInformationSync.class); String materialSql = "select * from dbo.Inventory"; @@ -345,7 +351,7 @@ public class YysInventoryQueryServiceImpl extends ServiceImpl getList(YysMaterialClassPagination yysMaterialClassPagination) { return getTypeList(yysMaterialClassPagination, yysMaterialClassPagination.getDataType()); @@ -318,8 +322,7 @@ public class YysMaterialClassServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper<>(YysMaterialClassEntity.class).isNull(YysMaterialClassEntity::getDeleteMark)) - .stream().map(YysMaterialClassEntity::getClassId).collect(Collectors.toList()); + List list = masterDataService.getMaterialClassIds(); //顶级分类 Map topCollect = query.stream() .filter(obj -> obj.getCInvCCode().equals("1")) @@ -362,7 +365,7 @@ public class YysMaterialClassServiceImpl extends ServiceImpl getList(YysMaterialInformationPagination yysMaterialInformationPagination) { return getTypeList(yysMaterialInformationPagination, yysMaterialInformationPagination.getDataType()); @@ -341,8 +345,7 @@ public class YysMaterialInformationServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper<>(YysMaterialInformationEntity.class).isNull(YysMaterialInformationEntity::getDeleteMark)) - .stream().map(YysMaterialInformationEntity::getMaterialId).collect(Collectors.toList()); + List list = masterDataService.getMaterialInfoIds(); List result = Lists.newArrayList(); for (MaterialInformationSync sync : query) { if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.contains(sync.getCInvCode())) { @@ -369,7 +372,7 @@ public class YysMaterialInformationServiceImpl extends ServiceImpl getList(YysSupplierClassPagination yysSupplierClassPagination) { return getTypeList(yysSupplierClassPagination, yysSupplierClassPagination.getDataType()); @@ -315,9 +319,7 @@ public class YysSupplierClassServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper<>(YysSupplierClassEntity.class).isNull(YysSupplierClassEntity::getDeleteMark)) - .stream().map(YysSupplierClassEntity::getClassId).collect(Collectors.toList()); - + List list = masterDataService.getSupplierClassIds(); //顶级分类 Map collect = query.stream() .filter(obj -> obj.getIVCGrade().equals("1")) @@ -348,7 +350,7 @@ public class YysSupplierClassServiceImpl extends ServiceImpl getList(YysSupplierInformationPagination yysSupplierInformationPagination) { return getTypeList(yysSupplierInformationPagination, yysSupplierInformationPagination.getDataType()); @@ -315,8 +319,7 @@ public class YysSupplierInformationServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper<>(YysSupplierInformationEntity.class).isNull(YysSupplierInformationEntity::getDeleteMark)) - .stream().map(YysSupplierInformationEntity::getSupplierId).collect(Collectors.toList()); + List list = masterDataService.getSupplierIds(); List result = Lists.newArrayList(); for (SupplierInfoSync sync : query) { if (CollectionUtils.isNotEmpty(list) && list.contains(sync.getCVenCode())) { @@ -339,7 +342,7 @@ public class YysSupplierInformationServiceImpl extends ServiceImpl getList(YysUnitInformationPagination yysUnitInformationPagination) { return getTypeList(yysUnitInformationPagination, yysUnitInformationPagination.getDataType()); @@ -327,8 +331,7 @@ public class YysUnitInformationServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper<>(YysUnitInformationEntity.class).isNull(YysUnitInformationEntity::getDeleteMark)) - .stream().map(YysUnitInformationEntity::getUnitId).collect(Collectors.toList()); + List list = masterDataService.getUnitIds(); List result = Lists.newArrayList(); for (UnitInfoSync sync : query) { if (CollectionUtils.isNotEmpty(list) && list.contains(sync.getCComunitCode())) { @@ -349,7 +352,7 @@ public class YysUnitInformationServiceImpl extends ServiceImpl list= yysDeviceDataService.getList(yysDeviceDataPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysDeviceDataPagination yysDeviceDataPagination) throws IOException { + List list = yysDeviceDataService.getList(yysDeviceDataPagination); + List> realList = new ArrayList<>(); for (YysDeviceDataEntity entity : list) { - Map yysDeviceDataMap=JsonUtil.entityToMap(entity); - yysDeviceDataMap.put("id", yysDeviceDataMap.get("id")); - //副表数据 - //子表数据 + Map yysDeviceDataMap = JsonUtil.entityToMap(entity); + yysDeviceDataMap.put("id", yysDeviceDataMap.get("id")); + //副表数据 + //子表数据 realList.add(yysDeviceDataMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysDeviceDataConstant.getFormData(), YysDeviceDataConstant.getColumnData(), yysDeviceDataPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysDeviceDataConstant.getFormData(), YysDeviceDataConstant.getColumnData(), yysDeviceDataPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -81,116 +85,126 @@ public class YysDeviceDataController { vo.setPagination(page); return ActionResult.success(vo); } + /** - * 创建 - * - * @param yysDeviceDataForm - * @return - */ + * 创建 + * + * @param yysDeviceDataForm + * @return + */ @PostMapping() @Operation(summary = "创建") public ActionResult create(@RequestBody @Valid YysDeviceDataForm yysDeviceDataForm) { - String b = yysDeviceDataService.checkForm(yysDeviceDataForm,0); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysDeviceDataService.checkForm(yysDeviceDataForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysDeviceDataService.saveOrUpdate(yysDeviceDataForm, null ,true); - }catch(Exception e){ + try { + yysDeviceDataService.saveOrUpdate(yysDeviceDataForm, null, true); + } catch (Exception e) { return ActionResult.fail("新增数据失败"); } return ActionResult.success("创建成功"); } + /** - * 编辑 - * @param id - * @param yysDeviceDataForm - * @return - */ + * 编辑 + * + * @param id + * @param yysDeviceDataForm + * @return + */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysDeviceDataForm yysDeviceDataForm, - @RequestParam(value = "isImport", required = false) boolean isImport){ + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysDeviceDataForm yysDeviceDataForm, + @RequestParam(value = "isImport", required = false) boolean isImport) { yysDeviceDataForm.setId(id); if (!isImport) { - String b = yysDeviceDataService.checkForm(yysDeviceDataForm,1); - if (StringUtil.isNotEmpty(b)){ - return ActionResult.fail(b ); + String b = yysDeviceDataService.checkForm(yysDeviceDataForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } } - YysDeviceDataEntity entity= yysDeviceDataService.getInfo(id); - if(entity!=null){ - try{ - yysDeviceDataService.saveOrUpdate(yysDeviceDataForm,id,false); - }catch(Exception e){ + YysDeviceDataEntity entity = yysDeviceDataService.getInfo(id); + if (entity != null) { + try { + yysDeviceDataService.saveOrUpdate(yysDeviceDataForm, id, false); + } catch (Exception e) { return ActionResult.fail("修改数据失败"); } return ActionResult.success("更新成功"); - }else{ + } else { return ActionResult.fail("更新失败，数据不存在"); } } + /** - * 删除 - * @param id - * @return - */ + * 删除 + * + * @param id + * @return + */ @Operation(summary = "删除") @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - YysDeviceDataEntity entity= yysDeviceDataService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysDeviceDataEntity entity = yysDeviceDataService.getInfo(id); + if (entity != null) { //主表数据删除 yysDeviceDataService.delete(entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysDeviceDataEntity entity= yysDeviceDataService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysDeviceDataEntity entity = yysDeviceDataService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDeviceDataMap=JsonUtil.entityToMap(entity); + Map yysDeviceDataMap = JsonUtil.entityToMap(entity); yysDeviceDataMap.put("id", yysDeviceDataMap.get("id")); //副表数据 //子表数据 - yysDeviceDataMap = generaterSwapUtil.swapDataDetail(yysDeviceDataMap,YysDeviceDataConstant.getFormData(),"591585418722415045",false); + yysDeviceDataMap = generaterSwapUtil.swapDataDetail(yysDeviceDataMap, YysDeviceDataConstant.getFormData(), "591585418722415045", false); return ActionResult.success(yysDeviceDataMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysDeviceDataEntity entity= yysDeviceDataService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysDeviceDataEntity entity = yysDeviceDataService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDeviceDataMap=JsonUtil.entityToMap(entity); + Map yysDeviceDataMap = JsonUtil.entityToMap(entity); yysDeviceDataMap.put("id", yysDeviceDataMap.get("id")); //副表数据 //子表数据 - yysDeviceDataMap = generaterSwapUtil.swapDataForm(yysDeviceDataMap,YysDeviceDataConstant.getFormData(),YysDeviceDataConstant.TABLEFIELDKEY,YysDeviceDataConstant.TABLERENAMES); + yysDeviceDataMap = generaterSwapUtil.swapDataForm(yysDeviceDataMap, YysDeviceDataConstant.getFormData(), YysDeviceDataConstant.TABLEFIELDKEY, YysDeviceDataConstant.TABLERENAMES); return ActionResult.success(yysDeviceDataMap); } - @Operation(summary = "信息") - @GetMapping("/zxcv") - public ActionResult zxcv(){ - return ActionResult.success(yysDeviceDataService.zxcv()); + @Operation(summary = "同步数采库") + @GetMapping("/syncData") + public ActionResult syncData() { + yysDeviceDataService.syncData(); + return ActionResult.success(); } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceWarnStatisticsController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceWarnStatisticsController.java index 0bf0bf2..201ed1d 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceWarnStatisticsController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceWarnStatisticsController.java @@ -15,22 +15,27 @@ 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开发平台组 @@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Slf4j @RestController -@Tag(name = "yysDeviceWarnStatistics" , description = "example") +@Tag(name = "yysDeviceWarnStatistics", description = "example") @RequestMapping("/api/example/YysDeviceWarnStatistics") public class YysDeviceWarnStatisticsController { @@ -52,27 +57,26 @@ public class YysDeviceWarnStatisticsController { private YysDeviceWarnStatisticsService yysDeviceWarnStatisticsService; - /** - * 列表 - * - * @param yysDeviceWarnStatisticsPagination - * @return - */ + * 列表 + * + * @param yysDeviceWarnStatisticsPagination + * @return + */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination)throws IOException{ - List list= yysDeviceWarnStatisticsService.getList(yysDeviceWarnStatisticsPagination); - List> realList=new ArrayList<>(); + public ActionResult list(@RequestBody YysDeviceWarnStatisticsPagination yysDeviceWarnStatisticsPagination) throws IOException { + List list = yysDeviceWarnStatisticsService.getList(yysDeviceWarnStatisticsPagination); + List> realList = new ArrayList<>(); for (YysDeviceWarnStatisticsEntity entity : list) { - Map yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity); - yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id")); - //副表数据 - //子表数据 + Map yysDeviceWarnStatisticsMap = JsonUtil.entityToMap(entity); + yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id")); + //副表数据 + //子表数据 realList.add(yysDeviceWarnStatisticsMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, YysDeviceWarnStatisticsConstant.getFormData(), YysDeviceWarnStatisticsConstant.getColumnData(), yysDeviceWarnStatisticsPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, YysDeviceWarnStatisticsConstant.getFormData(), YysDeviceWarnStatisticsConstant.getColumnData(), yysDeviceWarnStatisticsPagination.getModuleId(), false); //返回对象 PageListVO vo = new PageListVO(); @@ -81,110 +85,126 @@ public class YysDeviceWarnStatisticsController { vo.setPagination(page); return ActionResult.success(vo); } + /** - * 创建 - * - * @param yysDeviceWarnStatisticsForm - * @return - */ + * 创建 + * + * @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 ); + String b = yysDeviceWarnStatisticsService.checkForm(yysDeviceWarnStatisticsForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); } - try{ - yysDeviceWarnStatisticsService.saveOrUpdate(yysDeviceWarnStatisticsForm, null ,true); - }catch(Exception e){ + try { + yysDeviceWarnStatisticsService.saveOrUpdate(yysDeviceWarnStatisticsForm, null, true); + } catch (Exception e) { return ActionResult.fail("新增数据失败"); } return ActionResult.success("创建成功"); } + /** - * 编辑 - * @param id - * @param yysDeviceWarnStatisticsForm - * @return - */ + * 编辑 + * + * @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){ + 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 ); + 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){ + YysDeviceWarnStatisticsEntity entity = yysDeviceWarnStatisticsService.getInfo(id); + if (entity != null) { + try { + yysDeviceWarnStatisticsService.saveOrUpdate(yysDeviceWarnStatisticsForm, id, false); + } catch (Exception e) { return ActionResult.fail("修改数据失败"); } return ActionResult.success("更新成功"); - }else{ + } else { return ActionResult.fail("更新失败，数据不存在"); } } + /** - * 删除 - * @param id - * @return - */ + * 删除 + * + * @param id + * @return + */ @Operation(summary = "删除") @DeleteMapping("/{id}") @Transactional - public ActionResult delete(@PathVariable("id") String id){ - YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id); - if(entity!=null){ + public ActionResult delete(@PathVariable("id") String id) { + YysDeviceWarnStatisticsEntity entity = yysDeviceWarnStatisticsService.getInfo(id); + if (entity != null) { //主表数据删除 yysDeviceWarnStatisticsService.delete(entity); } return ActionResult.success("删除成功"); } + /** - * 表单信息(详情页) - * 详情页面使用-转换数据 - * @param id - * @return - */ + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id); - if(entity==null){ + public ActionResult detailInfo(@PathVariable("id") String id) { + YysDeviceWarnStatisticsEntity entity = yysDeviceWarnStatisticsService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity); + Map yysDeviceWarnStatisticsMap = JsonUtil.entityToMap(entity); yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id")); //副表数据 //子表数据 - yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataDetail(yysDeviceWarnStatisticsMap,YysDeviceWarnStatisticsConstant.getFormData(),"591593765148299845",false); + yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataDetail(yysDeviceWarnStatisticsMap, YysDeviceWarnStatisticsConstant.getFormData(), "591593765148299845", false); return ActionResult.success(yysDeviceWarnStatisticsMap); } + /** - * 获取详情(编辑页) - * 编辑页面使用-不转换数据 - * @param id - * @return - */ + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ @Operation(summary = "信息") @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - YysDeviceWarnStatisticsEntity entity= yysDeviceWarnStatisticsService.getInfo(id); - if(entity==null){ + public ActionResult info(@PathVariable("id") String id) { + YysDeviceWarnStatisticsEntity entity = yysDeviceWarnStatisticsService.getInfo(id); + if (entity == null) { return ActionResult.fail("表单数据不存在！"); } - Map yysDeviceWarnStatisticsMap=JsonUtil.entityToMap(entity); + Map yysDeviceWarnStatisticsMap = JsonUtil.entityToMap(entity); yysDeviceWarnStatisticsMap.put("id", yysDeviceWarnStatisticsMap.get("id")); //副表数据 //子表数据 - yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataForm(yysDeviceWarnStatisticsMap,YysDeviceWarnStatisticsConstant.getFormData(),YysDeviceWarnStatisticsConstant.TABLEFIELDKEY,YysDeviceWarnStatisticsConstant.TABLERENAMES); + yysDeviceWarnStatisticsMap = generaterSwapUtil.swapDataForm(yysDeviceWarnStatisticsMap, YysDeviceWarnStatisticsConstant.getFormData(), YysDeviceWarnStatisticsConstant.TABLEFIELDKEY, YysDeviceWarnStatisticsConstant.TABLERENAMES); return ActionResult.success(yysDeviceWarnStatisticsMap); } + @Operation(summary = "同步数采设备预警库") + @GetMapping("/syncData") + public ActionResult syncData() { + yysDeviceWarnStatisticsService.syncData(); + return ActionResult.success(); + } + } diff --git a/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/YysTaskHandler.java b/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/YysTaskHandler.java index 1b5098e..406de27 100644 --- a/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/YysTaskHandler.java +++ b/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/YysTaskHandler.java @@ -64,40 +64,40 @@ public class YysTaskHandler { //每十分钟执行一次 @XxlJob("syncDeviceData") public void syncDeviceData() { - //查询表中数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceDataEntity.class); - wrapper.isNull(YysDeviceDataEntity::getDeleteMark); - List list1 = yysDeviceDataService.list(wrapper); - List list = yysDeviceDataService.syncData(list1.stream().map(YysDeviceDataEntity::getSyncId).collect(Collectors.toList())); - if (CollectionUtils.isEmpty(list)) { - return; - } - List collect = list.stream().map(obj -> { - String mainId = RandomUtil.uuId(); - YysDeviceDataEntity entity = new YysDeviceDataEntity(); - entity.setId(mainId); - entity.setProductionLine(obj.getLine()); - entity.setProductionTime(obj.getGmtCreate()); - entity.setCreatorTime(obj.getCreateTime()); - entity.setProductionModels(obj.getProductType()); - entity.setProductionName(obj.getProductTypeName()); - entity.setProductionSpeed(String.valueOf(obj.getSpeed())); - entity.setProductionNum(String.valueOf(obj.getTotalProductQty())); - entity.setDayNum(String.valueOf(obj.getIntradayProductQty())); - entity.setDayQualifiedNum(String.valueOf(obj.getIntradayOkQty())); - entity.setDayBadNum(String.valueOf(obj.getIntradayNgQty())); - entity.setDayPassRate(obj.getIntradayYieldRate()); - entity.setDayOnTime(String.valueOf(obj.getIntradayEqmtRunTime())); - entity.setDayLoadingTime(String.valueOf(obj.getIntradayEqmtWorkTime())); - entity.setDayStopTime(String.valueOf(obj.getIntradayEqmtStopTime())); - entity.setDayStopNum(String.valueOf(obj.getIntradayEqmtStopTimes())); - entity.setOee(obj.getOee()); - entity.setSyncId(obj.getId()); - entity.setCreatorUserId(userProvider.get().getUserId()); - return entity; - }).collect(Collectors.toList()); - //批量存储 - yysDeviceDataService.saveBatch(collect); +// //查询表中数据 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceDataEntity.class); +// wrapper.isNull(YysDeviceDataEntity::getDeleteMark); +// List list1 = yysDeviceDataService.list(wrapper); +// List list = yysDeviceDataService.syncData(list1.stream().map(YysDeviceDataEntity::getSyncId).collect(Collectors.toList())); +// if (CollectionUtils.isEmpty(list)) { +// return; +// } +// List collect = list.stream().map(obj -> { +// String mainId = RandomUtil.uuId(); +// YysDeviceDataEntity entity = new YysDeviceDataEntity(); +// entity.setId(mainId); +// entity.setProductionLine(obj.getLine()); +// entity.setProductionTime(obj.getGmtCreate()); +// entity.setCreatorTime(obj.getCreateTime()); +// entity.setProductionModels(obj.getProductType()); +// entity.setProductionName(obj.getProductTypeName()); +// entity.setProductionSpeed(String.valueOf(obj.getSpeed())); +// entity.setProductionNum(String.valueOf(obj.getTotalProductQty())); +// entity.setDayNum(String.valueOf(obj.getIntradayProductQty())); +// entity.setDayQualifiedNum(String.valueOf(obj.getIntradayOkQty())); +// entity.setDayBadNum(String.valueOf(obj.getIntradayNgQty())); +// entity.setDayPassRate(obj.getIntradayYieldRate()); +// entity.setDayOnTime(String.valueOf(obj.getIntradayEqmtRunTime())); +// entity.setDayLoadingTime(String.valueOf(obj.getIntradayEqmtWorkTime())); +// entity.setDayStopTime(String.valueOf(obj.getIntradayEqmtStopTime())); +// entity.setDayStopNum(String.valueOf(obj.getIntradayEqmtStopTimes())); +// entity.setOee(obj.getOee()); +// entity.setSyncId(obj.getId()); +// entity.setCreatorUserId(userProvider.get().getUserId()); +// return entity; +// }).collect(Collectors.toList()); +// //批量存储 +// yysDeviceDataService.saveBatch(collect); } @@ -108,33 +108,33 @@ public class YysTaskHandler { @XxlJob("syncDeviceWarnData") public void syncDeviceWarnData() { //查询表中数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceWarnStatisticsEntity.class); - wrapper.isNull(YysDeviceWarnStatisticsEntity::getDeleteMark); - List list1 = yysDeviceWarnStatisticsService.list(wrapper); - List list = yysDeviceWarnStatisticsService.syncData(list1.stream().map(YysDeviceWarnStatisticsEntity::getSyncId).collect(Collectors.toList())); - if (CollectionUtils.isEmpty(list)) { - return; - } - List collect = list.stream().map(obj -> { - String mainId = RandomUtil.uuId(); - YysDeviceWarnStatisticsEntity entity = new YysDeviceWarnStatisticsEntity(); - entity.setId(mainId); - entity.setDeviceName(obj.getLine()); - entity.setProductionTime(obj.getGmtCreate()); - entity.setCreatorTime(obj.getCreateTime()); - entity.setRegisterAddress(obj.getRegistorAddress()); - entity.setWarnDetails(obj.getExceptMessage()); - entity.setWarnType(obj.getExceptTypeName()); - entity.setSyncId(obj.getId()); - entity.setCreatorUserId(userProvider.get().getUserId()); - return entity; - }).collect(Collectors.toList()); - //批量存储 - boolean result = yysDeviceWarnStatisticsService.saveBatch(collect); - //存储成功之后 统计数量 - if (result) { - CompletableFuture.runAsync(() -> yysDeviceWarnService.syncCount(collect)); - } +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(YysDeviceWarnStatisticsEntity.class); +// wrapper.isNull(YysDeviceWarnStatisticsEntity::getDeleteMark); +// List list1 = yysDeviceWarnStatisticsService.list(wrapper); +// List list = yysDeviceWarnStatisticsService.syncData(list1.stream().map(YysDeviceWarnStatisticsEntity::getSyncId).collect(Collectors.toList())); +// if (CollectionUtils.isEmpty(list)) { +// return; +// } +// List collect = list.stream().map(obj -> { +// String mainId = RandomUtil.uuId(); +// YysDeviceWarnStatisticsEntity entity = new YysDeviceWarnStatisticsEntity(); +// entity.setId(mainId); +// entity.setDeviceName(obj.getLine()); +// entity.setProductionTime(obj.getGmtCreate()); +// entity.setCreatorTime(obj.getCreateTime()); +// entity.setRegisterAddress(obj.getRegistorAddress()); +// entity.setWarnDetails(obj.getExceptMessage()); +// entity.setWarnType(obj.getExceptTypeName()); +// entity.setSyncId(obj.getId()); +// entity.setCreatorUserId(userProvider.get().getUserId()); +// return entity; +// }).collect(Collectors.toList()); +// //批量存储 +// boolean result = yysDeviceWarnStatisticsService.saveBatch(collect); +// //存储成功之后 统计数量 +// if (result) { +// CompletableFuture.runAsync(() -> yysDeviceWarnService.syncCount(collect)); +// } } /** diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue index 340247b..ae339aa 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue @@ -115,17 +115,17 @@

绑定物料列表

- + - + - +