From 14f0e20254e2487b33e80a1ceeb5fd99b60b1490 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 22 Jan 2024 17:28:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/WisdomSiteApplication.java | 6 +++ .../constant/DictionaryConstant.java | 1 + ...eriorScaffoldingCurrentDataController.java | 29 +++++++++++++++ .../controller/SewageDataController.java | 11 ++++++ .../modules/sewage/entity/SewageData.java | 5 +++ .../sewage/mapper/SewageDataMapper.java | 2 + .../sewage/mapper/xml/SewageDataMapper.xml | 30 +++++++++++++++ .../sewage/service/ISewageDataService.java | 2 + .../service/impl/SewageDataServiceImpl.java | 37 +++++++++++++++++-- .../SteelStructureCurrentDataController.java | 29 +++++++++++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 3 ++ 11 files changed, 152 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/WisdomSiteApplication.java b/src/main/java/com/WisdomSiteApplication.java index 130e3fc7f..e99765f8d 100644 --- a/src/main/java/com/WisdomSiteApplication.java +++ b/src/main/java/com/WisdomSiteApplication.java @@ -3,6 +3,7 @@ package com; import cn.xuyanwu.spring.file.storage.EnableFileStorage; import org.apache.catalina.connector.Connector; +import org.junit.Test; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -149,4 +150,9 @@ public class WisdomSiteApplication extends SpringBootServletInitializer { return firewall; } + @Test + public void test() { + System.out.println(); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java index 3035aec1e..306da2b76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java @@ -4,4 +4,5 @@ public interface DictionaryConstant { String PROJECT_CONSTRUCTION_STAGE = "project_construction_stage"; String AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE = "ai_analyse_hard_ware_alarm_record_type"; String LOCATION_DATA_PROJECT_SN_DISAPPEAR_TIME = "location_data_project_sn_disappear_time"; + String PROJECT_STRUCTURE_TYPE = "project_structure_type"; } diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/controller/ExteriorScaffoldingCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/controller/ExteriorScaffoldingCurrentDataController.java index bbe45189e..324b8a580 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/controller/ExteriorScaffoldingCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/controller/ExteriorScaffoldingCurrentDataController.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.exteriorscaffolding.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -208,4 +209,32 @@ public class ExteriorScaffoldingCurrentDataController { public Result> getNumberDifferentTypesAlarmsRadarChartOneMonth(@RequestParam Map map) { return Result.success(exteriorScaffoldingCurrentDataService.getNumberDifferentTypesAlarmsRadarChartOneMonth(map)); } + + @PostMapping("/lrk/add") + @ApiOperation(value = "接收外墙脚手架自动化监测系统数据", notes = "接收外墙脚手架自动化监测系统数据") + @ApiImplicitParams({ + @ApiImplicitParam(required = true, allowMultiple = true, dataType = "array"), + @ApiImplicitParam(name = "current", value = "实时数据", dataType = "object"), + @ApiImplicitParam(name = "current.calcValue", value = "单位根据监测类型", allowMultiple = true, dataType = "object"), + @ApiImplicitParam(name = "current.calcValue.rateChange", value = "变化速率", dataType = "float"), + @ApiImplicitParam(name = "current.calcValue.value", value = "计算值", dataType = "float"), + @ApiImplicitParam(name = "current.calcValue.variation", value = "变化值", dataType = "float"), + @ApiImplicitParam(name = "current.pointAlarmStatus", value = "报警状态", dataType = "object"), + @ApiImplicitParam(name = "current.pointAlarmStatus.alarmState", value = "警状态 报警状态 1.正常 2.超报警 3.超控制 4.变化速率报警", dataType = "int"), + @ApiImplicitParam(name = "metadata.deviceCode", value = "设备编号", dataType = "string"), + @ApiImplicitParam(name = "metadata.monitorTypeName", value = "监测名称", dataType = "string"), + @ApiImplicitParam(name = "metadata.nickname", value = "测点昵称", dataType = "string"), + @ApiImplicitParam(name = "metadata.projectCode", value = "项目编号", dataType = "string") + }) + public Result addLrkData(@RequestBody JSONArray jsonArray) { + log.info("addLrkData推送数据：{}", jsonArray); + try { + exteriorScaffoldingCurrentDataService.saveBatchExteriorScaffoldingCurrentData(jsonArray); + } catch (Exception e) { + e.printStackTrace(); + log.error("推送数据接收错误！错误原因为：{}", e.getMessage()); + throw new RuntimeException("推送数据接收错误！错误原因为：" + e.getMessage()); + } + return new Result().code(1); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java index 080b85faf..c6faf8274 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.sewage.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.sewage.entity.SewageData; import com.zhgd.xmgl.modules.sewage.service.ISewageDataService; import io.swagger.annotations.Api; @@ -173,4 +174,14 @@ public class SewageDataController { return mv; } + @ApiOperation(value = "监测曲线趋势", notes = "监测曲线趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "date", value = "日期", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countSewageDataTrend") + public Result> countSewageDataTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(sewageDataService.countSewageDataTrend(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java index 214aee4fd..c40a5fd94 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java @@ -105,4 +105,9 @@ public class SewageData implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "设备名称") private java.lang.String devName; + + @TableField(exist = false) + @ApiModelProperty(value = "time") + private java.lang.String time; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java index 90c153536..ff565bfd5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java @@ -21,4 +21,6 @@ import java.util.List; public interface SewageDataMapper extends BaseMapper { Page queryDevAndNewestData(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, Page page); + + List countSewageDataTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml index 3b5cc7781..177003951 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml @@ -1,6 +1,36 @@ + +