Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-24 bacec153f688bcee10795bd38f61b2406c20e488

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

@@ -3,6 +3,9 @@
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;
@@ -14,7 +17,12 @@
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;

/**
@@ -37,8 +45,9 @@
    @Autowired
    private RawUsageService rawUsageService;
    @Autowired
    private RawGlassStorageDetailsService  rawGlassStorageDetailsService;

    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    @Autowired
    private RawGlassStorageTaskService rawGlassStorageTaskService;

    @Test
    public void testFindPath() {
@@ -63,6 +72,40 @@
        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