| igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| igds-web/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
@@ -22,18 +22,13 @@ import com.ld.igds.util.ContextUtil; import com.ld.igds.util.DateUtil; import com.ld.igds.util.DecimalUtil; import com.ld.igds.util.FilesUtil; import com.ld.igds.view.service.BuildingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.text.Collator; import java.util.*; import java.util.concurrent.ExecutorService; @@ -67,8 +62,6 @@ private BuildingService buildingService; @Autowired private GrainExportBuilder grainExportBuilder; @Resource private FilesUtil filesUtil; /** * 根据参数获取粮情数据信息 @@ -850,7 +843,11 @@ if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) { Double oilHeight = Double.valueOf(grainData.getOilHeight()); //计算体积 volume = 3.14 * Math.pow(diameter / 2, 2) * oilHeight - deVolume; volume = 3.14159 * Math.pow(diameter / 2, 2) * oilHeight; if(volume > 0){ volume = volume - deVolume; } storage = volume * bulkWeight; }
@@ -3,6 +3,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +63,7 @@ } data.setCompanyId(ContextUtil.getCompanyId()); session.saveOrUpdate(data); refreshCache(data.getCompanyId(), data.getDeptId()); refreshCache(data.getCompanyId()); } finally { session.flush(); session.close(); @@ -101,7 +103,7 @@ } } refreshCache(items.get(0).getCompanyId(), items.get(0).getDeptId()); refreshCache(items.get(0).getCompanyId()); } finally { session.flush(); session.close(); @@ -110,7 +112,7 @@ } @SuppressWarnings("unchecked") public List<Building> getCacheBuilding(String companyId,String deptId) { public List<Building> getCacheBuilding(String companyId, String deptId) { if(StringUtils.isEmpty(companyId)){ companyId = ContextUtil.getCompanyId(); } @@ -120,14 +122,15 @@ List<Building> result = (List<Building>) redisUtil.get(key); if (null == result) { refreshCache(companyId, deptId); refreshCache(companyId); return null; } if(null == deptId) return result; return result; return result.stream().filter(item -> item.getDeptId().equals(deptId)) .collect(Collectors.toList()); } @SuppressWarnings("unchecked") @@ -136,12 +139,10 @@ companyId = ContextUtil.getCompanyId(); } String key = RedisConst.buildKey(companyId, RedisConst.KEY_BUILDING_LIST); List<Building> result = (List<Building>) redisUtil.get(key); List<Building> result = getCacheBuilding(companyId, deptId); if (null == result) { refreshCache(companyId, deptId); refreshCache(companyId); return null; } @@ -154,12 +155,11 @@ } public void refreshCache(String companyId, String deptId) { public void refreshCache(String companyId) { Map<String, Object> parameter = new HashMap<String, Object>(); parameter.put("companyId", companyId); parameter.put("deptId", deptId); List<Building> list = this.loadData(parameter); redisUtil.set(RedisConst.buildKey(companyId, deptId, RedisConst.KEY_BUILDING_LIST),list); redisUtil.set(RedisConst.buildKey(companyId, RedisConst.KEY_BUILDING_LIST),list); } } igds-web/pom.xml
@@ -144,15 +144,15 @@ </dependency> <!-- 接口包，包括上海接口和、气象接口、三维接口--> <!-- 接口包，包括上海接口和、气象接口、三维接口 <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-api-inte</artifactId> <version>${igds.version}</version> </dependency> </dependency>--> <!-- 私有协议-风正致远 <!-- 私有协议-风正致远--> <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-fzzy3</artifactId> @@ -167,7 +167,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency>--> </dependency> <!-- MODBUS-TCP <dependency> @@ -187,7 +187,7 @@ </dependency>--> <!-- 私有协议-风正致远IOT、制氮机 <!-- 私有协议-风正致远IOT、制氮机--> <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-iot</artifactId> @@ -202,9 +202,9 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency>--> </dependency> <!-- 私有协议-贝博粮情--> <!-- 私有协议-贝博粮情 <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-beibo</artifactId> @@ -219,9 +219,9 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- 私有协议-DLT645电表协议--> <!-- 私有协议-DLT645电表协议 <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-es</artifactId> @@ -236,7 +236,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> </dependency>--> <!-- 私有协议-邦海智能--> <dependency> @@ -255,7 +255,7 @@ </exclusions> </dependency> <!-- 私有协议-正来电子 <!-- 私有协议-正来电子--> <dependency> <groupId>com.ld.igds</groupId> <artifactId>igds-protocol-zldz</artifactId> @@ -270,7 +270,7 @@ <groupId>log4j</groupId> </exclusion> </exclusions> </dependency> --> </dependency> <!-- 海康车牌识别-SDK--> <dependency>
