From 2b2d292c1a274aa95aab8c2ac20530e54a503923 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期三, 08 十一月 2023 10:39:32 +0800
Subject: [PATCH] 对接数据 web接口
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java | 4 +
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/dto/PieceDto.java | 17 ++++
hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml | 25 ++++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 16 ++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java | 17 ++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java | 6 +
hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 18 ++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java | 2
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java | 16 +++-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java | 6 +
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/entity/dto/TypeName.java | 13 +++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TRawMaterial.java | 82 ++++++++++++++++++++
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java | 5 +
13 files changed, 221 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
index 900cb14..a9e5f7f 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
@@ -79,5 +79,9 @@
return materialReleaseService.materialReleaseExcel(values,response);
}
-
+ //搅拌站 消耗列表
+ @PostMapping("/materialRew")
+ public BasicResult materialRew(@RequestBody HashMap<String,Object> values) {
+ return materialReleaseService.materialRew(values);
+ }
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TRawMaterial.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TRawMaterial.java
new file mode 100644
index 0000000..63c93d5
--- /dev/null
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TRawMaterial.java
@@ -0,0 +1,82 @@
+package com.thhy.materials.modules.biz.concret.entity;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@Getter
+@Setter
+@ToString
+public class TRawMaterial implements Serializable {
+ /**
+ * 搅拌id
+ */
+ private Integer rawMaterialId;
+
+ /**
+ * 盘次
+ */
+ private String piece;
+
+ /**
+ * 原材料仓
+ */
+ private String storage;
+
+ /**
+ * 原材料
+ */
+ private String material;
+
+ /**
+ * 原材料规格
+ */
+ private String spec;
+
+ /**
+ * 含水率*100、含固率*100...
+ */
+ private String watfull;
+
+ /**
+ * 配方用量
+ */
+ private String recamnt;
+
+ /**
+ * 设定用量
+ */
+ private String planamnt;
+
+ /**
+ * 实际用量
+ */
+ private String factamnt;
+
+ /**
+ *
+ */
+ private String flag;
+
+ /**
+ *
+ */
+ private String savestamp;
+
+ /**
+ * 搅拌站接入主键
+ */
+ private Integer byId;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table t_raw_material
+ *
+ * @mbg.generated Fri Nov 03 09:16:01 CST 2023
+ */
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/dto/PieceDto.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/dto/PieceDto.java
new file mode 100644
index 0000000..f5bc41f
--- /dev/null
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/dto/PieceDto.java
@@ -0,0 +1,17 @@
+package com.thhy.materials.modules.biz.concret.entity.dto;
+
+import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PieceDto implements Serializable {
+
+ private Integer byId;
+
+
+ private List<TRawMaterial> rawMaterials;
+
+}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
index 8cbbfa9..5775e1c 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
@@ -2,7 +2,9 @@
import com.thhy.general.annotations.Idkey;
import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
+import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
+import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import java.util.HashMap;
import java.util.List;
@@ -22,4 +24,8 @@
void releaseDataDel(String materialReleaseId);
void materialReleaseDel(String materialReleaseId);
+
+ List<PieceDto> pieceList(HashMap<String, Object> values);
+
+ List<TRawMaterial> materialRew(Integer byId);
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
index ae27e72..a772fcb 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
@@ -19,4 +19,6 @@
BasicResult materialReleaseDel(String materialReleaseId);
BasicResult materialReleaseExcel(HashMap<String, Object> values, HttpServletResponse response) throws FileNotFoundException;
+
+ BasicResult materialRew(HashMap<String, Object> values);
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
index a3783fe..1e9c031 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
@@ -6,8 +6,10 @@
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease;
+import com.thhy.materials.modules.biz.concret.entity.TRawMaterial;
import com.thhy.materials.modules.biz.concret.entity.TReleaseData;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
+import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import com.thhy.materials.modules.biz.concret.mapper.TMaterialReleaseMappper;
import com.thhy.materials.modules.biz.concret.service.TMaterialReleaseService;
import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper;
@@ -205,4 +207,18 @@
}
return null;
}
+
+ @Override
+ public BasicResult materialRew(HashMap<String, Object> values) {
+ Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+ Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+ PageHelper.startPage(pageNum,pageSize);
+ List<PieceDto> pieceDtos = materialReleaseMappper.pieceList(values);
+ for (PieceDto pieceDto : pieceDtos){
+ List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById());
+ pieceDto.setRawMaterials(rawMaterials);
+ }
+ PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos);
+ return BasicResult.success(pieceDtoPageInfo);
+ }
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
index 86dc3df..d6350b6 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
@@ -4,10 +4,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.materials.modules.biz.helmet.service.HelmetService;
import org.apache.ibatis.annotations.Mapper;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -94,5 +91,16 @@
}
+ // 智能监控
+ @PostMapping("/dataAIList")
+ public BasicResult dataAIList(@RequestBody Map<String,Object> values){
+ return helmetService.dataAIList(values);
+ }
+
+ //智能监控类型
+ @GetMapping("dataAIType")
+ public BasicResult dataAIType(){
+ return helmetService.dataAIType();
+ }
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/entity/dto/TypeName.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/entity/dto/TypeName.java
new file mode 100644
index 0000000..90643d4
--- /dev/null
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/entity/dto/TypeName.java
@@ -0,0 +1,13 @@
+package com.thhy.materials.modules.biz.helmet.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class TypeName implements Serializable {
+
+ private Integer type;
+
+ private String typeName;
+
+}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
index b2abea6..e247b3f 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
@@ -2,6 +2,7 @@
import com.thhy.materials.modules.biz.helmet.entity.*;
import com.thhy.materials.modules.biz.helmet.entity.dto.ReportNumDto;
+import com.thhy.materials.modules.biz.helmet.entity.dto.TypeName;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -55,4 +56,8 @@
List<TDataValue> dataValuesList(Map<String, Object> values);
void dataBox(TDataAi tDataAi);
+
+ List<TDataAi> dataAIList(Map<String, Object> values);
+
+ List<TypeName> dataAIType();
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
index 9bee834..9d72ae9 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
@@ -50,4 +50,8 @@
BasicResult dataValuesList(Map<String, Object> values);
BasicResult dataBox(JSONObject result);
+
+ BasicResult dataAIList(Map<String, Object> values);
+
+ BasicResult dataAIType();
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
index c98c12e..1aff6fc 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
@@ -6,6 +6,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.materials.modules.biz.helmet.entity.*;
import com.thhy.materials.modules.biz.helmet.entity.dto.ReportNumDto;
+import com.thhy.materials.modules.biz.helmet.entity.dto.TypeName;
import com.thhy.materials.modules.biz.helmet.mapper.HelmetMapper;
import com.thhy.materials.modules.biz.helmet.service.HelmetService;
import org.springframework.stereotype.Service;
@@ -235,4 +236,20 @@
helmetMapper.dataBox(tDataAi);
return BasicResult.success();
}
+
+ @Override
+ public BasicResult dataAIList(Map<String, Object> values) {
+ Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
+ Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
+ PageHelper.startPage(pageNum,pageSize);
+ List<TDataAi> tDataAis = helmetMapper.dataAIList(values);
+ PageInfo<TDataAi> tDataAiPageInfo = new PageInfo<>(tDataAis);
+ return BasicResult.success(tDataAiPageInfo);
+ }
+
+ @Override
+ public BasicResult dataAIType() {
+ List<TypeName> typeNames = helmetMapper.dataAIType();
+ return BasicResult.success(typeNames);
+ }
}
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
index 2e9f97d..8814d92 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -1131,4 +1131,29 @@
</if>
</trim>
</insert>
+
+ <select id="dataAIList" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataAi">
+ select
+ sign_time as signTime,
+ box_name as boxName,
+ device_name as deviceName,
+ type_name as typeName,
+ `type` as `type`,
+ sign_avatar as signAvatar
+ from t_data_ai where
+ 1=1
+ <if test="strTime!=null and strTime!='' and endTime!='' and endTime!=null ">
+ and sign_time between #{strTime} and #{endTime}
+ </if>
+ <if test="type!=null and type!='' ">
+ and `type` =#{type}
+ </if>
+ order by sign_time desc
+ </select>
+ <select id="dataAIType" resultType="com.thhy.materials.modules.biz.helmet.entity.dto.TypeName">
+ select `type`,
+ type_name as typeName
+ from t_data_ai_type
+ order by `type` asc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
index 9ac50f0..a406e28 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -146,5 +146,21 @@
is_use=2
where material_release_id=#{materialReleaseId}
</update>
-
+ <select id="pieceList" resultType="com.thhy.materials.modules.biz.concret.entity.dto.PieceDto">
+ select by_id as byId from t_piece
+ where 1=1
+ <if test="byId!=null and byId!='' ">
+ and by_id=#{byId}
+ </if>
+ ORDER BY by_id desc
+ </select>
+ <select id="materialRew" resultType="com.thhy.materials.modules.biz.concret.entity.TRawMaterial">
+ select Storage as storage,
+ Material as material,
+ RecAmnt as recamnt,
+ PlanAmnt as planamnt,
+ FactAmnt as factamnt
+ from t_raw_material
+ where Piece=#{byId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3