cvt前端界面优化

hdy

2024-07-13 d9502f15ba2829816b466385df558ce266a8e197

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

@@ -1,30 +1,28 @@
package com.jcdm.main.da.passingStationCollection.controller;

import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.jcdm.common.core.domain.R;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;

import static com.jcdm.main.plcserver.callback.InitCallback.miloService;

/**
 * 产品过站采集Controller
@@ -34,8 +32,7 @@
 */
@RestController
@RequestMapping("/da/passingStationCollection")
public class DaPassingStationCollectionController extends BaseController
{
public class DaPassingStationCollectionController extends BaseController {
    @Autowired
    private IDaPassingStationCollectionService daPassingStationCollectionService;

@@ -44,8 +41,7 @@
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/list")
    public TableDataInfo list(DaPassingStationCollection daPassingStationCollection)
    {
    public TableDataInfo list(DaPassingStationCollection daPassingStationCollection) {
        startPage();
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
@@ -53,27 +49,25 @@

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getTopProcess")
    public TableDataInfo getTopProcess()
    {
    public TableDataInfo getTopProcess() {
        DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
        List<DaPassingStationVO> list = daPassingStationCollectionService.getTopProcess(daPassingStationCollection);
        return getDataTable(list);
    }

    /**
     * 查询产品过站采集列表
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/noPageList")
    public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
    {
    public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection) {
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getProduceNumToday")
    public R getProduceNumToday(String fieldName)
    {
    public R getProduceNumToday(String fieldName) {
        Integer num = daPassingStationCollectionService.getProduceNumToday(fieldName);
        return R.ok(num);
    }
@@ -82,8 +76,7 @@
     * 查询产品过站采集列表
     */
    @GetMapping("/insertRepairRecordByIds")
    public AjaxResult insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection)
    {
    public AjaxResult insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection) {
        daPassingStationCollectionService.insertRepairRecordByIds(daPassingStationCollection);
        return AjaxResult.success();
    }
@@ -94,8 +87,7 @@
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:export')")
    @Log(title = "产品过站采集", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, DaPassingStationCollection daPassingStationCollection)
    {
    public void export(HttpServletResponse response, DaPassingStationCollection daPassingStationCollection) {
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        ExcelUtil<DaPassingStationCollection> util = new ExcelUtil<DaPassingStationCollection>(DaPassingStationCollection.class);
        util.exportExcel(response, list, "产品过站采集数据");
@@ -106,8 +98,7 @@
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(daPassingStationCollectionService.selectDaPassingStationCollectionById(id));
    }

@@ -117,8 +108,7 @@
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:add')")
    @Log(title = "产品过站采集", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody DaPassingStationCollection daPassingStationCollection)
    {
    public AjaxResult add(@RequestBody DaPassingStationCollection daPassingStationCollection) {
        daPassingStationCollection.setCreateBy(getUsername());
        daPassingStationCollection.setCreateTime(DateUtils.getNowDate());
        return toAjax(daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection));
@@ -130,8 +120,7 @@
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:edit')")
    @Log(title = "产品过站采集", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody DaPassingStationCollection daPassingStationCollection)
    {
    public AjaxResult edit(@RequestBody DaPassingStationCollection daPassingStationCollection) {
        daPassingStationCollection.setUpdateBy(getUsername());
        daPassingStationCollection.setUpdateTime(DateUtils.getNowDate());
        return toAjax(daPassingStationCollectionService.updateDaPassingStationCollection(daPassingStationCollection));
@@ -142,9 +131,52 @@
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:remove')")
    @Log(title = "产品过站采集", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(daPassingStationCollectionService.deleteDaPassingStationCollectionByIds(ids));
    }
}


//    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:query')")
//    @Log(title = "产品过站采集", businessType = BusinessType.INSERT)
//    @GetMapping(value = "/addPassing")
//    public R addPassing(String sfcCode,String locationCode) {
//
//        DaPassingStationCollection saveData = new DaPassingStationCollection();
//        saveData.setSfcCode(sfcCode);
//        saveData.setLocationCode(locationCode);
//        saveData.setCollectionTime(new Date());
//        daPassingStationCollectionService.insertDaPassingStationCollection(saveData);
//
//        return R.ok();
//
//    }


    @GetMapping("/initializedData")
    public AjaxResult initializedData(@RequestParam String sfcCode, @RequestParam String locationCode) {

        try {
            String str = "CFL4CVT."+locationCode+".RecordData";
            Object recordDataObject = miloService.readFromOpcUa(str).getValue();
            if(Integer.valueOf(recordDataObject.toString())== 1){
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier("CFL4CVT." + locationCode + ".MesSNCode").value(sfcCode).build());
                ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT." + locationCode + ".MesRecordDataDone", 11);
                miloService.writeToOpcShort(entity);
                return AjaxResult.success("扫码成功");
            }else {
                return AjaxResult.error(500,"未进站禁止扫码");
            }
//            ReadWriteEntity entity = new ReadWriteEntity("CFL4CVT." + locationCode + ".MesSNCode", sfcCode);
//            miloService.writeToOpcChar(entity);
//            String nodeId = "CFL4CVT." + locationCode + ".MesSNCode";
//            String SaveSNCode ="CFL4CVT." + locationCode + ".SaveSNCode";
//            ReadWriteEntity SaveSNCodeEntity = new ReadWriteEntity(SaveSNCode, 11);
//            miloService.writeToOpcShort(SaveSNCodeEntity);
//            return AjaxResult.success("SFC Code updated successfully");
        } catch (Exception e) {
            throw new RuntimeException("扫码错误", e);
        }
    }

}