From 94a70a1f75f33c59b4b1e19c54cea1436d41ab21 Mon Sep 17 00:00:00 2001 From: 4670101279 Date: Mon, 5 Jun 2023 13:59:41 +0800 Subject: [PATCH] youhua --- .../resources/mapper/api/DapingMapper.xml | 13 ++++--- .../code/camera/controller/ApiController.java | 1 + .../camera/controller/CameraController.java | 38 ++++++++++++++++++- .../com/ruoyi/code/camera/domain/Camera.java | 18 +++++++-- .../code/camera/domain/CameraParams.java | 15 ++++++++ .../code/camera/scheduled/RegisterServer.java | 3 +- .../controller/ScStationInfoController.java | 6 ++- .../src/main/java/utils/run_device_cfg.java | 2 +- .../resources/mapper/camera/CameraMapper.xml | 5 ++- .../mapper/camera/WaterPhotoInfoMapper.xml | 4 ++ 10 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/CameraParams.java diff --git a/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml b/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml index 9fad3a5..f217657 100644 --- a/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml @@ -16,6 +16,7 @@ FROM sc_station_info s inner join sc_water_current_data c on c.stnm_id = s.id + where s.del_flag='0' select id,stnm from sc_station_info + del_flag='0' - id in (${ids}) + and id in (${ids}) @@ -72,10 +75,10 @@ diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java index 9fce774..71e6983 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java @@ -235,6 +235,7 @@ public class ApiController extends BaseController @RequestMapping("/getPicJson") public R getPicJson(@RequestParam Map params) throws Exception { System.out.println("==================================="); +// System.out.println(JSON.toJSONString(params)); if(params.containsKey("json")){ String serialNo = (String) params.get("SerialNo"); String json = (String) params.get("json"); diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java index a280fe9..e016cff 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java @@ -1,7 +1,9 @@ package com.ruoyi.code.camera.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.code.camera.domain.Camera; +import com.ruoyi.code.camera.domain.CameraParams; import com.ruoyi.code.camera.domain.LogInfo; import com.ruoyi.code.camera.service.ICameraService; import com.ruoyi.common.annotation.Log; @@ -107,7 +109,9 @@ public class CameraController extends BaseController @PreAuthorize("@ss.hasPermi('web:camera:remove')") @Log(title = "Camera", businessType = BusinessType.DELETE) public R delete(@PathVariable Long[] ids){ - cameraService.removeByIds(Arrays.asList(ids)); + List list = cameraService.list(new QueryWrapper().in("id",Arrays.asList(ids))); + list.forEach(d ->d.setDelFlag("1")); + cameraService.updateBatchById(list); return R.ok(); } @@ -313,4 +317,36 @@ public class CameraController extends BaseController } + @RequestMapping("/setConfig") + public R setConfig(@RequestBody Map params){ + Integer id = (Integer) params.get("id"); + String lStart = (String)params.get("lstart"); + String cLen = (String)params.get("clen"); + String tLen = (String)params.get("tlen"); + String cP = (String)params.get("cp"); + Map map = new HashMap<>(); + if(StringUtils.isNotBlank(lStart)){ + map.put("l_start",Double.valueOf(lStart)); + } + if(StringUtils.isNotBlank(cLen)){ + map.put("c_len",Double.valueOf(cLen)); + } + if(StringUtils.isNotBlank(tLen)){ + map.put("t_len",Double.valueOf(tLen)); + } + if(StringUtils.isNotBlank(cP)){ + map.put("c_p",Double.valueOf(cP)); + } + String paramsStr = JSON.toJSONString(map); + Camera camera = cameraService.getById(id); + if(paramsStr.length() > 5){ + camera.setParams(paramsStr); + }else{ + camera.setParams(null); + } + cameraService.updateById(camera); + return R.ok(); + } + + } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java index 644e3b4..6a6f48b 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java @@ -1,9 +1,9 @@ package com.ruoyi.code.camera.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.utils.StringUtils; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -70,4 +70,16 @@ public class Camera implements Serializable /** 摄像机品牌,关联品牌表 */ private Long brand; + + private String delFlag; + + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String params; + + public CameraParams getParamsObject(){ + if(StringUtils.isNotBlank(this.params)) { + return JSON.parseObject(this.params, CameraParams.class); + } + return new CameraParams(); + } } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/CameraParams.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/CameraParams.java new file mode 100644 index 0000000..b20a2f8 --- /dev/null +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/CameraParams.java @@ -0,0 +1,15 @@ +package com.ruoyi.code.camera.domain; + +import lombok.Data; + +@Data +public class CameraParams { + /** */ + private Double lstart; + /** 某一时刻水位+水位上水尺长度，单位m */ + private Double tlen; + /** 某一时刻水面上水尺长度（单位米）*/ + private Double clen; + /** 和水面上的水尺长度对应像素 */ + private Double cp; +} diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java index eda95d8..3366df4 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/scheduled/RegisterServer.java @@ -48,7 +48,8 @@ public class RegisterServer { } private void start(){ - String ip = IPUtils.getLocalIpAddress(); +// String ip = IPUtils.getLocalIpAddress(); + String ip = "192.168.16.219"; System.out.println(ip); if(localip.equals(ip) && "0".equals(accessmode)){ R result = cameraService.register(localip); diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/sctaationinfo/controller/ScStationInfoController.java b/ruoyi-code/src/main/java/com/ruoyi/code/sctaationinfo/controller/ScStationInfoController.java index 830da51..7f37e00 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/sctaationinfo/controller/ScStationInfoController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/sctaationinfo/controller/ScStationInfoController.java @@ -1,5 +1,7 @@ package com.ruoyi.code.sctaationinfo.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.code.camera.domain.Camera; import com.ruoyi.code.sctaationinfo.domain.ScStationInfo; import com.ruoyi.code.sctaationinfo.service.IScStationInfoService; import com.ruoyi.common.annotation.Log; @@ -96,7 +98,9 @@ public class ScStationInfoController extends BaseController @PreAuthorize("@ss.hasPermi('system:info:remove')") @Log(title = "ScStationInfo", businessType = BusinessType.DELETE) public R delete(@PathVariable Long[] ids){ - scStationInfoService.removeByIds(Arrays.asList(ids)); + List list = scStationInfoService.list(new QueryWrapper().in("id",Arrays.asList(ids))); + list.forEach(d ->d.setDelFlag("1")); + scStationInfoService.updateBatchById(list); return R.ok(); } diff --git a/ruoyi-code/src/main/java/utils/run_device_cfg.java b/ruoyi-code/src/main/java/utils/run_device_cfg.java index ba19459..e2fa07c 100644 --- a/ruoyi-code/src/main/java/utils/run_device_cfg.java +++ b/ruoyi-code/src/main/java/utils/run_device_cfg.java @@ -60,7 +60,7 @@ public class run_device_cfg implements ActionListener, ListSelectionListener { * Create the application. */ public run_device_cfg() { - initialize(); +// initialize(); initilizeRyNetLib(); } diff --git a/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml b/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml index 1ffbe11..2c8d8e6 100644 --- a/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml +++ b/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"