linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改设备及模具时间格式

Browse Source
main
HuangHuiKang 1 day ago
parent c1967dde73
commit 497dabf8f8
15 changed files with 85 additions and 64 deletions
Show Stats Download Patch File Download Diff File

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairRespVO.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -53,16 +54,19 @@ public class MoldRepairRespVO {
@Schema(description = "报修日期")
@ExcelProperty("报修日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ColumnWidth(20)
private LocalDateTime requireDate;
@Schema(description = "完成日期")
@ExcelProperty("完成日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ColumnWidth(20)
private LocalDateTime finishDate;
@Schema(description = "验收日期")
@ExcelProperty("验收日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ColumnWidth(20)
private LocalDateTime confirmDate;

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairSaveReqVO.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairLineDO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -45,12 +46,15 @@ public class MoldRepairSaveReqVO {
private Long moldTypeId;
@Schema(description = "报修日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime requireDate;
@Schema(description = "完成日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishDate;
@Schema(description = "验收日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime confirmDate;
//
// @Schema(description = "维修结果")

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldrepair/vo/MoldRepairUpdateReqVO.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo;
import cn.iocoder.yudao.module.common.controller.admin.moldrepair.vo.MoldRepairLineSaveReqVO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -20,14 +21,17 @@ public class MoldRepairUpdateReqVO {
private Long id;
@Schema(description = "报修日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@NotNull(message = "报修日期不能为空")
private LocalDateTime requireDate;
@Schema(description = "完成日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@NotNull(message = "完成日期不能为空")
private LocalDateTime finishDate;
@Schema(description = "验收日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@NotNull(message = "验收日期不能为空")
private LocalDateTime confirmDate;

12
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java
Unescape Escape View File

@ -62,8 +62,8 @@ public class DvRepairRespVO {
@Schema(description = "报修日期")
@ExcelProperty("报修日期")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@ColumnWidth(20)
@ -71,8 +71,8 @@ public class DvRepairRespVO {
@Schema(description = "完成日期")
@ExcelProperty("完成日期")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@ColumnWidth(20)
@ -80,8 +80,8 @@ public class DvRepairRespVO {
@Schema(description = "验收日期")
@ExcelProperty("验收日期")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(fallbackPatterns = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@ColumnWidth(20)

10
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/scheduled/coretask/GenerateMoldWorkOrderTask.java
Unescape Escape View File

@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
@ -113,8 +112,7 @@ public class GenerateMoldWorkOrderTask implements Task {
moldTicketManagementDO.setMoldName(moldDO.getName());
moldTicketManagementDO.setPlanType(moldTaskManagementDO.getTaskType());
moldTicketManagementDO.setConfigName(moldTaskManagementDO.getName());
moldTicketManagementDO.setTaskEndTime(moldTaskManagementDO.getEndDate() != null
? moldTaskManagementDO.getEndDate().atStartOfDay() : null);
moldTicketManagementDO.setTaskEndTime(moldTaskManagementDO.getEndDate());
moldTicketManagementDO.setCreator("1");
moldTicketManagementDO.setUpdater("1");
moldTicketManagementMapper.insert(moldTicketManagementDO);
@ -136,11 +134,11 @@ public class GenerateMoldWorkOrderTask implements Task {
}
private boolean isWithinTaskDateRange(MoldTaskManagementDO moldTaskManagementDO) {
LocalDate today = LocalDate.now();
if (moldTaskManagementDO.getStartDate() != null && today.isBefore(moldTaskManagementDO.getStartDate())) {
LocalDateTime now = LocalDateTime.now();
if (moldTaskManagementDO.getStartDate() != null && now.isBefore(moldTaskManagementDO.getStartDate())) {
return false;
}
if (moldTaskManagementDO.getEndDate() != null && today.isAfter(moldTaskManagementDO.getEndDate())) {
if (moldTaskManagementDO.getEndDate() != null && now.isAfter(moldTaskManagementDO.getEndDate())) {
return false;
}
return true;

9
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementCreateTicketReqVO.java
Unescape Escape View File

@ -8,6 +8,7 @@ import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "管理后台 - 模具任务管理直接创建工单 Request VO")
@ -33,13 +34,13 @@ public class MoldTaskManagementCreateTicketReqVO {
private Long projectForm;
@Schema(description = "起止开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate;
@Schema(description = "起止结束日期", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @NotBlank(message = "起止结束日期不能为空")
private String endDate;
private LocalDateTime endDate;
@Schema(description = "cron表达式")
private String cronExpression;

15
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java
Unescape Escape View File

@ -9,7 +9,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@ -46,13 +45,17 @@ public class MoldTaskManagementRespVO extends BaseDO {
@Schema(description = "起止开始日期")
@ExcelProperty("起止开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime startDate;
@Schema(description = "起止结束日期")
@ExcelProperty("起止结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime endDate;
@Schema(description = "cron表达式")
@ExcelProperty("cron表达式")
@ -78,4 +81,4 @@ public class MoldTaskManagementRespVO extends BaseDO {
@ExcelProperty("项目表单名称")
private String projectFormName;
}
}

14
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementSaveReqVO.java
Unescape Escape View File

@ -33,12 +33,16 @@ public class MoldTaskManagementSaveReqVO {
private Long projectForm;
@Schema(description = "起止开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime startDate;
@Schema(description = "起止结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String endDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime endDate;
@Schema(description = "cron表达式")
private String cronExpression;
@ -50,4 +54,4 @@ public class MoldTaskManagementSaveReqVO {
@NotNull(message = "是否启用不能为空")
private Boolean enabled;
}
}

9
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java
Unescape Escape View File

@ -23,7 +23,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
@ -124,7 +123,7 @@ public class GenerateWorkOrderTask implements Task {
ticketManagementDO.setDeviceName(deviceLedgerDO.getDeviceName());
ticketManagementDO.setPlanType(taskManagementDO.getTaskType());
ticketManagementDO.setConfigName(taskManagementDO.getName());
ticketManagementDO.setTaskEndTime(taskManagementDO.getEndDate().atStartOfDay());
ticketManagementDO.setTaskEndTime(taskManagementDO.getEndDate());
// TODO 默认为内置管理员Id
ticketManagementDO.setCreator("1");
ticketManagementDO.setUpdater("1");
@ -152,11 +151,11 @@ public class GenerateWorkOrderTask implements Task {
}
private boolean isWithinTaskDateRange(TaskManagementDO taskManagementDO) {
LocalDate today = LocalDate.now();
if (taskManagementDO.getStartDate() != null && today.isBefore(taskManagementDO.getStartDate())) {
LocalDateTime now = LocalDateTime.now();
if (taskManagementDO.getStartDate() != null && now.isBefore(taskManagementDO.getStartDate())) {
return false;
}
if (taskManagementDO.getEndDate() != null && today.isAfter(taskManagementDO.getEndDate())) {
if (taskManagementDO.getEndDate() != null && now.isAfter(taskManagementDO.getEndDate())) {
return false;
}
return true;

17
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementRespVO.java
Unescape Escape View File

@ -12,7 +12,6 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@ -52,13 +51,19 @@ public class TaskManagementRespVO extends BaseDO {
@Schema(description = "起止开始日期")
@ExcelProperty("起止开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@ColumnWidth(20)
private LocalDateTime startDate;
@Schema(description = "起止结束日期")
@ExcelProperty("起止结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@ColumnWidth(20)
private LocalDateTime endDate;
@Schema(description = "cron表达式")
@ExcelProperty("cron表达式")
@ -84,4 +89,4 @@ public class TaskManagementRespVO extends BaseDO {
}
}

14
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementSaveReqVO.java
Unescape Escape View File

@ -35,12 +35,16 @@ public class TaskManagementSaveReqVO {
private Long projectForm;
@Schema(description = "起止开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String startDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime startDate;
@Schema(description = "起止结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private String endDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDateTime endDate;
@Schema(description = "cron表达式")
private String cronExpression;
@ -52,4 +56,4 @@ public class TaskManagementSaveReqVO {
@NotNull(message = "是否启用不能为空")
private Boolean enabled;
}
}

14
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldtaskmanagement/MoldTaskManagementDO.java
Unescape Escape View File

@ -7,11 +7,8 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.*;
import java.time.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -54,16 +51,17 @@ public class MoldTaskManagementDO extends BaseDO {
/**
* 起止开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDate startDate;
private LocalDateTime startDate;
/**
* 起止结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDate endDate;
private LocalDateTime endDate;
/**
* cron表达式
*/
@ -81,4 +79,4 @@ public class MoldTaskManagementDO extends BaseDO {
private String projectFormName;
}
}

14
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/taskmanagement/TaskManagementDO.java
Unescape Escape View File

@ -7,11 +7,8 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.*;
import java.time.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -54,16 +51,17 @@ public class TaskManagementDO extends BaseDO {
/**
* 起止开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDate startDate;
private LocalDateTime startDate;
/**
* 起止结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
private LocalDate endDate;
private LocalDateTime endDate;
/**
* cron表达式
*/
@ -81,4 +79,4 @@ public class TaskManagementDO extends BaseDO {
private String projectFormName;
}
}

7
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldtaskmanagement/MoldTaskManagementServiceImpl.java
Unescape Escape View File

@ -43,7 +43,6 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
@ -209,12 +208,12 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService
@Override
public void createMoldTicketDirect(MoldTaskManagementCreateTicketReqVO createReqVO) {
createMoldTicketInternal(createReqVO.getId(), createReqVO.getProjectForm(), createReqVO.getTaskType(),
createReqVO.getName(), createReqVO.getEndDate()!=null?LocalDate.parse(createReqVO.getEndDate()):null,
createReqVO.getName(), createReqVO.getEndDate(),
createReqVO.getMoldList(), createReqVO.getTicketResultsList());
}
private void createMoldTicketInternal(Long taskId, Long planId, Integer taskType, String configName,
LocalDate endDate, String moldList,
LocalDateTime endDate, String moldList,
List<MoldTicketResultsSaveReqVO> ticketResultsList) {
List<Long> moldIds = Arrays.stream(moldList.split(","))
.map(String::trim)
@ -238,7 +237,7 @@ public class MoldTaskManagementServiceImpl implements MoldTaskManagementService
moldticketManagementDO.setMoldName(moldDO.getName());
moldticketManagementDO.setPlanType(taskType);
moldticketManagementDO.setConfigName(configName);
moldticketManagementDO.setTaskEndTime(endDate !=null ? endDate.atStartOfDay(): null);
moldticketManagementDO.setTaskEndTime(endDate);
moldticketManagementMapper.insert(moldticketManagementDO);
sendMoldTicketCreateNotifyMessage(taskId, moldticketManagementDO);

2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java
Unescape Escape View File

@ -242,7 +242,7 @@ public class TaskManagementServiceImpl implements TaskManagementService {
ticketManagementDO.setDeviceName(deviceLedgerDO.getDeviceName());
ticketManagementDO.setPlanType(taskManagementDO.getTaskType());
ticketManagementDO.setConfigName(taskManagementDO.getName());
ticketManagementDO.setTaskEndTime(taskManagementDO.getEndDate().atStartOfDay());
ticketManagementDO.setTaskEndTime(taskManagementDO.getEndDate());
ticketManagementMapper.insert(ticketManagementDO);
sendTicketCreateNotifyMessage(taskManagementDO, ticketManagementDO);

Write Preview
Loading…
Cancel
Save