优化显示主界面

wu

2023-09-20 aaa2f09419a78299a01e80bd66ced6f6c5aa40bf

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -7,9 +7,11 @@
import org.springframework.beans.factory.annotation.Autowired;

import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -27,6 +29,9 @@

    @Autowired
    SpianService spianService;

    @Autowired
    SpianMapper spianMapper;

    @GetMapping("/load")
    public Result selectAll() {
@@ -80,7 +85,7 @@
            map.put("message2", "500");
        } else {
            // 调用伍上片函数
            short results = spianService.selectAll(glassid);
            short results = spianService.selectAll(Short.toString(glassid));
            if (results == 200) {
                map.put("message2", "200");
            } else if (results == 300) {
@@ -95,11 +100,17 @@
    @GetMapping("/UpdateTask")
    public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
        Map<String, Object> map = new HashMap<>();
        homeMapper.UpdateTask(types, shelfrack);
        homeMapper.UpdateTask(types);
        StorageCage glass=homeMapper.SelectGlassInfo(glassid);
        if (types == 0) {
            homeMapper.UpdateCageTask1(shelfrack, glassid);
            // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
            homeMapper.UpdateCageTask1(glassid);
            S7control.getinstance().WriteWord("DB105.14",(short)0);
        } else {
            homeMapper.UpdateCageTask2(shelfrack, glassid);
            
            spianMapper.UpdataOutCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
            homeMapper.UpdateCageTask2(glassid);
            S7control.getinstance().WriteWord("DB105.12",(short)0);
        }
        map.put("message3", "200");
        return Result.success(map);
@@ -123,7 +134,9 @@

    @GetMapping("/DeleteByGlassID")
    public Result DeleteByGlassID(short glassid) {
        homeMapper.DeleteByGlassID(glassid);
        StorageCage glassinfor= homeMapper.SelectGlassInfo(Integer.valueOf(glassid));
        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(),glassinfor.getCage(),glassinfor.getCell());
        homeMapper.DeleteByGlassID(glassid);  
        Map<String, Object> map = new HashMap<>();
        map.put("message3", "200");
        return Result.success(map);
@@ -151,4 +164,14 @@
        map.put("carlist", carlist);
        return Result.success(map);
    }

    @GetMapping("/SelectPassword")
    public Result SelectPassword() {
        String pwdct = homeMapper.SelectPassword();
        Map<String, Object> map = new HashMap<>();
        map.put("password", pwdct);
        return Result.success(map);
    }
    
    
}