From 534049f6eec4eed7368de95845feed0409865486 Mon Sep 17 00:00:00 2001 From: yj <913944315@qq.com> Date: Wed, 3 Jul 2024 13:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=975=E4=B8=AA=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MeterConfigController.java | 20 ++++- .../controller/MeterReadController.java | 1 + .../modules/analysis/entity/MeterConfig.java | 4 + .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-prod.yml | 4 +- .../modules/analysis/MeterConfigMapper.xml | 2 +- .../common/configvalue/StaticProperties.java | 3 + .../device/common/utils/StaticPropUtil.java | 5 +- .../xr/device/common/utils/UploadUtil.java | 22 ++--- .../model/mapper/MeterConfigMapper.java | 2 +- .../model/service/MeterConfigService.java | 2 +- .../service/impl/MeterConfigServiceImpl.java | 4 +- .../xr/device/schedule/GetMeterSchedule.java | 11 +-- ...ation-jc-dev.yml => application-jcDev.yml} | 8 +- ...ion-jc-prod.yml => application-jcProd.yml} | 8 +- .../main/resources/application-jiangcDev.yml | 82 +++++++++++++++++++ .../main/resources/application-jiangcProd.yml | 82 +++++++++++++++++++ .../src/main/resources/application-ppDev.yml | 82 +++++++++++++++++++ .../src/main/resources/application-ppProd.yml | 82 +++++++++++++++++++ .../src/main/resources/application-psDev.yml | 82 +++++++++++++++++++ .../src/main/resources/application-psProd.yml | 82 +++++++++++++++++++ .../src/main/resources/application-sbDev.yml | 82 +++++++++++++++++++ .../src/main/resources/application-sbProd.yml | 82 +++++++++++++++++++ .../src/main/resources/application.yml | 2 +- .../resources/mapper/MeterConfigMapper.xml | 2 +- 25 files changed, 724 insertions(+), 36 deletions(-) rename device_gather/src/main/resources/{application-jc-dev.yml => application-jcDev.yml} (92%) rename device_gather/src/main/resources/{application-jc-prod.yml => application-jcProd.yml} (92%) create mode 100644 device_gather/src/main/resources/application-jiangcDev.yml create mode 100644 device_gather/src/main/resources/application-jiangcProd.yml create mode 100644 device_gather/src/main/resources/application-ppDev.yml create mode 100644 device_gather/src/main/resources/application-ppProd.yml create mode 100644 device_gather/src/main/resources/application-psDev.yml create mode 100644 device_gather/src/main/resources/application-psProd.yml create mode 100644 device_gather/src/main/resources/application-sbDev.yml create mode 100644 device_gather/src/main/resources/application-sbProd.yml diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java index 2e4e48d..9312983 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java +++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java @@ -154,7 +154,7 @@ public class MeterConfigController { UpdateWrapper updateWrapper=new UpdateWrapper<>(); updateWrapper.in("id",ids).set("status",status); meterConfigService.update(null,updateWrapper); - scheduleSettingService.meterStart(ids,Integer.valueOf(status)); + //scheduleSettingService.meterStart(ids,Integer.valueOf(status)); return Result.OK(status.equals("1")?"启动":"停止"+"成功！"); } @RequestMapping("/saveCamera") @@ -232,6 +232,21 @@ public class MeterConfigController { return Result.OK("解绑成功！"); } + @RequestMapping("/saveCalibration") + public Result saveCalibration(MeterConfig config){ + if(StringUtils.isEmpty(config.getJzVal())){ + return Result.error("保存失败，校准值不能为空"); + } + UpdateWrapper update = new UpdateWrapper<>(); + if(StringUtils.isNotEmpty(config.getIsJz())){ + update.set("is_jz",config.getIsJz()); + } + update.set("jz_val",config.getJzVal()); + update.eq("id",config.getId()); + meterConfigService.update(update); + return Result.OK("保存成功！"); + } + @RequestMapping("/hisFocal") public Result hisFocal(@RequestBody String str){ List ids = JSONObject.parseObject(str,List.class); @@ -344,4 +359,7 @@ public class MeterConfigController { return sum; } + + + } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java index 74488a7..75ff989 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java +++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java @@ -34,6 +34,7 @@ public class MeterReadController { if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){ query.like("d.device_ip",readingRecord.getDeviceIp()); } + query.orderByDesc("reading_time"); IPage ipage = meterReadingRecordService.pageList(page,query); return ipage; } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java index 4e58fde..7188760 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java +++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java @@ -145,6 +145,10 @@ public class MeterConfig implements Serializable { private Integer stationId; + private Integer isJz; + + private String jzVal; + /** * 修改时间 */ diff --git a/device_cars/src/main/resources/application-dev.yml b/device_cars/src/main/resources/application-dev.yml index 4fd6c63..7325b1f 100644 --- a/device_cars/src/main/resources/application-dev.yml +++ b/device_cars/src/main/resources/application-dev.yml @@ -64,8 +64,8 @@ analysis: upload: img: - url: http://192.168.1.83:18081/file/img/zs/ - path: D:\\service\\fileService\\img\\zs\\ + url: http://192.168.1.83:18081/file/img/ + path: D:\\service\\fileService\\img\\ python: path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe modelPath: D:\\smartGrid\\smartGrid\\models diff --git a/device_cars/src/main/resources/application-prod.yml b/device_cars/src/main/resources/application-prod.yml index c5a8db5..b1c7ce3 100644 --- a/device_cars/src/main/resources/application-prod.yml +++ b/device_cars/src/main/resources/application-prod.yml @@ -64,8 +64,8 @@ analysis: upload: img: - url: http://192.168.1.94:18081/file/img/zs/ - path: E:\\service\\fileService\\img\\zs\\ + url: http://192.168.1.94:18081/file/img/ + path: E:\\service\\fileService\\img\\ python: path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe modelPath: D:\\smartGrid\\smartGrid\\models diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml index 6e688a0..bb48628 100644 --- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml +++ b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml @@ -41,7 +41,7 @@ a.type_id,a.status,a.first_time, a.algorithm_type,a.interval_time,a.focal_number, a.parameter_config,a.remarks,a.init_status,a.create_user, - a.create_time,a.update_user,a.update_time,a.station_id, + a.create_time,a.update_user,a.update_time,a.station_id,a.jz_val, select a.*,b.device_ip from meter_config a left join device_camera b - on a.camera_id = b.id where a.status = 1 + on a.camera_id = b.id where a.status = 1 and a.station_id = #{stationId}