部分优化代码

zhoushihao

2024-04-15 d835c061b4c259bbc35784c3234c8133fdef20af

部分优化代码

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java

@@ -2,9 +2,12 @@

import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -12,12 +15,13 @@

/**
 * <p>
 * 前端控制器
 * 大理片笼信息
 * </p>
 *
 * @author zhoush
 * @since 2024-03-27
 */
@ApiModel("大理片笼信息")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
@@ -25,22 +29,20 @@
    @Autowired
    private BigStorageCageService bigStorageCageService;

    //todo: 实例代码 待删除
    @ApiOperation("测试")
    @GetMapping("/index")
    public String index() {
        return "hello world";
    }
//    public Result<BigStorageCageDetails> feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails){
//
//    }

    @ApiOperation("理片笼信息")
    @GetMapping("/bigStorageCage")
    public List<BigStorageCage> querybigStorageCageDetail() {
        return bigStorageCageService.querybigStorageCageDetail();
    public Result<List<BigStorageCage>> querybigStorageCageDetail() {
        return Result.success(bigStorageCageService.querybigStorageCageDetail());
    }

    @ApiOperation("手动完成任务")
    @GetMapping("/finishTask")
    public void finishTask(int type, int id) {
    @PostMapping("/finishTask")
    public Result<String> finishTask(int type, int id) {
        //    bigStorageCageDetailsService.FinishTask();
        return Result.success("success");
    }
}

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java

@@ -9,9 +9,7 @@
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import lombok.extern.slf4j.Slf4j;
import com.mes.glassinfo.entity.GlassInfo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -33,8 +31,6 @@
@Service
@Slf4j
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
    @Resource
    private BigStorageCageMapper bigStorageCageMapper;

    @Resource
    private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
@@ -52,6 +48,7 @@
        bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());

        //2、有符合条件的格子活片序为1时
        log.info("有符合条件的格子活片序为1时");
        if (layoutSlotInfo.getSlot() != null) {
            bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
        } else {
@@ -133,13 +130,13 @@
        bigStorageCage.setRemainWidth(width);
        UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
        bigStorageCageWrapper.eq("remain_width", width);
        bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
        baseMapper.update(bigStorageCage, bigStorageCageWrapper);
    }

    @Override
    public List<BigStorageCage> querybigStorageCageDetail() {
        //1、获取大理片笼信息
        List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
        List<BigStorageCage> bigStorageCages = baseMapper.selectList(null);
        log.info("1、获取大理片笼信息完成，获取到的数据{}", bigStorageCages.size());
        //2获取理片笼所有信息
        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java

@@ -3,13 +3,10 @@
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.List;

public class PlcStorageCage extends Thread {