From a9816afaf13115c2119fd607ce505b72452f64a9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 07 二月 2024 17:56:21 +0800
Subject: [PATCH] 修改车间id类型
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/SectionDTO.java | 12 ++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java | 5 --
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java | 8 ++--
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/workshop/WorkshopDTO.java | 9 +++-
mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java | 12 -----
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/Machine.java | 12 +++---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java | 12 +++---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java | 8 ++--
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/NcDistributeQueryDTO.java | 12 +++---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineFullDTO.java | 12 +++---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineQueryDTO.java | 12 +++---
11 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java b/mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java
index d52cc41..a9d9b26 100644
--- a/mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java
+++ b/mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java
@@ -40,17 +40,7 @@
//@Column(name = "protocol_id")
@TableField("protocol_id")
private Integer protocolId;
- /**
- * workshop id
- */
- //@Column(name = "workshop_id")
- private Integer workshopId;
-
- /**
- * section id
- */
- //@Column(name = "section_id")
- private Integer sectionId;
+
/**
* user id
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
index b353b96..690f3c7 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
@@ -2,8 +2,6 @@
import java.util.List;
-import javax.validation.groups.Default;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,8 @@
import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.SectionDTO;
import com.qianwen.mdc.service.section.SectionService;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* @author y_ys79
@@ -36,7 +36,7 @@
@PostMapping(value = "/create")
public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @Validated(value = {Default.class}) @RequestBody SectionDTO sectionDTO) {
+ @Validated(value = {AddGroup.class}) @RequestBody SectionDTO sectionDTO) {
try {
sectionService.save(sectionDTO);
@@ -50,7 +50,7 @@
@PostMapping(value = "/update")
public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @Validated(value = {Default.class}) @RequestBody SectionDTO sectionDTO) {
+ @Validated(value = {UpdateGroup.class}) @RequestBody SectionDTO sectionDTO) {
try {
sectionService.modify(sectionDTO);
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
index 451b814..502a63e 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
@@ -1,7 +1,5 @@
package com.qianwen.mdc.controller.workshop;
-import javax.validation.groups.Default;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +16,8 @@
import com.qianwen.mdc.dto.workshop.WorkshopDTO;
import com.qianwen.mdc.service.workshop.WorkshopEditService;
import com.qianwen.mdc.service.workshop.WorkshopService;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* @author y_ys79
@@ -36,7 +36,7 @@
@PostMapping(value = "/create")
public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @Validated(value = {Default.class}) @RequestBody WorkshopDTO workshopDTO) {
+ @Validated(value = {AddGroup.class}) @RequestBody WorkshopDTO workshopDTO) {
try {
editService.save(workshopDTO);
@@ -50,7 +50,7 @@
@PostMapping(value = "/update")
public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
- @Validated(value = {Default.class}) @RequestBody WorkshopDTO workshopDTO) {
+ @Validated(value = {UpdateGroup.class}) @RequestBody WorkshopDTO workshopDTO) {
try {
editService.modify(workshopDTO);
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/Machine.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/Machine.java
index dcbec87..fd5f4c6 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/Machine.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/Machine.java
@@ -51,9 +51,9 @@
//private Integer typeId;
private Integer protocolId;
- private Integer workshopId;
+ private Long workshopId;
- private Integer sectionId;
+ private Long sectionId;
/**
* user id
@@ -221,20 +221,20 @@
this.protocolId = protocolId;
}
- public Integer getWorkshopId() {
+ public Long getWorkshopId() {
return workshopId;
}
- public void setWorkshopId(Integer workshopId) {
+ public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
- public Integer getSectionId() {
+ public Long getSectionId() {
return sectionId;
}
- public void setSectionId(Integer sectionId) {
+ public void setSectionId(Long sectionId) {
this.sectionId = sectionId;
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/NcDistributeQueryDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/NcDistributeQueryDTO.java
index d4dce21..09a6e89 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/NcDistributeQueryDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/NcDistributeQueryDTO.java
@@ -14,11 +14,11 @@
/**
* 杞﹂棿id
*/
- private Integer workshopId;
+ private Long workshopId;
/**
* 宸ユid
*/
- private Integer sectionId;
+ private Long sectionId;
/**
* 鏈哄簥id
*/
@@ -36,19 +36,19 @@
- public Integer getWorkshopId() {
+ public Long getWorkshopId() {
return workshopId;
}
- public void setWorkshopId(Integer workshopId) {
+ public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
- public Integer getSectionId() {
+ public Long getSectionId() {
return sectionId;
}
- public void setSectionId(Integer sectionId) {
+ public void setSectionId(Long sectionId) {
this.sectionId = sectionId;
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/SectionDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/SectionDTO.java
index 58fd9c8..7a75296 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/SectionDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/SectionDTO.java
@@ -1,6 +1,12 @@
package com.qianwen.mdc.dto;
import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 宸ユ鏁版嵁浼犺緭瀵硅薄
*/
@@ -10,11 +16,11 @@
*
*/
private static final long serialVersionUID = -2006517821720524176L;
-
+ @NotNull(message = "ID涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
-
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String name;
-
+ @NotNull(message = "杞﹂棿id涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private Long workshopId;
public Long getId() {
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java
index 72dd2d0..32990d9 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineDTO.java
@@ -36,13 +36,13 @@
* 杞﹂棿id
*/
@NotNull(message = "杞﹂棿涓嶈兘涓虹┖")
- private Integer workshopId;
+ private Long workshopId;
/**
* 宸ユid
*/
@NotNull(message = "宸ユ涓嶈兘涓虹┖")
- private Integer sectionId;
+ private Long sectionId;
/**
* 浼犺緭妯″紡(0. com; 1. share; 2. net)
*/
@@ -92,19 +92,19 @@
this.protocolId = protocolId;
}
- public Integer getWorkshopId() {
+ public Long getWorkshopId() {
return workshopId;
}
- public void setWorkshopId(Integer workshopId) {
+ public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
- public Integer getSectionId() {
+ public Long getSectionId() {
return sectionId;
}
- public void setSectionId(Integer sectionId) {
+ public void setSectionId(Long sectionId) {
this.sectionId = sectionId;
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineFullDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineFullDTO.java
index 56cb178..4138875 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineFullDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineFullDTO.java
@@ -37,12 +37,12 @@
/**
* 杞﹂棿id
*/
- private Integer workshopId;
+ private Long workshopId;
/**
* 宸ユid
*/
- private Integer sectionId;
+ private Long sectionId;
private String workshop;
@@ -152,19 +152,19 @@
this.protocolId = protocolId;
}
- public Integer getWorkshopId() {
+ public Long getWorkshopId() {
return workshopId;
}
- public void setWorkshopId(Integer workshopId) {
+ public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
- public Integer getSectionId() {
+ public Long getSectionId() {
return sectionId;
}
- public void setSectionId(Integer sectionId) {
+ public void setSectionId(Long sectionId) {
this.sectionId = sectionId;
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineQueryDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineQueryDTO.java
index d866780..da0aa51 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineQueryDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/machine/MachineQueryDTO.java
@@ -29,7 +29,7 @@
/**
* 杞﹂棿id
*/
- private Integer workshopId;
+ private Long workshopId;
/**
* 鍏虫敞鏍囧織
@@ -38,7 +38,7 @@
/**
* 宸ユid
*/
- private Integer sectionId;
+ private Long sectionId;
/**
* 鐘舵�侊紝 RUN/STOP/IDLE/ALARM锛屽搴旇溅闂村湴鍥剧瓑鐣岄潰涓婇潰鐨�4涓姸鎬佺瓫閫�
*/
@@ -57,10 +57,10 @@
this.machineName = machineName;
}
- public Integer getWorkshopId() {
+ public Long getWorkshopId() {
return workshopId;
}
- public void setWorkshopId(Integer workshopId) {
+ public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
public String getStatus() {
@@ -81,10 +81,10 @@
public void setIp(String ip) {
this.ip = ip;
}
- public Integer getSectionId() {
+ public Long getSectionId() {
return sectionId;
}
- public void setSectionId(Integer sectionId) {
+ public void setSectionId(Long sectionId) {
this.sectionId = sectionId;
}
public Integer getTransMode() {
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/workshop/WorkshopDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/workshop/WorkshopDTO.java
index 3f524ff..ceae2d8 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/workshop/WorkshopDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/workshop/WorkshopDTO.java
@@ -3,7 +3,12 @@
import java.io.Serializable;
import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
import com.qianwen.mdc.dto.SectionDTO;
+import com.qianwen.mdc.vallidate.AddGroup;
+import com.qianwen.mdc.vallidate.UpdateGroup;
/**
* 杞﹂棿鏁版嵁浼犺緭瀵硅薄
*/
@@ -13,9 +18,9 @@
*
*/
private static final long serialVersionUID = -2006517821720524176L;
-
+ @NotNull(message = "ID涓嶈兘涓虹┖", groups = {UpdateGroup.class})
private Long id;
-
+ @NotBlank(message = "鍚嶇О涓嶈兘涓虹┖", groups = {AddGroup.class, UpdateGroup.class})
private String name;
private List<SectionDTO> sections;
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java
index dc97da5..8a8a515 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java
@@ -23,11 +23,6 @@
List<MachineFullDTO> listWithStatus(MachineQueryDTO dto);
Page<MachineFullDTO> queryPage(Page<MachineFullDTO> page,@Param("dto")MachineQueryDTO dto);
- /**
- * 鏌ヨ鏈哄簥鍩烘湰淇℃伅
- */
- //List<Machine> queryMachineList(@Param("workshopId") Integer workshopId, @Param("sectionId") Integer sectionId,
- // @Param("concernFlag") Integer concernFlag, @Param("id") Integer id, @Param("status") String status);
/**
* 鍒涘缓璀︽姤鍘嗗彶璁板綍
--
Gitblit v1.9.3