| src/main/java/com/fzzy/api/timer/SyncDataScheduled.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/templates/home/home.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/fzzy/api/timer/SyncDataScheduled.java
@@ -36,7 +36,7 @@ * <p> * 固定时间：0分钟和30分钟执行 */ @Scheduled(cron = "0 0,30 * * * ? ") // @Scheduled(cron = "0 0,30 * * * ? ") public void scheduled() { log.info("系统执行定时数据同步操作<<<<<<<<<<<<<--------"); src/main/java/com/fzzy/gateway/GatewayTimerScheduled.java
@@ -147,9 +147,13 @@ */ @Scheduled(cron = "0/3 * * * * ?") public void scheduled3() { try{ //执行HTTP地磅请求 exeHttpWeightReq(); }catch (Exception e){ log.error(e.getMessage(),e); } //执行HTTP地磅请求 exeHttpWeightReq(); } @@ -240,17 +244,14 @@ BaseReqData reqData; for (GatewayDevice device : list) { if (!GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode().equals(device.getSyncProtocol())) { continue; } reqData = new BaseReqData(); reqData.setDevice(device); reqData.setDeviceName(device.getDeviceName()); reqData.setProductId(device.getProductId()); reqData.setDeviceId(device.getDeviceId()); gatewayRemoteManager.getSyncWeightService(device.getSyncProtocol()).syncWeightInfo(reqData); } } src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -640,13 +640,17 @@ //仓温度信息 KafkaGrainTH grainTH = new KafkaGrainTH(); List<GrainTH> ths= output.getTemperatureAndhumidity(); grainTH.setHumidity(ths.get(0).getHumidity()); grainTH.setTemperature(ths.get(0).getTemperature() ); if(ths != null && ths.size() > 0){ grainTH.setHumidity(ths.get(0).getHumidity()); grainTH.setTemperature(ths.get(0).getTemperature() ); } GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class); grainTH.setAirHumidity(weather.getHumidity()); grainTH.setAirTemperature(weather.getTemperature() ); if (weather!=null){ grainTH.setAirHumidity(weather.getHumidity()); grainTH.setAirTemperature(weather.getTemperature() ); } List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>(); temperatureAndhumidity.add(grainTH);
@@ -257,11 +257,11 @@ GrainOutPut outPut = new GrainOutPut(); double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0, sumNum = cableX * cableY * cableZ; double max = ReMessageBuilder.MAX_TEMP, min = ReMessageBuilder.MIN_TEMP, sumT = 0.0; List<GrainTemp> temperature = new ArrayList<>(); //根号 int cableNum = 1, position = 0; int cableNum = 1, position = 0,sumNum = 0; double curTemp; int x = 0, y = 0, z = 0; @@ -284,6 +284,9 @@ if (curTemp < min && new Double(curTemp).intValue()!= -100) { min = curTemp; } if(new Double(curTemp).intValue()!= -100){ sumNum++; } } if (sumNum == 0) { src/main/resources/application.yml
@@ -10,7 +10,10 @@ favicon: enabled: false static-path-pattern: /** task: scheduling: pool: size: 100 jackson: date-format: yyyy-MM-dd HH:mm:ss joda-date-time-format: yyyy-MM-dd HH:mm:ss src/main/resources/templates/home/home.html
@@ -50,7 +50,7 @@ </dd> <hr> <dd> <a href="#" target="_self">退出</a> <a href="./log-out">退出</a> </dd> </dl> </li> @@ -94,6 +94,12 @@ </dd> <dd> <a lay-href="com.fzzy.api.view.GbCheckItem.d">检验项配置</a> </dd> <dd> <a lay-href="com.fzzy.sys.User.d">用户管理</a> </dd> <dd> <a lay-href="com.fzzy.api.view.GbUnifiedCoding.d">统一编码管理</a> </dd> </dl> </li> @@ -237,6 +243,12 @@ <a lay-href="com.fzzy.api.view.Api1306.d">熏蒸作业</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1405.d">能耗信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1403.d">化验条件基础信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1307.d">仓内视频图像</a> </dd> <dd> @@ -311,13 +323,8 @@ <dd> <a lay-href="com.fzzy.otherview.sh2023.ShApi2204.d">上海-定化水检验</a> </dd> <dd> <a lay-href="com.fzzy.test.ApiTest.d">视频接口测试</a> </dd> </dl> </li> <li data-name="template" class="layui-nav-item"> <a class="one" href="javascript:;" lay-tips="" lay-direction="2"> <div class="g-icon"> @@ -330,12 +337,55 @@ <dd> <a lay-href="com.fzzy.gateway.view.GatewayConf.d">网关配置</a> </dd> </dl> <dl class="layui-nav-child"> <dd> <a lay-href="com.fzzy.gateway.view.GatewayDevice.d">设备配置</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1401.d">上报账套信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1402.d">上报科目信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1403.d">上报科目余额</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1404.d">上报辅助核算余额</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1401.d">上报凭证信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1402.d">上报辅助核算管理信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1403.d">上报辅助核算部门信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1404.d">上报辅助核算个人信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1401.d">上报辅助核算单位信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1402.d">上报辅助核算项目信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1403.d">上报辅助核算仓房信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1401.d">上报辅助核算低值易耗品信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1402.d">粮油品种信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1403.d">数量检测信息</a> </dd> <dd> <a lay-href="com.fzzy.api.view.Api1405.d">视频采集信息</a> </dd> </dl> </li>
