From b3f34374327db922013714e006485f31ebb2989e Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 18 May 2024 18:48:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=90=A8=E8=BE=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/task/ElectricalTask.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java index f6c9b327b..857fb0fad 100644 --- a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java @@ -93,7 +93,7 @@ public class ElectricalTask { /** * 获取电箱情况 每5分钟触发任务 */ - @Scheduled(cron = "0 30 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") @RequestMapping("/xmgl/task/getElectricData") public void getElectricData() { log.info("获取设备数据 每1分钟触发任务"); @@ -140,11 +140,16 @@ public class ElectricalTask { log.info("电箱实时数据" + execute.body()); JSONObject result = JSONObject.parseObject(execute.body()).getJSONObject("result"); JSONObject metric = result.getJSONObject("metric"); - String temperatures = result.getJSONArray("temperatures").getJSONObject(0).getString("temperature"); - ElectricalData electricalData = new ElectricalData(devId, metric.getString("modified"), metric.getString("voltage_a"), - metric.getString("voltage_b"), - metric.getString("voltage_c"), metric.getString("current_a"), metric.getString("current_b"), metric.getString("current_c"), - result.getJSONArray("leakages").getJSONObject(0).getString("leakage"), + String temperatures = String.format("%.1f", Double.parseDouble(result.getJSONArray("temperatures").getJSONObject(0).getString("temperature"))); + ElectricalData electricalData = new ElectricalData(devId, + metric.getString("modified"), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_a"))), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_b"))), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_c"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_a"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_b"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_c"))), + String.format("%.1f", Double.parseDouble(result.getJSONArray("leakages").getJSONObject(0).getString("leakage"))), temperatures, temperatures, temperatures, temperatures); electricalDataService.saveElectricalData(electricalData); From bb61add63c1b9d8601689ad682eadd143afbba6d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 18 May 2024 19:36:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=90=A8=E8=BE=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/task/ElectricalTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java index 857fb0fad..1d3625a15 100644 --- a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java @@ -93,7 +93,7 @@ public class ElectricalTask { /** * 获取电箱情况 每5分钟触发任务 */ - @Scheduled(cron = "0 0/1 * * * ?") + @Scheduled(cron = "0 30 * * * ?") @RequestMapping("/xmgl/task/getElectricData") public void getElectricData() { log.info("获取设备数据 每1分钟触发任务"); From 640fe5c635a2f3f17abae2ff6c11fdd1b3ce9f40 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 18 May 2024 20:00:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=99=BD=E8=89=B2=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E5=81=9Aai=E5=92=8C=E8=BD=A6=E8=BE=86=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/mybatis/DataScopeHandler.java | 14 +++++++++++--- .../com/zhgd/xmgl/util/EnvironmentUtil.java | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index c03e1367b..16dc5fab2 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl; import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.EnvironmentUtil; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Alias; @@ -44,6 +45,9 @@ import java.util.stream.Collectors; @Slf4j public class DataScopeHandler implements DataPermissionHandler { + @Lazy + @Autowired + EnvironmentUtil environmentUtil; @Lazy @Autowired IAiAnalyseHardWareRecordService aiAnalyseHardWareRecordService; @@ -85,15 +89,17 @@ public class DataScopeHandler implements DataPermissionHandler { tables.put("xz_task_progress_content", "enterprise_id"); tables.put("xz_task_progress_alarm", "enterprise_id"); tables.put("xz_task_progress", "enterprise_id"); - tables.put("enterprise_info", "id"); tables.put("quality_inspection_record", "enterprise_id"); tables.put("worker_info_audit_record", "enterprise_id"); - tables.put("car_info", "enterprise_id"); tables.put("xz_material", "enterprise_id"); tables.put("inspect_task_record", "enterprise_id"); tables.put("xz_security_inspect_task_record", "enterprise_id"); tables.put("xz_security_quality_inspection_record", "enterprise_id"); tables.put("team_info", "enterprise_id"); + if (!environmentUtil.isBaise()) { + tables.put("car_info", "enterprise_id"); + tables.put("enterprise_info", "id"); + } return tables; } @@ -105,7 +111,9 @@ public class DataScopeHandler implements DataPermissionHandler { private HashMap getFieldAiTables() { HashMap tables = new HashMap<>(); - tables.put("ai_analyse_hard_ware_alarm_record", "hardware_id"); + if (!environmentUtil.isBaise()) { + tables.put("ai_analyse_hard_ware_alarm_record", "hardware_id"); + } return tables; } diff --git a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java index 4285fec76..6b99783fd 100644 --- a/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java @@ -17,15 +17,15 @@ public class EnvironmentUtil { */ private static String activeEnvironment; + public static String getActiveEnvironment() { + return activeEnvironment; + } + @Value("${active.environment.name}") public void setActiveEnvironment(String activeEnvironment) { EnvironmentUtil.activeEnvironment = activeEnvironment; } - public static String getActiveEnvironment() { - return activeEnvironment; - } - /** * 是否本地开发环境 * @@ -125,4 +125,13 @@ public class EnvironmentUtil { return Stream.of("gxlt-prod", "gxlt-dev").anyMatch(s -> s.equals(activeEnvironment)); } + /** + * 是否baise环境 + * + * @return + */ + public boolean isBaise() { + return Stream.of("baise").anyMatch(s -> s.equals(activeEnvironment)); + } + } From 7e568d81e62a6a5df658c44b060decd1885b3649 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 18 May 2024 20:05:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VideoItemServiceImpl.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index 34439e0ed..f4cd30a36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -92,16 +92,7 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) - .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) - .eq(VideoItem::getVerificationCode, videoItem.getVerificationCode()); - int count = videoItemMapper.selectCount(queryWrapper); - if (count > 0) { - throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr")); - } - } + valid(videoItem, projectVideoConfig); // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加 // if (projectVideoConfig.getVideoType() == 1) { // String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret()); @@ -119,6 +110,27 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()); + int count = videoItemMapper.selectCount(queryWrapper); + if (count > 0) { + throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); + } + } else if (projectVideoConfig.getVideoType() != 2) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) + .eq(VideoItem::getVerificationCode, videoItem.getVerificationCode()); + int count = videoItemMapper.selectCount(queryWrapper); + if (count > 0) { + throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr")); + } + } + } + @Override public void updateVideoItem(VideoItem videoItem) { ProjectVideoConfig projectVideoConfig = projectVideoConfigMapper.selectById(videoItem.getVideoId());