修改方法名

ZengTao

2024-07-15 50084cc263b868a148baa79cddf1228f850b2f23

修改方法名

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java

@@ -26,9 +26,9 @@

    @Autowired
    private WorkAssignmentService workAssignmentService;
    @ApiOperation("报工数据查询")
    @ApiOperation("值班数据查询")
    @GetMapping("/selectWorkAssignment")
    public Result selectDamage(int line,String workingProcedure) {
    public Result selectWorkAssignment(int line,String workingProcedure) {
        return Result.build(200,"查询成功",workAssignmentService.selectWorkAssignment(line,workingProcedure));
    }


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java

@@ -33,7 +33,7 @@
    private TemperingGlassInfoService temperingGlassInfoService;

    private JSONObject jsonObject = new JSONObject();
    public void dataBase1() throws InterruptedException {
    public void queryDataSource1() throws InterruptedException {
        List<Double> carPostion=new ArrayList<>();
        carPostion.add(0.25);
        carPostion.add(0.5);
@@ -58,7 +58,7 @@

    }

    public void dataBase2() throws InterruptedException {
    public void queryDataSource2() throws InterruptedException {
        //出片队列
        List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
        jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
@@ -72,8 +72,10 @@
    public void plcStorageCageTask() throws InterruptedException {
        jsonObject = new JSONObject();
        try {
            dataBase1();
            dataBase2();
            //查询使用数据源1查询数据
            queryDataSource1();
            //查询使用数据源2查询数据
            queryDataSource2();
            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
            if (sendwServer != null) {
                for (WebSocketServer webserver : sendwServer) {

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java

@@ -95,6 +95,5 @@
        damage.setRemark("");
        damage.setStatus(2);
        damageService.insertDamage(damage);

    }
}