add - panel

wujian

5 天以前 ea3c33c8561df39d4f123d1424fda99dd0f0c51d

 jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java

@@ -6,6 +6,8 @@
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.jcdm.common.core.domain.R;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.tileMatchCollection.domain.DaTileMatchCollection;
@@ -56,8 +58,7 @@
     */
    @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
    @GetMapping("/list")
    public TableDataInfo list(DaTileMatchRules daTileMatchRules)
    {
    public TableDataInfo list(DaTileMatchRules daTileMatchRules) {
        startPage();
        List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
        return getDataTable(list);
@@ -66,12 +67,31 @@
    /**
     *  曲轴配瓦
     */
    @PreAuthorize("@ss.hasPermi('da:tileMatchRules:list')")
    @GetMapping("/list2")
    public TableDataInfo list2(DaTileMatchRules daTileMatchRules)
    public TableDataInfo list2(DaTileMatchRules daTileMatchRules) throws Exception
    {
        startPage();
        List<DaTileMatchRules> list = daTileMatchRulesService.selectDaTileMatchRulesList(daTileMatchRules);
        //这里取第一行的数据发送颜色信号
        if (CollUtil.isNotEmpty(list)){
            DaTileMatchRules daTileMatchRules1 = list.get(0);
            String tileColor = daTileMatchRules1.getTileColor();
            //1绿色  2黑色   3红色   4蓝色
            Integer colorInt = null;
            if ("#008000".equals(tileColor)){
                colorInt = 1;
            } else if ("#000000".equals(tileColor)){
                colorInt = 2;
            } else if ("#FF0000".equals(tileColor)){
                colorInt = 3;
            } else if ("#0000FF".equals(tileColor)){
                colorInt = 4;
            }
            if (ObjectUtil.isNotEmpty(colorInt)){
                ReadWriteEntity entity = new ReadWriteEntity("CFL4LJ.OP001.Color", colorInt);
                miloService.writeToOpcByte(entity);
            }
        }
        return getDataTable(list);
    }

@@ -195,7 +215,7 @@
                    XT = lastOne.getParamValue();
                }

                ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP040.Partcode", "1");
                ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP040.Partcode", 1);
                miloService.writeToOpcByte(entity6);
            }
        } catch (Exception e) {
@@ -203,4 +223,11 @@
        }
        return XT;
    }


    @GetMapping("/getCheckData")
    public R getCheckData(String SNCode, String XT, String CZ){
        List<DaTileMatchRules> daTileMatchRulesList = daTileMatchRulesService.checkData(SNCode, XT, CZ);
        return R.ok(daTileMatchRulesList);
    }
}