diff --git a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/AgvTaskContorller.java b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/AgvTaskContorller.java index ec79383..fc4d098 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/AgvTaskContorller.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/AgvTaskContorller.java @@ -17,7 +17,7 @@ import java.util.List; @RequiredArgsConstructor(onConstructor_ =@Autowired) @RestController -@RequestMapping("/api") +@RequestMapping("/agvapi") public class AgvTaskContorller { diff --git a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java index 55193ab..dfdbd01 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/controller/busin/WcsTaskController.java @@ -1,11 +1,8 @@ package com.shkj.wcs.controller.busin; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.shkj.common.annotation.Log; import com.shkj.common.annotation.RepeatSubmit; -import com.shkj.common.core.domain.Result; import com.shkj.common.enums.BusinessType; import com.shkj.common.utils.DateUtils; import com.shkj.wcs.service.IBusinDataTaskService; @@ -26,9 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Slf4j @RequiredArgsConstructor(onConstructor_ =@Autowired) diff --git a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java index c50ce17..9bc5c1e 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java @@ -1,24 +1,16 @@ package com.shkj.wcs.plc; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.shkj.common.constant.RedisConstant; -import com.shkj.common.core.domain.Result; -import com.shkj.common.utils.DateUtils; -import com.shkj.common.utils.MessageUtils; import com.shkj.plc.sdk.device.PlcOperate; import com.shkj.system.service.ISysParameterService; import com.shkj.wcs.bo.WcsPlcConnectQueryBo; -import com.shkj.wcs.domain.BusinDataTask; import com.shkj.wcs.domain.WcsPlcConnect; import com.shkj.wcs.domain.WcsPlcProperty; import com.shkj.wcs.mapper.WcsPlcConnectMapper; -import com.shkj.wcs.service.IBusinDataTaskService; import com.shkj.wcs.service.IWcsPlcConnectService; import com.shkj.wcs.service.IWcsPlcPropertyService; import com.shkj.wcs.third.rcs.RCSUtil; import com.shkj.wcs.vo.WcsPlcConnectVo; -import com.shkj.wms.domain.BaseLocation; -import com.shkj.wms.enums.TaskStatusEnum; import com.shkj.wms.utils.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -59,8 +51,6 @@ public class PlcEventTask { @Autowired PlcInit plcInit; - @Autowired - IBusinDataTaskService iBusinDataTaskService; //@Scheduled(fixedDelay = 5000) public void init() { diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/SysAppVersionController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/SysAppVersionController.java deleted file mode 100644 index 36b9a8b..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/SysAppVersionController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.shkj.wms.controller; - -import com.shkj.common.annotation.Log; -import com.shkj.common.core.controller.BaseController; -import com.shkj.common.core.domain.Result; -import com.shkj.common.core.page.TableDataInfo; -import com.shkj.common.enums.BusinessType; -import com.shkj.wms.service.ISysAppVersionService; -import com.shkj.wms.bo.SysAppVersionAddBo; -import com.shkj.wms.bo.SysAppVersionQueryBo; -import com.shkj.wms.vo.SysAppVersionVo; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** - * 版本管理Controller - * - * @author lch - * @menu 版本管理管理 - * @date 2022-07-24 - */ -@RequiredArgsConstructor(onConstructor_ = @Autowired) -@RestController -@RequestMapping("/wms/version") -public class SysAppVersionController extends BaseController { - - private final ISysAppVersionService iSysAppVersionService; - - /** - * 查询版本管理列表 - */ - @PreAuthorize("@ss.hasPermi('wms:version:list')") - @GetMapping("/list") - public TableDataInfo list(SysAppVersionQueryBo bo) { - startPage(); - List list = iSysAppVersionService.queryList(bo); - return getDataTable(list); - } - - - /** - * 获取版本管理详细信息 - */ - @GetMapping("/{id}") - public Result getInfo(@PathVariable("id") Long id) { - return iSysAppVersionService.queryById(id); - } - - /** - * 新增版本管理 - */ - @Log(title = "版本管理", businessType = BusinessType.INSERT) - @PostMapping("/add") - public Result add(@Valid @RequestBody SysAppVersionAddBo bo) { - return iSysAppVersionService.insertByAddBo(bo); - } - - /** - * 检查是否需要更新 code=200 需要更新并返回对应的数据、 其他的不需要更新 - * - * @param code 版本号 - * @return 结果 - */ - @GetMapping("/check") - public Result checkAppNeedUpdate(String code) { - return iSysAppVersionService.checkAppNeedUpdate(code); - } - - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/ISysAppVersionService.java b/shkj-wms/src/main/java/com/shkj/wms/service/ISysAppVersionService.java deleted file mode 100644 index c4af0b9..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/ISysAppVersionService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.shkj.wms.service; - -import com.shkj.common.core.domain.Result; -import com.shkj.wms.domain.SysAppVersion; -import com.shkj.wms.vo.SysAppVersionVo; -import com.shkj.wms.bo.SysAppVersionQueryBo; -import com.shkj.wms.bo.SysAppVersionAddBo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * 版本管理Service接口 - * - * @author lch - * @date 2022-07-24 - */ -public interface ISysAppVersionService extends IService { - /** - * 查询单个 - * - * @param id - * @return - */ - Result queryById(Long id); - - /** - * 查询列表 - * - * @param bo - * @return - */ - List queryList(SysAppVersionQueryBo bo); - - /** - * 根据新增业务对象插入版本管理 - * @param bo 版本管理新增业务对象 - * @return - */ - Result insertByAddBo(SysAppVersionAddBo bo); - - - Result checkAppNeedUpdate(String code); -}