From e20b7fc2f9380cb6addacfa97b1325edd74f11ac Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期三, 06 十二月 2023 10:59:06 +0800
Subject: [PATCH] thing.js 原料消耗总量/详情
---
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingDto.java | 32 ++++++++++
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java | 15 ++++-
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java | 6 ++
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/PipeInfoService.java | 4 +
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingNumDto.java | 13 ++++
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java | 16 +++++
hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml | 47 +++++++++++++++
7 files changed, 130 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java
index d00bea6..738edb4 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/controller/PipeScreenController.java
@@ -3,9 +3,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
-import com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialInfo;
-import com.thhy.mobile.modules.biz.pipeinfo.entity.PipeListVo;
-import com.thhy.mobile.modules.biz.pipeinfo.entity.ScreenPipeCompare;
+import com.thhy.mobile.modules.biz.pipeinfo.entity.*;
import com.thhy.mobile.modules.biz.pipeinfo.service.PipeInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -76,4 +74,15 @@
return BasicResult.success(mapto);
}
+ //thing.js 原料实际消耗数量列表 前10条数据
+ @RequestMapping("/materialInfo")
+ public BasicResult materialInfo(){
+ return BasicResult.success(pipeInfoService.materialInfo());
+ }
+ //thing.js 原料消耗总量
+ @RequestMapping("/materialNumInfo")
+ public BasicResult materialNumInfo(){
+ List<MaterialThingNumDto> materialInfo = pipeInfoService.materialNumInfo();
+ return BasicResult.success(materialInfo);
+ }
}
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingDto.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingDto.java
new file mode 100644
index 0000000..ceea258
--- /dev/null
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingDto.java
@@ -0,0 +1,32 @@
+package com.thhy.mobile.modules.biz.pipeinfo.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MaterialThingDto implements Serializable {
+ //盘次
+ private Integer piece;
+ //河砂
+ private String sand;
+ //小石子
+ private String pebbles;
+ //水泥3
+ private String cement3;
+ //粉煤灰2
+ private String flyAsh2;
+ //水
+ private String water;
+ //大石子
+ private String dashizi;
+ //外剂1
+ private String externalAgent1;
+ //粉煤灰1
+ private String flyAsh1;
+ //水泥4
+ private String cement4;
+ //水泥2
+ private String cement2;
+
+}
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingNumDto.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingNumDto.java
new file mode 100644
index 0000000..7af299c
--- /dev/null
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/MaterialThingNumDto.java
@@ -0,0 +1,13 @@
+package com.thhy.mobile.modules.biz.pipeinfo.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MaterialThingNumDto implements Serializable {
+ //原料名称
+ private String material;
+ //数量
+ private String counts;
+}
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
index 209139d..4dca6a4 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
@@ -175,4 +175,10 @@
void updateInRepoTime(RepoRecord repoRecord);
List<Integer> queryAllNumType();
+
+ List<MaterialThingDto> materialInfo();
+
+ List<MaterialThingNumDto> materialNumInfo();
+
+ List<MaterialThingDto> materialInfoTwo();
}
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/PipeInfoService.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/PipeInfoService.java
index 9cc442a..b084723 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/PipeInfoService.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/PipeInfoService.java
@@ -59,4 +59,8 @@
Map<String,Object> updateDateInfo(PipeInfo pipeInfo);
void updatePipeDate(PipeDateDto pipeDateDto);
+
+ Map<String,Object> materialInfo();
+
+ List<MaterialThingNumDto> materialNumInfo();
}
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
index 19d0ea5..2ad0f8b 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/service/impl/PipeInfoServiceImpl.java
@@ -345,4 +345,20 @@
calendar.add(Calendar.MINUTE,amount);
return calendar.getTime();
}
+ @Override
+ public Map<String, Object> materialInfo() {
+ List<MaterialThingDto> materialThingDtos1 = pipeInfoMapper.materialInfo();
+ List<MaterialThingDto> materialThingDtos2 = pipeInfoMapper.materialInfoTwo();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("materialThingDtos1",materialThingDtos1);
+ map.put("materialThingDtos2",materialThingDtos2);
+ return map;
+ }
+
+ @Override
+ public List<MaterialThingNumDto> materialNumInfo() {
+ List<MaterialThingNumDto> materialThingNumDtos = pipeInfoMapper.materialNumInfo();
+
+ return materialThingNumDtos;
+ }
}
diff --git a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
index 2a92eba..93127b1 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
@@ -972,4 +972,51 @@
<select id="queryAllNumType" resultType="integer">
select DISTINCT a.numType from (select SUBSTRING_INDEX(m.mould_num,'-',-1) as numType from sys_mould m) a
</select>
+
+ <select id="materialInfo" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialThingDto">
+ select
+ Piece as piece,
+ MAX(CASE WHEN Material = '河砂' THEN FactAmnt END) AS sand,
+ MAX(CASE WHEN Material = '小石子' THEN FactAmnt END) AS pebbles,
+ MAX(CASE WHEN Material = '水泥3' THEN FactAmnt END) AS cement3,
+ MAX(CASE WHEN Material = '粉煤灰2' THEN FactAmnt END) AS flyAsh2,
+ MAX(CASE WHEN Material = '大石子' THEN FactAmnt END) AS dashizi,
+ MAX(CASE WHEN Material = '水' THEN FactAmnt END) AS water,
+ MAX(CASE WHEN Material = '外剂1' THEN FactAmnt END) AS externalAgent1,
+ MAX(CASE WHEN Material = '粉煤灰1' THEN FactAmnt END) AS flyAsh1,
+ MAX(CASE WHEN Material = '水泥4' THEN FactAmnt END) AS cement4,
+ MAX(CASE WHEN Material = '水泥2' THEN FactAmnt END) AS cement2
+ from
+ t_raw_material where types=1
+ GROUP BY Piece
+ ORDER BY Piece desc limit 0,10
+ </select>
+
+ <select id="materialInfoTwo" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialThingDto">
+ select
+ Piece as piece,
+ MAX(CASE WHEN Material = '河砂' THEN FactAmnt END) AS sand,
+ MAX(CASE WHEN Material = '小石子' THEN FactAmnt END) AS pebbles,
+ MAX(CASE WHEN Material = '水泥3' THEN FactAmnt END) AS cement3,
+ MAX(CASE WHEN Material = '粉煤灰2' THEN FactAmnt END) AS flyAsh2,
+ MAX(CASE WHEN Material = '大石子' THEN FactAmnt END) AS dashizi,
+ MAX(CASE WHEN Material = '水' THEN FactAmnt END) AS water,
+ MAX(CASE WHEN Material = '外剂1' THEN FactAmnt END) AS externalAgent1,
+ MAX(CASE WHEN Material = '粉煤灰1' THEN FactAmnt END) AS flyAsh1,
+ MAX(CASE WHEN Material = '水泥4' THEN FactAmnt END) AS cement4,
+ MAX(CASE WHEN Material = '水泥2' THEN FactAmnt END) AS cement2
+ from
+ t_raw_material where types=2
+ GROUP BY Piece
+ ORDER BY Piece desc limit 0,10
+ </select>
+ <select id="materialNumInfo" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialThingNumDto">
+ SELECT
+ Material as material,
+ CAST( SUM( FactAmnt ) AS FLOAT ) AS counts
+FROM
+ t_raw_material
+GROUP BY
+ Material
+ </select>
</mapper>
--
Gitblit v1.9.3