From 7303ab9ec74a3410c3c04f897cf91beaf98c5d10 Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 19 Mar 2024 10:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AE=89=E5=85=A8=E5=B8=BDbu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/config/SafetyHatWSClient.java | 2 - .../SafetyHatDayRecordController.java | 9 ++++- .../service/ISafetyHatDayRecordService.java | 2 + .../impl/SafetyHatAlarmServiceImpl.java | 5 ++- .../impl/SafetyHatDataServiceImpl.java | 3 +- .../impl/SafetyHatDayRecordServiceImpl.java | 39 +++++++++++++++---- .../zhgd/xmgl/security/WebSecurityConfig.java | 2 +- .../java/com/zhgd/xmgl/util/DateUtils.java | 26 +++++++++++++ 8 files changed, 73 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java index 3a4905c60..02e20a147 100644 --- a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java +++ b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java @@ -105,12 +105,10 @@ public class SafetyHatWSClient { Double yPoint = joData.getDouble("y_point"); Long ctime = joData.getLong("c_time"); Integer sosType = joData.getInteger("sos_type"); - String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), sosType); SafetyHatAlarm alarm = new SafetyHatAlarm(); alarm.setWorkerInfoId(dev.getWorkerInfoId()); alarm.setDevSn(dev.getDevSn()); alarm.setAlarmTime(new Date(ctime * 1000L)); - alarm.setAlarmInfo(str); alarm.setProjectSn(dev.getProjectSn()); alarm.setAlarmType(sosType); alarm.setLatitude(yPoint); diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDayRecordController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDayRecordController.java index bf2e0e168..08b739166 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDayRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDayRecordController.java @@ -86,7 +86,6 @@ public class SafetyHatDayRecordController { @ApiOperation(value = "添加智能安全帽-日行数据信息", notes = "添加智能安全帽-日行数据信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody SafetyHatDayRecord safetyHatDayRecord) { - log.info("添加智能安全帽-日行数据信息:{}", JSON.toJSONString(safetyHatDayRecord)); safetyHatDayRecordService.add(safetyHatDayRecord); return Result.ok(); } @@ -104,6 +103,14 @@ public class SafetyHatDayRecordController { return Result.ok(); } + @ApiOperation(value = "保存智能安全帽-日行数据信息", notes = "保存智能安全帽-日行数据信息", httpMethod = "POST") + @PostMapping(value = "/saveData") + public Result saveData(@RequestBody SafetyHatDayRecord safetyHatDayRecord) { + log.info("保存智能安全帽-日行数据信息:{}", JSON.toJSONString(safetyHatDayRecord)); + safetyHatDayRecordService.saveData(safetyHatDayRecord); + return Result.ok(); + } + /** * 通过id删除 * diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDayRecordService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDayRecordService.java index 25672b6ef..3a109d684 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDayRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDayRecordService.java @@ -20,4 +20,6 @@ public interface ISafetyHatDayRecordService extends IService List queryList(HashMap paramMap); void add(SafetyHatDayRecord safetyHatDayRecord); + + void saveData(SafetyHatDayRecord safetyHatDayRecord); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java index 7ba878cd6..f3fe7638b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.safetyhat.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatAlarmMapper; @@ -55,7 +56,7 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "sha."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatAlarm.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatAlarm::getId)); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatAlarm::getAlarmTime)); return queryWrapper; } @@ -70,6 +71,8 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "shd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatData.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatData::getId)); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatData::getUploadTime)); return queryWrapper; } @@ -76,7 +76,6 @@ public class SafetyHatDataServiceImpl extends ServiceImpl implements ISafetyHatDayRecordService { @Autowired SafetyHatDevMapper safetyHatDevMapper; + @Autowired + SafetyHatDayRecordMapper safetyHatDayRecordMapper; @Override public IPage queryPageList(HashMap paramMap) { @@ -57,6 +56,30 @@ public class SafetyHatDayRecordServiceImpl extends ServiceImpl() + .eq(SafetyHatDev::getDevSn, safetyHatDayRecord.getDevSn())); + if (dev == null) { + throw new OpenAlertException("设备编号不正确"); + } + SafetyHatDayRecord record = safetyHatDayRecordMapper.selectOne(new LambdaQueryWrapper() + .eq(SafetyHatDayRecord::getDay, safetyHatDayRecord.getDay()) + .eq(SafetyHatDayRecord::getDevSn, safetyHatDayRecord.getDevSn()) + ); + safetyHatDayRecord.setProjectSn(dev.getProjectSn()); + safetyHatDayRecord.setId(null); + if (record != null) { + baseMapper.update(safetyHatDayRecord, new LambdaQueryWrapper() + .eq(SafetyHatDayRecord::getDevSn, safetyHatDayRecord.getDevSn())); + } else { + baseMapper.insert(safetyHatDayRecord); + } + } private List dealList(List list) { return list; diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index f77fd2ab4..126690262 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -330,7 +330,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/upload/uploadBase64").permitAll() .antMatchers("/xmgl/massReboundSurveyArea/getMassReboundSurveyArea").permitAll() .antMatchers("/xmgl/safetyHatData/add").permitAll() - .antMatchers("/xmgl/safetyHatDayRecord/add").permitAll() + .antMatchers("/xmgl/safetyHatDayRecord/saveData").permitAll() .antMatchers("/xmgl/safetyHatAlarm/add").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index 0882d7fb5..41cf66898 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -13,6 +13,8 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** @@ -561,4 +563,28 @@ public class DateUtils { System.out.println(getNowWeekAllDayList()); System.out.println(getDateTimeStrList(100, "HH:mm")); } + + /** + * 是否正确的日期格式：1:yyyy-MM-dd + * + * @param timeStr + * @param type + * @return + */ + public static boolean isValidDateFormat(String timeStr, int type) { + if (type == 1) { + String datePattern = "\\d{4}-\\d{2}-\\d{2}"; + // 编译正则表达式模式 + Pattern pattern = Pattern.compile(datePattern); + // 创建 Matcher 对象 + Matcher matcher = pattern.matcher(timeStr); + // 检查是否匹配 + if (matcher.matches()) { + return true; + } else { + return false; + } + } + return false; + } }