xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-06-20 15:46:01 +08:00
parent abf5911ff4
commit eb2bca2023
11 changed files with 175 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java
View File

@ -11,8 +11,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@Data
@ -75,7 +73,7 @@ public class GardsDetectors implements Serializable {
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dateBegin;
private Date dateBegin;
/**
* 结束运行日期
@ -83,7 +81,7 @@ public class GardsDetectors implements Serializable {
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dateEnd;
private Date dateEnd;
/**
* Y：在运行，状态良好；N：停止
@ -103,7 +101,7 @@ public class GardsDetectors implements Serializable {
@TableField(value = "MODDATE")
@NotNull(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime moddate;
private Date moddate;
/**
* 台站id

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java
View File

@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@Data
@TableName("GARDS_NUCLEARFACILITY")
@ -67,7 +67,7 @@ public class GardsNuclearfacility implements Serializable {
@TableField(value = "BUILDDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime buildDate;
private Date buildDate;
/**
* 临界时间
@ -75,7 +75,7 @@ public class GardsNuclearfacility implements Serializable {
@TableField(value = "CRITICALITYDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime criticalityDate;
private Date criticalityDate;
/**
* 退休时间
@ -83,7 +83,7 @@ public class GardsNuclearfacility implements Serializable {
@TableField(value = "RETIREDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime retireDate;
private Date retireDate;
/**
* 网格工程日期
@ -91,7 +91,7 @@ public class GardsNuclearfacility implements Serializable {
@TableField(value = "GRIDCONEETIONDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime gridconeetionDate;
private Date gridconeetionDate;
/**
* 销售公司

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
View File

@ -14,8 +14,6 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import java.io.Serializable;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@Data
@ -78,7 +76,7 @@ public class GardsStations implements Serializable {
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate dateBegin;
private Date dateBegin;
/**
* 运行终止日期
@ -86,7 +84,7 @@ public class GardsStations implements Serializable {
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate dateEnd;
private Date dateEnd;
/**
* 运行状态
@ -99,6 +97,7 @@ public class GardsStations implements Serializable {
*/
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime moddate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTask.java
View File

@ -12,8 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@Data
@ -31,7 +30,7 @@ public class SysTask implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private LocalDate schedulingDate;
private Date schedulingDate;
@TableField(value = "create_by")
private String createBy;
@ -42,12 +41,12 @@ public class SysTask implements Serializable {
@TableField(value = "create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
private Date createTime;
@TableField(value = "update_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
private Date updateTime;
@TableField(exist = false)
private String userName;

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStation.java
View File

@ -12,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@Data
@ -36,12 +35,12 @@ public class SysTaskStation implements Serializable {
@TableField(value = "create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
private Date createTime;
@TableField(value = "update_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
private Date updateTime;
@TableField(exist = false)
private String stationName;

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskChangeVo.java
View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@ -19,6 +18,6 @@ public class SysTaskChangeVo {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate day;
private Date day;
}

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskVo.java
View File

@ -4,7 +4,6 @@ import lombok.Data;
import org.jeecg.modules.system.entity.SysTaskStation;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@ -16,7 +15,7 @@ public class SysTaskVo {
private String userId;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate schedulingDate;
private Date schedulingDate;
private String username;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java
View File

@ -86,7 +86,7 @@ public class GardsDetectorsServiceImpl extends ServiceImpl<GardsDetectorsMapper,
return result;
}
}
gardsDetectors.setModdate(LocalDateTime.now());
gardsDetectors.setModdate(new Date());
this.baseMapper.insert(gardsDetectors);
result.success("新增成功");
this.findDetectors();

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java
View File

@ -20,10 +20,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@Service("gardsStationsService")
@ -101,7 +98,7 @@ public class GardsStationsServiceImpl extends ServiceImpl<GardsStationsMapper, G
return result;
}
}
gardsStations.setModdate(LocalDateTime.now());
gardsStations.setModdate(new Date());
this.baseMapper.insert(gardsStations);
result.setSuccess(true);
result.success("新增成功");

35
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java
View File

@ -39,9 +39,6 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@ -118,7 +115,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
}
}
for (String day:allDay) {
List<SysTaskVo> taskVos = sysTaskVos.stream().filter(item -> item.getSchedulingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")).equals(day)).collect(Collectors.toList());
List<SysTaskVo> taskVos = sysTaskVos.stream().filter(item -> DateUtils.formatDate(item.getSchedulingDate(), "yyyy-MM-dd").equals(day)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(taskVos)){
map.put(day, taskVos);
}else {
@ -200,7 +197,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
//id
sysTask.setId(String.valueOf(IdWorker.getId()));
//创建时间
sysTask.setCreateTime(LocalDateTime.now());
sysTask.setCreateTime(new Date());
this.baseMapper.insert(sysTask);
//如果排班任务中台站信息不为空
if (CollectionUtils.isNotEmpty(sysTask.getStationList())){
@ -237,7 +234,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
//id
sysTask.setId(String.valueOf(IdWorker.getId()));
//创建时间
sysTask.setCreateTime(LocalDateTime.now());
sysTask.setCreateTime(new Date());
this.baseMapper.insert(sysTask);
//如果排班任务中台站信息不为空
if (CollectionUtils.isNotEmpty(sysTask.getStationList())){
@ -254,10 +251,11 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
* 根据排班任务日期删除历史任务信息
* @param schedulingDate
*/
private void deleteByDate(LocalDate schedulingDate){
private void deleteByDate(Date schedulingDate){
try {
//根据排班日期查询对应的任务信息
LambdaQueryWrapper<SysTask> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysTask::getSchedulingDate, schedulingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
queryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(schedulingDate, "yyyy-MM-dd"), "yyyy-MM-dd"));
List<SysTask> sysTasks = this.baseMapper.selectList(queryWrapper);
//获取任务信息的id
List<String> taskIds = sysTasks.stream().map(SysTask::getId).collect(Collectors.toList());
@ -267,6 +265,9 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
sysTaskStationMapper.delete(taskStationQueryWrapper);
//根据任务id删除任务信息
this.baseMapper.deleteBatchIds(taskIds);
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
@Override
@ -287,11 +288,12 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
@Transactional
public Result changeScheduling(SysTaskChangeVo sysTaskChangeVo) {
Result result = new Result();
try {
//来源用户相关信息查询
//查询出当前来源用户在排版日期的任务信息
LambdaQueryWrapper<SysTask> fromQueryWrapper = new LambdaQueryWrapper<>();
fromQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getFromUserId());
fromQueryWrapper.eq(SysTask::getSchedulingDate, sysTaskChangeVo.getDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
fromQueryWrapper.eq(SysTask::getSchedulingDate, DateUtils.parseDate(DateUtils.formatDate(sysTaskChangeVo.getDay(), "yyyy-MM-dd"), "yyyy-MM-dd"));
SysTask fromSysTask = this.baseMapper.selectOne(fromQueryWrapper);
//根据来源用户的任务以及台站信息查询出对应的任务及台站信息
LambdaQueryWrapper<SysTaskStation> fromTaskQueryWrapper = new LambdaQueryWrapper<>();
@ -302,7 +304,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
//查询出当前转移到用户在排班日期的任务信息
LambdaQueryWrapper<SysTask> toQueryWrapper = new LambdaQueryWrapper<>();
toQueryWrapper.eq(SysTask::getUserId, sysTaskChangeVo.getToUserId());
toQueryWrapper.eq(SysTask::getSchedulingDate, sysTaskChangeVo.getDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
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)){
@ -321,6 +323,9 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
}
result.setSuccess(true);
result.success("交接完成");
} catch (ParseException e) {
throw new RuntimeException(e);
}
return result;
}
@ -336,7 +341,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
List<SysTaskVo> sysTaskVos = entry.getValue();
if (CollectionUtils.isNotEmpty(sysTaskVos)){
for (SysTaskVo sysTaskVo:sysTaskVos) {
String schedulingDate = sysTaskVo.getSchedulingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String schedulingDate = DateUtils.formatDate(sysTaskVo.getSchedulingDate(), "yyyy-MM-dd");
String username = sysTaskVo.getUsername();
String stationNames = "";
for (SysTaskStation sysTaskStation:sysTaskVo.getStationList()) {
@ -410,6 +415,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
List<ImportFailureVo> failureList = new ArrayList<>();
int successNum = 0;
int failureNum = 0;
try {
//第一步 读取导入数据中的全部排班任务相关信息进行新增
if (CollectionUtils.isNotEmpty(dataList)){
//遍历导入数据内容
@ -449,7 +455,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
stations = Arrays.asList(stationName.split(StringPool.COMMA));
}
}
sysTask.setSchedulingDate(LocalDate.parse(schedulingDate));
sysTask.setSchedulingDate(DateUtils.parseDate(schedulingDate, "yyyy-MM-dd"));
//根据用户名称过滤出对应的用户信息
List<SysUser> sysUserList = userList.stream().filter(item -> item.getUsername().equals(userName)).collect(Collectors.toList());
//如果用户存在，将用户id传入排班任务
@ -518,6 +524,9 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
this.addOrUpdate(sysTaskList,taskList);
}
}
} catch (ParseException e) {
throw new RuntimeException(e);
}
importViewVo.setDetailList(failureList);
importViewVo.setSuccess(successNum);
importViewVo.setFailure(failureNum);
@ -549,7 +558,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTask> impl
//id
sysTask.setId(String.valueOf(IdWorker.getId()));
//创建时间
sysTask.setCreateTime(LocalDateTime.now());
sysTask.setCreateTime(new Date());
this.baseMapper.insert(sysTask);
//如果排班任务中台站信息不为空
if (CollectionUtils.isNotEmpty(sysTask.getStationList())){

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskStationServiceImpl.java
View File

@ -10,7 +10,6 @@ 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;
@ -27,7 +26,7 @@ public class SysTaskStationServiceImpl extends ServiceImpl<SysTaskStationMapper,
sysTaskStation.setOperateIp(ipAddr);
sysTaskStation.setId(String.valueOf(IdWorker.getId()));
sysTaskStation.setTaskId(taskId);
sysTaskStation.setCreateTime(LocalDateTime.now());
sysTaskStation.setCreateTime(new Date());
this.baseMapper.insert(sysTaskStation);
}
}
@ -45,7 +44,7 @@ public class SysTaskStationServiceImpl extends ServiceImpl<SysTaskStationMapper,
sysTaskStation.setOperateIp(ipAddr);
sysTaskStation.setId(String.valueOf(IdWorker.getId()));
sysTaskStation.setTaskId(taskId);
sysTaskStation.setCreateTime(LocalDateTime.now());
sysTaskStation.setCreateTime(new Date());
this.baseMapper.insert(sysTaskStation);
}
}