mdc展示后台
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yangys
2024-11-02 27eb2df01ab873bc7f1451ff5865ed66b2876159 
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/controller/WorkstationController.java


@@ -1,14 +1,21 @@


package com.qianwen.smartman.modules.smis.controller;




import com.baomidou.mybatisplus.core.metadata.IPage;


import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


import java.util.List;




import javax.servlet.http.HttpServletResponse;


import javax.validation.Valid;


import com.qianwen.smartman.common.cache.RegionCache;




import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.multipart.MultipartFile;




import com.baomidou.mybatisplus.core.metadata.IPage;


import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;


import com.qianwen.core.boot.ctrl.BladeController;


import com.qianwen.core.excel.util.ExcelUtil;


import com.qianwen.core.mp.support.Condition;


@@ -22,34 +29,25 @@


import com.qianwen.core.secure.annotation.PreAuth;


import com.qianwen.core.tenant.annotation.NonDS;


import com.qianwen.core.tool.api.R;


import com.qianwen.smartman.common.cache.RegionCache;


import com.qianwen.smartman.modules.resource.enums.TemplateEnum;


import com.qianwen.smartman.modules.resource.service.ISystemResourceService;


import com.qianwen.smartman.modules.smis.dto.WorkstationRealTimeStatusDTO;


import com.qianwen.smartman.modules.smis.entity.WorkstationDatapoints;


import com.qianwen.smartman.modules.smis.excel.WorkstationImport;


import com.qianwen.smartman.modules.smis.service.IDmpVariablesService;


import com.qianwen.smartman.modules.smis.service.IWorkstationService;


import com.qianwen.smartman.modules.smis.service.WorkstationDatapointsService;


import com.qianwen.smartman.modules.smis.vo.DmpVariablesVO;


import com.qianwen.smartman.modules.smis.vo.FmsWorkstationGroupVO;


import com.qianwen.smartman.modules.smis.vo.FmsWorkstationQueryVO;


import com.qianwen.smartman.modules.smis.vo.MachineDmpVariablesVO;


import com.qianwen.smartman.modules.smis.vo.WorkMachineEasyVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationChangeCalendarVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationDatapointsVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationPageQueryVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationRealTimeStatusVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationSubmitVO;


import com.qianwen.smartman.modules.smis.vo.WorkstationVO;


import com.qianwen.smartman.modules.resource.enums.TemplateEnum;


import com.qianwen.smartman.modules.resource.service.ISystemResourceService;




import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.multipart.MultipartFile;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;




@Api(value = "工位管理", tags = {"工位管理"})


@RestController


@@ -59,8 +57,8 @@


public class WorkstationController extends BladeController {


   @Autowired


    private IWorkstationService workstationService;


    @Autowired


    private IDmpVariablesService dmpVariablesService;


    //@Autowired


    //private IDmpVariablesService dmpVariablesService;


    @Autowired


    private ISystemResourceService systemResourceService;




@@ -71,7 +69,7 @@


    public R<WorkstationVO> submit(@Valid @RequestBody WorkstationSubmitVO workstationSubmitVO) {


        return R.data(this.workstationService.submit(workstationSubmitVO));


    }




    /*


    @GetResource({"/listDmpVariablesByMachineId"})


    @ApiOperation("根据机器id获取采集项")


    public R<List<DmpVariablesVO>> listDmpVariablesByMachineId(@RequestParam Long machineId) {


@@ -84,7 +82,7 @@


    public R<MachineDmpVariablesVO> listDmpVariablesByWorkstationId(@RequestParam Long workstationId) {


        return R.data(this.dmpVariablesService.listByWorkstationId(workstationId));


    }




   */


   


    


    @GetMapping({"/get"})


@@ -169,14 +167,15 @@


    public R<IPage<WorkstationRealTimeStatusVO>> getRealTimeStatus(@RequestBody WorkstationRealTimeStatusDTO dto, Query query) {


        return R.data(this.workstationService.getRealTimeStatus(dto, query));


    }




    /*


    @PreAuth


    @GetResource({"/get-dmp-variables"})


    @ApiOperation(value = "获得采集项", notes = "获得采集项")


    public R<List<DmpVariablesVO>> getDmpVariables(@RequestParam("workstationId") @ApiParam(value = "工位ID", required = true) String workstationId, @RequestParam("machineId") @ApiParam(value = "机器Id", required = false) String machineId) {


        return R.data(this.workstationService.getDmpVariables(workstationId, machineId));


    }




   */


    


    @PostResource({"/get-workstation-by-groupIds"})


    @ApiOperation("多个工位组查询工位")


    public R<List<WorkstationVO>> getWorkstationByGroupIds(@RequestBody List<String> groupIds) {