mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/UseDepartmentController.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -24,6 +25,8 @@ import com.qianwen.mdc.dto.usedepartment.UseDepartmentDTO; import com.qianwen.mdc.dto.usedepartment.UseDepartmentQueryDTO; import com.qianwen.mdc.service.usedepartment.UseDepartmentService; import com.qianwen.mdc.vallidate.AddGroup; import com.qianwen.mdc.vallidate.UpdateGroup; /** * 使用部门管理控制器 @@ -40,13 +43,13 @@ @PostMapping(value = "/create") public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token, @RequestBody UseDepartmentDTO dto, HttpServletRequest request) { @Validated(value = {AddGroup.class}) @RequestBody UseDepartmentDTO dto, HttpServletRequest request) { try { //accountTokenService.checkToken(token); useDeptService.save(dto); }catch(Exception ex) { logger.error("新增生产厂商错误",ex); logger.error("新增使用部门错误",ex); return OpResult.fail(ex.getMessage()); } return OpResult.success(); @@ -54,13 +57,13 @@ @PostMapping(value = "/update") public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token, @RequestBody UseDepartmentDTO dto, HttpServletRequest request) { @Validated(value = {UpdateGroup.class}) @RequestBody UseDepartmentDTO dto, HttpServletRequest request) { try { //accountTokenService.checkToken(token); useDeptService.modify(dto); }catch(Exception ex) { logger.error("修改生产厂商错误",ex); logger.error("修改使用部门错误",ex); return OpResult.fail(ex.getMessage()); } return OpResult.success(); @@ -74,7 +77,7 @@ try { return OpResult.success(useDeptService.pageQuery(dto)); }catch(Exception e) { logger.error("生产厂商分页查询异常",e); logger.error("使用部门分页查询异常",e); return OpResult.fail(e.getMessage()); } mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/devicetype/DeviceTypeController.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -24,6 +25,8 @@ import com.qianwen.mdc.dto.IdsDTO; import com.qianwen.mdc.dto.devicetype.DeviceTypeDTO; import com.qianwen.mdc.service.devicetype.DeviceTypeService; import com.qianwen.mdc.vallidate.AddGroup; import com.qianwen.mdc.vallidate.UpdateGroup; /** * 设备类型管理控制器 @@ -40,7 +43,7 @@ @PostMapping(value = "/create") public OpResult<Void> create(@RequestHeader(value = "mdc-token", defaultValue = "") String token, @RequestBody DeviceTypeDTO dto, HttpServletRequest request) { @Validated(value = {AddGroup.class}) @RequestBody DeviceTypeDTO dto, HttpServletRequest request) { try { //accountTokenService.checkToken(token); @@ -54,7 +57,7 @@ @PostMapping(value = "/update") public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token, @RequestBody DeviceTypeDTO dto, HttpServletRequest request) { @Validated(value = {UpdateGroup.class}) @RequestBody DeviceTypeDTO dto, HttpServletRequest request) { try { //accountTokenService.checkToken(token); mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/devicetype/DeviceTypeDTO.java
@@ -1,18 +1,24 @@ package com.qianwen.mdc.dto.devicetype; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import com.qianwen.mdc.dto.BasePageDTO; import com.qianwen.mdc.vallidate.AddGroup; import com.qianwen.mdc.vallidate.UpdateGroup; /** * 设备类型"数据 */ public class DeviceTypeDTO extends BasePageDTO{ @NotNull(message = "id不能为空", groups = {UpdateGroup.class}) private Long id; /* * 类型名称 */ @NotBlank(message = "名称不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String name; /* mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/manufacturer/ManufacturerDTO.java
@@ -1,18 +1,23 @@ package com.qianwen.mdc.dto.manufacturer; import com.qianwen.mdc.dto.BasePageDTO; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import com.qianwen.mdc.vallidate.AddGroup; import com.qianwen.mdc.vallidate.UpdateGroup; /** * 设备类型"数据 */ public class ManufacturerDTO{ @NotNull(message = "id不能为空", groups = {UpdateGroup.class}) private Long id; /* * 类型名称 */ @NotBlank(message = "名称不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String name; mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/usedepartment/UseDepartmentDTO.java
@@ -1,16 +1,23 @@ package com.qianwen.mdc.dto.usedepartment; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import com.qianwen.mdc.vallidate.AddGroup; import com.qianwen.mdc.vallidate.UpdateGroup; /** * "使用部门"数据 */ public class UseDepartmentDTO{ @NotNull(message = "id不能为空", groups = {UpdateGroup.class}) private Long id; /* * 部门名称 */ @NotBlank(message = "名称不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String name; public Long getId() {