From f7178996ca77a1bccc941c0e7a73b36803e508cb Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 01 三月 2024 16:13:11 +0800
Subject: [PATCH] 优化协议
---
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java | 1
src/main/java/com/fzzy/gateway/hx2023/data/GrainOutPut.java | 3
src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java | 51 ++++
src/main/java/com/ld/igds/models/MQuality.java | 59 ++++++
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 13 +
src/main/java/com/ld/igds/grain/dto/GrainPoint.java | 41 ++++
src/main/java/com/ld/igds/grain/dto/GrainIotData.java | 57 ++++++
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java | 4
src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java | 3
src/main/java/com/fzzy/api/Constant.java | 4
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java | 7
src/main/java/com/ld/igds/models/Depot.java | 89 +++++++++
src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java | 4
src/main/java/com/ld/igds/grain/dto/GrainRow.java | 36 ++++
src/main/java/com/ld/igds/grain/dto/GrainLay.java | 56 ++++++
src/main/java/com/ld/igds/grain/dto/GrainData.java | 111 ++++++++++++
16 files changed, 521 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index 3d0c911..9fb3f23 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -325,7 +325,7 @@
public static ApiCommonDevice getCommonDeviceCache(String sn) {
if (null == sn) return null;
- log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
+ //log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
return contextDeviceMap.get(sn);
}
@@ -333,7 +333,7 @@
if (null == ip) return null;
if (contextDeviceMap.isEmpty()) return null;
- log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
+ //log.info("鍦ㄧ嚎璁惧锛�" + JSON.toJSONString(contextDeviceMap));
for (ApiCommonDevice device : contextDeviceMap.values()) {
if (ip.equals(device.getIp())) return device;
}
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index f65eead..c8bb60d 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -153,4 +153,8 @@
@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
private String remark;
+
+ @Column(name = "BH_ID_", length = 50)
+ @PropertyDef(label = "鍒嗘満鍐呴儴浠撳簱缂栫爜")
+ private String bhId;
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
index 8fc8ad1..2c6194b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -28,4 +28,5 @@
private JSONObject properties;
+
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainOutPut.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainOutPut.java
index 65b1c93..912daa9 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainOutPut.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainOutPut.java
@@ -39,5 +39,8 @@
private List<GrainTemp> temperature;
+ private String liquidHeight = "0.0";
+
+ private String detectTime ;
}
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index b7e1133..f2cdce0 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -150,13 +150,17 @@
<Property name="label">鐢电紗绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="depotType">
- <Property/>
+ <Property></Property>
<Property name="label">浠撳簱绫诲瀷</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerPR#listDepotType").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ </PropertyDef>
+ <PropertyDef name="bhId">
+ <Property></Property>
+ <Property name="label">鍒嗘満鍐呴儴浠撳簱缂栫爜</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam" parent="Map">
@@ -449,7 +453,12 @@
<Property name="property">position</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">bhId</Property>
+ <Property name="property">bhId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:1">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
index 2010ea8..3c22d41 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -125,7 +125,7 @@
//鑾峰彇璇锋眰淇℃伅
- BaseReqData reqData = ProtocolUtils.getSyncReq(gatewayDevice.getDepotIdSys());
+ BaseReqData reqData = ProtocolUtils.getSyncReq(gatewayDevice.getDeviceSn());
if (null == reqData) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绮儏璇锋眰淇℃伅锛�" + message.getAddr());
@@ -350,18 +350,46 @@
JSONObject properties = new JSONObject();
- properties.put("data", outPut);
- properties.put("timestamp", grain.getTimestamp());
+ properties.put("timestamp", grain.getTimestamp());
+ outPut.setDetectTime( grain.getTimestamp());
String height = this.getCacheHeight(device);
if (StringUtils.isEmpty(height)) height = "0.0";
properties.put("liquidHeight", height);
- grain.setProperties(properties);
+ outPut.setLiquidHeight(height);
+ grain.setOutput(JSONObject.toJSONString(outPut));
+ properties.put("output", outPut);
+ GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
+
+ //绯荤粺姘旇薄绔欎俊鎭�
+ WeatherWebDto weather = WeatherWebDto.contextMap.get("default");
+
+ //姘旇薄淇℃伅
+ GrainWeather weatherStation = new GrainWeather();
+ weatherStation.setMessageId(ScConstant.getMessageId());
+ weatherStation.setMessgeId(weatherStation.getMessageId());
+
+ if (null != gatewayDeviceWeather) {
+ weatherStation.setId(gatewayDeviceWeather.getDeviceId());
+ } else {
+ weatherStation.setId(device.getDeviceId());
+ }
+ weatherStation.setAirPressure(weather.getPressure());
+ weatherStation.setHumidity(weather.getHumidity());
+ weatherStation.setPm(weather.getAir_pm25());
+ weatherStation.setRadiation("0");
+ weatherStation.setRainfallAmount(weather.getWea());
+ weatherStation.setTemperature(weather.getTem());
+ weatherStation.setWindDirection(weather.getWin());
+ weatherStation.setWindPower(weather.getWin_meter());
+ weatherStation.setWindSpeed(weather.getWin_speed());
+
+ grain.setWeatherStation(JSONObject.toJSONString(weatherStation));
//灏佽濂界殑鏁版嵁
log.info("---娌圭綈浠撲俊鎭皝瑁呭畬鎴�----寮�濮嬫墽琛屾帹閫�");
-
+ grain.setProperties(properties);
reqData.setData(JSONObject.toJSONString(grain));
doPushGrain(reqData);
@@ -375,8 +403,17 @@
*/
private String getCacheHeight(GatewayDevice device) {
//缁欏叾浠栬蒋浣跨敤
- String key = RedisConst.KEY_DEPOT_HEIGHT + ":" + configData.getCompanyId() + "_" + device.getDepotIdSys();
- return (String) redisUtil.get(key);
+ //igds:5012:DEPOT_HEIGHT:0134
+ String key = "igds:"+ device.getOrgId() + ":" + RedisConst.KEY_DEPOT_HEIGHT+ ":" + device.getDepotIdSys();
+ com.ld.igds.grain.dto.GrainData ht = (com.ld.igds.grain.dto.GrainData) redisUtil.get(key);
+ log.info("KEY="+key);
+ if(ht!=null){
+ log.info("VALUE="+ht.getOilHeight());
+ return ht.getOilHeight() ;
+ }else {
+ return "0.0";
+ }
+
}
diff --git a/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java b/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
index 9d0a916..240c90a 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
@@ -58,10 +58,10 @@
try {
//Step 璇锋眰淇℃伅鏀惧叆鍐呭瓨
- ProtocolUtils.addSyncReq2Map(device.getDepotIdSys(), reqData);
+ ProtocolUtils.addSyncReq2Map(device.getDeviceSn(), reqData);
// 鐢熸垚绮儏淇℃伅
- String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getDepotIdSys());
+ String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getBhId());
// 鍙戦�佸懡浠�
InvokeResult message = BhznGrainV2ServerEngine.push(device.getIp(), device.getPort(), BytesUtil.hexStrToBytes(hexStr));
diff --git a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
index 83b0fae..16a7fab 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisSystem.java
@@ -36,10 +36,11 @@
public void analysis1001(ReMessage reMessage) {
//鑾峰彇鍒扮櫥闄嗕俊鎭紝鎵ц璁惧淇℃伅鏁寸悊
- ApiCommonDevice device = Constant.getCommonDeviceCache(reMessage.getSn());
- if (null == device) {
- device = new ApiCommonDevice();
+ GatewayDevice d = GatewayUtils.getCacheByDeviceSn(reMessage.getSn());
+ if (null == d) {
+ d = new GatewayDevice();
}
+ ApiCommonDevice device = new ApiCommonDevice();
device.setIp(reMessage.getIp());
device.setPort(reMessage.getPort());
device.setSn(reMessage.getSn());
diff --git a/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java b/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
index b6f3461..c97e274 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
@@ -36,8 +36,7 @@
GatewayDevice device = reqData.getDevice();
//鑾峰彇杩炴帴涓殑璁惧淇℃伅
- ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getIp());
-
+ ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCacheBySn(device.getDeviceSn());
if (null == apiCommonDevice) {
resp.setCode(500);
resp.setMsg("绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅锛屾棤娉曟墽琛�");
diff --git a/src/main/java/com/ld/igds/grain/dto/GrainData.java b/src/main/java/com/ld/igds/grain/dto/GrainData.java
new file mode 100644
index 0000000..e73c73c
--- /dev/null
+++ b/src/main/java/com/ld/igds/grain/dto/GrainData.java
@@ -0,0 +1,111 @@
+package com.ld.igds.grain.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ld.igds.models.Depot;
+import com.ld.igds.models.MQuality;
+import lombok.Data;
+
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐢ㄤ簬灏佽鐨勭伯鎯呬俊鎭紝姣忔鑾峰彇绮儏鏁版嵁锛屽皝瑁呬负褰撳墠瀵硅薄
+ *
+ * @author jiazx
+ */
+@Data
+public class GrainData implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ @PropertyDef(label = "鎵规缂栧彿")
+ private String batchId;
+
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @PropertyDef(label = "鎵�灞炰粨搴�", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+ @PropertyDef(label = "鏈�浣庢俯绮俯", description = "鍗曚綅鈩冿紝绮儏鏈�浣庢俯")
+ private Double tempMin = 0.0;
+
+ @PropertyDef(label = "鏈�楂樼伯娓�", description = "鍗曚綅鈩冿紝绮儏鏈�楂樻俯")
+ private Double tempMax = 0.0;
+
+ @PropertyDef(label = "骞冲潎绮俯", description = "鍗曚綅鈩冿紝绮儏骞冲潎娓╁害")
+ private Double tempAve = 0.0;
+
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double humidityIn;
+
+ @PropertyDef(label = "浠撳唴娓╁害")
+ private Double tempIn;
+
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double humidityOut;
+
+ @PropertyDef(label = "浠撳娓╁害")
+ private Double tempOut;
+
+ @PropertyDef(label = "灞傝鍒�", description = "鐢�-闅斿紑鐨勯厤缃俊鎭�")
+ private String cable;
+
+ @PropertyDef(label = "绛掍粨灞傞厤缃�", description = "鐢�-闅斿紑鐨勯厤缃俊鎭�")
+ private String cableCir;
+
+ @PropertyDef(label = "娌归潰楂樺害",description = "鐢�-闅斿紑鐨勪袱涓�硷紝娌归潰楂樺害-寤虹瓚楂樺害")
+ private String oilHeight;
+
+ @PropertyDef(label = "澶╂皵", description = "鐩存帴濉啓涓枃淇℃伅锛屾櫞锛岄槾闆ㄥぉ")
+ private String weather = "#";
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+ @PropertyDef(label = "鎺ユ敹鏃堕棿")
+ private Date receiveDate;
+
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+ @PropertyDef(label = "閲囬泦鐐逛俊鎭�", description = "鐢ㄩ�楀彿闅斿紑鐨勬俯搴︿俊鎭俊鎭�")
+ private String points;
+
+ @PropertyDef(label = "鍚勪釜閲囬泦鐐圭殑淇℃伅", description = "鍏崇郴瀛楁")
+ private List<GrainPoint> listPoints;
+
+ @PropertyDef(label = "鍚勫眰绮俯", description = "鍏崇郴瀛楁")
+ private List<GrainLay> listLays;
+
+ @PropertyDef(label = "鍚勮娓╁害", description = "鍏崇郴瀛楁")
+ private List<GrainRow> listRows;
+
+ @PropertyDef(label = "浠撴埧淇℃伅", description = "鍏崇郴瀛楁")
+ private Depot depotData;
+
+ @PropertyDef(label = "鍖栭獙淇℃伅", description = "鍏崇郴瀛楁")
+ private MQuality mquality;
+
+ @PropertyDef(label = "绯荤粺鏃堕棿", description = "鍏崇郴瀛楁")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+ private Date sysDate = new Date();
+
+ @PropertyDef(label = "寤虹瓚楂樺害")
+ private String depotHeight;
+
+ @PropertyDef(label = "妫�娴嬪偍閲�", description = "鍗曚綅KG")
+ private Double storage;
+
+ @Transient
+ @PropertyDef(label = "褰撳墠浠搃ot璁惧鐨勬俯婀垮害鏁版嵁")
+ private List<GrainIotData> grainIotData;
+}
diff --git a/src/main/java/com/ld/igds/grain/dto/GrainIotData.java b/src/main/java/com/ld/igds/grain/dto/GrainIotData.java
new file mode 100644
index 0000000..4ad5e45
--- /dev/null
+++ b/src/main/java/com/ld/igds/grain/dto/GrainIotData.java
@@ -0,0 +1,57 @@
+package com.ld.igds.grain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鐢ㄤ簬灏佽鎴愬搧绮俯婀垮害淇℃伅
+ *
+ * @author chen
+ */
+@Data
+public class GrainIotData implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缁勭粐缂栫爜
+ */
+ private String companyId;
+ /**
+ * 浠撳簱缂栫爜
+ */
+ private String depotId;
+ /**
+ * 璁惧缂栫爜
+ */
+ private String deviceId;
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String name;
+ /**
+ * 鏃堕棿
+ */
+ private String time;
+ /**
+ * 娓╁害
+ */
+ private Double temp = 0.0;
+ /**
+ * 婀垮害
+ */
+ private Double hum = 0.0;
+
+ /**
+ * 澶栨俯
+ */
+ private Double outTemp = 0.0;
+ /**
+ * 澶栨箍
+ */
+ private Double outHum = 0.0;
+}
diff --git a/src/main/java/com/ld/igds/grain/dto/GrainLay.java b/src/main/java/com/ld/igds/grain/dto/GrainLay.java
new file mode 100644
index 0000000..f96e563
--- /dev/null
+++ b/src/main/java/com/ld/igds/grain/dto/GrainLay.java
@@ -0,0 +1,56 @@
+package com.ld.igds.grain.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+/**
+ * 绮儏鏁版嵁瑙ｆ瀽瀵硅薄-灞備俊鎭�
+ */
+@Data
+public class GrainLay {
+
+ @PropertyDef(label = "鎵�鍦ㄥ眰")
+ private int fz;
+
+ @PropertyDef(label = "鎵�鍦ㄥ眰")
+ private int z;
+
+ @PropertyDef(label = "灞傛渶浣庢俯")
+ private Double tempMin;
+
+ @PropertyDef(label = "灞傛渶楂樻俯")
+ private Double tempMax;
+
+ @PropertyDef(label = "灞傚钩鍧囨俯")
+ private Double tempAve = 0.0;
+
+ @PropertyDef(label = "鍐呭湀骞冲潎娓╁害", description = "鍗曚綅鈩冿紝绮儏骞冲潎娓╁害")
+ private Double tempAveIn = 0.0;
+
+ @PropertyDef(label = "澶栧湀骞冲潎娓╁害", description = "鍗曚綅鈩冿紝绮儏骞冲潎娓╁害")
+ private Double tempAveOut = 0.0;
+
+
+ private int sumNum;//褰撳墠灞傛�绘暟
+
+ private int sumInNum;//鍐呭湀涓暟
+
+ private int sumOutNum;//澶栧湀涓暟
+
+ private double sumTemp;//灞傛�绘俯搴�
+
+ private double sumInTemp;
+
+ private double sumOutTemp;
+
+
+ public GrainLay() {
+ super();
+ }
+
+ public GrainLay(int fz,int z) {
+ super();
+ this.fz = fz;
+ this.z = z;
+ }
+}
diff --git a/src/main/java/com/ld/igds/grain/dto/GrainPoint.java b/src/main/java/com/ld/igds/grain/dto/GrainPoint.java
new file mode 100644
index 0000000..3cf765b
--- /dev/null
+++ b/src/main/java/com/ld/igds/grain/dto/GrainPoint.java
@@ -0,0 +1,41 @@
+package com.ld.igds.grain.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+/**
+ * 绮儏鏁版嵁瑙ｆ瀽瀵硅薄-閲囬泦鐐瑰璞′俊鎭紝XYZ琛ㄧず鐨勫垪琛屽眰锛屾暟鍊间粠1寮�濮嬨��
+ *
+ */
+@Data
+public class GrainPoint {
+
+ @PropertyDef(label = "鎵�鍦ㄥ眰")
+ private int z;
+
+ @PropertyDef(label = "鎵�鍦ㄥ眰")
+ private int fz;
+
+ @PropertyDef(label = "鎵�鍦ㄥ垪锛岀瓛浠撴墍鍦ㄥ湀鏁�")
+ private int x;
+
+ @PropertyDef(label = "鎵�鍦ㄨ锛岀瓛浠撴牴鍙凤紝鎬绘牴鍙�")
+ private int y;
+
+ @PropertyDef(label = "閲囬泦鐐规俯搴�")
+ private Double temp = 0.0;
+
+ public GrainPoint() {
+ super();
+ }
+
+ public GrainPoint(Double temp,int x, int y, int z, int fz) {
+ super();
+ this.z = z;
+ this.x = x;
+ this.y = y;
+ this.fz = fz;
+ this.temp = temp;
+ }
+
+}
diff --git a/src/main/java/com/ld/igds/grain/dto/GrainRow.java b/src/main/java/com/ld/igds/grain/dto/GrainRow.java
new file mode 100644
index 0000000..8f1d877
--- /dev/null
+++ b/src/main/java/com/ld/igds/grain/dto/GrainRow.java
@@ -0,0 +1,36 @@
+package com.ld.igds.grain.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+/**
+ * 绮儏鏁版嵁瑙ｆ瀽瀵硅薄-鍒椾俊鎭�
+ */
+@Data
+public class GrainRow {
+
+ @PropertyDef(label = "鎵�鍦ㄨ", description = "鏁版嵁浠�0寮�濮嬶紝濡傛灉鏄瓛浠撶殑璇濓紝鐢ㄤ簬璁板綍绛掍粨鐨勬牴鏁�")
+ private int y;
+
+ @PropertyDef(label = "灞傛渶浣庢俯")
+ private Double tempMin;
+
+ @PropertyDef(label = "灞傛渶楂樻俯")
+ private Double tempMax;
+
+ @PropertyDef(label = "灞傚钩鍧囨俯")
+ private Double tempAve = 0.0;
+
+ private int sumNum;// 褰撳墠灞傛�绘暟
+
+ private double sumTemp;// 灞傛�绘俯搴�
+
+ public GrainRow() {
+ super();
+ }
+
+ public GrainRow(int y) {
+ super();
+ this.y = y;
+ }
+}
diff --git a/src/main/java/com/ld/igds/models/Depot.java b/src/main/java/com/ld/igds/models/Depot.java
new file mode 100644
index 0000000..451d7c0
--- /dev/null
+++ b/src/main/java/com/ld/igds/models/Depot.java
@@ -0,0 +1,89 @@
+package com.ld.igds.models;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Desc: 鍩虹淇℃伅-璐т綅淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
+ */
+@Data
+public class Depot implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ private String id;
+
+ private String companyId;
+
+ private String deptId;
+
+ private String ggm;
+
+ private String name;
+
+ private String buildingId;
+
+ private String granaryId;
+
+ private String depotType;
+
+ private String depotStatus;
+
+ private String storeType;
+
+ private Double storageMax;
+ private Double storageReal;
+ private String foodType;
+ private String foodVariety;
+
+ private String foodLevel;
+
+ private String foodLocation;
+
+ private String foodYear;
+
+ private Double perWet;
+
+ private Double perImpurity;
+
+ private Double bulkWeight;
+
+ private String storeKeeper;
+
+ private String storeKeeperName;
+
+ private Date storeDate;
+
+ private Date checkDate;
+
+ private String remark;
+
+ private Date updateTime;
+
+ private String bhId;
+
+ // ------------鍏朵粬灞炴�т俊鎭�------------//
+ private String foodVarietyName;
+
+ private String foodTypeName;
+
+ private String depotTypeName;
+
+ private String depotStatusName;
+
+ private String foodLevelName;
+
+ private Double posX;
+
+ private Double posY;
+
+
+}
diff --git a/src/main/java/com/ld/igds/models/MQuality.java b/src/main/java/com/ld/igds/models/MQuality.java
new file mode 100644
index 0000000..339b007
--- /dev/null
+++ b/src/main/java/com/ld/igds/models/MQuality.java
@@ -0,0 +1,59 @@
+package com.ld.igds.models;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ *
+ * @author chen
+ */
+@Data
+public class MQuality implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+ private String companyId;
+ private String deptId;
+ private String depotId;
+ private String foodVariety;
+ private String foodLevel;
+ private Date storeDate;
+ private String type;
+ private Date time;
+ private String unit;
+ private String user;
+ private String standard;
+ private String zblb;
+ private String result;
+ private String spaqzbsfhg;
+ private Date qfrq;
+ private Date bgcjsj;
+ private String shrxm;
+ private String qydbh;
+
+ private Date checkTime;
+
+ private String checkArea;
+
+ private String checkUser;
+
+ private String jdrxm;
+ private String ypbh;
+ private Double ypsl;
+
+ private Double dbsl;
+
+ private String ypdj;
+
+ private String normalYear;
+
+ private String remark;
+
+ private Date updateTime;
+
+
+}
--
Gitblit v1.9.3