From 69d1184fa56f6f88d94476449278981b556354cb Mon Sep 17 00:00:00 2001 From: zxy Date: Fri, 27 Mar 2026 14:35:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(heli):=20=E6=9B=B4=E6=96=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataAcquisitionController.java | 54 ++--- .../dataacquisition/DataAcquisitionDO.java | 12 +- .../DataAcquisitionService.java | 16 +- .../DataAcquisitionServiceImpl.java | 198 ++++++++++++++---- .../src/api/heli/dataacquisition/index.ts | 8 +- .../src/views/heli/dataacquisition/update.vue | 40 ++-- 6 files changed, 235 insertions(+), 93 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java index 7ec0bed8..d71aff65 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/dataacquisition/DataAcquisitionController.java @@ -1,35 +1,31 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition; -import org.apache.ibatis.annotations.Param; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.*; -import javax.servlet.http.*; -import java.time.LocalDateTime; -import java.util.*; -import java.io.IOException; - +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.common.pojo.PageParam; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; -import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; - import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; - import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; -import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionPageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionRespVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition.DataAcquisitionDO; import com.chanko.yunxi.mes.module.heli.service.dataacquisition.DataAcquisitionService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 设备数据采集") @RestController @@ -114,12 +110,18 @@ public class DataAcquisitionController { List dataAcquisition = dataAcquisitionService.getDataAcquisitionList(code); return success(dataAcquisition); } + @GetMapping("/updateTime") @Operation(summary = "更新设备数据采集") @PreAuthorize("@ss.hasPermission('heli:data-acquisition:update')") - public CommonResult updateTime(@RequestParam("acquisitionTime") @org.springframework.format.annotation.DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime acquisitionTime) { - dataAcquisitionService.updateTime(acquisitionTime); + public CommonResult updateTime(@RequestParam("code") String code) { + dataAcquisitionService.updateTime(code, null); + return success(true); + } + @GetMapping("/stopCode") + @Operation(summary = "停止设备数据采集") + public CommonResult stopCode(@RequestParam("code") String code) { + dataAcquisitionService.stopUpdateTask(code); return success(true); } - } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/dataacquisition/DataAcquisitionDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/dataacquisition/DataAcquisitionDO.java index 5a139252..ad9baa1b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/dataacquisition/DataAcquisitionDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/dataacquisition/DataAcquisitionDO.java @@ -1,11 +1,11 @@ package com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; /** * 设备数据采集 DO @@ -69,4 +69,4 @@ public class DataAcquisitionDO extends BaseDO { private Integer feedSpeedLower; @TableField(exist = false) private Integer feedSpeedUpper; -} \ No newline at end of file +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionService.java index 7a6ec4dc..4ccf90d6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionService.java @@ -1,11 +1,13 @@ package com.chanko.yunxi.mes.module.heli.service.dataacquisition; -import java.time.LocalDateTime; -import java.util.*; -import javax.validation.*; -import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition.DataAcquisitionDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionPageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionSaveReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition.DataAcquisitionDO; + +import javax.validation.Valid; +import java.time.LocalDateTime; +import java.util.List; /** * 设备数据采集 Service 接口 @@ -58,6 +60,8 @@ public interface DataAcquisitionService { List getDataAcquisitionList(String code); - void updateTime(LocalDateTime acquisitionTime); + void updateTime(String code,LocalDateTime acquisitionTime); + + void stopUpdateTask(String code); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionServiceImpl.java index 40756fa9..9ff0f426 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/dataacquisition/DataAcquisitionServiceImpl.java @@ -3,19 +3,24 @@ package com.chanko.yunxi.mes.module.heli.service.dataacquisition; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.chanko.yunxi.mes.framework.common.exception.ErrorCode; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionPageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.DataAcquisitionSaveReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition.DataAcquisitionDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.dataacquisition.DataAcquisitionMapper; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; import java.util.Map; -import com.chanko.yunxi.mes.module.heli.controller.admin.dataacquisition.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.dataacquisition.DataAcquisitionDO; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; - -import com.chanko.yunxi.mes.module.heli.dal.mysql.dataacquisition.DataAcquisitionMapper; +import java.util.concurrent.ConcurrentHashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -26,11 +31,18 @@ import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExcept */ @Service @Validated +@Slf4j public class DataAcquisitionServiceImpl implements DataAcquisitionService { @Resource private DataAcquisitionMapper dataAcquisitionMapper; + // 时间格式正则：匹配 数字H 数字M 数字S + private static final Pattern TIME_PATTERN = Pattern.compile("(\\d+)H(\\d+)M(\\d+)S"); + + // 用于保存正在运行的线程（防止重复启动） + private final Map runningThreads = new ConcurrentHashMap<>(); + @Override public Long createDataAcquisition(DataAcquisitionSaveReqVO createReqVO) { // 插入 @@ -78,18 +90,18 @@ public class DataAcquisitionServiceImpl implements DataAcquisitionService { // 查找每个 code 分组中 status=1 的最大 createTime 之后的 status=0 的最小记录的 id Integer integer = dataAcquisitionMapper.selectStatus(); System.out.println("=== equipment_job_config status: " + integer); - if (ObjectUtil.isNotEmpty( integer)&&integer==0){ - List ids = dataAcquisitionMapper.selectNextStatusZeroIds(); - System.out.println("=== selectNextStatusZeroIds returned " + (ids == null ? 0 : ids.size()) + " ids: " + ids); - if (ObjectUtil.isNotEmpty(ids)){ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.in(DataAcquisitionDO::getId, ids); - updateWrapper.set(DataAcquisitionDO::getStatus, 1); - int rows = dataAcquisitionMapper.update(null, updateWrapper); - System.out.println("=== updated rows: " + rows); - } else { - System.out.println("=== No status=0 records found"); - } + if (ObjectUtil.isNotEmpty(integer) && integer == 0) { + List ids = dataAcquisitionMapper.selectNextStatusZeroIds(); + System.out.println("=== selectNextStatusZeroIds returned " + (ids == null ? 0 : ids.size()) + " ids: " + ids); + if (ObjectUtil.isNotEmpty(ids)) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(DataAcquisitionDO::getId, ids); + updateWrapper.set(DataAcquisitionDO::getStatus, 1); + int rows = dataAcquisitionMapper.update(null, updateWrapper); + System.out.println("=== updated rows: " + rows); + } else { + System.out.println("=== No status=0 records found"); + } } else { System.out.println("=== Task disabled (status != 0)"); } @@ -102,37 +114,141 @@ public class DataAcquisitionServiceImpl implements DataAcquisitionService { @Override public List getDataAcquisitionList(String code) { - return dataAcquisitionMapper.getDataAcquisitionList( code); + return dataAcquisitionMapper.getDataAcquisitionList(code); } @Override - public void updateTime(LocalDateTime acquisitionTime) { - // 查询所有数据按 code 分组，并按 id 排序（id 代表插入顺序） - List allData = dataAcquisitionMapper.selectList( - new LambdaQueryWrapper() - .orderByAsc(DataAcquisitionDO::getId) - ); + public void updateTime(String code, LocalDateTime acquisitionTime) { + // 1. 根据传入的 code 查询最新一条数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataAcquisitionDO::getCode, code); + queryWrapper.orderByDesc(DataAcquisitionDO::getId); + queryWrapper.last("limit 1"); + DataAcquisitionDO data = dataAcquisitionMapper.selectOne(queryWrapper); + if (data == null) { + throw exception(new ErrorCode(400, "设备信息不存在！")); + } + // 正在运行的线程,打印运行中的线程code + runningThreads.forEach((key, value) -> { + log.info("正在运行的线程,code:{}", key); + }); + startUpdateTask(data); - if (allData == null || allData.isEmpty()) { + // 查询所有数据按 code 分组，并按 id 排序（id 代表插入顺序） +// List allData = dataAcquisitionMapper.selectList( +// new LambdaQueryWrapper() +// .orderByAsc(DataAcquisitionDO::getId) +// ); +// +// if (allData == null || allData.isEmpty()) { +// return; +// } +// +// // 按 code 分组 +// Map> groupedByCode = allData.stream() +// .collect(java.util.stream.Collectors.groupingBy(DataAcquisitionDO::getCode, java.util.stream.Collectors.toList())); +// +// // 遍历每个分组，更新时间 +// for (Map.Entry> entry : groupedByCode.entrySet()) { +// List groupData = entry.getValue(); +// for (int i = 0; i < groupData.size(); i++) { +// DataAcquisitionDO record = groupData.get(i); +// // 第一条记录使用 updateReqVO 的时间，之后的每条增加5秒 +// LocalDateTime newCreateTime = acquisitionTime.plusSeconds(i * 5L); +// +// // 更新该条记录的创建时间 +// record.setCreateTime(newCreateTime); +// dataAcquisitionMapper.updateById(record); +// } +// } + } + + /** + * 外部调用：传入 code → 自动每5秒执行一次时间+5秒 + * + * @param dataAcquisitionDO 外部传入：01#、02#、03#... + */ + public void startUpdateTask(DataAcquisitionDO dataAcquisitionDO) { + String code = dataAcquisitionDO.getCode(); + // 如果已经在运行，不再重复启动 + if (runningThreads.containsKey(code)) { return; } - // 按 code 分组 - Map> groupedByCode = allData.stream() - .collect(java.util.stream.Collectors.groupingBy(DataAcquisitionDO::getCode, java.util.stream.Collectors.toList())); + Thread thread = new Thread(() -> { + while (!Thread.currentThread().isInterrupted()) { + try { - // 遍历每个分组，更新时间 - for (Map.Entry> entry : groupedByCode.entrySet()) { - List groupData = entry.getValue(); - for (int i = 0; i < groupData.size(); i++) { - DataAcquisitionDO record = groupData.get(i); - // 第一条记录使用 updateReqVO 的时间，之后的每条增加5秒 - LocalDateTime newCreateTime = acquisitionTime.plusSeconds(i * 5L); - - // 更新该条记录的创建时间 - record.setCreateTime(newCreateTime); - dataAcquisitionMapper.updateById(record); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataAcquisitionDO::getCode, code); + queryWrapper.orderByDesc(DataAcquisitionDO::getId); + queryWrapper.last("limit 1"); + DataAcquisitionDO data = dataAcquisitionMapper.selectOne(queryWrapper); + if (data == null) { + Thread.sleep(5000); + continue; + } + + // 2. 解析时间 28863H41M32S + String timeStr = data.getRunningDuration(); + Matcher matcher = TIME_PATTERN.matcher(timeStr); + if (!matcher.matches()) { + Thread.sleep(5000); + continue; + } + + int hour = Integer.parseInt(matcher.group(1)); + int min = Integer.parseInt(matcher.group(2)); + int sec = Integer.parseInt(matcher.group(3)); + + // 3. +5 秒 + sec += 5; + + // 秒进位 + if (sec >= 60) { + min++; + sec -= 60; + } + // 分钟进位 + if (min >= 60) { + hour++; + min -= 60; + } + + // 4. 拼接新时间（自动补0） + String newTime = String.format("%dH%02dM%02dS", hour, min, sec); + + // 5. 更新数据库 + data.setRunningDuration(newTime); + data.setUpdateTime(LocalDateTime.now()); + dataAcquisitionMapper.updateById(data); + + } catch (Exception e) { + e.printStackTrace(); + } + + // 每5秒执行一次 + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + break; + } } + }); + + thread.start(); + runningThreads.put(code, thread); + } + + /** + * 停止某个 code 的任务 + */ + @Override + public void stopUpdateTask(String code) { + Thread thread = runningThreads.get(code); + if (thread != null) { + thread.interrupt(); + runningThreads.remove(code); } } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/dataacquisition/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/dataacquisition/index.ts index a993db61..27144376 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/dataacquisition/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/dataacquisition/index.ts @@ -48,6 +48,10 @@ export const getDataAcquisitionList = async (code: string) => { return await request.get({ url: `/heli/data-acquisition/getDataAcquisitionList`, params: { code } }) } // 新增客户新表 -export const updateTime = async (acquisitionTime) => { - return await request.get({ url: `/heli/data-acquisition/updateTime`,params: { acquisitionTime } }) +export const updateTime = async (code: string) => { + return await request.get({ url: `/heli/data-acquisition/updateTime`,params: {code } }) +} + +export const stopCode = async (code: string) => { + return await request.get({ url: `/heli/data-acquisition/updateTime`,params: {code } }) } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dataacquisition/update.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dataacquisition/update.vue index a6e17674..896ffa1e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dataacquisition/update.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dataacquisition/update.vue @@ -12,17 +12,21 @@ :inline="true" label-width="108px" > - - - + + + + + + + + + + + + - 更新 + 启动 + 停止 @@ -49,6 +53,7 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, acquisitionTime: undefined, + code: undefined, }) const queryFormRef = ref() // 搜索的表单 @@ -56,10 +61,21 @@ const queryFormRef = ref() // 搜索的表单 /** 查询列表 */ -/** 搜索按钮操作 */ +/** 搜索按钮操作 */code: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }] + const handleQuery = async () => { - const data = await DataAcquisitionApi.updateTime(queryParams.acquisitionTime) + if (!queryParams.code) { + return message.error('设备编号不能为空') + } + const data = await DataAcquisitionApi.updateTime(queryParams.code) message.success("更新成功") } +const stopCode = async () => { + if (!queryParams.code) { + return message.error('设备编号不能为空') + } + const data = await DataAcquisitionApi.stopCode(queryParams.code) + message.success("停止成功") +}