修改车间id类型

yangys

2024-02-07 a9816afaf13115c2119fd607ce505b72452f64a9

修改车间id类型

 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


 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);

 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);

 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;

    }




 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;

    }




 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() {


 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;

    }




 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;

    }




 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() {


 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;


 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);



    /**

     * 创建警报历史记录