From bdf01355ebefe00c6bcd28dcf7acac92ff6a2b0b Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 20 Jun 2023 15:28:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89date=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BALocalDate=E6=88=96LocalDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/base/entity/SysEmail.java | 13 +- .../modules/entity/AlarmContactGroup.java | 14 +- .../jeecg/modules/entity/AlarmHistory.java | 8 +- .../org/jeecg/modules/entity/AlarmLog.java | 4 +- .../org/jeecg/modules/entity/AlarmRule.java | 14 +- .../org/jeecg/modules/entity/SysDatabase.java | 14 +- .../org/jeecg/modules/entity/SysServer.java | 14 +- .../impl/AlarmContactGroupServiceImpl.java | 9 +- .../service/impl/AlarmRuleServiceImpl.java | 5 +- .../service/impl/SysDatabaseServiceImpl.java | 5 +- .../service/impl/SysEmailServiceImpl.java | 5 +- .../service/impl/SysServerServiceImpl.java | 5 +- .../modules/entity/SysUserFocusStation.java | 7 +- .../impl/SysUserFocusStationServiceImpl.java | 3 +- .../modules/system/entity/GardsDetectors.java | 8 +- .../system/entity/GardsNuclearfacility.java | 11 +- .../modules/system/entity/GardsStations.java | 8 +- .../jeecg/modules/system/entity/SysTask.java | 9 +- .../modules/system/entity/SysTaskStation.java | 5 +- .../system/entity/vo/SysTaskChangeVo.java | 3 +- .../modules/system/entity/vo/SysTaskVo.java | 3 +- .../impl/GardsDetectorsServiceImpl.java | 9 +- .../impl/GardsStationsServiceImpl.java | 2 + .../service/impl/SysTaskServiceImpl.java | 301 +++++++++--------- .../impl/SysTaskStationServiceImpl.java | 4 +- .../jeecg/modules/entity/GardsAnalyses.java | 16 +- .../jeecg/modules/entity/GardsSampleAux.java | 7 +- .../jeecg/modules/entity/GardsSampleCert.java | 7 +- .../modules/system/entity/GardsDetectors.java | 7 +- .../modules/system/entity/GardsStations.java | 8 +- 30 files changed, 282 insertions(+), 246 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java index 820cdccf..72a9e2fe 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java @@ -9,6 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; /** @@ -67,9 +68,9 @@ public class SysEmail implements Serializable { * 创建日期 */ @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; /** * 创建人员 @@ -81,9 +82,9 @@ public class SysEmail implements Serializable { * 修改日期 */ @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; /** * 修改人员 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java index a4504e04..f5e6cc38 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java @@ -9,7 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @Data @@ -38,9 +38,9 @@ public class AlarmContactGroup implements Serializable { * 创建时间 */ @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; /** * 创建人 @@ -52,9 +52,9 @@ public class AlarmContactGroup implements Serializable { * 修改时间 */ @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; /** * 修改人 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java index 2c01a63d..46e3e173 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmHistory.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.util.Date; +import java.time.LocalDate; @Data public class AlarmHistory { @@ -17,9 +17,9 @@ public class AlarmHistory { /** * 报警开始时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date alarmStartDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate alarmStartDate; /** * 报警详情 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmLog.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmLog.java index 9a1d50ca..5111fd21 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmLog.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmLog.java @@ -9,7 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; @Data @TableName(value = "alarm_log") @@ -33,7 +33,7 @@ public class AlarmLog implements Serializable { @TableField(value = "alarm_start_date") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date alarmStartDate; + private LocalDateTime alarmStartDate; /** * 报警详情 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRule.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRule.java index 7ea20d8d..9c5f8d37 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRule.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmRule.java @@ -9,7 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @Data @TableName(value = "alarm_rule") @@ -73,9 +73,9 @@ public class AlarmRule implements Serializable { * 创建时间 */ @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; /** * 创建人 @@ -87,9 +87,9 @@ public class AlarmRule implements Serializable { * 修改时间 */ @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; /** * 修改人 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java index f6db3143..68fc51fd 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysDatabase.java @@ -9,7 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @Data @TableName(value = "sys_database") @@ -67,9 +67,9 @@ public class SysDatabase implements Serializable { * 创建时间 */ @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; /** * 创建人 @@ -81,9 +81,9 @@ public class SysDatabase implements Serializable { * 修改时间 */ @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; /** * 修改人 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java index c280c565..ad4c7267 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysServer.java @@ -9,7 +9,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; @Data @TableName(value = "sys_server") @@ -43,9 +43,9 @@ public class SysServer implements Serializable { * 创建时间 */ @TableField(value = "create_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; /** * 创建人 @@ -57,9 +57,9 @@ public class SysServer implements Serializable { * 修改时间 */ @TableField(value = "update_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; /** * 修改人 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index 7b0f53ee..5eb89be6 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -99,7 +100,7 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl userIds = alarmContactGroup.getUserIds(); @@ -120,6 +121,10 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AlarmContactGroup::getId, alarmContactGroup.getId()); AlarmContactGroup contactGroup = this.baseMapper.selectOne(queryWrapper); @@ -141,6 +146,8 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl i Long id = IdWorker.getId(); sysEmail.setId(id.toString()); //创建时间 - sysEmail.setCreateTime(new Date()); + sysEmail.setCreateTime(LocalDate.now()); sysEmail.setCreateBy(username); this.baseMapper.insert(sysEmail); result.setSuccess(true); @@ -91,7 +92,7 @@ public class SysEmailServiceImpl extends ServiceImpl i return result; } //创建时间 - sysEmail.setUpdateTime(new Date()); + sysEmail.setUpdateTime(LocalDate.now()); sysEmail.setUpdateBy(username); this.baseMapper.updateById(sysEmail); result.setSuccess(true); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java index c1b686b7..3f2d7113 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.text.ParseException; +import java.time.LocalDate; import java.util.Date; import java.util.List; import java.util.Objects; @@ -68,7 +69,7 @@ public class SysServerServiceImpl extends ServiceImpl implements IGardsDetectorsService { - - @Autowired - private IGardsStationsService gardsStationsService; @Autowired private RedisUtil redisUtil; @@ -94,6 +86,7 @@ public class GardsDetectorsServiceImpl extends ServiceImpl impl } } for (String day:allDay) { - List taskVos = sysTaskVos.stream().filter(item -> DateUtils.formatDate(item.getSchedulingDate(), "yyyy-MM-dd").equals(day)).collect(Collectors.toList()); + List taskVos = sysTaskVos.stream().filter(item -> item.getSchedulingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).equals(day)).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(taskVos)){ map.put(day, taskVos); }else { @@ -197,7 +200,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl //id sysTask.setId(String.valueOf(IdWorker.getId())); //创建时间 - sysTask.setCreateTime(new Date()); + sysTask.setCreateTime(LocalDateTime.now()); this.baseMapper.insert(sysTask); //如果排班任务中台站信息不为空 if (CollectionUtils.isNotEmpty(sysTask.getStationList())){ @@ -234,7 +237,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl //id sysTask.setId(String.valueOf(IdWorker.getId())); //创建时间 - sysTask.setCreateTime(new Date()); + sysTask.setCreateTime(LocalDateTime.now()); this.baseMapper.insert(sysTask); //如果排班任务中台站信息不为空 if (CollectionUtils.isNotEmpty(sysTask.getStationList())){ @@ -251,23 +254,19 @@ public class SysTaskServiceImpl extends ServiceImpl impl * 根据排班任务日期删除历史任务信息 * @param schedulingDate */ - private void deleteByDate(Date schedulingDate){ - try { - //根据排班日期查询对应的任务信息 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(schedulingDate, "yyyy-MM-dd"), "yyyy-MM-dd")); - List sysTasks = this.baseMapper.selectList(queryWrapper); - //获取任务信息的id - List taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList()); - //根据任务id删除关联的台站信息 - LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); - taskStationQueryWrapper.in(SysTaskStation::getTaskId, taskIds); - sysTaskStationMapper.delete(taskStationQueryWrapper); - //根据任务id删除任务信息 - this.baseMapper.deleteBatchIds(taskIds); - } catch (ParseException e) { - throw new RuntimeException(e); - } + private void deleteByDate(LocalDate schedulingDate){ + //根据排班日期查询对应的任务信息 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysTask::getSchedulingDate, schedulingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + List sysTasks = this.baseMapper.selectList(queryWrapper); + //获取任务信息的id + List taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList()); + //根据任务id删除关联的台站信息 + LambdaQueryWrapper taskStationQueryWrapper = new LambdaQueryWrapper<>(); + taskStationQueryWrapper.in(SysTaskStation::getTaskId, taskIds); + sysTaskStationMapper.delete(taskStationQueryWrapper); + //根据任务id删除任务信息 + this.baseMapper.deleteBatchIds(taskIds); } @Override @@ -288,44 +287,40 @@ public class SysTaskServiceImpl extends ServiceImpl impl @Transactional public Result changeScheduling(SysTaskChangeVo sysTaskChangeVo) { Result result = new Result(); - try { - //来源用户相关信息查询 - //查询出当前来源用户在排版日期的任务信息 - LambdaQueryWrapper fromQueryWrapper = new LambdaQueryWrapper<>(); - fromQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getFromUserId()); - fromQueryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); - SysTask fromSysTask = this.baseMapper.selectOne(fromQueryWrapper); - //根据来源用户的任务以及台站信息查询出对应的任务及台站信息 - LambdaQueryWrapper fromTaskQueryWrapper = new LambdaQueryWrapper<>(); - fromTaskQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); - fromTaskQueryWrapper.in(SysTaskStation::getStationId, sysTaskChangeVo.getStationIds()); - List sysTaskStations = sysTaskStationMapper.selectList(fromTaskQueryWrapper); - //转移到用户相关信息查询 - //查询出当前转移到用户在排班日期的任务信息 - LambdaQueryWrapper toQueryWrapper = new LambdaQueryWrapper<>(); - toQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getToUserId()); - toQueryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd")); - SysTask toSysTask = this.baseMapper.selectOne(toQueryWrapper); - //台站信息不为空 - if (CollectionUtils.isNotEmpty(sysTaskStations)){ - //遍历当前要进行修改的台站信息 - for (SysTaskStation taskStation:sysTaskStations) { - taskStation.setTaskId(toSysTask.getId()); - sysTaskStationMapper.updateById(taskStation); - } + //来源用户相关信息查询 + //查询出当前来源用户在排版日期的任务信息 + LambdaQueryWrapper fromQueryWrapper = new LambdaQueryWrapper<>(); + fromQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getFromUserId()); + fromQueryWrapper.eq(SysTask::getSchedulingDate, sysTaskChangeVo.getDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + SysTask fromSysTask = this.baseMapper.selectOne(fromQueryWrapper); + //根据来源用户的任务以及台站信息查询出对应的任务及台站信息 + LambdaQueryWrapper fromTaskQueryWrapper = new LambdaQueryWrapper<>(); + fromTaskQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); + fromTaskQueryWrapper.in(SysTaskStation::getStationId, sysTaskChangeVo.getStationIds()); + List sysTaskStations = sysTaskStationMapper.selectList(fromTaskQueryWrapper); + //转移到用户相关信息查询 + //查询出当前转移到用户在排班日期的任务信息 + LambdaQueryWrapper toQueryWrapper = new LambdaQueryWrapper<>(); + toQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getToUserId()); + toQueryWrapper.eq(SysTask::getSchedulingDate, sysTaskChangeVo.getDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + SysTask toSysTask = this.baseMapper.selectOne(toQueryWrapper); + //台站信息不为空 + if (CollectionUtils.isNotEmpty(sysTaskStations)){ + //遍历当前要进行修改的台站信息 + for (SysTaskStation taskStation:sysTaskStations) { + taskStation.setTaskId(toSysTask.getId()); + sysTaskStationMapper.updateById(taskStation); } - //判断 如果当前来源用户及日期下的排班任务对应的台站信息为空，排班任务信息删除 - LambdaQueryWrapper sysTaskStationQueryWrapper = new LambdaQueryWrapper<>(); - sysTaskStationQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); - List stations = sysTaskStationMapper.selectList(sysTaskStationQueryWrapper); - if (CollectionUtils.isEmpty(stations)){ - this.baseMapper.deleteById(fromSysTask); - } - result.setSuccess(true); - result.success("交接完成"); - } catch (ParseException e) { - throw new RuntimeException(e); } + //判断 如果当前来源用户及日期下的排班任务对应的台站信息为空，排班任务信息删除 + LambdaQueryWrapper sysTaskStationQueryWrapper = new LambdaQueryWrapper<>(); + sysTaskStationQueryWrapper.eq(SysTaskStation::getTaskId, fromSysTask.getId()); + List stations = sysTaskStationMapper.selectList(sysTaskStationQueryWrapper); + if (CollectionUtils.isEmpty(stations)){ + this.baseMapper.deleteById(fromSysTask); + } + result.setSuccess(true); + result.success("交接完成"); return result; } @@ -341,7 +336,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl List sysTaskVos = entry.getValue(); if (CollectionUtils.isNotEmpty(sysTaskVos)){ for (SysTaskVo sysTaskVo:sysTaskVos) { - String schedulingDate = DateUtils.formatDate(sysTaskVo.getSchedulingDate(), "yyyy-MM-dd"); + String schedulingDate = sysTaskVo.getSchedulingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String username = sysTaskVo.getUsername(); String stationNames = ""; for (SysTaskStation sysTaskStation:sysTaskVo.getStationList()) { @@ -415,117 +410,113 @@ public class SysTaskServiceImpl extends ServiceImpl impl List failureList = new ArrayList<>(); int successNum = 0; int failureNum = 0; - try { - //第一步 读取导入数据中的全部排班任务相关信息进行新增 - if (CollectionUtils.isNotEmpty(dataList)){ - //遍历导入数据内容 - for (SysTaskExportVo sysTaskExportVo:dataList) { - boolean failFlag = false; - //排班任务相关台站信息集合 - List sysTaskStationList = new ArrayList<>(); - SysTask sysTask = new SysTask(); - headRow++; - //排班日期 - String schedulingDate = sysTaskExportVo.getSchedulingDate(); - //用户名称 - String userName = sysTaskExportVo.getUserName(); - //台站名称 - String stationName = sysTaskExportVo.getStationName(); - //存放切割后的台站名称 - List stations = new ArrayList<>(); - //判断排版日期，用户名称，台站名称是否为空 - if (StringUtils.isAnyEmpty(schedulingDate,userName,stationName)){ - failureList.add(new ImportFailureVo(headRow+1, "必填信息不全")); + //第一步 读取导入数据中的全部排班任务相关信息进行新增 + if (CollectionUtils.isNotEmpty(dataList)){ + //遍历导入数据内容 + for (SysTaskExportVo sysTaskExportVo:dataList) { + boolean failFlag = false; + //排班任务相关台站信息集合 + List sysTaskStationList = new ArrayList<>(); + SysTask sysTask = new SysTask(); + headRow++; + //排班日期 + String schedulingDate = sysTaskExportVo.getSchedulingDate(); + //用户名称 + String userName = sysTaskExportVo.getUserName(); + //台站名称 + String stationName = sysTaskExportVo.getStationName(); + //存放切割后的台站名称 + List stations = new ArrayList<>(); + //判断排版日期，用户名称，台站名称是否为空 + if (StringUtils.isAnyEmpty(schedulingDate,userName,stationName)){ + failureList.add(new ImportFailureVo(headRow+1, "必填信息不全")); + failureNum++; + failFlag = true; + if (failFlag){ + continue; + } + } + //判断台站名称是否为空 + if (StringUtils.isNotBlank(stationName)){ + if (stationName.indexOf("，")>0){ + failureList.add(new ImportFailureVo(headRow+1, "台站信息内容错误，台站编码间用英文逗号隔开")); failureNum++; failFlag = true; if (failFlag){ continue; } - } - //判断台站名称是否为空 - if (StringUtils.isNotBlank(stationName)){ - if (stationName.indexOf("，")>0){ - failureList.add(new ImportFailureVo(headRow+1, "台站信息内容错误，台站编码间用英文逗号隔开")); - failureNum++; - failFlag = true; - if (failFlag){ - continue; - } - }else { - stations = Arrays.asList(stationName.split(StringPool.COMMA)); - } - } - sysTask.setSchedulingDate(DateUtils.parseDate(schedulingDate, "yyyy-MM-dd")); - //根据用户名称过滤出对应的用户信息 - List sysUserList = userList.stream().filter(item -> item.getUsername().equals(userName)).collect(Collectors.toList()); - //如果用户存在，将用户id传入排班任务 - if (CollectionUtils.isNotEmpty(sysUserList)){ - SysUser sysUser = sysUserList.get(0); - sysTask.setUserId(sysUser.getId()); }else { - failureList.add(new ImportFailureVo(headRow+1, "用户信息不存在")); + stations = Arrays.asList(stationName.split(StringPool.COMMA)); + } + } + sysTask.setSchedulingDate(LocalDate.parse(schedulingDate)); + //根据用户名称过滤出对应的用户信息 + List sysUserList = userList.stream().filter(item -> item.getUsername().equals(userName)).collect(Collectors.toList()); + //如果用户存在，将用户id传入排班任务 + if (CollectionUtils.isNotEmpty(sysUserList)){ + SysUser sysUser = sysUserList.get(0); + sysTask.setUserId(sysUser.getId()); + }else { + failureList.add(new ImportFailureVo(headRow+1, "用户信息不存在")); + failureNum++; + failFlag = true; + if (failFlag){ + continue; + } + } + + //判断内容是否重复 + if (CollectionUtils.isNotEmpty(taskList)){ + //与本次录入的数据进行比较 + for (SysTask task:taskList) { + if (task.getUserId().equals(sysTask.getUserId()) && task.getSchedulingDate().equals(sysTask.getSchedulingDate()) ){ + failureList.add(new ImportFailureVo(headRow+1, "排班任务信息已存在，重复录入")); + failureNum++; + failFlag = true; + } + } + if (failFlag){ + continue; + } + } + + if (CollectionUtils.isNotEmpty(stations)){ + for (GardsStations station:stationsList) { + for (String sName:stations) { + if (station.getStationCode().equals(sName)){ + SysTaskStation taskStation = new SysTaskStation(); + taskStation.setStationId(String.valueOf(station.getStationId())); + taskStation.setStationName(sName); + sysTaskStationList.add(taskStation); + } + } + } + //判断 台站名称集合长度与排班任务对应台站信息长度不一致 丢失台站信息 + if (stations.size()!=sysTaskStationList.size()){ + String code = ""; + List sysTaskStationNames = sysTaskStationList.stream().map(SysTaskStation::getStationName).collect(Collectors.toList()); + for (String name:stations) { + if (sysTaskStationNames.indexOf(name)<0){ + code+=name+","; + } + } + code = code.substring(0,code.length()-1); + failureList.add(new ImportFailureVo(headRow+1, "台站信息"+code+"不存在！")); failureNum++; failFlag = true; if (failFlag){ continue; } } - - //判断内容是否重复 - if (CollectionUtils.isNotEmpty(taskList)){ - //与本次录入的数据进行比较 - for (SysTask task:taskList) { - if (task.getUserId().equals(sysTask.getUserId()) && task.getSchedulingDate().equals(sysTask.getSchedulingDate()) ){ - failureList.add(new ImportFailureVo(headRow+1, "排班任务信息已存在，重复录入")); - failureNum++; - failFlag = true; - } - } - if (failFlag){ - continue; - } - } - - if (CollectionUtils.isNotEmpty(stations)){ - for (GardsStations station:stationsList) { - for (String sName:stations) { - if (station.getStationCode().equals(sName)){ - SysTaskStation taskStation = new SysTaskStation(); - taskStation.setStationId(String.valueOf(station.getStationId())); - taskStation.setStationName(sName); - sysTaskStationList.add(taskStation); - } - } - } - //判断 台站名称集合长度与排班任务对应台站信息长度不一致 丢失台站信息 - if (stations.size()!=sysTaskStationList.size()){ - String code = ""; - List sysTaskStationNames = sysTaskStationList.stream().map(SysTaskStation::getStationName).collect(Collectors.toList()); - for (String name:stations) { - if (sysTaskStationNames.indexOf(name)<0){ - code+=name+","; - } - } - code = code.substring(0,code.length()-1); - failureList.add(new ImportFailureVo(headRow+1, "台站信息"+code+"不存在！")); - failureNum++; - failFlag = true; - if (failFlag){ - continue; - } - } - sysTask.setStationList(sysTaskStationList); - } - successNum++; - taskList.add(sysTask); - } - //判断当前数据库中的排班任务信息是否为空 - if (CollectionUtils.isNotEmpty(taskList)){ - this.addOrUpdate(sysTaskList,taskList); + sysTask.setStationList(sysTaskStationList); } + successNum++; + taskList.add(sysTask); + } + //判断当前数据库中的排班任务信息是否为空 + if (CollectionUtils.isNotEmpty(taskList)){ + this.addOrUpdate(sysTaskList,taskList); } - } catch (ParseException e) { - throw new RuntimeException(e); } importViewVo.setDetailList(failureList); importViewVo.setSuccess(successNum); @@ -558,7 +549,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl //id sysTask.setId(String.valueOf(IdWorker.getId())); //创建时间 - sysTask.setCreateTime(new Date()); + sysTask.setCreateTime(LocalDateTime.now()); this.baseMapper.insert(sysTask); //如果排班任务中台站信息不为空 if (CollectionUtils.isNotEmpty(sysTask.getStationList())){ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java index 48ae9f91..a2c78b4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java @@ -10,6 +10,7 @@ import org.jeecg.modules.system.service.ISysTaskStationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -26,6 +27,7 @@ public class SysTaskStationServiceImpl extends ServiceImpl