Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-04-19 6a3a328811ec5835bba1df5bc651979262081bfe

Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java

@@ -13,7 +13,7 @@
 * @since 2024-04-16
 */
@RestController
@RequestMapping("/userinfo/optimize-detail")
@RequestMapping("/optimize-detail")
public class OptimizeDetailController {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeLayoutController.java

@@ -13,7 +13,7 @@
 * @since 2024-04-16
 */
@RestController
@RequestMapping("/userinfo/optimize-layout")
@RequestMapping("/optimize-layout")
public class OptimizeLayoutController {

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
@@ -21,7 +22,7 @@
 * @since 2024-04-18
 */
@RestController
@RequestMapping("/userinfo/up-patten-usage")
@RequestMapping("/up-patten-usage")
@Slf4j
public class UpPattenUsageController {


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java

@@ -2,14 +2,12 @@


import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
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.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import java.util.List;
@@ -24,7 +22,7 @@
 */
@ApiModel("进片任务信息")
@RestController
@RequestMapping("/userinfo/big-storage-cage-feed-task")
@RequestMapping("/big-storage-cage-feed-task")
public class BigStorageCageFeedTaskController {

    @Autowired

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java

@@ -1,8 +1,6 @@
package com.mes.userinfo.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import io.swagger.annotations.ApiModel;
@@ -10,7 +8,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import java.util.List;
@@ -25,7 +22,7 @@
 */
@ApiModel("出片任务信息")
@RestController
@RequestMapping("/userinfo/big-storage-cage-out-task")
@RequestMapping("/big-storage-cage-out-task")
public class BigStorageCageOutTaskController {

    @Autowired

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java

@@ -2,7 +2,6 @@


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
@@ -14,7 +13,7 @@
 * @since 2024-04-16
 */
@RestController
@RequestMapping("/userinfo/task-cache")
@RequestMapping("/task-cache")
public class TaskCacheController {
    
}

 hangzhoumesParent/moduleService/UnLoadGlassModule/pom.xml

@@ -32,6 +32,12 @@
            <version>1.2.4</version>
        </dependency>

        <dependency>
            <groupId>com.microsoft.sqlserver</groupId>
            <artifactId>sqljdbc4</artifactId>
            <version>4.0</version>
        </dependency>

    </dependencies>

    <properties>

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java

@@ -1,6 +1,5 @@
package com.mes.downglassinfo.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,7 +23,7 @@
    /**
     * id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableId(value = "id")
    private Long id;

    /**

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassTaskMapper.java

@@ -1,5 +1,6 @@
package com.mes.downglassinfo.mapper;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.downglassinfo.entity.DownGlassTask;

@@ -11,6 +12,7 @@
 * @author zhoush
 * @since 2024-04-07
 */
@DS("salve_hangzhoumes")
public interface DownGlassTaskMapper extends BaseMapper<DownGlassTask> {



 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml

@@ -12,6 +12,11 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_hangzhoumes:
          url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
  cloud:
    nacos:
      discovery: