From 0debb337ce16aac7e80a9a788ff741f4bcc4fe9f Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 30 May 2025 17:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...idgeErectMachineAlarmConfigController.java | 89 +++++ .../BridgeErectMachineAlarmController.java | 51 ++- ...ridgeErectMachineDataConfigController.java | 91 +++++ .../BridgeErectMachineDataController.java | 70 ++-- .../entity/BridgeErectMachineAlarmConfig.java | 154 +++++++++ .../entity/BridgeErectMachineDataConfig.java | 196 +++++++++++ .../dto/BridgeErectMachineAlarmDto.java | 80 ----- .../entity/dto/BridgeErectMachineDataDto.java | 95 ------ .../BridgeErectMachineAlarmConfigMapper.java | 19 ++ .../BridgeErectMachineDataConfigMapper.java | 19 ++ .../BridgeErectMachineAlarmConfigMapper.xml | 5 + .../BridgeErectMachineDataConfigMapper.xml | 5 + ...IBridgeErectMachineAlarmConfigService.java | 14 + .../IBridgeErectMachineAlarmService.java | 9 +- .../IBridgeErectMachineDataConfigService.java | 14 + .../IBridgeErectMachineDataService.java | 8 +- ...dgeErectMachineAlarmConfigServiceImpl.java | 19 ++ .../BridgeErectMachineAlarmServiceImpl.java | 86 ++--- ...idgeErectMachineDataConfigServiceImpl.java | 19 ++ .../BridgeErectMachineDataServiceImpl.java | 91 ++--- .../PaveCompactionRecordConfigController.java | 90 +++++ .../PaveCompactionRecordController.java | 28 +- .../PaveRecordConfigController.java | 91 +++++ .../pave/controller/PaveRecordController.java | 49 ++- .../entity/PaveCompactionRecordConfig.java | 322 ++++++++++++++++++ .../modules/pave/entity/PaveRecordConfig.java | 322 ++++++++++++++++++ .../entity/dto/PaveCompactionRecordDto.java | 161 --------- .../pave/entity/dto/PaveRecordDto.java | 161 --------- .../PaveCompactionRecordConfigMapper.java | 19 ++ .../pave/mapper/PaveRecordConfigMapper.java | 19 ++ .../xml/PaveCompactionRecordConfigMapper.xml | 5 + .../mapper/xml/PaveRecordConfigMapper.xml | 5 + .../IPaveCompactionRecordConfigService.java | 14 + .../service/IPaveCompactionRecordService.java | 4 +- .../service/IPaveRecordConfigService.java | 14 + .../pave/service/IPaveRecordService.java | 5 +- ...PaveCompactionRecordConfigServiceImpl.java | 19 ++ .../impl/PaveCompactionRecordServiceImpl.java | 117 ++++--- .../impl/PaveRecordConfigServiceImpl.java | 19 ++ .../service/impl/PaveRecordServiceImpl.java | 142 ++++---- .../service/impl/SafetyHatDevServiceImpl.java | 2 +- .../entity/VehiclePositionDev.java | 2 +- .../mapper/xml/VehiclePositionDevMapper.xml | 2 +- .../impl/VehiclePositionDevServiceImpl.java | 4 +- 44 files changed, 1986 insertions(+), 764 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineAlarmConfig.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDataConfig.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineAlarmDto.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineDataDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineAlarmConfigMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineDataConfigMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmConfigService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataConfigService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmConfigServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataConfigServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionRecordConfig.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveRecordConfig.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveCompactionRecordDto.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveRecordDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionRecordConfigMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordConfigMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordConfigService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordConfigService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordConfigServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordConfigServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java new file mode 100644 index 000000000..a2842cc0e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java @@ -0,0 +1,89 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.util.PageUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmConfigService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 架桥机报警数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/bridgeErectMachineAlarmConfig") +@Slf4j +@Api(tags = "架桥机报警数据生成配置管理") +public class BridgeErectMachineAlarmConfigController { + @Autowired + private IBridgeErectMachineAlarmConfigService bridgeErectMachineAlarmConfigService; + + /** + * 查询配置 + * @return + */ + @OperLog(operModul = "架桥机报警数据生成配置管理", operType = "删除", operDesc = "查询配置") + @ApiOperation(value = "查询配置", notes = "查询配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryInfo") + public Result queryInfo(@RequestBody BridgeErectMachineAlarmConfig bridgeErectMachineAlarmConfig) { + return Result.success(bridgeErectMachineAlarmConfigService.getOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineAlarmConfig::getProjectSn, bridgeErectMachineAlarmConfig.getProjectSn()))); + } + + /** + * 清空配置 + * @return + */ + @OperLog(operModul = "架桥机报警数据生成配置管理", operType = "删除", operDesc = "重置配置") + @ApiOperation(value = "重置配置", notes = "重置配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/delete") + public Result delete(@RequestBody BridgeErectMachineAlarmConfig bridgeErectMachineAlarmConfig) { + Result result = new Result(); + bridgeErectMachineAlarmConfigService.remove(Wrappers.lambdaQuery() + .eq(BridgeErectMachineAlarmConfig::getProjectSn, bridgeErectMachineAlarmConfig.getProjectSn())); + result.success("清除成功!"); + return result; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java index 85c49a148..39b853a59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java @@ -1,30 +1,27 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.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.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineAlarmDto; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; - -import com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -119,6 +116,26 @@ public class BridgeErectMachineAlarmController { return result; } + /** + * 批量删除 + * + * @return + */ + @ApiOperation(value = "批量删除架桥机-报警数据表信息", notes = "批量删除架桥机-报警数据表信息", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "架桥机报警数据ID字符串", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + Result result = new Result(); + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.bridgeErectMachineAlarmService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } + /** * 通过id查询 * @@ -142,7 +159,7 @@ public class BridgeErectMachineAlarmController { @ApiOperation(value = "生成随机数据", notes = "生成随机数据", httpMethod = "POST") @PostMapping(value = "/randomData") - public Result randomData(@RequestBody BridgeErectMachineAlarmDto alarmDto) { + public Result randomData(@RequestBody BridgeErectMachineAlarmConfig alarmDto) { bridgeErectMachineAlarmService.randomData(alarmDto); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java new file mode 100644 index 000000000..8579ea05d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java @@ -0,0 +1,91 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.zhgd.xmgl.util.PageUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataConfigService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 架桥机实时数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/bridgeErectMachineDataConfig") +@Slf4j +@Api(tags = "架桥机实时数据生成配置管理") +public class BridgeErectMachineDataConfigController { + @Autowired + private IBridgeErectMachineDataConfigService bridgeErectMachineDataConfigService; + + /** + * 查询配置 + * @return + */ + @OperLog(operModul = "架桥机报警数据生成配置管理", operType = "删除", operDesc = "查询配置") + @ApiOperation(value = "查询配置", notes = "查询配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryInfo") + public Result queryInfo(@ApiIgnore @RequestBody BridgeErectMachineDataConfig bridgeErectMachineDataConfig) { + return Result.success(bridgeErectMachineDataConfigService.getOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineDataConfig::getProjectSn, bridgeErectMachineDataConfig.getProjectSn()))); + } + + /** + * 清空配置 + * @return + */ + @OperLog(operModul = "架桥机报警数据生成配置管理", operType = "删除", operDesc = "重置配置") + @ApiOperation(value = "重置配置", notes = "重置配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/delete") + public Result delete(@RequestBody BridgeErectMachineDataConfig bridgeErectMachineDataConfig) { + Result result = new Result(); + bridgeErectMachineDataConfigService.remove(Wrappers.lambdaQuery() + .eq(BridgeErectMachineDataConfig::getProjectSn, bridgeErectMachineDataConfig.getProjectSn())); + result.success("清除成功!"); + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java index 5c46ea6b0..513749ba9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java @@ -1,44 +1,38 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.controller; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.base.entity.vo.TrendOneVo; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo; import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -133,6 +127,26 @@ public class BridgeErectMachineDataController { return result; } + /** + * 批量删除 + * + * @return + */ + @ApiOperation(value = "批量删除架桥机实时数据信息", notes = "批量删除架桥机实时数据信息", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "架桥机实时数据ID字符串", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + Result result = new Result(); + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.bridgeErectMachineDataService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } + /** * 通过id查询 * @@ -229,7 +243,7 @@ public class BridgeErectMachineDataController { @ApiOperation(value = "生成随机数据", notes = "生成随机数据", httpMethod = "POST") @PostMapping(value = "/randomData") - public Result randomData(@RequestBody BridgeErectMachineDataDto dataDto) { + public Result randomData(@RequestBody BridgeErectMachineDataConfig dataDto) { bridgeErectMachineDataService.randomData(dataDto); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineAlarmConfig.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineAlarmConfig.java new file mode 100644 index 000000000..17181ef34 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineAlarmConfig.java @@ -0,0 +1,154 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 架桥机报警数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Data +@TableName("bridge_erect_machine_alarm_config") +@ApiModel(value = "BridgeErectMachineAlarmConfig实体类", description = "BridgeErectMachineAlarmConfig") +public class BridgeErectMachineAlarmConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 报警数据生成配置ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "报警数据生成配置ID") + private Long id; + /** + * 设备编号 + */ + @Excel(name = "设备编号", width = 15) + @ApiModelProperty(value = "设备编号") + private String devSn; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private String projectSn; + /** + * 开始时间 + */ + @Excel(name = "开始时间", width = 15) + @ApiModelProperty(value = "开始时间") + private String startTime; + /** + * 结束时间 + */ + @Excel(name = "结束时间", width = 15) + @ApiModelProperty(value = "结束时间") + private String endTime; + /** + * 架桥机报警时间最小 + */ + @Excel(name = "架桥机报警时间最小", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "架桥机报警时间最小") + private String addTimeMin; + /** + * 架桥机报警时间最大 + */ + @Excel(name = "架桥机报警时间最大", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "架桥机报警时间最大") + private String addTimeMax; + /** + * 司机姓名 + */ + @Excel(name = "司机姓名", width = 15) + @ApiModelProperty(value = "司机姓名") + private String driverName; + /** + * 司机身份证号 + */ + @Excel(name = "司机身份证号", width = 15) + @ApiModelProperty(value = "司机身份证号") + private String driverIdCard; + /** + * 特种作业号 + */ + @Excel(name = "特种作业号", width = 15) + @ApiModelProperty(value = "特种作业号") + private String certification; + /** + * 主钩吊重状态 0: 正常1: 报警 + */ + @Excel(name = "主钩吊重状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "主钩吊重状态 0: 正常1: 报警") + private Integer masterHookWeightAlarm; + /** + * 副钩吊重状态 0: 正常1: 报警 + */ + @Excel(name = "副钩吊重状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "副钩吊重状态 0: 正常1: 报警") + private Integer subHookWeightAlarm; + /** + * 小车2主钩吊重状态 0: 正常1: 报警 + */ + @Excel(name = "小车2主钩吊重状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "小车2主钩吊重状态 0: 正常1: 报警") + private Integer secondMasterHookWeightAlarm; + /** + * 小车2副钩吊重状态 0: 正常1: 报警 + */ + @Excel(name = "小车2副钩吊重状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "小车2副钩吊重状态 0: 正常1: 报警") + private Integer secondSubHookWeightAlarm; + /** + * 大车行程状态 0: 正常1: 报警 + */ + @Excel(name = "大车行程状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "大车行程状态 0: 正常1: 报警") + private Integer largeCarRangePreAlarm; + /** + * 小车(天车)行程状态 0: 正常1: 报警 + */ + @Excel(name = "小车(天车)行程状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "小车(天车)行程状态 0: 正常1: 报警") + private Integer smallCarRangePreAlarm; + /** + * 小车2行程状态 0: 正常1: 报警 + */ + @Excel(name = "小车2行程状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "小车2行程状态 0: 正常1: 报警") + private Integer secondSmallCarRangePreAlarm; + /** + * 大车速度状态 0: 正常1: 报警 + */ + @Excel(name = "大车速度状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "大车速度状态 0: 正常1: 报警") + private Integer largeCarSpeedAlarm; + /** + * 小车速度状态 0: 正常1: 报警 + */ + @Excel(name = "小车速度状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "小车速度状态 0: 正常1: 报警") + private Integer smallCarSpeedAlarm; + /** + * 风速状态 0: 正常1: 报警 + */ + @Excel(name = "风速状态 0: 正常1: 报警", width = 15) + @ApiModelProperty(value = "风速状态 0: 正常1: 报警") + private Integer windSpeedAlarm; + /** + * 数据条数 + */ + @Excel(name = "数据条数", width = 15) + @ApiModelProperty(value = "数据条数") + private Integer dataNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDataConfig.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDataConfig.java new file mode 100644 index 000000000..789ce56fc --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDataConfig.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 架桥机实时数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Data +@TableName("bridge_erect_machine_data_config") +@ApiModel(value = "BridgeErectMachineDataConfig实体类", description = "BridgeErectMachineDataConfig") +public class BridgeErectMachineDataConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 实时数据生成配置ID + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "实时数据生成配置ID") + private Long id; + /** + * 设备编码 + */ + @Excel(name = "设备编码", width = 15) + @ApiModelProperty(value = "设备编码") + private String devSn; + /** + * 项目SN + */ + @Excel(name = "项目SN", width = 15) + @ApiModelProperty(value = "项目SN") + private String projectSn; + /** + * 最小风速(m/s) + */ + @Excel(name = "最小风速(m/s)", width = 15) + @ApiModelProperty(value = "最小风速(m/s)") + private Double windSpeedMin; + /** + * 最大风速(m/s) + */ + @Excel(name = "最大风速(m/s)", width = 15) + @ApiModelProperty(value = "最大风速(m/s)") + private Double windSpeedMax; + /** + * 最小主钩吊重(t) + */ + @Excel(name = "最小主钩吊重(t)", width = 15) + @ApiModelProperty(value = "最小主钩吊重(t)") + private Double mainHookLiftingWeightMin; + /** + * 最大主钩吊重(t) + */ + @Excel(name = "最大主钩吊重(t)", width = 15) + @ApiModelProperty(value = "最大主钩吊重(t)") + private Double mainHookLiftingWeightMax; + /** + * 最小主钩高度(m) + */ + @Excel(name = "最小主钩高度(m)", width = 15) + @ApiModelProperty(value = "最小主钩高度(m)") + private Double mainHookHeightMin; + /** + * 最大主钩高度(m) + */ + @Excel(name = "最大主钩高度(m)", width = 15) + @ApiModelProperty(value = "最大主钩高度(m)") + private Double mainHookHeightMax; + /** + * 最小主钩速度(m/min) + */ + @Excel(name = "最小主钩速度(m/min)", width = 15) + @ApiModelProperty(value = "最小主钩速度(m/min)") + private Double mainHookSpeedMin; + /** + * 最大主钩速度(m/min) + */ + @Excel(name = "最大主钩速度(m/min)", width = 15) + @ApiModelProperty(value = "最大主钩速度(m/min)") + private Double mainHookSpeedMax; + /** + * 最小副钩吊重(t) + */ + @Excel(name = "最小副钩吊重(t)", width = 15) + @ApiModelProperty(value = "最小副钩吊重(t)") + private Double auxiliaryHookLiftingWeightMin; + /** + * 最大副钩吊重(t) + */ + @Excel(name = "最大副钩吊重(t)", width = 15) + @ApiModelProperty(value = "最大副钩吊重(t)") + private Double auxiliaryHookLiftingWeightMax; + /** + * 最小副钩高度(m) + */ + @Excel(name = "最小副钩高度(m)", width = 15) + @ApiModelProperty(value = "最小副钩高度(m)") + private Double auxiliaryHookHeightMin; + /** + * 最大副钩高度(m) + */ + @Excel(name = "最大副钩高度(m)", width = 15) + @ApiModelProperty(value = "最大副钩高度(m)") + private Double auxiliaryHookHeightMax; + /** + * 最小副钩速度(m/min) + */ + @Excel(name = "最小副钩速度(m/min)", width = 15) + @ApiModelProperty(value = "最小副钩速度(m/min)") + private Double auxiliaryHookSpeedMin; + /** + * 最大副钩速度(m/min) + */ + @Excel(name = "最大副钩速度(m/min)", width = 15) + @ApiModelProperty(value = "最大副钩速度(m/min)") + private Double auxiliaryHookSpeedMax; + /** + * 最小大车行程(m) + */ + @Excel(name = "最小大车行程(m)", width = 15) + @ApiModelProperty(value = "最小大车行程(m)") + private Double bigCarTripMin; + /** + * 最大大车行程(m) + */ + @Excel(name = "最大大车行程(m)", width = 15) + @ApiModelProperty(value = "最大大车行程(m)") + private Double bigCarTripMax; + /** + * 最小大车速度(m/min) + */ + @Excel(name = "最小大车速度(m/min)", width = 15) + @ApiModelProperty(value = "最小大车速度(m/min)") + private Double bigCartSpeedMin; + /** + * 最大大车速度(m/min) + */ + @Excel(name = "最大大车速度(m/min)", width = 15) + @ApiModelProperty(value = "最大大车速度(m/min)") + private Double bigCartSpeedMax; + /** + * 最小小车行程(m) + */ + @Excel(name = "最小小车行程(m)", width = 15) + @ApiModelProperty(value = "最小小车行程(m)") + private Double carTripMin; + /** + * 最大小车行程(m) + */ + @Excel(name = "最大小车行程(m)", width = 15) + @ApiModelProperty(value = "最大小车行程(m)") + private Double carTripMax; + /** + * 最小小车速度(m/min) + */ + @Excel(name = "最小小车速度(m/min)", width = 15) + @ApiModelProperty(value = "最小小车速度(m/min)") + private Double carSpeedMin; + /** + * 最大小车速度(m/min) + */ + @Excel(name = "最大小车速度(m/min)", width = 15) + @ApiModelProperty(value = "最大小车速度(m/min)") + private Double carSpeedMax; + /** + * 数据条数 + */ + @Excel(name = "数据条数", width = 15) + @ApiModelProperty(value = "数据条数") + private Integer dataNum; + /** + * 时间范围开始时间 + */ + @Excel(name = "时间范围开始时间", width = 15) + @ApiModelProperty(value = "时间范围开始时间") + private String startTime; + /** + * 时间范围结束时间 + */ + @Excel(name = "时间范围结束时间", width = 15) + @ApiModelProperty(value = "时间范围结束时间") + private String endTime; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineAlarmDto.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineAlarmDto.java deleted file mode 100644 index bb5839e9c..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineAlarmDto.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; -@Data -public class BridgeErectMachineAlarmDto implements Serializable { - private static final long serialVersionUID = 1L; - - - @ApiModelProperty(value = "设备编号") - private String devSn; - - @ApiModelProperty(value = "项目sn") - private String projectSn; - - @ApiModelProperty(value = "开始时间") - private String startTime; - - @ApiModelProperty(value = "结束时间") - private String endTime; - - @ApiModelProperty(value = "架桥机报警时间") - private String addTimeMin; - - @ApiModelProperty(value = "架桥机报警时间") - private String addTimeMax; - - @ApiModelProperty(value = "司机姓名") - private String driverName; - - @ApiModelProperty(value = "司机身份证号") - private String driverIdCard; - - @ApiModelProperty(value = "特种作业号") - private String certification; - - @ApiModelProperty(value = "主钩吊重状态 0: 正常1: 报警") - private Integer masterHookWeightAlarm; - - @ApiModelProperty(value = "副钩吊重状态 0: 正常1: 报警") - private Integer subHookWeightAlarm; - - @ApiModelProperty(value = "小车2主钩吊重状态 0: 正常1: 报警") - private Integer secondMasterHookWeightAlarm; - - @ApiModelProperty(value = "小车2副钩吊重状态 0: 正常1: 报警") - private Integer secondSubHookWeightAlarm; - - @ApiModelProperty(value = "大车行程状态 0: 正常1: 报警") - private Integer largeCarRangePreAlarm; - - @ApiModelProperty(value = "小车(天车)行程状态 0: 正常1: 报警") - private Integer smallCarRangePreAlarm; - - @ApiModelProperty(value = "小车2行程状态 0: 正常1: 报警") - private Integer secondSmallCarRangePreAlarm; - - @ApiModelProperty(value = "大车速度状态 0: 正常1: 报警") - private Integer largeCarSpeedAlarm; - - @ApiModelProperty(value = "小车速度状态 0: 正常1: 报警") - private Integer smallCarSpeedAlarm; - - @ApiModelProperty(value = "风速状态 0: 正常1: 报警") - private Integer windSpeedAlarm; - - @ApiModelProperty(value = "数据条数") - private java.lang.Integer dataNum; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineDataDto.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineDataDto.java deleted file mode 100644 index af1027fd1..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/dto/BridgeErectMachineDataDto.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -@Data -public class BridgeErectMachineDataDto { - - @ApiModelProperty(value = "风速(m/s)") - private java.lang.Double windSpeedMin; - - @ApiModelProperty(value = "风速(m/s)") - private java.lang.Double windSpeedMax; - - @ApiModelProperty(value = "主钩吊重(t)") - private java.lang.Double mainHookLiftingWeightMin; - - @ApiModelProperty(value = "主钩吊重(t)") - private java.lang.Double mainHookLiftingWeightMax; - - @ApiModelProperty(value = "主钩高度(m)") - private java.lang.Double mainHookHeightMin; - - @ApiModelProperty(value = "主钩高度(m)") - private java.lang.Double mainHookHeightMax; - - @ApiModelProperty(value = "主钩速度(m/min)") - private java.lang.Double mainHookSpeedMin; - - @ApiModelProperty(value = "主钩速度(m/min)") - private java.lang.Double mainHookSpeedMax; - - @ApiModelProperty(value = "副钩吊重(t)") - private java.lang.Double auxiliaryHookLiftingWeightMin; - - @ApiModelProperty(value = "副钩吊重(t)") - private java.lang.Double auxiliaryHookLiftingWeightMax; - - @ApiModelProperty(value = "副钩高度(m)") - private java.lang.Double auxiliaryHookHeightMin; - - @ApiModelProperty(value = "副钩高度(m)") - private java.lang.Double auxiliaryHookHeightMax; - - @ApiModelProperty(value = "副钩速度(m/min)") - private java.lang.Double auxiliaryHookSpeedMin; - - @ApiModelProperty(value = "副钩速度(m/min)") - private java.lang.Double auxiliaryHookSpeedMax; - - @ApiModelProperty(value = "大车行程(m)") - private java.lang.Double bigCarTripMin; - - @ApiModelProperty(value = "大车行程(m)") - private java.lang.Double bigCarTripMax; - - @ApiModelProperty(value = "大车速度(m/min)") - private java.lang.Double bigCartSpeedMin; - - @ApiModelProperty(value = "大车速度(m/min)") - private java.lang.Double bigCartSpeedMax; - - @ApiModelProperty(value = "小车行程(m)") - private java.lang.Double carTripMin; - - @ApiModelProperty(value = "小车行程(m)") - private java.lang.Double carTripMax; - - @ApiModelProperty(value = "小车速度(m/min)") - private java.lang.Double carSpeedMin; - - @ApiModelProperty(value = "小车速度(m/min)") - private java.lang.Double carSpeedMax; - - @ApiModelProperty(value = "项目sn") - private java.lang.String projectSn; - - @ApiModelProperty(value = "设备编码") - private java.lang.String devSn; - - @ApiModelProperty(value = "数据条数") - private java.lang.Integer dataNum; - - @ApiModelProperty(value = "时间范围开始时间") - private java.lang.String startTime; - - @ApiModelProperty(value = "时间范围结束时间") - private java.lang.String endTime; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineAlarmConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineAlarmConfigMapper.java new file mode 100644 index 000000000..3c8d0adf8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineAlarmConfigMapper.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 架桥机报警数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Mapper +public interface BridgeErectMachineAlarmConfigMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineDataConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineDataConfigMapper.java new file mode 100644 index 000000000..e6e4859d0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineDataConfigMapper.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 架桥机实时数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Mapper +public interface BridgeErectMachineDataConfigMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml new file mode 100644 index 000000000..5fb823137 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml new file mode 100644 index 000000000..2486e8675 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmConfigService.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmConfigService.java new file mode 100644 index 000000000..4e06ca49e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmConfigService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.service; + +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 架桥机报警数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +public interface IBridgeErectMachineAlarmConfigService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmService.java index ff3b447dd..4cd7e2948 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineAlarmService.java @@ -1,10 +1,9 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.service; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineAlarmDto; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; import java.util.HashMap; import java.util.List; @@ -25,5 +24,5 @@ public interface IBridgeErectMachineAlarmService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java index c8c20a7de..73dd9bbe3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/IBridgeErectMachineDataService.java @@ -1,10 +1,10 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo; import java.util.HashMap; @@ -33,5 +33,5 @@ public interface IBridgeErectMachineDataService extends IService countWindSpeed(HashMap paramMap); - void randomData(BridgeErectMachineDataDto dataDto); + void randomData(BridgeErectMachineDataConfig dataDto); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmConfigServiceImpl.java new file mode 100644 index 000000000..cd90e3f29 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmConfigServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl; + +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmConfigMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 架桥机报警数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Service +public class BridgeErectMachineAlarmConfigServiceImpl extends ServiceImpl implements IBridgeErectMachineAlarmConfigService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmServiceImpl.java index ddd8665bb..ca233c8c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmServiceImpl.java @@ -3,32 +3,28 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineAlarmDto; -import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmMapper; -import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevMapper; -import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmService; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Random; - +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarmConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; +import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmConfigService; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineAlarmService; +import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * @Description: 架桥机-报警数据表 @@ -43,6 +39,8 @@ public class BridgeErectMachineAlarmServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { @@ -88,26 +86,36 @@ public class BridgeErectMachineAlarmServiceImpl extends ServiceImpllambdaQuery() - .eq(BridgeErectMachineDev::getDevSn, alarmDto.getDevSn()) - .eq(BridgeErectMachineDev::getProjectSn, alarmDto.getProjectSn())); - if (bridgeErectMachineDev != null) { - DateTime startTime = DateUtil.parseDateTime(alarmDto.getAddTimeMin()); - DateTime endTime = DateUtil.parseDateTime(alarmDto.getAddTimeMax()); - long betweenDay = DateUtil.betweenDay(startTime, endTime, true); - List list = new ArrayList<>(); - for (int i = 0; i < alarmDto.getDataNum(); i++) { - BridgeErectMachineAlarm alarm = new BridgeErectMachineAlarm(); - BeanUtils.copyProperties(alarmDto, alarm); - alarm.setProjectSn(bridgeErectMachineDev.getProjectSn()); - alarm.setDevSn(bridgeErectMachineDev.getDevSn()); - alarm.setDevName(bridgeErectMachineDev.getDevName()); - DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); - alarm.setAddTime(DateUtil.offsetMinute(dateTime, randomInt(0, 1440))); - list.add(alarm); + public void randomData(BridgeErectMachineAlarmConfig alarmDto) { + BridgeErectMachineAlarmConfig one = bridgeErectMachineAlarmConfigService.getOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineAlarmConfig::getProjectSn, alarmDto.getProjectSn())); + if (one != null) { + alarmDto.setId(one.getId()); + } + bridgeErectMachineAlarmConfigService.saveOrUpdate(alarmDto); + alarmDto.setId(null); + List snList = new ArrayList<>(Arrays.asList(alarmDto.getDevSn().split(","))); + for (String dev : snList) { + BridgeErectMachineDev bridgeErectMachineDev = bridgeErectMachineDevMapper.selectOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineDev::getDevSn, dev) + .eq(BridgeErectMachineDev::getProjectSn, alarmDto.getProjectSn())); + if (bridgeErectMachineDev != null) { + DateTime startTime = DateUtil.parseDateTime(alarmDto.getAddTimeMin()); + DateTime endTime = DateUtil.parseDateTime(alarmDto.getAddTimeMax()); + long betweenDay = DateUtil.betweenDay(startTime, endTime, true); + List list = new ArrayList<>(); + for (int i = 0; i < alarmDto.getDataNum(); i++) { + BridgeErectMachineAlarm alarm = new BridgeErectMachineAlarm(); + BeanUtils.copyProperties(alarmDto, alarm); + alarm.setProjectSn(bridgeErectMachineDev.getProjectSn()); + alarm.setDevSn(bridgeErectMachineDev.getDevSn()); + alarm.setDevName(bridgeErectMachineDev.getDevName()); + DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); + alarm.setAddTime(DateUtil.offsetMinute(dateTime, randomInt(0, 1440))); + list.add(alarm); + } + this.saveBatch(list); } - this.saveBatch(list); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataConfigServiceImpl.java new file mode 100644 index 000000000..7685211f2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataConfigServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl; + +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; +import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDataConfigMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 架桥机实时数据生成配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Service +public class BridgeErectMachineDataConfigServiceImpl extends ServiceImpl implements IBridgeErectMachineDataConfigService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java index c58694f5a..0b83540f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java @@ -2,38 +2,35 @@ package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.bo.CountAlarmBo; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo; import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmMapper; import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDataMapper; import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevMapper; +import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataConfigService; import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataService; import com.zhgd.xmgl.util.AqiUtil; import com.zhgd.xmgl.util.DateUtils; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; -import org.jsoup.helper.DataUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import java.math.RoundingMode; import java.util.*; -import com.zhgd.xmgl.util.RefUtil; - /** * @Description: 架桥机生产数据 * @author： pds @@ -46,6 +43,8 @@ public class BridgeErectMachineDataServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { @@ -126,36 +125,46 @@ public class BridgeErectMachineDataServiceImpl extends ServiceImpllambdaQuery() - .eq(BridgeErectMachineDev::getDevSn, dataDto.getDevSn()) - .eq(BridgeErectMachineDev::getProjectSn, dataDto.getProjectSn())); - if (bridgeErectMachineDev != null) { - DateTime startTime = DateUtil.parseDateTime(dataDto.getStartTime()); - DateTime endTime = DateUtil.parseDateTime(dataDto.getEndTime()); - long betweenDay = DateUtil.betweenDay(startTime, endTime, true); - List list = new ArrayList<>(); - for (int i = 0; i < dataDto.getDataNum(); i++) { - BridgeErectMachineData data = new BridgeErectMachineData(); - data.setProjectSn(bridgeErectMachineDev.getProjectSn()); - data.setDevSn(bridgeErectMachineDev.getDevSn()); - data.setDevName(bridgeErectMachineDev.getDevName()); - DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); - data.setCreateDate(DateUtil.offsetMinute(dateTime, randomInt(0, 1440))); - data.setWindSpeed(randomDouble(dataDto.getWindSpeedMin(), dataDto.getWindSpeedMax())); - data.setMainHookLiftingWeight(randomDouble(dataDto.getMainHookLiftingWeightMin(), dataDto.getMainHookLiftingWeightMax())); - data.setMainHookHeight(randomDouble(dataDto.getMainHookHeightMin(), dataDto.getMainHookHeightMax())); - data.setMainHookSpeed(randomDouble(dataDto.getMainHookSpeedMin(), dataDto.getMainHookSpeedMax())); - data.setAuxiliaryHookLiftingWeight(randomDouble(dataDto.getAuxiliaryHookLiftingWeightMin(), dataDto.getAuxiliaryHookLiftingWeightMax())); - data.setAuxiliaryHookHeight(randomDouble(dataDto.getAuxiliaryHookHeightMin(), dataDto.getAuxiliaryHookHeightMax())); - data.setAuxiliaryHookSpeed(randomDouble(dataDto.getAuxiliaryHookSpeedMin(), dataDto.getAuxiliaryHookSpeedMax())); - data.setBigCarTrip(randomDouble(dataDto.getBigCarTripMin(), dataDto.getBigCarTripMax())); - data.setBigCartSpeed(randomDouble(dataDto.getBigCartSpeedMin(), dataDto.getBigCartSpeedMax())); - data.setCarTrip(randomDouble(dataDto.getCarTripMin(), dataDto.getCarTripMax())); - data.setCarSpeed(randomDouble(dataDto.getCarSpeedMin(), dataDto.getCarSpeedMax())); - list.add(data); + public void randomData(BridgeErectMachineDataConfig dataDto) { + BridgeErectMachineDataConfig one = bridgeErectMachineDataConfigService.getOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineDataConfig::getProjectSn, dataDto.getProjectSn())); + if (one != null) { + dataDto.setId(one.getId()); + } + bridgeErectMachineDataConfigService.saveOrUpdate(dataDto); + + List snList = new ArrayList<>(Arrays.asList(dataDto.getDevSn().split(","))); + for (String dev : snList) { + BridgeErectMachineDev bridgeErectMachineDev = bridgeErectMachineDevMapper.selectOne(Wrappers.lambdaQuery() + .eq(BridgeErectMachineDev::getDevSn, dev) + .eq(BridgeErectMachineDev::getProjectSn, dataDto.getProjectSn())); + if (bridgeErectMachineDev != null) { + DateTime startTime = DateUtil.parseDateTime(dataDto.getStartTime()); + DateTime endTime = DateUtil.parseDateTime(dataDto.getEndTime()); + long betweenDay = DateUtil.betweenDay(startTime, endTime, true); + List list = new ArrayList<>(); + for (int i = 0; i < dataDto.getDataNum(); i++) { + BridgeErectMachineData data = new BridgeErectMachineData(); + data.setProjectSn(bridgeErectMachineDev.getProjectSn()); + data.setDevSn(bridgeErectMachineDev.getDevSn()); + data.setDevName(bridgeErectMachineDev.getDevName()); + DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); + data.setCreateDate(DateUtil.offsetMinute(dateTime, randomInt(0, 1440))); + data.setWindSpeed(randomDouble(dataDto.getWindSpeedMin(), dataDto.getWindSpeedMax())); + data.setMainHookLiftingWeight(randomDouble(dataDto.getMainHookLiftingWeightMin(), dataDto.getMainHookLiftingWeightMax())); + data.setMainHookHeight(randomDouble(dataDto.getMainHookHeightMin(), dataDto.getMainHookHeightMax())); + data.setMainHookSpeed(randomDouble(dataDto.getMainHookSpeedMin(), dataDto.getMainHookSpeedMax())); + data.setAuxiliaryHookLiftingWeight(randomDouble(dataDto.getAuxiliaryHookLiftingWeightMin(), dataDto.getAuxiliaryHookLiftingWeightMax())); + data.setAuxiliaryHookHeight(randomDouble(dataDto.getAuxiliaryHookHeightMin(), dataDto.getAuxiliaryHookHeightMax())); + data.setAuxiliaryHookSpeed(randomDouble(dataDto.getAuxiliaryHookSpeedMin(), dataDto.getAuxiliaryHookSpeedMax())); + data.setBigCarTrip(randomDouble(dataDto.getBigCarTripMin(), dataDto.getBigCarTripMax())); + data.setBigCartSpeed(randomDouble(dataDto.getBigCartSpeedMin(), dataDto.getBigCartSpeedMax())); + data.setCarTrip(randomDouble(dataDto.getCarTripMin(), dataDto.getCarTripMax())); + data.setCarSpeed(randomDouble(dataDto.getCarSpeedMin(), dataDto.getCarSpeedMax())); + list.add(data); + } + this.saveBatch(list); } - this.saveBatch(list); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java new file mode 100644 index 000000000..b7bd7ea10 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java @@ -0,0 +1,90 @@ +package com.zhgd.xmgl.modules.pave.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; +import com.zhgd.xmgl.util.PageUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordConfigService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 路面压实实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/paveCompactionRecordConfig") +@Slf4j +@Api(tags = "路面压实实时数据配置管理") +public class PaveCompactionRecordConfigController { + @Autowired + private IPaveCompactionRecordConfigService paveCompactionRecordConfigService; + + /** + * 查询配置 + * @return + */ + @OperLog(operModul = "路面压实实时数据生成配置管理", operType = "删除", operDesc = "查询配置") + @ApiOperation(value = "查询配置", notes = "查询配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryInfo") + public Result queryInfo(@ApiIgnore @RequestBody PaveCompactionRecordConfig paveCompactionRecordConfig) { + return Result.success(paveCompactionRecordConfigService.getOne(Wrappers.lambdaQuery() + .eq(PaveCompactionRecordConfig::getProjectSn, paveCompactionRecordConfig.getProjectSn()))); + } + + /** + * 清空配置 + * @return + */ + @OperLog(operModul = "路面压实实时数据生成配置管理", operType = "删除", operDesc = "重置配置") + @ApiOperation(value = "重置配置", notes = "重置配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/delete") + public Result delete(@RequestBody PaveCompactionRecordConfig paveCompactionRecordConfig) { + Result result = new Result(); + paveCompactionRecordConfigService.remove(Wrappers.lambdaQuery() + .eq(PaveCompactionRecordConfig::getProjectSn, paveCompactionRecordConfig.getProjectSn())); + result.success("清除成功!"); + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java index b3db8ac2e..fccd8b86f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java @@ -2,19 +2,21 @@ package com.zhgd.xmgl.modules.pave.controller; import com.gexin.fastjson.JSON; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveCompactionRecordDto; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveRecordDto; +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.zhgd.xmgl.modules.pave.entity.PaveRecord; import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; +import java.util.Arrays; import java.util.HashMap; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Map; import com.zhgd.jeecg.common.api.vo.Result; import org.apache.commons.collections.MapUtils; @@ -119,6 +121,26 @@ public class PaveCompactionRecordController { return result; } + /** + * 批量删除 + * + * @return + */ + @ApiOperation(value = "批量删除路面压实-记录信息", notes = "批量删除路面压实-记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "压实记录数据ID字符串", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + Result result = new Result(); + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.paveCompactionRecordService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } + /** * 通过id查询 * @@ -142,7 +164,7 @@ public class PaveCompactionRecordController { @ApiOperation(value = "生成随机数据", notes = "生成随机数据", httpMethod = "POST") @PostMapping(value = "/randomData") - public Result randomData(@RequestBody PaveCompactionRecordDto recordDto) { + public Result randomData(@RequestBody PaveCompactionRecordConfig recordDto) { paveCompactionRecordService.randomData(recordDto); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java new file mode 100644 index 000000000..0d3915c43 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java @@ -0,0 +1,91 @@ +package com.zhgd.xmgl.modules.pave.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDataConfig; +import com.zhgd.xmgl.util.PageUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; +import com.zhgd.xmgl.modules.pave.service.IPaveRecordConfigService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 路面摊铺实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/paveRecordConfig") +@Slf4j +@Api(tags = "路面摊铺实时数据配置管理") +public class PaveRecordConfigController { + @Autowired + private IPaveRecordConfigService paveRecordConfigService; + + /** + * 查询配置 + * @return + */ + @OperLog(operModul = "路面摊铺实时数据生成配置管理", operType = "删除", operDesc = "查询配置") + @ApiOperation(value = "查询配置", notes = "查询配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryInfo") + public Result queryInfo(@ApiIgnore @RequestBody PaveRecordConfig paveRecordConfig) { + return Result.success(paveRecordConfigService.getOne(Wrappers.lambdaQuery() + .eq(PaveRecordConfig::getProjectSn, paveRecordConfig.getProjectSn()))); + } + + /** + * 清空配置 + * @return + */ + @OperLog(operModul = "路面摊铺实时数据生成配置管理", operType = "删除", operDesc = "重置配置") + @ApiOperation(value = "重置配置", notes = "重置配置", httpMethod = "POST") + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/delete") + public Result delete(@RequestBody PaveRecordConfig paveRecordConfig) { + Result result = new Result(); + paveRecordConfigService.remove(Wrappers.lambdaQuery() + .eq(PaveRecordConfig::getProjectSn, paveRecordConfig.getProjectSn())); + result.success("清除成功!"); + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java index 9d92a0bed..7430ba9b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java @@ -1,30 +1,26 @@ package com.zhgd.xmgl.modules.pave.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.pave.entity.PaveRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveRecordDto; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; import com.zhgd.xmgl.modules.pave.service.IPaveRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; - -import com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -119,6 +115,25 @@ public class PaveRecordController { return result; } + /** + * 批量删除 + * + * @return + */ + @ApiOperation(value = "批量删除路面摊铺-记录信息", notes = "批量删除路面摊铺-记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "摊铺记录数据ID字符串", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + Result result = new Result(); + String ids = MapUtils.getString(map, "ids"); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.paveRecordService.removeByIds(Arrays.asList(ids.split(","))); + result.success("删除成功!"); + } + return result; + } /** * 通过id查询 * @@ -142,7 +157,7 @@ public class PaveRecordController { @ApiOperation(value = "生成随机数据", notes = "生成随机数据", httpMethod = "POST") @PostMapping(value = "/randomData") - public Result randomData(@RequestBody PaveRecordDto recordDto) { + public Result randomData(@RequestBody PaveRecordConfig recordDto) { paveRecordService.randomData(recordDto); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionRecordConfig.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionRecordConfig.java new file mode 100644 index 000000000..7671b7a8c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionRecordConfig.java @@ -0,0 +1,322 @@ +package com.zhgd.xmgl.modules.pave.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 路面压实实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Data +@TableName("pave_compaction_record_config") +@ApiModel(value = "PaveCompactionRecordConfig实体类", description = "PaveCompactionRecordConfig") +public class PaveCompactionRecordConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 路面压实-设备id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "路面压实-设备id") + private Long id; + /** + * 设备编码 + */ + @Excel(name = "设备编码", width = 15) + @ApiModelProperty(value = "设备编码") + private String devSn; + /** + * 最小压实速度(m/min) + */ + @Excel(name = "最小压实速度(m/min)", width = 15) + @ApiModelProperty(value = "最小压实速度(m/min)") + private Double paveSpeedMin; + /** + * 最大压实速度(m/min) + */ + @Excel(name = "最大压实速度(m/min)", width = 15) + @ApiModelProperty(value = "最大压实速度(m/min)") + private Double paveSpeedMax; + /** + * 最小平均压实温度(C) + */ + @Excel(name = "最小平均压实温度(C)", width = 15) + @ApiModelProperty(value = "最小平均压实温度(C)") + private Double averagePaveTempMin; + /** + * 最大平均压实温度(C) + */ + @Excel(name = "最大平均压实温度(C)", width = 15) + @ApiModelProperty(value = "最大平均压实温度(C)") + private Double averagePaveTempMax; + /** + * 最小压实度(mm) + */ + @Excel(name = "最小压实度(mm)", width = 15) + @ApiModelProperty(value = "最小压实度(mm)") + private Double paveDegreeMin; + /** + * 最大压实度(mm) + */ + @Excel(name = "最大压实度(mm)", width = 15) + @ApiModelProperty(value = "最大压实度(mm)") + private Double paveDegreeMax; + /** + * 最小振幅 + */ + @Excel(name = "最小振幅", width = 15) + @ApiModelProperty(value = "最小振幅") + private Double amplitudeMin; + /** + * 最大振幅 + */ + @Excel(name = "最大振幅", width = 15) + @ApiModelProperty(value = "最大振幅") + private Double amplitudeMax; + /** + * 最小频率(Hz) + */ + @Excel(name = "最小频率(Hz)", width = 15) + @ApiModelProperty(value = "最小频率(Hz)") + private Double frequencyMin; + /** + * 最大频率(Hz) + */ + @Excel(name = "最大频率(Hz)", width = 15) + @ApiModelProperty(value = "最大频率(Hz)") + private Double frequencyMax; + /** + * 范围类型：1标准区域2自定义 + */ + @ApiModelProperty(value = "范围类型：1标准区域2自定义") + private java.lang.Integer rangeType; + /** + * 区域半径 + */ + @ApiModelProperty(value = "区域半径") + private java.lang.Integer areaRadius; + /** + * 围栏形状（经度和纬度用“|“分隔，坐标对见用“, ”分隔）如：经度1|维度1,经度2|维度2 + */ + @ApiModelProperty(value = "围栏形状（经度和纬度用“|“分隔，坐标对见用“, ”分隔）如：经度1|维度1,经度2|维度2") + private java.lang.String fenceShape; + /** + * 圆心维度 + */ + @ApiModelProperty(value = "圆心维度") + private java.lang.Double latitude; + /** + * 圆心经度 + */ + @ApiModelProperty(value = "圆心经度") + private java.lang.Double longitude; + /** + * 围栏形状json数组 + */ + @ApiModelProperty(value = "围栏形状json数组") + private java.lang.String fenceShapeArr; + /** + * 最小压实时间 + */ + @Excel(name = "最小压实时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "最小压实时间") + private String paveTimeMin; + /** + * 最大压实时间 + */ + @Excel(name = "最大压实时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "最大压实时间") + private String paveTimeMax; + /** + * 最小传感器1-压实温度(C) + */ + @Excel(name = "最小传感器1-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器1-压实温度(C)") + private Double sensor1PaveTempMin; + /** + * 最大传感器1-压实温度(C) + */ + @Excel(name = "最大传感器1-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器1-压实温度(C)") + private Double sensor1PaveTempMax; + /** + * 最小传感器2-压实温度(C) + */ + @Excel(name = "最小传感器2-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器2-压实温度(C)") + private Double sensor2PaveTempMin; + /** + * 最大传感器2-压实温度(C) + */ + @Excel(name = "最大传感器2-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器2-压实温度(C)") + private Double sensor2PaveTempMax; + /** + * 最小传感器3-压实温度(C) + */ + @Excel(name = "最小传感器3-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器3-压实温度(C)") + private Double sensor3PaveTempMin; + /** + * 最大传感器3-压实温度(C) + */ + @Excel(name = "最大传感器3-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器3-压实温度(C)") + private Double sensor3PaveTempMax; + /** + * 最小传感器4-压实温度(C) + */ + @Excel(name = "最小传感器4-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器4-压实温度(C)") + private Double sensor4PaveTempMin; + /** + * 最大传感器4-压实温度(C) + */ + @Excel(name = "最大传感器4-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器4-压实温度(C)") + private Double sensor4PaveTempMax; + /** + * 最小传感器5-压实温度(C) + */ + @Excel(name = "最小传感器5-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器5-压实温度(C)") + private Double sensor5PaveTempMin; + /** + * 最大传感器5-压实温度(C) + */ + @Excel(name = "最大传感器5-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器5-压实温度(C)") + private Double sensor5PaveTempMax; + /** + * 最小传感器6-压实温度(C) + */ + @Excel(name = "最小传感器6-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器6-压实温度(C)") + private Double sensor6PaveTempMin; + /** + * 最大传感器6-压实温度(C) + */ + @Excel(name = "最大传感器6-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器6-压实温度(C)") + private Double sensor6PaveTempMax; + /** + * 最小传感器7-压实温度(C) + */ + @Excel(name = "最小传感器7-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器7-压实温度(C)") + private Double sensor7PaveTempMin; + /** + * 最大传感器7-压实温度(C) + */ + @Excel(name = "最大传感器7-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器7-压实温度(C)") + private Double sensor7PaveTempMax; + /** + * 最小传感器8-压实温度(C) + */ + @Excel(name = "最小传感器8-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器8-压实温度(C)") + private Double sensor8PaveTempMin; + /** + * 最大传感器8-压实温度(C) + */ + @Excel(name = "最大传感器8-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器8-压实温度(C)") + private Double sensor8PaveTempMax; + /** + * 最小传感器9-压实温度(C) + */ + @Excel(name = "最小传感器9-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器9-压实温度(C)") + private Double sensor9PaveTempMin; + /** + * 最大传感器9-压实温度(C) + */ + @Excel(name = "最大传感器9-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器9-压实温度(C)") + private Double sensor9PaveTempMax; + /** + * 最小传感器10-压实温度(C) + */ + @Excel(name = "最小传感器10-压实温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器10-压实温度(C)") + private Double sensor10PaveTempMin; + /** + * 最大传感器10-压实温度(C) + */ + @Excel(name = "最大传感器10-压实温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器10-压实温度(C)") + private Double sensor10PaveTempMax; + /** + * 最小传感器1-压实度(C) + */ + @Excel(name = "最小传感器1-压实度(C)", width = 15) + @ApiModelProperty(value = "最小传感器1-压实度(C)") + private Double sensor1PaveDegreeMin; + /** + * 最大传感器1-压实度(C) + */ + @Excel(name = "最大传感器1-压实度(C)", width = 15) + @ApiModelProperty(value = "最大传感器1-压实度(C)") + private Double sensor1PaveDegreeMax; + /** + * 最小传感器2-压实度(C) + */ + @Excel(name = "最小传感器2-压实度(C)", width = 15) + @ApiModelProperty(value = "最小传感器2-压实度(C)") + private Double sensor2PaveDegreeMin; + /** + * 最大传感器2-压实度(C) + */ + @Excel(name = "最大传感器2-压实度(C)", width = 15) + @ApiModelProperty(value = "最大传感器2-压实度(C)") + private Double sensor2PaveDegreeMax; + /** + * 最小传感器3-压实度(C) + */ + @Excel(name = "最小传感器3-压实度(C)", width = 15) + @ApiModelProperty(value = "最小传感器3-压实度(C)") + private Double sensor3PaveDegreeMin; + /** + * 最大传感器3-压实度(C) + */ + @Excel(name = "最大传感器3-压实度(C)", width = 15) + @ApiModelProperty(value = "最大传感器3-压实度(C)") + private Double sensor3PaveDegreeMax; + /** + * 最小传感器4-压实度(C) + */ + @Excel(name = "最小传感器4-压实度(C)", width = 15) + @ApiModelProperty(value = "最小传感器4-压实度(C)") + private Double sensor4PaveDegreeMin; + /** + * 最大传感器4-压实度(C) + */ + @Excel(name = "最大传感器4-压实度(C)", width = 15) + @ApiModelProperty(value = "最大传感器4-压实度(C)") + private Double sensor4PaveDegreeMax; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private String projectSn; + /** + * 数据条数 + */ + @Excel(name = "数据条数", width = 15) + @ApiModelProperty(value = "数据条数") + private Integer dataNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveRecordConfig.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveRecordConfig.java new file mode 100644 index 000000000..31461d137 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveRecordConfig.java @@ -0,0 +1,322 @@ +package com.zhgd.xmgl.modules.pave.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 路面摊铺实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Data +@TableName("pave_record_config") +@ApiModel(value = "PaveRecordConfig实体类", description = "PaveRecordConfig") +public class PaveRecordConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 路面摊铺-数据配置id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "路面摊铺-数据配置id") + private Long id; + /** + * 设备编码 + */ + @Excel(name = "设备编码", width = 15) + @ApiModelProperty(value = "设备编码") + private String devSn; + /** + * 最小摊铺速度(m/min) + */ + @Excel(name = "最小摊铺速度(m/min)", width = 15) + @ApiModelProperty(value = "最小摊铺速度(m/min)") + private Double paveSpeedMin; + /** + * 最大摊铺速度(m/min) + */ + @Excel(name = "最大摊铺速度(m/min)", width = 15) + @ApiModelProperty(value = "最大摊铺速度(m/min)") + private Double paveSpeedMax; + /** + * 最小平均摊铺温度(C) + */ + @Excel(name = "最小平均摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小平均摊铺温度(C)") + private Double averagePaveTempMin; + /** + * 最大平均摊铺温度(C) + */ + @Excel(name = "最大平均摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大平均摊铺温度(C)") + private Double averagePaveTempMax; + /** + * 最小平均摊铺厚度(mm) + */ + @Excel(name = "最小平均摊铺厚度(mm)", width = 15) + @ApiModelProperty(value = "最小平均摊铺厚度(mm)") + private Double averagePaveThicknessMin; + /** + * 最大平均摊铺厚度(mm) + */ + @Excel(name = "最大平均摊铺厚度(mm)", width = 15) + @ApiModelProperty(value = "最大平均摊铺厚度(mm)") + private Double averagePaveThicknessMax; + /** + * 最小振幅 + */ + @Excel(name = "最小振幅", width = 15) + @ApiModelProperty(value = "最小振幅") + private Double amplitudeMin; + /** + * 最大振幅 + */ + @Excel(name = "最大振幅", width = 15) + @ApiModelProperty(value = "最大振幅") + private Double amplitudeMax; + /** + * 最小频率(Hz) + */ + @Excel(name = "最小频率(Hz)", width = 15) + @ApiModelProperty(value = "最小频率(Hz)") + private Double frequencyMin; + /** + * 最大频率(Hz) + */ + @Excel(name = "最大频率(Hz)", width = 15) + @ApiModelProperty(value = "最大频率(Hz)") + private Double frequencyMax; + /** + * 范围类型：1标准区域2自定义 + */ + @ApiModelProperty(value = "范围类型：1标准区域2自定义") + private java.lang.Integer rangeType; + /** + * 区域半径 + */ + @ApiModelProperty(value = "区域半径") + private java.lang.Integer areaRadius; + /** + * 围栏形状（经度和纬度用“|“分隔，坐标对见用“, ”分隔）如：经度1|维度1,经度2|维度2 + */ + @ApiModelProperty(value = "围栏形状（经度和纬度用“|“分隔，坐标对见用“, ”分隔）如：经度1|维度1,经度2|维度2") + private java.lang.String fenceShape; + /** + * 圆心维度 + */ + @ApiModelProperty(value = "圆心维度") + private java.lang.Double latitude; + /** + * 圆心经度 + */ + @ApiModelProperty(value = "圆心经度") + private java.lang.Double longitude; + /** + * 围栏形状json数组 + */ + @ApiModelProperty(value = "围栏形状json数组") + private java.lang.String fenceShapeArr; + /** + * 最小摊铺时间 + */ + @Excel(name = "最小摊铺时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "最小摊铺时间") + private String paveTimeMin; + /** + * 最大摊铺时间 + */ + @Excel(name = "最大摊铺时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "最大摊铺时间") + private String paveTimeMax; + /** + * 最小传感器1-摊铺温度(C) + */ + @Excel(name = "最小传感器1-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器1-摊铺温度(C)") + private Double sensor1PaveTempMin; + /** + * 最大传感器1-摊铺温度(C) + */ + @Excel(name = "最大传感器1-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器1-摊铺温度(C)") + private Double sensor1PaveTempMax; + /** + * 最小传感器2-摊铺温度(C) + */ + @Excel(name = "最小传感器2-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器2-摊铺温度(C)") + private Double sensor2PaveTempMin; + /** + * 最大传感器2-摊铺温度(C) + */ + @Excel(name = "最大传感器2-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器2-摊铺温度(C)") + private Double sensor2PaveTempMax; + /** + * 最小传感器3-摊铺温度(C) + */ + @Excel(name = "最小传感器3-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器3-摊铺温度(C)") + private Double sensor3PaveTempMin; + /** + * 最大传感器3-摊铺温度(C) + */ + @Excel(name = "最大传感器3-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器3-摊铺温度(C)") + private Double sensor3PaveTempMax; + /** + * 最小传感器4-摊铺温度(C) + */ + @Excel(name = "最小传感器4-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器4-摊铺温度(C)") + private Double sensor4PaveTempMin; + /** + * 最大传感器4-摊铺温度(C) + */ + @Excel(name = "最大传感器4-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器4-摊铺温度(C)") + private Double sensor4PaveTempMax; + /** + * 最小传感器5-摊铺温度(C) + */ + @Excel(name = "最小传感器5-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器5-摊铺温度(C)") + private Double sensor5PaveTempMin; + /** + * 最大传感器5-摊铺温度(C) + */ + @Excel(name = "最大传感器5-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器5-摊铺温度(C)") + private Double sensor5PaveTempMax; + /** + * 最小传感器6-摊铺温度(C) + */ + @Excel(name = "最小传感器6-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器6-摊铺温度(C)") + private Double sensor6PaveTempMin; + /** + * 最大传感器6-摊铺温度(C) + */ + @Excel(name = "最大传感器6-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器6-摊铺温度(C)") + private Double sensor6PaveTempMax; + /** + * 最小传感器7-摊铺温度(C) + */ + @Excel(name = "最小传感器7-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器7-摊铺温度(C)") + private Double sensor7PaveTempMin; + /** + * 最大传感器7-摊铺温度(C) + */ + @Excel(name = "最大传感器7-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器7-摊铺温度(C)") + private Double sensor7PaveTempMax; + /** + * 最小传感器8-摊铺温度(C) + */ + @Excel(name = "最小传感器8-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器8-摊铺温度(C)") + private Double sensor8PaveTempMin; + /** + * 最大传感器8-摊铺温度(C) + */ + @Excel(name = "最大传感器8-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器8-摊铺温度(C)") + private Double sensor8PaveTempMax; + /** + * 最小传感器9-摊铺温度(C) + */ + @Excel(name = "最小传感器9-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器9-摊铺温度(C)") + private Double sensor9PaveTempMin; + /** + * 最大传感器9-摊铺温度(C) + */ + @Excel(name = "最大传感器9-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器9-摊铺温度(C)") + private Double sensor9PaveTempMax; + /** + * 最小传感器10-摊铺温度(C) + */ + @Excel(name = "最小传感器10-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最小传感器10-摊铺温度(C)") + private Double sensor10PaveTempMin; + /** + * 最大传感器10-摊铺温度(C) + */ + @Excel(name = "最大传感器10-摊铺温度(C)", width = 15) + @ApiModelProperty(value = "最大传感器10-摊铺温度(C)") + private Double sensor10PaveTempMax; + /** + * 最小传感器1-摊铺厚度(C) + */ + @Excel(name = "最小传感器1-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最小传感器1-摊铺厚度(C)") + private Double sensor1PaveThicknessMin; + /** + * 最大传感器1-摊铺厚度(C) + */ + @Excel(name = "最大传感器1-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最大传感器1-摊铺厚度(C)") + private Double sensor1PaveThicknessMax; + /** + * 最小传感器2-摊铺厚度(C) + */ + @Excel(name = "最小传感器2-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最小传感器2-摊铺厚度(C)") + private Double sensor2PaveThicknessMin; + /** + * 最大传感器2-摊铺厚度(C) + */ + @Excel(name = "最大传感器2-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最大传感器2-摊铺厚度(C)") + private Double sensor2PaveThicknessMax; + /** + * 最小传感器3-摊铺厚度(C) + */ + @Excel(name = "最小传感器3-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最小传感器3-摊铺厚度(C)") + private Double sensor3PaveThicknessMin; + /** + * 最大传感器3-摊铺厚度(C) + */ + @Excel(name = "最大传感器3-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最大传感器3-摊铺厚度(C)") + private Double sensor3PaveThicknessMax; + /** + * 最小传感器4-摊铺厚度(C) + */ + @Excel(name = "最小传感器4-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最小传感器4-摊铺厚度(C)") + private Double sensor4PaveThicknessMin; + /** + * 最大传感器4-摊铺厚度(C) + */ + @Excel(name = "最大传感器4-摊铺厚度(C)", width = 15) + @ApiModelProperty(value = "最大传感器4-摊铺厚度(C)") + private Double sensor4PaveThicknessMax; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private String projectSn; + /** + * 数据条数 + */ + @Excel(name = "数据条数", width = 15) + @ApiModelProperty(value = "数据条数") + private Integer dataNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveCompactionRecordDto.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveCompactionRecordDto.java deleted file mode 100644 index 54642dd8f..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveCompactionRecordDto.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.zhgd.xmgl.modules.pave.entity.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - - -@Data -public class PaveCompactionRecordDto implements Serializable { - - - @ApiModelProperty(value = "设备编码") - private String devSn; - - @ApiModelProperty(value = "压实速度(m/min)") - private Double paveSpeedMin; - - @ApiModelProperty(value = "压实速度(m/min)") - private Double paveSpeedMax; - - @ApiModelProperty(value = "平均压实温度(C)") - private Double averagePaveTempMin; - - @ApiModelProperty(value = "平均压实温度(C)") - private Double averagePaveTempMax; - - @ApiModelProperty(value = "压实度(mm)") - private Double paveDegreeMin; - - @ApiModelProperty(value = "压实度(mm)") - private Double paveDegreeMax; - - @ApiModelProperty(value = "振幅") - private Double amplitudeMin; - - @ApiModelProperty(value = "振幅") - private Double amplitudeMax; - - @ApiModelProperty(value = "频率(Hz)") - private Double frequencyMin; - - @ApiModelProperty(value = "频率(Hz)") - private Double frequencyMax; - - @ApiModelProperty(value = "地理经度(W/E)") - private Double geographicalLongitudeMin; - - @ApiModelProperty(value = "地理经度(W/E)") - private Double geographicalLongitudeMax; - - @ApiModelProperty(value = "地理纬度(N/S)") - private Double geographicalLatitudeMin; - - @ApiModelProperty(value = "地理纬度(N/S)") - private Double geographicalLatitudeMax; - - @ApiModelProperty(value = "压实时间") - private String paveTimeMin; - - @ApiModelProperty(value = "压实时间") - private String paveTimeMax; - - @ApiModelProperty(value = "传感器1-压实温度(C)") - private Double sensor1PaveTempMin; - - @ApiModelProperty(value = "传感器1-压实温度(C)") - private Double sensor1PaveTempMax; - - @ApiModelProperty(value = "传感器2-压实温度(C)") - private Double sensor2PaveTempMin; - - @ApiModelProperty(value = "传感器2-压实温度(C)") - private Double sensor2PaveTempMax; - - @ApiModelProperty(value = "传感器3-压实温度(C)") - private Double sensor3PaveTempMin; - - @ApiModelProperty(value = "传感器3-压实温度(C)") - private Double sensor3PaveTempMax; - - @ApiModelProperty(value = "传感器4-压实温度(C)") - private Double sensor4PaveTempMin; - - @ApiModelProperty(value = "传感器4-压实温度(C)") - private Double sensor4PaveTempMax; - - @ApiModelProperty(value = "传感器5-压实温度(C)") - private Double sensor5PaveTempMin; - - @ApiModelProperty(value = "传感器5-压实温度(C)") - private Double sensor5PaveTempMax; - - @ApiModelProperty(value = "传感器6-压实温度(C)") - private Double sensor6PaveTempMin; - - @ApiModelProperty(value = "传感器6-压实温度(C)") - private Double sensor6PaveTempMax; - - @ApiModelProperty(value = "传感器7-压实温度(C)") - private Double sensor7PaveTempMin; - - @ApiModelProperty(value = "传感器7-压实温度(C)") - private Double sensor7PaveTempMax; - - @ApiModelProperty(value = "传感器8-压实温度(C)") - private Double sensor8PaveTempMin; - - @ApiModelProperty(value = "传感器8-压实温度(C)") - private Double sensor8PaveTempMax; - - @ApiModelProperty(value = "传感器9-压实温度(C)") - private Double sensor9PaveTempMin; - - @ApiModelProperty(value = "传感器9-压实温度(C)") - private Double sensor9PaveTempMax; - - @ApiModelProperty(value = "传感器10-压实温度(C)") - private Double sensor10PaveTempMin; - - @ApiModelProperty(value = "传感器10-压实温度(C)") - private Double sensor10PaveTempMax; - - @ApiModelProperty(value = "传感器1-压实度(C)") - private Double sensor1PaveDegreeMin; - - @ApiModelProperty(value = "传感器1-压实度(C)") - private Double sensor1PaveDegreeMax; - - @ApiModelProperty(value = "传感器2-压实度(C)") - private Double sensor2PaveDegreeMin; - - @ApiModelProperty(value = "传感器2-压实度(C)") - private Double sensor2PaveDegreeMax; - - @ApiModelProperty(value = "传感器3-压实度(C)") - private Double sensor3PaveDegreeMin; - - @ApiModelProperty(value = "传感器3-压实度(C)") - private Double sensor3PaveDegreeMax; - - @ApiModelProperty(value = "传感器4-压实度(C)") - private Double sensor4PaveDegreeMin; - - @ApiModelProperty(value = "传感器4-压实度(C)") - private Double sensor4PaveDegreeMax; - - @ApiModelProperty(value = "项目sn") - private String projectSn; - - @ApiModelProperty(value = "数据条数") - private java.lang.Integer dataNum; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveRecordDto.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveRecordDto.java deleted file mode 100644 index 9e34a2dfe..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/dto/PaveRecordDto.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.zhgd.xmgl.modules.pave.entity.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - - -@Data -public class PaveRecordDto implements Serializable { - - - @ApiModelProperty(value = "设备编码") - private String devSn; - - @ApiModelProperty(value = "摊铺速度(m/min)") - private Double paveSpeedMin; - - @ApiModelProperty(value = "摊铺速度(m/min)") - private Double paveSpeedMax; - - @ApiModelProperty(value = "平均摊铺温度(C)") - private Double averagePaveTempMin; - - @ApiModelProperty(value = "平均摊铺温度(C)") - private Double averagePaveTempMax; - - @ApiModelProperty(value = "平均摊铺厚度(mm)") - private Double averagePaveThicknessMin; - - @ApiModelProperty(value = "平均摊铺厚度(mm)") - private Double averagePaveThicknessMax; - - @ApiModelProperty(value = "振幅") - private Double amplitudeMin; - - @ApiModelProperty(value = "振幅") - private Double amplitudeMax; - - @ApiModelProperty(value = "频率(Hz)") - private Double frequencyMin; - - @ApiModelProperty(value = "频率(Hz)") - private Double frequencyMax; - - @ApiModelProperty(value = "地理经度(W/E)") - private Double geographicalLongitudeMin; - - @ApiModelProperty(value = "地理经度(W/E)") - private Double geographicalLongitudeMax; - - @ApiModelProperty(value = "地理纬度(N/S)") - private Double geographicalLatitudeMin; - - @ApiModelProperty(value = "地理纬度(N/S)") - private Double geographicalLatitudeMax; - - @ApiModelProperty(value = "摊铺时间") - private String paveTimeMin; - - @ApiModelProperty(value = "摊铺时间") - private String paveTimeMax; - - @ApiModelProperty(value = "传感器1-摊铺温度(C)") - private Double sensor1PaveTempMin; - - @ApiModelProperty(value = "传感器1-摊铺温度(C)") - private Double sensor1PaveTempMax; - - @ApiModelProperty(value = "传感器2-摊铺温度(C)") - private Double sensor2PaveTempMin; - - @ApiModelProperty(value = "传感器2-摊铺温度(C)") - private Double sensor2PaveTempMax; - - @ApiModelProperty(value = "传感器3-摊铺温度(C)") - private Double sensor3PaveTempMin; - - @ApiModelProperty(value = "传感器3-摊铺温度(C)") - private Double sensor3PaveTempMax; - - @ApiModelProperty(value = "传感器4-摊铺温度(C)") - private Double sensor4PaveTempMin; - - @ApiModelProperty(value = "传感器4-摊铺温度(C)") - private Double sensor4PaveTempMax; - - @ApiModelProperty(value = "传感器5-摊铺温度(C)") - private Double sensor5PaveTempMin; - - @ApiModelProperty(value = "传感器5-摊铺温度(C)") - private Double sensor5PaveTempMax; - - @ApiModelProperty(value = "传感器6-摊铺温度(C)") - private Double sensor6PaveTempMin; - - @ApiModelProperty(value = "传感器6-摊铺温度(C)") - private Double sensor6PaveTempMax; - - @ApiModelProperty(value = "传感器7-摊铺温度(C)") - private Double sensor7PaveTempMin; - - @ApiModelProperty(value = "传感器7-摊铺温度(C)") - private Double sensor7PaveTempMax; - - @ApiModelProperty(value = "传感器8-摊铺温度(C)") - private Double sensor8PaveTempMin; - - @ApiModelProperty(value = "传感器8-摊铺温度(C)") - private Double sensor8PaveTempMax; - - @ApiModelProperty(value = "传感器9-摊铺温度(C)") - private Double sensor9PaveTempMin; - - @ApiModelProperty(value = "传感器9-摊铺温度(C)") - private Double sensor9PaveTempMax; - - @ApiModelProperty(value = "传感器10-摊铺温度(C)") - private Double sensor10PaveTempMin; - - @ApiModelProperty(value = "传感器10-摊铺温度(C)") - private Double sensor10PaveTempMax; - - @ApiModelProperty(value = "传感器1-摊铺厚度(C)") - private Double sensor1PaveThicknessMin; - - @ApiModelProperty(value = "传感器1-摊铺厚度(C)") - private Double sensor1PaveThicknessMax; - - @ApiModelProperty(value = "传感器2-摊铺厚度(C)") - private Double sensor2PaveThicknessMin; - - @ApiModelProperty(value = "传感器2-摊铺厚度(C)") - private Double sensor2PaveThicknessMax; - - @ApiModelProperty(value = "传感器3-摊铺厚度(C)") - private Double sensor3PaveThicknessMin; - - @ApiModelProperty(value = "传感器3-摊铺厚度(C)") - private Double sensor3PaveThicknessMax; - - @ApiModelProperty(value = "传感器4-摊铺厚度(C)") - private Double sensor4PaveThicknessMin; - - @ApiModelProperty(value = "传感器4-摊铺厚度(C)") - private Double sensor4PaveThicknessMax; - - @ApiModelProperty(value = "项目sn") - private String projectSn; - - @ApiModelProperty(value = "数据条数") - private java.lang.Integer dataNum; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionRecordConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionRecordConfigMapper.java new file mode 100644 index 000000000..7ed019f79 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveCompactionRecordConfigMapper.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.pave.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 路面压实实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Mapper +public interface PaveCompactionRecordConfigMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordConfigMapper.java new file mode 100644 index 000000000..6fb4a1134 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/PaveRecordConfigMapper.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.pave.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 路面摊铺实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Mapper +public interface PaveRecordConfigMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml new file mode 100644 index 000000000..8d3c47510 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml new file mode 100644 index 000000000..ea5eb16c2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordConfigService.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordConfigService.java new file mode 100644 index 000000000..942144646 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordConfigService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.pave.service; + +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 路面压实实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +public interface IPaveCompactionRecordConfigService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java index 2e2ceab13..f92b18f3d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.pave.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveCompactionRecordDto; +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; import java.util.HashMap; import java.util.List; @@ -45,5 +45,5 @@ public interface IPaveCompactionRecordService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java index b2d43de5d..016d7d2aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java @@ -2,9 +2,8 @@ package com.zhgd.xmgl.modules.pave.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.dto.BridgeErectMachineDataDto; import com.zhgd.xmgl.modules.pave.entity.PaveRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveRecordDto; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; import java.util.HashMap; import java.util.List; @@ -46,5 +45,5 @@ public interface IPaveRecordService extends IService { */ void edit(PaveRecord paveRecord); - void randomData(PaveRecordDto recordDto); + void randomData(PaveRecordConfig recordDto); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordConfigServiceImpl.java new file mode 100644 index 000000000..935679b76 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordConfigServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.pave.service.impl; + +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.zhgd.xmgl.modules.pave.mapper.PaveCompactionRecordConfigMapper; +import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 路面压实实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Service +public class PaveCompactionRecordConfigServiceImpl extends ServiceImpl implements IPaveCompactionRecordConfigService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java index 8c1261f24..6c5ae25e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionRecordServiceImpl.java @@ -7,12 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionDev; import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecord; -import com.zhgd.xmgl.modules.pave.entity.PaveDev; -import com.zhgd.xmgl.modules.pave.entity.PaveRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveCompactionRecordDto; +import com.zhgd.xmgl.modules.pave.entity.PaveCompactionRecordConfig; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; import com.zhgd.xmgl.modules.pave.mapper.PaveCompactionDevMapper; import com.zhgd.xmgl.modules.pave.mapper.PaveCompactionRecordMapper; +import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordConfigService; import com.zhgd.xmgl.modules.pave.service.IPaveCompactionRecordService; +import com.zhgd.xmgl.modules.pave.service.IPaveRecordConfigService; +import com.zhgd.xmgl.modules.safetyhat.generator.CircleTrajectoryGenerator; +import com.zhgd.xmgl.modules.safetyhat.generator.Point; +import com.zhgd.xmgl.modules.safetyhat.generator.PolygonTrajectoryGenerator; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -40,6 +44,8 @@ public class PaveCompactionRecordServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { @@ -88,48 +94,71 @@ public class PaveCompactionRecordServiceImpl extends ServiceImpllambdaQuery() - .eq(PaveCompactionDev::getDevSn, recordDto.getDevSn()) - .eq(PaveCompactionDev::getProjectSn, recordDto.getProjectSn())); - if (paveCompactionDev != null) { - DateTime startTime = DateUtil.parseDateTime(recordDto.getPaveTimeMin()); - DateTime endTime = DateUtil.parseDateTime(recordDto.getPaveTimeMax()); - long betweenDay = DateUtil.betweenDay(startTime, endTime, true); - List list = new ArrayList<>(); - for (int i = 0; i < recordDto.getDataNum(); i++) { - PaveCompactionRecord record = new PaveCompactionRecord(); - record.setProjectSn(paveCompactionDev.getProjectSn()); - record.setDevSn(paveCompactionDev.getDevSn()); - record.setDevName(paveCompactionDev.getDevName()); - DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); - DateTime paveTime = DateUtil.offsetMinute(dateTime, randomInt(0, 1440)); - record.setPaveTime(paveTime); - record.setCreateDate(paveTime); - record.setPaveSpeed(randomDouble(recordDto.getPaveSpeedMin(), recordDto.getPaveSpeedMax())); - record.setAveragePaveTemp(randomDouble(recordDto.getAveragePaveTempMin(), recordDto.getAveragePaveTempMax())); - record.setPaveDegree(randomDouble(recordDto.getPaveDegreeMin(), recordDto.getPaveDegreeMax())); - record.setAmplitude(randomDouble(recordDto.getAmplitudeMin(), recordDto.getAmplitudeMax())); - record.setFrequency(randomDouble(recordDto.getFrequencyMin(), recordDto.getFrequencyMax())); - record.setGeographicalLatitude(randomDouble(recordDto.getGeographicalLatitudeMin(), recordDto.getGeographicalLatitudeMax())); - record.setGeographicalLongitude(randomDouble(recordDto.getGeographicalLongitudeMin(), recordDto.getGeographicalLongitudeMax())); - record.setSensor1PaveTemp(randomDouble(recordDto.getSensor1PaveTempMin(), recordDto.getSensor1PaveTempMax())); - record.setSensor2PaveTemp(randomDouble(recordDto.getSensor2PaveTempMin(), recordDto.getSensor2PaveTempMax())); - record.setSensor3PaveTemp(randomDouble(recordDto.getSensor3PaveTempMin(), recordDto.getSensor3PaveTempMax())); - record.setSensor4PaveTemp(randomDouble(recordDto.getSensor4PaveTempMin(), recordDto.getSensor4PaveTempMax())); - record.setSensor5PaveTemp(randomDouble(recordDto.getSensor5PaveTempMin(), recordDto.getSensor5PaveTempMax())); - record.setSensor6PaveTemp(randomDouble(recordDto.getSensor6PaveTempMin(), recordDto.getSensor6PaveTempMax())); - record.setSensor7PaveTemp(randomDouble(recordDto.getSensor7PaveTempMin(), recordDto.getSensor7PaveTempMax())); - record.setSensor8PaveTemp(randomDouble(recordDto.getSensor8PaveTempMin(), recordDto.getSensor8PaveTempMax())); - record.setSensor9PaveTemp(randomDouble(recordDto.getSensor9PaveTempMin(), recordDto.getSensor9PaveTempMax())); - record.setSensor10PaveTemp(randomDouble(recordDto.getSensor10PaveTempMin(), recordDto.getSensor10PaveTempMax())); - record.setSensor1PaveDegree(randomDouble(recordDto.getSensor1PaveDegreeMin(), recordDto.getSensor1PaveDegreeMax())); - record.setSensor2PaveDegree(randomDouble(recordDto.getSensor2PaveDegreeMin(), recordDto.getSensor2PaveDegreeMax())); - record.setSensor3PaveDegree(randomDouble(recordDto.getSensor3PaveDegreeMin(), recordDto.getSensor3PaveDegreeMax())); - record.setSensor4PaveDegree(randomDouble(recordDto.getSensor4PaveDegreeMin(), recordDto.getSensor4PaveDegreeMax())); - list.add(record); + public void randomData(PaveCompactionRecordConfig recordDto) { + PaveCompactionRecordConfig one = paveCompactionRecordConfigService.getOne(Wrappers.lambdaQuery() + .eq(PaveCompactionRecordConfig::getProjectSn, recordDto.getProjectSn())); + if (one != null) { + recordDto.setId(one.getId()); + } + paveCompactionRecordConfigService.saveOrUpdate(recordDto); + + List snList = new ArrayList<>(Arrays.asList(recordDto.getDevSn().split(","))); + List> trajectorys = new ArrayList<>(); + List> points = new ArrayList<>(); + for (String devSn : snList) { + if (recordDto.getRangeType() == 1) { + trajectorys.add(CircleTrajectoryGenerator.generateRandomCircleTrajectory(recordDto.getLatitude(), recordDto.getLongitude(), recordDto.getAreaRadius(), recordDto.getDataNum())); + } else { + points.add(PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(recordDto.getFenceShape(), recordDto.getDataNum(), 0.001)); + } + } + int j = 0; + for (String dev : snList) { + List doubles = trajectorys.size() > 0 ? trajectorys.get(j) : new ArrayList<>(); + List points1 = points.size() > 0 ? points.get(j) : new ArrayList<>(); + j++; + PaveCompactionDev paveCompactionDev = paveCompactionDevMapper.selectOne(Wrappers.lambdaQuery() + .eq(PaveCompactionDev::getDevSn, dev) + .eq(PaveCompactionDev::getProjectSn, recordDto.getProjectSn())); + if (paveCompactionDev != null) { + DateTime startTime = DateUtil.parseDateTime(recordDto.getPaveTimeMin()); + DateTime endTime = DateUtil.parseDateTime(recordDto.getPaveTimeMax()); + long betweenDay = DateUtil.betweenDay(startTime, endTime, true); + List list = new ArrayList<>(); + for (int i = 0; i < recordDto.getDataNum(); i++) { + PaveCompactionRecord record = new PaveCompactionRecord(); + record.setProjectSn(paveCompactionDev.getProjectSn()); + record.setDevSn(paveCompactionDev.getDevSn()); + record.setDevName(paveCompactionDev.getDevName()); + DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); + DateTime paveTime = DateUtil.offsetMinute(dateTime, randomInt(0, 1440)); + record.setPaveTime(paveTime); + record.setCreateDate(paveTime); + record.setPaveSpeed(randomDouble(recordDto.getPaveSpeedMin(), recordDto.getPaveSpeedMax())); + record.setAveragePaveTemp(randomDouble(recordDto.getAveragePaveTempMin(), recordDto.getAveragePaveTempMax())); + record.setPaveDegree(randomDouble(recordDto.getPaveDegreeMin(), recordDto.getPaveDegreeMax())); + record.setAmplitude(randomDouble(recordDto.getAmplitudeMin(), recordDto.getAmplitudeMax())); + record.setFrequency(randomDouble(recordDto.getFrequencyMin(), recordDto.getFrequencyMax())); + record.setGeographicalLatitude(recordDto.getRangeType() == 1 ? doubles.get(i)[0] : points1.get(i).getLat()); + record.setGeographicalLongitude(recordDto.getRangeType() == 1 ? doubles.get(i)[1] : points1.get(i).getLng()); + record.setSensor1PaveTemp(randomDouble(recordDto.getSensor1PaveTempMin(), recordDto.getSensor1PaveTempMax())); + record.setSensor2PaveTemp(randomDouble(recordDto.getSensor2PaveTempMin(), recordDto.getSensor2PaveTempMax())); + record.setSensor3PaveTemp(randomDouble(recordDto.getSensor3PaveTempMin(), recordDto.getSensor3PaveTempMax())); + record.setSensor4PaveTemp(randomDouble(recordDto.getSensor4PaveTempMin(), recordDto.getSensor4PaveTempMax())); + record.setSensor5PaveTemp(randomDouble(recordDto.getSensor5PaveTempMin(), recordDto.getSensor5PaveTempMax())); + record.setSensor6PaveTemp(randomDouble(recordDto.getSensor6PaveTempMin(), recordDto.getSensor6PaveTempMax())); + record.setSensor7PaveTemp(randomDouble(recordDto.getSensor7PaveTempMin(), recordDto.getSensor7PaveTempMax())); + record.setSensor8PaveTemp(randomDouble(recordDto.getSensor8PaveTempMin(), recordDto.getSensor8PaveTempMax())); + record.setSensor9PaveTemp(randomDouble(recordDto.getSensor9PaveTempMin(), recordDto.getSensor9PaveTempMax())); + record.setSensor10PaveTemp(randomDouble(recordDto.getSensor10PaveTempMin(), recordDto.getSensor10PaveTempMax())); + record.setSensor1PaveDegree(randomDouble(recordDto.getSensor1PaveDegreeMin(), recordDto.getSensor1PaveDegreeMax())); + record.setSensor2PaveDegree(randomDouble(recordDto.getSensor2PaveDegreeMin(), recordDto.getSensor2PaveDegreeMax())); + record.setSensor3PaveDegree(randomDouble(recordDto.getSensor3PaveDegreeMin(), recordDto.getSensor3PaveDegreeMax())); + record.setSensor4PaveDegree(randomDouble(recordDto.getSensor4PaveDegreeMin(), recordDto.getSensor4PaveDegreeMax())); + list.add(record); + } + this.saveBatch(list); } - this.saveBatch(list); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordConfigServiceImpl.java new file mode 100644 index 000000000..c3c2a768e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordConfigServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.pave.service.impl; + +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; +import com.zhgd.xmgl.modules.pave.mapper.PaveRecordConfigMapper; +import com.zhgd.xmgl.modules.pave.service.IPaveRecordConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 路面摊铺实时数据配置 + * @author： pengj + * @date： 2025-05-30 + * @version： V1.0 + */ +@Service +public class PaveRecordConfigServiceImpl extends ServiceImpl implements IPaveRecordConfigService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordServiceImpl.java index 113485be1..c4379daaa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveRecordServiceImpl.java @@ -3,31 +3,31 @@ package com.zhgd.xmgl.modules.pave.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData; -import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev; -import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev; -import com.zhgd.xmgl.modules.pave.entity.PaveDev; -import com.zhgd.xmgl.modules.pave.entity.PaveRecord; -import com.zhgd.xmgl.modules.pave.entity.dto.PaveRecordDto; -import com.zhgd.xmgl.modules.pave.mapper.PaveDevMapper; -import com.zhgd.xmgl.modules.pave.mapper.PaveRecordMapper; -import com.zhgd.xmgl.modules.pave.service.IPaveRecordService; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.pave.entity.PaveDev; +import com.zhgd.xmgl.modules.pave.entity.PaveRecord; +import com.zhgd.xmgl.modules.pave.entity.PaveRecordConfig; +import com.zhgd.xmgl.modules.pave.mapper.PaveDevMapper; +import com.zhgd.xmgl.modules.pave.mapper.PaveRecordMapper; +import com.zhgd.xmgl.modules.pave.service.IPaveRecordConfigService; +import com.zhgd.xmgl.modules.pave.service.IPaveRecordService; +import com.zhgd.xmgl.modules.safetyhat.generator.CircleTrajectoryGenerator; +import com.zhgd.xmgl.modules.safetyhat.generator.Point; +import com.zhgd.xmgl.modules.safetyhat.generator.PolygonTrajectoryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: 路面摊铺-记录 * @author： pds @@ -41,6 +41,8 @@ public class PaveRecordServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { @@ -89,48 +91,70 @@ public class PaveRecordServiceImpl extends ServiceImpllambdaQuery() - .eq(PaveDev::getDevSn, recordDto.getDevSn()) - .eq(PaveDev::getProjectSn, recordDto.getProjectSn())); - if (paveDev != null) { - DateTime startTime = DateUtil.parseDateTime(recordDto.getPaveTimeMin()); - DateTime endTime = DateUtil.parseDateTime(recordDto.getPaveTimeMax()); - long betweenDay = DateUtil.betweenDay(startTime, endTime, true); - List list = new ArrayList<>(); - for (int i = 0; i < recordDto.getDataNum(); i++) { - PaveRecord record = new PaveRecord(); - record.setProjectSn(paveDev.getProjectSn()); - record.setDevSn(paveDev.getDevSn()); - record.setDevName(paveDev.getDevName()); - DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); - DateTime paveTime = DateUtil.offsetMinute(dateTime, randomInt(0, 1440)); - record.setPaveTime(paveTime); - record.setCreateDate(paveTime); - record.setPaveSpeed(randomDouble(recordDto.getPaveSpeedMin(), recordDto.getPaveSpeedMax())); - record.setAveragePaveTemp(randomDouble(recordDto.getAveragePaveTempMin(), recordDto.getAveragePaveTempMax())); - record.setAveragePaveThickness(randomDouble(recordDto.getAveragePaveThicknessMin(), recordDto.getAveragePaveThicknessMax())); - record.setAmplitude(randomDouble(recordDto.getAmplitudeMin(), recordDto.getAmplitudeMax())); - record.setFrequency(randomDouble(recordDto.getFrequencyMin(), recordDto.getFrequencyMax())); - record.setGeographicalLatitude(randomDouble(recordDto.getGeographicalLatitudeMin(), recordDto.getGeographicalLatitudeMax())); - record.setGeographicalLongitude(randomDouble(recordDto.getGeographicalLongitudeMin(), recordDto.getGeographicalLongitudeMax())); - record.setSensor1PaveTemp(randomDouble(recordDto.getSensor1PaveTempMin(), recordDto.getSensor1PaveTempMax())); - record.setSensor2PaveTemp(randomDouble(recordDto.getSensor2PaveTempMin(), recordDto.getSensor2PaveTempMax())); - record.setSensor3PaveTemp(randomDouble(recordDto.getSensor3PaveTempMin(), recordDto.getSensor3PaveTempMax())); - record.setSensor4PaveTemp(randomDouble(recordDto.getSensor4PaveTempMin(), recordDto.getSensor4PaveTempMax())); - record.setSensor5PaveTemp(randomDouble(recordDto.getSensor5PaveTempMin(), recordDto.getSensor5PaveTempMax())); - record.setSensor6PaveTemp(randomDouble(recordDto.getSensor6PaveTempMin(), recordDto.getSensor6PaveTempMax())); - record.setSensor7PaveTemp(randomDouble(recordDto.getSensor7PaveTempMin(), recordDto.getSensor7PaveTempMax())); - record.setSensor8PaveTemp(randomDouble(recordDto.getSensor8PaveTempMin(), recordDto.getSensor8PaveTempMax())); - record.setSensor9PaveTemp(randomDouble(recordDto.getSensor9PaveTempMin(), recordDto.getSensor9PaveTempMax())); - record.setSensor10PaveTemp(randomDouble(recordDto.getSensor10PaveTempMin(), recordDto.getSensor10PaveTempMax())); - record.setSensor1PaveThickness(randomDouble(recordDto.getSensor1PaveThicknessMin(), recordDto.getSensor1PaveThicknessMax())); - record.setSensor2PaveThickness(randomDouble(recordDto.getSensor2PaveThicknessMin(), recordDto.getSensor2PaveThicknessMax())); - record.setSensor3PaveThickness(randomDouble(recordDto.getSensor3PaveThicknessMin(), recordDto.getSensor3PaveThicknessMax())); - record.setSensor4PaveThickness(randomDouble(recordDto.getSensor4PaveThicknessMin(), recordDto.getSensor4PaveThicknessMax())); - list.add(record); + public void randomData(PaveRecordConfig recordDto) { + PaveRecordConfig one = paveRecordConfigService.getOne(Wrappers.lambdaQuery() + .eq(PaveRecordConfig::getProjectSn, recordDto.getProjectSn())); + if (one != null) { + recordDto.setId(one.getId()); + } + paveRecordConfigService.saveOrUpdate(recordDto); + List snList = new ArrayList<>(Arrays.asList(recordDto.getDevSn().split(","))); + List> trajectorys = new ArrayList<>(); + List> points = new ArrayList<>(); + for (String devSn : snList) { + if (recordDto.getRangeType() == 1) { + trajectorys.add(CircleTrajectoryGenerator.generateRandomCircleTrajectory(recordDto.getLatitude(), recordDto.getLongitude(), recordDto.getAreaRadius(), recordDto.getDataNum())); + } else { + points.add(PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(recordDto.getFenceShape(), recordDto.getDataNum(), 0.001)); + } + } + int j = 0; + for (String dev : snList) { + List doubles = trajectorys.size() > 0 ? trajectorys.get(j) : new ArrayList<>(); + List points1 = points.size() > 0 ? points.get(j) : new ArrayList<>(); + j++; + PaveDev paveDev = paveDevMapper.selectOne(Wrappers.lambdaQuery() + .eq(PaveDev::getDevSn, dev) + .eq(PaveDev::getProjectSn, recordDto.getProjectSn())); + if (paveDev != null) { + DateTime startTime = DateUtil.parseDateTime(recordDto.getPaveTimeMin()); + DateTime endTime = DateUtil.parseDateTime(recordDto.getPaveTimeMax()); + long betweenDay = DateUtil.betweenDay(startTime, endTime, true); + List list = new ArrayList<>(); + for (int i = 0; i < recordDto.getDataNum(); i++) { + PaveRecord record = new PaveRecord(); + record.setProjectSn(paveDev.getProjectSn()); + record.setDevSn(paveDev.getDevSn()); + record.setDevName(paveDev.getDevName()); + DateTime dateTime = DateUtil.offsetDay(DateUtil.beginOfDay(startTime), randomInt(1, (int) betweenDay)); + DateTime paveTime = DateUtil.offsetMinute(dateTime, randomInt(0, 1440)); + record.setPaveTime(paveTime); + record.setCreateDate(paveTime); + record.setPaveSpeed(randomDouble(recordDto.getPaveSpeedMin(), recordDto.getPaveSpeedMax())); + record.setAveragePaveTemp(randomDouble(recordDto.getAveragePaveTempMin(), recordDto.getAveragePaveTempMax())); + record.setAveragePaveThickness(randomDouble(recordDto.getAveragePaveThicknessMin(), recordDto.getAveragePaveThicknessMax())); + record.setAmplitude(randomDouble(recordDto.getAmplitudeMin(), recordDto.getAmplitudeMax())); + record.setFrequency(randomDouble(recordDto.getFrequencyMin(), recordDto.getFrequencyMax())); + record.setGeographicalLatitude(recordDto.getRangeType() == 1 ? doubles.get(i)[0] : points1.get(i).getLat()); + record.setGeographicalLongitude(recordDto.getRangeType() == 1 ? doubles.get(i)[1] : points1.get(i).getLng()); + record.setSensor1PaveTemp(randomDouble(recordDto.getSensor1PaveTempMin(), recordDto.getSensor1PaveTempMax())); + record.setSensor2PaveTemp(randomDouble(recordDto.getSensor2PaveTempMin(), recordDto.getSensor2PaveTempMax())); + record.setSensor3PaveTemp(randomDouble(recordDto.getSensor3PaveTempMin(), recordDto.getSensor3PaveTempMax())); + record.setSensor4PaveTemp(randomDouble(recordDto.getSensor4PaveTempMin(), recordDto.getSensor4PaveTempMax())); + record.setSensor5PaveTemp(randomDouble(recordDto.getSensor5PaveTempMin(), recordDto.getSensor5PaveTempMax())); + record.setSensor6PaveTemp(randomDouble(recordDto.getSensor6PaveTempMin(), recordDto.getSensor6PaveTempMax())); + record.setSensor7PaveTemp(randomDouble(recordDto.getSensor7PaveTempMin(), recordDto.getSensor7PaveTempMax())); + record.setSensor8PaveTemp(randomDouble(recordDto.getSensor8PaveTempMin(), recordDto.getSensor8PaveTempMax())); + record.setSensor9PaveTemp(randomDouble(recordDto.getSensor9PaveTempMin(), recordDto.getSensor9PaveTempMax())); + record.setSensor10PaveTemp(randomDouble(recordDto.getSensor10PaveTempMin(), recordDto.getSensor10PaveTempMax())); + record.setSensor1PaveThickness(randomDouble(recordDto.getSensor1PaveThicknessMin(), recordDto.getSensor1PaveThicknessMax())); + record.setSensor2PaveThickness(randomDouble(recordDto.getSensor2PaveThicknessMin(), recordDto.getSensor2PaveThicknessMax())); + record.setSensor3PaveThickness(randomDouble(recordDto.getSensor3PaveThicknessMin(), recordDto.getSensor3PaveThicknessMax())); + record.setSensor4PaveThickness(randomDouble(recordDto.getSensor4PaveThicknessMin(), recordDto.getSensor4PaveThicknessMax())); + list.add(record); + } + this.saveBatch(list); } - this.saveBatch(list); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java index 81dcd6f59..441e22088 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java @@ -77,7 +77,7 @@ public class SafetyHatDevServiceImpl extends ServiceImpl queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); if (StringUtils.isNotBlank(noExist)) { - queryWrapper.notLike("shd.fence_id", fenceId); + queryWrapper.and(a -> a.notLike("shd.fence_id", fenceId).or().isNull("shd.fence_id")); } else if (StringUtils.isNotBlank(fenceId)) { queryWrapper.like("shd.fence_id", fenceId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java index f00757852..e3b22a13f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionDev.java @@ -66,7 +66,7 @@ public class VehiclePositionDev implements Serializable { */ @Excel(name = "车种", width = 15) @ApiModelProperty(value = "车种") - private java.lang.Long carType; + private java.lang.String carType; /** * 人员姓名 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml index d10b437e8..076693779 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml @@ -2,7 +2,7 @@