Merge remote-tracking branch 'origin/master'

wangfei

2025-05-14 f6195615cfceedfa1add7ffb762f76c1757545b9

 hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java

@@ -3,13 +3,7 @@
import com.mes.GlassStorageApplication;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.rawusage.entity.RawUsage;
import com.mes.rawusage.service.RawUsageService;
import com.mes.shelfrack.service.ShelfRackService;
import com.mes.storagetask.service.StorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -17,12 +11,7 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
@@ -33,17 +22,9 @@
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = GlassStorageApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

public class GlassStorageModuleApplicationTest {



    @Autowired
    private StorageTaskService storageTaskService;
    @Autowired
    private ShelfRackService shelfRackService;
    @Autowired
    private RawUsageService rawUsageService;
    @Autowired
    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    @Autowired
@@ -54,67 +35,6 @@
        log.info("完整路径：{}", Arrays.asList("123"));
    }

    @Test
    public void testCacheGlass() {
     // storageTaskService.getBaseMapper().selectById(1);
        //StorageTask storageTask=new StorageTask();
//        storageTask.setId(Long.valueOf("1"));
//        storageTask.setTaskState("1");
//      storageTaskService.updateById(storageTask);
//        storageTaskService.getBaseMapper().deleteById(1);
       // storageTaskService.findList(storageTask);
        ///storageTaskService.findLatestTasks();
        storageTaskService.Tasks();
    }
    @Test
    public void selectshelf_rack() {

        shelfRackService.selectshelf_rack();
    }

    /**
     * 测试
     */
//    @Test
//    public void testWebSocket() {
//        List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll();
//        log.info("返回内容：{}",list);
//    }

    /**
     * 测试修改WebSocket  参数
     */
//    @Test
//    public void testWebSocketArgument() {
//        RawGlassTaskRequest request=new RawGlassTaskRequest();
//        //设置参数：
//        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
//        Date startDate=null;
//        Date endDate=null;
//        try {
//            startDate= df.parse("2022-01-01");
//            endDate= df.parse("2025-01-01");
//        }catch (ParseException e){
//            e.printStackTrace();
//
//        request.setCreateTime(startDate);//
//        request.setPatternQuantity(endDate);
//        request.setEnableState(new ArrayList<Integer>());
//        request.setEnableType(new ArrayList<Integer>());
//        String list=rawGlassStorageTaskService.setRawGlassTaskRequest(request);
//        log.info("返回内容：{}",list);
//    }
//    }



    @Test
    public void updateRawPackageAndStorageRack() {
        RawUsage raw=new RawUsage();

        raw.setId(null);
        rawUsageService.updateRawPackageAndStorageRack(raw);
    }
    @Test
    public void txt() {
        RawGlassStorageDetails rs=new RawGlassStorageDetails();