change-1

wujian

2024-09-04 e4a393c219c3c48cbf0e4af615b316facb82eb62

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

@@ -6,6 +6,7 @@
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;
@@ -57,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);
@@ -67,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("CFL4HX.OP055.Color", colorInt);
                miloService.writeToOpcByte(entity);
            }
        }
        return getDataTable(list);
    }