#

zhou zhou

5 天以前 a87c92309e4f06c7363daa6d7b1f98309bfc0f41

#

 rsf-open-api/src/main/resources/application-dev.yml

@@ -14,8 +14,8 @@
#    url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    username: rsf
    username: root
    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: 34821015
    url: jdbc:mysql://192.168.4.15:3306/rsf_20250106?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: 1234
#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    password: xltys1995
    type: com.alibaba.druid.pool.DruidDataSource

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java

New file
@@ -0,0 +1,34 @@
package com.vincent.rsf.server.api.controller.pda;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.InBoundService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

@Api(tags = "PDA入库操作接口")
@RequestMapping("/pda")
@RestController
public class InBoundController extends BaseController {

    @Autowired
    private InBoundService inBoundService;

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/in/emptyContainer/warehousing")
    @ApiOperation("空容器入库")
    public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) {

        return R.ok();
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java

New file
@@ -0,0 +1,15 @@
package com.vincent.rsf.server.api.entity.params;

import lombok.Data;
import lombok.experimental.Accessors;

@Data
@Accessors(chain = true)
public class PdaGeneralParam {

    // 容器号
    private String containerNo;
    // 接驳站号
    private String transferStationNo;

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java

New file
@@ -0,0 +1,10 @@
package com.vincent.rsf.server.api.service;

import com.vincent.rsf.framework.common.R;

/**
 * PDA入库操作Service接口
 */
public interface InBoundService {

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java

New file
@@ -0,0 +1,14 @@
package com.vincent.rsf.server.api.service.impl;

import com.vincent.rsf.server.api.service.InBoundService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * PDA入库操作Service实现类
 */
@Slf4j
@Service
public class InBoundServiceImpl implements InBoundService {

}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -237,7 +237,7 @@
    /**
     * 非光电站点任务下发
     */
    @Scheduled(cron = "0/5 * * * * ?  ")
//    @Scheduled(cron = "0/5 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void pubTaskToWcs() {
        Long loginUserId = SystemAuthUtils.getLoginUserId();

 rsf-server/src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@
    username: root
#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    password: xltys1995
    url: jdbc:mysql://192.168.4.15:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.4.15:3306/rsf_20250106?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: 1234
    type: com.alibaba.druid.pool.DruidDataSource
    druid: