From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java
index 3e1f773..d50bf9c 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java
@@ -3,18 +3,27 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
+import com.thhy.materials.modules.biz.concret.entity.SysSteel;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.TMinxingPlant;
import com.thhy.materials.modules.biz.concret.entity.dto.WeighDto;
+import com.thhy.materials.modules.biz.helmet.entity.TDataSmock;
+import com.thhy.materials.modules.biz.helmet.entity.TDataValue;
import com.thhy.materials.modules.biz.weigh.dto.QueryWeighDto;
+import com.thhy.materials.modules.biz.weigh.entity.TSuMaterialWarehouseRecord;
import com.thhy.materials.modules.biz.weigh.entity.TWeighbridge;
import com.thhy.materials.modules.biz.weigh.entity.WeighVo;
+import com.thhy.materials.modules.biz.weigh.entity.dto.AssistGoodDto;
+import com.thhy.materials.modules.biz.weigh.entity.dto.MaterialStockRecordDto;
+import com.thhy.materials.modules.biz.weigh.entity.dto.MouldDto;
+import com.thhy.materials.modules.biz.weigh.entity.dto.SteelDto;
import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper;
import com.thhy.materials.modules.biz.weigh.service.WeighService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -95,4 +104,76 @@
PageInfo<TWeighbridge> tWeighbridgePageInfo = new PageInfo<>(weighbridges);
return BasicResult.success(tWeighbridgePageInfo);
}
+
+ @Override
+ public BasicResult headThingJsInventory() {
+
+ //原料库存
+ List<MaterialStockRecordDto> materialStockDtos =weighMapper.materialStockInventory();
+ //钢筋
+ List<SteelDto> steelDtos = weighMapper.steelInventory();
+ //辅材
+ List<AssistGoodDto> assistGoodDtos = weighMapper.assistGoodInventory();
+
+ //模具
+ List<MouldDto> mouldDtos = weighMapper.mouldInventory();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("materialStockDtos",materialStockDtos);
+ map.put("steelDtos",steelDtos);
+ map.put("assistGoodDtos",assistGoodDtos);
+ map.put("mouldDtos",mouldDtos);
+ return BasicResult.success(map);
+ }
+
+ @Override
+ public List<SysSteel> steelType() {
+ return weighMapper.steelType();
+ }
+
+ @Override
+ public BasicResult materialWarehouseRecordList(Map<String, Object> values) {
+ Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+ Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+ PageHelper.startPage(pageNum,pageSize);
+ List<TSuMaterialWarehouseRecord> records = weighMapper.materialWarehouseRecordList(values);
+ PageInfo<TSuMaterialWarehouseRecord> recordPageInfo = new PageInfo<>(records);
+ return BasicResult.success(recordPageInfo);
+ }
+
+ @Override
+ public BasicResult materialWarehouseRecordInsert(Map<String, Object> values) {
+ values.put("id","");
+ weighMapper.materialWarehouseRecordInsert(values);
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult materialWarehouseRecordUpdate(Map<String, Object> values) {
+ weighMapper.materialWarehouseRecordUpdate(values);
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult materialWarehouseRecordDel(String id) {
+ weighMapper.materialWarehouseRecordDel(id);
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult headThingJsDateValue() {
+ //每小时数据值
+ List<TDataValue> tDataValues = weighMapper.headThingJsDateValue();
+ //烟尘 开关
+ TDataSmock tDataSmock = weighMapper.headThingJsDateSmock();
+ //环境最新一条
+ TDataValue tDataValue = weighMapper.headThingJsDateValueByOne();
+ //pm10 pm25 本月数据
+ List<TDataValue> tDataValuesMonth = weighMapper.headThingJsDateValueMonth();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("tDataValues",tDataValues);
+ map.put("tDataSmock",tDataSmock);
+ map.put("tDataValue",tDataValue);
+ map.put("tDataValuesMonth",tDataValuesMonth);
+ return BasicResult.success(map);
+ }
}
--
Gitblit v1.9.3