From 527bb45705e462e6071605aef152d4fffc811866 Mon Sep 17 00:00:00 2001 From: icewint Date: Wed, 25 Feb 2026 10:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=BF=94=E5=9B=9E=E7=B1=BB=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExecuteStackerTaskService.java | 1 - .../AppBaseGroupOperationPermissionDao.java | 20 +++++------ .../mapper/impl/AppBaseMenuPermissionDao.java | 18 +++++----- .../mapper/impl/AppConveyCheckStandDao.java | 26 +++++++-------- .../impl/AppConveyDeliverStandStandDao.java | 26 +++++++-------- .../wcs/mapper/impl/AppEtagTagInfoDao.java | 26 +++++++-------- .../mapper/impl/AppEtagTagLocationDao.java | 24 +++++++------- .../org/wcs/mapper/impl/AppEtagTaskDao.java | 28 ++++++++-------- ...ppBaseGroupOperationPermissionService.java | 6 ++-- .../intf/AppBaseMenuPermissionService.java | 6 ++-- .../intf/AppConveyCheckStandService.java | 8 ++--- .../intf/AppConveyDeliverStandService.java | 8 ++--- .../mapper/intf/AppEtagTagInfoService.java | 8 ++--- .../intf/AppEtagTagLocationService.java | 8 ++--- .../wcs/mapper/intf/AppEtagTaskService.java | 10 +++--- ...sult.java => DataBaseActionIntResult.java} | 33 +++++++++---------- .../plugin/plc/PlcCommunicationFactory.java | 4 +-- .../service/impl/ConveyLocationService.java | 9 +++-- .../service/impl/ConveyStandService.java | 12 +++---- .../serve/service/impl/ConveyTaskService.java | 4 --- .../serve/service/impl/EtagBaseService.java | 24 +++++++------- .../serve/service/impl/EtagTaskService.java | 5 ++- .../wcs/serve/service/impl/FileService.java | 3 -- .../wcs/serve/service/impl/MenuService.java | 4 +-- .../service/impl/RecordErrorService.java | 1 - .../service/impl/StackerLocationService.java | 1 - .../service/impl/StockComposeTaskService.java | 1 - .../service/impl/StockSingleTaskService.java | 2 -- .../impl/TrayConveyLocationService.java | 7 +++- .../serve/service/impl/UserGroupService.java | 1 - .../wcs/serve/service/impl/UserService.java | 1 - .../serve/service/pub/impl/DeviceService.java | 7 +++- .../serve/service/pub/impl/TaskService.java | 2 +- 33 files changed, 169 insertions(+), 175 deletions(-) rename wcs/src/main/java/org/wcs/model/bo/db/{DataBaseActionResult.java => DataBaseActionIntResult.java} (63%) diff --git a/wcs/src/main/java/org/wcs/business/stacker/impl/ExecuteStackerTaskService.java b/wcs/src/main/java/org/wcs/business/stacker/impl/ExecuteStackerTaskService.java index 411c50f..83fb56b 100644 --- a/wcs/src/main/java/org/wcs/business/stacker/impl/ExecuteStackerTaskService.java +++ b/wcs/src/main/java/org/wcs/business/stacker/impl/ExecuteStackerTaskService.java @@ -230,7 +230,6 @@ public class ExecuteStackerTaskService implements IExecuteStackerTaskService { } stockSingleTaskItem.setDestination(standInfo.getStandId()); returnList.add(stockSingleTaskItem); - continue; } return new Tuple2<>(returnList, standInfo); } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppBaseGroupOperationPermissionDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseGroupOperationPermissionDao.java index 8b6ac39..9439184 100644 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppBaseGroupOperationPermissionDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseGroupOperationPermissionDao.java @@ -6,7 +6,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.stereotype.Service; import org.wcs.mapper.AppBaseGroupOperationPermissionMapper; import org.wcs.mapper.intf.AppBaseGroupOperationPermissionService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.po.app.AppBaseGroupOperationPermission; import org.wcs.model.po.app.AppBaseMenuPermission; import org.wcs.model.po.app.JoinOperationPermission; @@ -45,17 +45,17 @@ public class AppBaseGroupOperationPermissionDao extends ServiceImpl deleteByGroupId(String groupId) { + public DataBaseActionIntResult deleteByGroupId(String groupId) { if(groupId == null) { - return new DataBaseActionResult<>(0, new Exception("组ID不能为空")); + return new DataBaseActionIntResult(0, new Exception("组ID不能为空")); } try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppBaseGroupOperationPermission::getUserGroup, groupId); int delete = baseMapper.delete(queryWrapper); - return new DataBaseActionResult<>(delete); + return new DataBaseActionIntResult(delete); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -65,18 +65,18 @@ public class AppBaseGroupOperationPermissionDao extends ServiceImpl insert(List appBaseGroupOperationPermissionList) { + public DataBaseActionIntResult insert(List appBaseGroupOperationPermissionList) { if(appBaseGroupOperationPermissionList == null || appBaseGroupOperationPermissionList.isEmpty()) { - return new DataBaseActionResult<>(0, new Exception("权限列表不能为空")); + return new DataBaseActionIntResult(0, new Exception("权限列表不能为空")); } try { boolean insert = super.saveBatch(appBaseGroupOperationPermissionList); if(!insert) { - return new DataBaseActionResult<>(0); + return new DataBaseActionIntResult(0); } - return new DataBaseActionResult<>(appBaseGroupOperationPermissionList.size()); + return new DataBaseActionIntResult(appBaseGroupOperationPermissionList.size()); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java index a075a2a..594bf5f 100644 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.wcs.mapper.AppBaseMenuPermissionMapper; import org.wcs.mapper.intf.AppBaseMenuPermissionService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.po.app.AppBaseMenuPermission; import java.util.List; @@ -72,15 +72,15 @@ public class AppBaseMenuPermissionDao extends ServiceImpl insert(AppBaseMenuPermission appBaseMenuPermission) { + public DataBaseActionIntResult insert(AppBaseMenuPermission appBaseMenuPermission) { if(appBaseMenuPermission == null) { - return new DataBaseActionResult<>(0, new Exception("菜单权限不能为空")); + return new DataBaseActionIntResult(0, new Exception("菜单权限不能为空")); } try { int insert = super.baseMapper.insert(appBaseMenuPermission); - return new DataBaseActionResult<>(insert); + return new DataBaseActionIntResult(insert); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -90,17 +90,17 @@ public class AppBaseMenuPermissionDao extends ServiceImpl deleteByPermissionId(String permissionId) { + public DataBaseActionIntResult deleteByPermissionId(String permissionId) { if(permissionId == null) { - return new DataBaseActionResult<>(0, new Exception("菜单ID不能为空")); + return new DataBaseActionIntResult(0, new Exception("菜单ID不能为空")); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppBaseMenuPermission::getPermissionId, permissionId); try { int delete = super.baseMapper.delete(queryWrapper); - return new DataBaseActionResult<>(delete); + return new DataBaseActionIntResult(delete); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppConveyCheckStandDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyCheckStandDao.java index 05cb94c..3a19545 100644 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppConveyCheckStandDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyCheckStandDao.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.wcs.mapper.AppConveyCheckStandMapper; import org.wcs.mapper.intf.AppConveyCheckStandService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.conveyStand.QueryCheckStandReq; import org.wcs.model.po.app.AppConveyCheckStand; @@ -74,16 +74,16 @@ public class AppConveyCheckStandDao extends ServiceImpl insert(AppConveyCheckStand appConveyCheckStand) { + public DataBaseActionIntResult insert(AppConveyCheckStand appConveyCheckStand) { if(appConveyCheckStand == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } try { int insert = baseMapper.insert(appConveyCheckStand); - return new DataBaseActionResult<>(insert); + return new DataBaseActionIntResult(insert); } catch (Exception e) { log.error("复核台基础数据添加数据失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -93,18 +93,18 @@ public class AppConveyCheckStandDao extends ServiceImpl deleteByStandId(String standId) { + public DataBaseActionIntResult deleteByStandId(String standId) { if(standId == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppConveyCheckStand::getStandId, standId); int delete = baseMapper.delete(queryWrapper); - return new DataBaseActionResult<>(delete); + return new DataBaseActionIntResult(delete); } catch (Exception e) { log.error("复核台基础数据删除数据失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -114,9 +114,9 @@ public class AppConveyCheckStandDao extends ServiceImpl update(AppConveyCheckStand appConveyCheckStand) { + public DataBaseActionIntResult update(AppConveyCheckStand appConveyCheckStand) { if(appConveyCheckStand == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(AppConveyCheckStand::getStandId, appConveyCheckStand.getStandId()); @@ -130,10 +130,10 @@ public class AppConveyCheckStandDao extends ServiceImpl(update); + return new DataBaseActionIntResult(update); } catch (Exception e) { log.error("复核台基础数据修改数据失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java index ec2f517..c00ef6e 100644 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppConveyDeliverStandStandDao.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.wcs.mapper.AppConveyDeliverStandMapper; import org.wcs.mapper.intf.AppConveyDeliverStandService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.conveyStand.QueryDeliverStandReq; import org.wcs.model.po.app.AppConveyDeliverStand; @@ -69,15 +69,15 @@ public class AppConveyDeliverStandStandDao extends ServiceImpl insert(AppConveyDeliverStand appConveyDeliverStand) { + public DataBaseActionIntResult insert(AppConveyDeliverStand appConveyDeliverStand) { if(appConveyDeliverStand == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } try { int insert = baseMapper.insert(appConveyDeliverStand); - return new DataBaseActionResult<>(insert); + return new DataBaseActionIntResult(insert); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -87,9 +87,9 @@ public class AppConveyDeliverStandStandDao extends ServiceImpl update(AppConveyDeliverStand appConveyDeliverStand) { + public DataBaseActionIntResult update(AppConveyDeliverStand appConveyDeliverStand) { if(appConveyDeliverStand == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(AppConveyDeliverStand::getStandId, appConveyDeliverStand.getStandId()); @@ -103,9 +103,9 @@ public class AppConveyDeliverStandStandDao extends ServiceImpl(update); + return new DataBaseActionIntResult(update); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -115,17 +115,17 @@ public class AppConveyDeliverStandStandDao extends ServiceImpl delete(String standId) { + public DataBaseActionIntResult delete(String standId) { if(standId == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppConveyDeliverStand::getStandId, standId); int delete = baseMapper.delete(queryWrapper); - return new DataBaseActionResult<>(delete); + return new DataBaseActionIntResult(delete); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagInfoDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagInfoDao.java index 9ddd38a..17b5130 100755 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagInfoDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagInfoDao.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.wcs.mapper.AppEtagTagInfoMapper; import org.wcs.mapper.intf.AppEtagTagInfoService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagBase.EtagTagInfoQueryReq; import org.wcs.model.po.app.AppEtagTagInfo; @@ -110,15 +110,15 @@ public class AppEtagTagInfoDao extends ServiceImpl insert(AppEtagTagInfo appEtagTagInfo) { + public DataBaseActionIntResult insert(AppEtagTagInfo appEtagTagInfo) { if(appEtagTagInfo == null) { - return new DataBaseActionResult<>(null, new Exception("添加参数不能为空")); + return new DataBaseActionIntResult(0, new Exception("添加参数不能为空")); } try { int insert = baseMapper.insert(appEtagTagInfo); - return new DataBaseActionResult<>(insert); + return new DataBaseActionIntResult(insert); } catch (Exception e) { - return new DataBaseActionResult<>(null, e); + return new DataBaseActionIntResult(0, e); } } @@ -128,9 +128,9 @@ public class AppEtagTagInfoDao extends ServiceImpl update(AppEtagTagInfo appEtagTagInfo) { + public DataBaseActionIntResult update(AppEtagTagInfo appEtagTagInfo) { if(appEtagTagInfo == null) { - return new DataBaseActionResult<>(null, new Exception("修改参数不能为空")); + return new DataBaseActionIntResult(0, new Exception("修改参数不能为空")); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(AppEtagTagInfo::getTagName, appEtagTagInfo.getTagName()); @@ -143,9 +143,9 @@ public class AppEtagTagInfoDao extends ServiceImpl(update); + return new DataBaseActionIntResult(update); } catch (Exception e) { - return new DataBaseActionResult<>(null, e); + return new DataBaseActionIntResult(0, e); } } @@ -155,17 +155,17 @@ public class AppEtagTagInfoDao extends ServiceImpl deleteByTagName(String tagName) { + public DataBaseActionIntResult deleteByTagName(String tagName) { if(tagName == null) { - return new DataBaseActionResult<>(null, new Exception("标签名称不能为空")); + return new DataBaseActionIntResult(0, new Exception("标签名称不能为空")); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppEtagTagInfo::getTagName, tagName); try { int delete = baseMapper.delete(queryWrapper); - return new DataBaseActionResult<>(delete); + return new DataBaseActionIntResult(delete); } catch (Exception e) { - return new DataBaseActionResult<>(null, e); + return new DataBaseActionIntResult(0, e); } } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagLocationDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagLocationDao.java index 17a7a60..43d6f81 100755 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagLocationDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTagLocationDao.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.wcs.mapper.AppEtagTagLocationMapper; import org.wcs.mapper.intf.AppEtagTagLocationService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagBase.EtagLocationQueryReq; import org.wcs.model.po.app.AppEtagTagLocation; @@ -75,11 +75,11 @@ public class AppEtagTagLocationDao extends ServiceImpl insert(AppEtagTagLocation appEtagTagLocation) { + public DataBaseActionIntResult insert(AppEtagTagLocation appEtagTagLocation) { try { - return new DataBaseActionResult<>(baseMapper.insert(appEtagTagLocation)); + return new DataBaseActionIntResult(baseMapper.insert(appEtagTagLocation)); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -122,9 +122,9 @@ public class AppEtagTagLocationDao extends ServiceImpl updateAll(AppEtagTagLocation appEtagTagLocation) { + public DataBaseActionIntResult updateAll(AppEtagTagLocation appEtagTagLocation) { if(appEtagTagLocation == null || appEtagTagLocation.getRecordId() == null) { - return new DataBaseActionResult<>(0, new Exception("传入的数据不正确")); + return new DataBaseActionIntResult(0, new Exception("传入的数据不正确")); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(AppEtagTagLocation::getRecordId, appEtagTagLocation.getRecordId()); @@ -134,9 +134,9 @@ public class AppEtagTagLocationDao extends ServiceImpl(baseMapper.update(appEtagTagLocation, updateWrapper)); + return new DataBaseActionIntResult(baseMapper.update(appEtagTagLocation, updateWrapper)); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -146,16 +146,16 @@ public class AppEtagTagLocationDao extends ServiceImpl deleteWithRecordId(String recordId) { + public DataBaseActionIntResult deleteWithRecordId(String recordId) { if(recordId == null) { - return new DataBaseActionResult<>(0, new Exception("传入的数据不正确")); + return new DataBaseActionIntResult(0, new Exception("传入的数据不正确")); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppEtagTagLocation::getRecordId, recordId); try { - return new DataBaseActionResult<>(baseMapper.delete(queryWrapper)); + return new DataBaseActionIntResult(baseMapper.delete(queryWrapper)); } catch (Exception e) { - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTaskDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTaskDao.java index 01cd561..257243e 100755 --- a/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTaskDao.java +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppEtagTaskDao.java @@ -4,14 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.wcs.mapper.AppEtagTaskMapper; import org.wcs.mapper.intf.AppEtagTaskService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagTask.EtagTaskQueryReq; import org.wcs.model.po.app.AppEtagTagInfo; @@ -68,16 +66,16 @@ public class AppEtagTaskDao extends ServiceImpl * @return 响应 */ @Override - public DataBaseActionResult insert(AppEtagTask appEtagTask) { + public DataBaseActionIntResult insert(AppEtagTask appEtagTask) { if(appEtagTask == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } appEtagTask.setCreateTime(LocalDateTime.now()); try { - return new DataBaseActionResult<>(baseMapper.insert(appEtagTask)); + return new DataBaseActionIntResult(baseMapper.insert(appEtagTask)); } catch (Exception e) { log.error("新增电子标签任务失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -87,17 +85,17 @@ public class AppEtagTaskDao extends ServiceImpl * @return 响应 */ @Override - public DataBaseActionResult insert(List appEtagTaskList) { + public DataBaseActionIntResult insert(List appEtagTaskList) { if(appEtagTaskList == null || appEtagTaskList.isEmpty()) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } appEtagTaskList.forEach(appEtagTask -> appEtagTask.setCreateTime(LocalDateTime.now())); try { boolean saveBatch = super.saveBatch(appEtagTaskList); - return new DataBaseActionResult<>(saveBatch ? appEtagTaskList.size() : 0); + return new DataBaseActionIntResult(saveBatch ? appEtagTaskList.size() : 0); } catch (Exception e) { log.error("批量新增电子标签任务失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } @@ -107,9 +105,9 @@ public class AppEtagTaskDao extends ServiceImpl * @return 响应 */ @Override - public DataBaseActionResult updateIgnoreNull(AppEtagTask appEtagTask) { + public DataBaseActionIntResult updateIgnoreNull(AppEtagTask appEtagTask) { if(appEtagTask == null) { - return new DataBaseActionResult<>(0, new Exception("参数错误")); + return new DataBaseActionIntResult(0, new Exception("参数错误")); } try { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); @@ -133,10 +131,10 @@ public class AppEtagTaskDao extends ServiceImpl updateWrapper.set(appEtagTask.getConfirmPerson() != null, AppEtagTask::getConfirmPerson, appEtagTask.getConfirmPerson()); updateWrapper.set(appEtagTask.getCompletedTime() != null, AppEtagTask::getCompletedTime, appEtagTask.getCompletedTime()); updateWrapper.set(appEtagTask.getRemark() != null, AppEtagTask::getRemark, appEtagTask.getRemark()); - return new DataBaseActionResult<>(baseMapper.update(appEtagTask, updateWrapper)); + return new DataBaseActionIntResult(baseMapper.update(appEtagTask, updateWrapper)); } catch (Exception e) { log.error("修改电子标签任务失败", e); - return new DataBaseActionResult<>(0, e); + return new DataBaseActionIntResult(0, e); } } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppBaseGroupOperationPermissionService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseGroupOperationPermissionService.java index 1f5574f..3ca6806 100644 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppBaseGroupOperationPermissionService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseGroupOperationPermissionService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.po.app.AppBaseGroupOperationPermission; import org.wcs.model.po.app.JoinOperationPermission; @@ -11,7 +11,7 @@ import java.util.List; public interface AppBaseGroupOperationPermissionService extends IService { List queryByGroupId(String groupId); // 根据用户组ID查询 - DataBaseActionResult deleteByGroupId(String groupId); // 根据用户组ID删除 - DataBaseActionResult insert(List appBaseGroupOperationPermissionList); // 批量插入 + DataBaseActionIntResult deleteByGroupId(String groupId); // 根据用户组ID删除 + DataBaseActionIntResult insert(List appBaseGroupOperationPermissionList); // 批量插入 } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java index 5b8bc0b..0e2886a 100644 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.po.app.AppBaseMenuPermission; import java.util.List; @@ -11,6 +11,6 @@ public interface AppBaseMenuPermissionService extends IService queryAll(); // 查询所有 List queryByMenuId(String menuId); // 查询菜单权限 List queryByPermissionId(String permissionId); // 查询权限菜单 - DataBaseActionResult insert(AppBaseMenuPermission appBaseMenuPermission); // 添加菜单权限 - DataBaseActionResult deleteByPermissionId(String permissionId); + DataBaseActionIntResult insert(AppBaseMenuPermission appBaseMenuPermission); // 添加菜单权限 + DataBaseActionIntResult deleteByPermissionId(String permissionId); } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppConveyCheckStandService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyCheckStandService.java index 26cec72..d57e9b3 100644 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppConveyCheckStandService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyCheckStandService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.conveyStand.QueryCheckStandReq; import org.wcs.model.po.app.AppConveyCheckStand; @@ -15,7 +15,7 @@ public interface AppConveyCheckStandService extends IService> query(QueryCheckStandReq request, Integer pageSize, Integer pageIndex); List queryByStandId(String standId); // 根据站台ID查询 - DataBaseActionResult insert(AppConveyCheckStand appConveyCheckStand); // 添加一条数据 - DataBaseActionResult deleteByStandId(String standId); // 删除一条数据 - DataBaseActionResult update(AppConveyCheckStand appConveyCheckStand); // 修改一条数据 + DataBaseActionIntResult insert(AppConveyCheckStand appConveyCheckStand); // 添加一条数据 + DataBaseActionIntResult deleteByStandId(String standId); // 删除一条数据 + DataBaseActionIntResult update(AppConveyCheckStand appConveyCheckStand); // 修改一条数据 } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java index ba6704a..bff6188 100644 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppConveyDeliverStandService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.conveyStand.QueryDeliverStandReq; import org.wcs.model.po.app.AppConveyDeliverStand; @@ -15,7 +15,7 @@ public interface AppConveyDeliverStandService extends IService> query(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex); // 查询 List queryByStandId(String standId); // 根据站台ID查询 - DataBaseActionResult insert(AppConveyDeliverStand appConveyDeliverStand); // 添加输送机发货站台 - DataBaseActionResult update(AppConveyDeliverStand appConveyDeliverStand); // 修改站台信息 - DataBaseActionResult delete(String standId); // 删除一个站台 + DataBaseActionIntResult insert(AppConveyDeliverStand appConveyDeliverStand); // 添加输送机发货站台 + DataBaseActionIntResult update(AppConveyDeliverStand appConveyDeliverStand); // 修改站台信息 + DataBaseActionIntResult delete(String standId); // 删除一个站台 } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagInfoService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagInfoService.java index 349a1d8..1565a3c 100755 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagInfoService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagInfoService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagBase.EtagTagInfoQueryReq; import org.wcs.model.po.app.AppEtagTagInfo; @@ -17,8 +17,8 @@ public interface AppEtagTagInfoService extends IService { List queryEtagTagInfoByTagName(String tagName); // 通过标签名称查询 List queryAll(); // 查询所有 List queryIgnoreNull(AppEtagTagInfo appEtagTagInfo); // 忽略空字段查询 - DataBaseActionResult insert(AppEtagTagInfo appEtagTagInfo); // 添加电子标签小标签基础信息 - DataBaseActionResult update(AppEtagTagInfo appEtagTagInfo); // 修改电子标签小标签基础信息 - DataBaseActionResult deleteByTagName(String tagName); // 删除电子标签小标签基础信息 + DataBaseActionIntResult insert(AppEtagTagInfo appEtagTagInfo); // 添加电子标签小标签基础信息 + DataBaseActionIntResult update(AppEtagTagInfo appEtagTagInfo); // 修改电子标签小标签基础信息 + DataBaseActionIntResult deleteByTagName(String tagName); // 删除电子标签小标签基础信息 } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagLocationService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagLocationService.java index 9f8620b..77e6a4c 100755 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagLocationService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTagLocationService.java @@ -1,7 +1,7 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagBase.EtagLocationQueryReq; import org.wcs.model.po.app.AppEtagTagLocation; @@ -12,9 +12,9 @@ public interface AppEtagTagLocationService extends IService Tuple2> queryEtagTagLocation(EtagLocationQueryReq request, Integer pageIndex, Integer pageSize); // 分页查询 List queryWithLocationAndType(String location, Integer locationType); // 查询指定货位和货位类型的数据 - DataBaseActionResult insert(AppEtagTagLocation appEtagTagLocation); // 插入一条数据 + DataBaseActionIntResult insert(AppEtagTagLocation appEtagTagLocation); // 插入一条数据 List queryWithRecordId(String recordId); // 查询指定记录ID的数据 List queryAll(); // 查询所有数据 - DataBaseActionResult updateAll(AppEtagTagLocation appEtagTagLocation); // 更新一条数据 - DataBaseActionResult deleteWithRecordId(String recordId); // 删除指定记录ID的数据 + DataBaseActionIntResult updateAll(AppEtagTagLocation appEtagTagLocation); // 更新一条数据 + DataBaseActionIntResult deleteWithRecordId(String recordId); // 删除指定记录ID的数据 } diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTaskService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTaskService.java index 84f0ca4..d240f49 100755 --- a/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTaskService.java +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppEtagTaskService.java @@ -1,21 +1,19 @@ package org.wcs.mapper.intf; import com.baomidou.mybatisplus.extension.service.IService; -import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.bo.db.DataBaseActionIntResult; import org.wcs.model.bo.tuple.Tuple2; import org.wcs.model.dto.serve.etagTask.EtagTaskQueryReq; import org.wcs.model.po.app.AppEtagTask; -import java.time.LocalDateTime; -import java.util.Iterator; import java.util.List; public interface AppEtagTaskService extends IService { Tuple2> queryEtagTask(EtagTaskQueryReq request, Integer pageIndex, Integer pageSize); - DataBaseActionResult insert(AppEtagTask appEtagTask); // 插入新数据 - DataBaseActionResult insert(List appEtagTaskList); // 插入新数据 - DataBaseActionResult updateIgnoreNull(AppEtagTask appEtagTask); // 更新数据,忽略Null值 + DataBaseActionIntResult insert(AppEtagTask appEtagTask); // 插入新数据 + DataBaseActionIntResult insert(List appEtagTaskList); // 插入新数据 + DataBaseActionIntResult updateIgnoreNull(AppEtagTask appEtagTask); // 更新数据,忽略Null值 List queryByTaskId(String taskId); // 通过任务ID查询 List queryByTagAreaIdAndVehicleAndStatus(String areaId, String vehicleNo, List status); // 通过标签区域ID和载具号和状态查询 List queryByVehicleAndStatus(String vehicleNo, List status); // 通过标签]载具号和状态查询 diff --git a/wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionResult.java b/wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionIntResult.java similarity index 63% rename from wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionResult.java rename to wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionIntResult.java index 07d18d0..2eae450 100644 --- a/wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionResult.java +++ b/wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionIntResult.java @@ -2,14 +2,13 @@ package org.wcs.model.bo.db; /** * 数据库操作结果 - * @param 数据类型 */ -public class DataBaseActionResult { +public class DataBaseActionIntResult { /** - * 数据 + * 影响的数据行 */ - private final T data; + private final int result; /** * 异常 @@ -19,17 +18,17 @@ public class DataBaseActionResult { /** * 创建一个空结果，禁止普通初始化 */ - private DataBaseActionResult() { - this.data = null; + private DataBaseActionIntResult() { + this.result = 0; this.exception = null; } /** * 创建一个成功结果 - * @param data 数据 + * @param result 结果 */ - public DataBaseActionResult(T data) { - this.data = data; + public DataBaseActionIntResult(int result) { + this.result = result; this.exception = null; } @@ -37,27 +36,27 @@ public class DataBaseActionResult { * 创建一个失败结果 * @param exception 异常 */ - public DataBaseActionResult(Exception exception) { - this.data = null; + public DataBaseActionIntResult(Exception exception) { + this.result = 0; this.exception = exception; } /** * 创建一个结果 - * @param data 数据 + * @param result 结果 * @param exception 异常 */ - public DataBaseActionResult(T data, Exception exception) { - this.data = data; + public DataBaseActionIntResult(int result, Exception exception) { + this.result = result; this.exception = exception; } /** - * 获取数据 + * 获取结果 * @return 数据 */ - public T result() { - return data; + public int result() { + return result; } /** diff --git a/wcs/src/main/java/org/wcs/plugin/plc/PlcCommunicationFactory.java b/wcs/src/main/java/org/wcs/plugin/plc/PlcCommunicationFactory.java index 1b89175..4013699 100644 --- a/wcs/src/main/java/org/wcs/plugin/plc/PlcCommunicationFactory.java +++ b/wcs/src/main/java/org/wcs/plugin/plc/PlcCommunicationFactory.java @@ -32,12 +32,12 @@ public class PlcCommunicationFactory { public static IPlcCommunication getPlcCommunicationByPlcId(Integer plcId) { setPlcCommunicationMap(); // 初始化PLC通讯对象 if(plcId == null) { - return null; + throw new NullPointerException("PLCID不能为空"); } if(plcCommunicationMap.containsKey(plcId)) { return plcCommunicationMap.get(plcId); } - return null; + throw new NullPointerException("找不到该ID的连接"); } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyLocationService.java b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyLocationService.java index ef25adf..e169ee6 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyLocationService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyLocationService.java @@ -17,12 +17,13 @@ import org.wcs.model.vo.serve.common.PageDataResponse; import org.wcs.model.vo.serve.convey.ConveyStatusVo; import org.wcs.model.vo.serve.convey.QueryConveyLocationVo; import org.wcs.plugin.plc.PlcCommunicationFactory; +import org.wcs.plugin.plc.communication.IPlcCommunication; import org.wcs.plugin.plc.model.TaskConveyStatus; import org.wcs.serve.service.intf.IConveyLocationService; import org.wcs.utils.AppBeanUtils; import org.wcs.utils.AppStringUtils; -import java.time.LocalDateTime; + import java.util.List; @Slf4j @@ -140,7 +141,11 @@ public class ConveyLocationService implements IConveyLocationService { return AppServeResponseFactory.fail("数据服务异常或者点位不存在", null); } AppConveyLocation conveyLocation = conveyLocations.getFirst(); - Tuple2 taskConveyStatusTuple2 = PlcCommunicationFactory.getPlcCommunicationByPlcId(conveyLocation.getPlcId()).readTaskConveyStatus(conveyId); + IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(conveyLocation.getPlcId()); + if(plcCommunicationByPlcId == null) { + return AppServeResponseFactory.fail("该PLCID对应的PLC不存在", null); + } + Tuple2 taskConveyStatusTuple2 = plcCommunicationByPlcId.readTaskConveyStatus(conveyId); if(AppStringUtils.isNotEmpty(taskConveyStatusTuple2.item1)) { return AppServeResponseFactory.fail(taskConveyStatusTuple2.item1, null); } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java index 801f56d..d802698 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyStandService.java @@ -164,7 +164,7 @@ public class ConveyStandService implements IConveyStandService { } AppConveyCheckStand newCheckStand = new AppConveyCheckStand(); AppBeanUtils.copyProperties(request, newCheckStand); - Integer result = conveyCheckStandService.insert(newCheckStand).result(); + int result = conveyCheckStandService.insert(newCheckStand).result(); if(result <= 0) { return AppServeResponseFactory.fail("添加失败，数据服务异常"); } @@ -185,7 +185,7 @@ public class ConveyStandService implements IConveyStandService { if(checkStands.isEmpty()) { return AppServeResponseFactory.fail("站台不存在"); } - Integer result = conveyCheckStandService.deleteByStandId(standId).result(); + int result = conveyCheckStandService.deleteByStandId(standId).result(); if(result <= 0) { return AppServeResponseFactory.fail("删除失败，数据服务异常"); } @@ -208,7 +208,7 @@ public class ConveyStandService implements IConveyStandService { } AppConveyCheckStand updateCheckStand = new AppConveyCheckStand(); AppBeanUtils.copyProperties(request, updateCheckStand); - Integer result = conveyCheckStandService.update(updateCheckStand).result(); + int result = conveyCheckStandService.update(updateCheckStand).result(); if(result <= 0) { return AppServeResponseFactory.fail("修改失败，数据服务异常"); } @@ -253,7 +253,7 @@ public class ConveyStandService implements IConveyStandService { } AppConveyDeliverStand newDeliverStand = new AppConveyDeliverStand(); AppBeanUtils.copyProperties(request, newDeliverStand); - Integer result = conveyDeliverStandService.insert(newDeliverStand).result(); + int result = conveyDeliverStandService.insert(newDeliverStand).result(); if(result <= 0) { return AppServeResponseFactory.fail("添加失败，数据服务异常"); } @@ -274,7 +274,7 @@ public class ConveyStandService implements IConveyStandService { if(conveyDeliverStands.isEmpty()) { return AppServeResponseFactory.fail("站台不存在"); } - Integer result = conveyDeliverStandService.delete(standId).result(); + int result = conveyDeliverStandService.delete(standId).result(); if(result <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } @@ -305,7 +305,7 @@ public class ConveyStandService implements IConveyStandService { conveyDeliverStand.setReadArriveAddress(request.getReadArriveAddress()); conveyDeliverStand.setWriteTaskAddress(request.getWriteTaskAddress()); conveyDeliverStand.setRemark(request.getRemark()); - Integer result = conveyDeliverStandService.update(conveyDeliverStand).result(); + int result = conveyDeliverStandService.update(conveyDeliverStand).result(); return result > 0 ? AppServeResponseFactory.success() : AppServeResponseFactory.fail("数据服务异常"); } } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyTaskService.java b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyTaskService.java index 2c9173f..d649e2d 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/ConveyTaskService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/ConveyTaskService.java @@ -15,7 +15,6 @@ import org.wcs.helper.PlcTaskIdHelper; import org.wcs.mapper.intf.AppConveyTaskBakService; import org.wcs.mapper.intf.AppConveyTaskService; import org.wcs.model.bo.tuple.Tuple2; -import org.wcs.model.dto.client.ConveyTaskStatusUploadReq; import org.wcs.model.dto.serve.conveyTask.AddConveyTaskReq; import org.wcs.model.dto.serve.conveyTask.QueryConveyTaskReq; import org.wcs.model.dto.serve.conveyTask.ReporterConveyTaskStatusReq; @@ -27,9 +26,6 @@ import org.wcs.model.vo.serve.common.PageDataResponse; import org.wcs.model.vo.serve.conveyTask.ExportConveyTaskBakVo; import org.wcs.model.vo.serve.conveyTask.QueryConveyTaskVo; import org.wcs.plugin.excel.ExcelPoi; -import org.wcs.plugin.webHttpClient.WebHttpClient; -import org.wcs.plugin.webHttpClient.model.HttpRequest; -import org.wcs.plugin.webHttpClient.model.HttpResponse; import org.wcs.serve.service.intf.IConveyTaskService; import org.wcs.utils.AppBeanUtils; import org.wcs.utils.AppStringUtils; diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/EtagBaseService.java b/wcs/src/main/java/org/wcs/serve/service/impl/EtagBaseService.java index ed1249e..c6f4474 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/EtagBaseService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/EtagBaseService.java @@ -170,8 +170,8 @@ public class EtagBaseService implements IEtagBaseService { } AppEtagTagInfo appEtagTagInfo = new AppEtagTagInfo(); AppBeanUtils.copyProperties(request, appEtagTagInfo); - Integer value = etagTagInfoService.insert(appEtagTagInfo).result(); - if(value == null || value <= 0) { + int value = etagTagInfoService.insert(appEtagTagInfo).result(); + if(value <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); @@ -196,8 +196,8 @@ public class EtagBaseService implements IEtagBaseService { } AppEtagTagInfo appEtagTagInfo = new AppEtagTagInfo(); AppBeanUtils.copyProperties(request, appEtagTagInfo); - Integer result = etagTagInfoService.update(appEtagTagInfo).result(); - if(result == null || result <= 0) { + int result = etagTagInfoService.update(appEtagTagInfo).result(); + if(result <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); @@ -220,8 +220,8 @@ public class EtagBaseService implements IEtagBaseService { if(appEtagTagInfos.isEmpty()) { return AppServeResponseFactory.fail("标签名称不存在", null); } - Integer result = etagTagInfoService.deleteByTagName(tagName).result(); - if(result == null || result <= 0) { + int result = etagTagInfoService.deleteByTagName(tagName).result(); + if(result <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); @@ -273,8 +273,8 @@ public class EtagBaseService implements IEtagBaseService { AppEtagTagLocation appEtagTagLocation = new AppEtagTagLocation(); AppBeanUtils.copyProperties(request, appEtagTagLocation); appEtagTagLocation.setRecordId(AppUUIDUtils.getNewUUID()); - Integer insertResult = etagLocationService.insert(appEtagTagLocation).result(); - if(insertResult == null || insertResult <= 0) { + int insertResult = etagLocationService.insert(appEtagTagLocation).result(); + if(insertResult <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); @@ -303,8 +303,8 @@ public class EtagBaseService implements IEtagBaseService { } AppEtagTagLocation appEtagTagLocation = new AppEtagTagLocation(); AppBeanUtils.copyProperties(request, appEtagTagLocation); - Integer updateResult = etagLocationService.updateAll(appEtagTagLocation).result(); - if(updateResult == null || updateResult <= 0) { + int updateResult = etagLocationService.updateAll(appEtagTagLocation).result(); + if(updateResult <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); @@ -324,8 +324,8 @@ public class EtagBaseService implements IEtagBaseService { if(etagTagLocations.isEmpty()) { return AppServeResponseFactory.fail("记录不存在", null); } - Integer deleteResult = etagLocationService.deleteWithRecordId(recordId).result(); - if(deleteResult == null || deleteResult <= 0) { + int deleteResult = etagLocationService.deleteWithRecordId(recordId).result(); + if(deleteResult <= 0) { return AppServeResponseFactory.fail("数据服务异常", null); } return AppServeResponseFactory.success(); diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/EtagTaskService.java b/wcs/src/main/java/org/wcs/serve/service/impl/EtagTaskService.java index 57d83fe..d43f3c2 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/EtagTaskService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/EtagTaskService.java @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.wcs.business.pub.ReportStandard; import org.wcs.constant.ConstantData; -import org.wcs.constant.enums.database.EtagTaskLightModelEnum; import org.wcs.constant.enums.database.EtagTaskStatusEnum; import org.wcs.factory.AppServeResponseFactory; import org.wcs.mapper.intf.AppEtagTaskBakService; @@ -92,7 +91,7 @@ public class EtagTaskService implements IEtagTaskService { appEtagTask.setCreatePerson(operationUserId); appEtagTask.setCreateTime(LocalDateTime.now()); appEtagTask.setRemark(request.getRemark()); - Integer result = etagTaskService.insert(appEtagTask).result(); + int result = etagTaskService.insert(appEtagTask).result(); if(result > 0) { return AppServeResponseFactory.success("添加成功", null); } @@ -126,7 +125,7 @@ public class EtagTaskService implements IEtagTaskService { appEtagTask.setTaskStatus(request.getTaskStatus()); appEtagTask.setLightModel(request.getLightModel()); appEtagTask.setRemark(request.getRemark()); - Integer result = etagTaskService.updateIgnoreNull(appEtagTask).result(); + int result = etagTaskService.updateIgnoreNull(appEtagTask).result(); if(result > 0) { return AppServeResponseFactory.success("修改成功", null); } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/FileService.java b/wcs/src/main/java/org/wcs/serve/service/impl/FileService.java index e9d7908..46d064d 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/FileService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/FileService.java @@ -15,9 +15,6 @@ import org.wcs.factory.AppServeResponseFactory; import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.serve.service.intf.IFileService; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java b/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java index 3357377..760959b 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java @@ -183,7 +183,7 @@ public class MenuService implements IMenuService { insertValue.setMenuId(request.getMenuId()); insertValue.setCreatePerson(userId); insertValue.setCreateTime(LocalDateTime.now()); - Integer insertCount = baseMenuPermissionService.insert(insertValue).result(); + int insertCount = baseMenuPermissionService.insert(insertValue).result(); if(insertCount > 0) { log.info("用户：{} 添加菜单权限基础资料成功，数据：{}", userId, AppStringUtils.objectToString(insertValue)); return AppServeResponseFactory.success(String.format("添加成功，添加了 %d 条记录", insertCount)); @@ -213,7 +213,7 @@ public class MenuService implements IMenuService { if(menuPermissions.isEmpty()) { return AppServeResponseFactory.fail(String.format("权限ID %s 不存在", permissionId)); } - Integer deleteCount = baseMenuPermissionService.deleteByPermissionId(permissionId).result(); + int deleteCount = baseMenuPermissionService.deleteByPermissionId(permissionId).result(); if(deleteCount > 0) { log.info("用户：{} 删除菜单权限基础资料成功，权限ID：{}", userId, menuPermissions); return AppServeResponseFactory.success(String.format("删除成功，删除了 %d 条记录", deleteCount)); diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/RecordErrorService.java b/wcs/src/main/java/org/wcs/serve/service/impl/RecordErrorService.java index 2eb9f09..b99d88e 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/RecordErrorService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/RecordErrorService.java @@ -7,7 +7,6 @@ import org.springframework.stereotype.Service; import org.wcs.constant.enums.database.BaseErroorEquipmentTypeEnum; import org.wcs.constant.enums.database.BaseErrorLevelEnum; import org.wcs.constant.enums.database.BaseErrorTypeEnum; -import org.wcs.constant.enums.database.EquipmentTypeEnum; import org.wcs.factory.AppServeResponseFactory; import org.wcs.mapper.intf.AppRecordErrService; import org.wcs.model.bo.tuple.Tuple2; diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/StackerLocationService.java b/wcs/src/main/java/org/wcs/serve/service/impl/StackerLocationService.java index 1864405..cdd2445 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/StackerLocationService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/StackerLocationService.java @@ -5,7 +5,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.wcs.constant.ConstantData; import org.wcs.constant.enums.database.StackerLocationStatusEnum; import org.wcs.factory.AppServeResponseFactory; import org.wcs.mapper.intf.AppStackerLocationService; diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/StockComposeTaskService.java b/wcs/src/main/java/org/wcs/serve/service/impl/StockComposeTaskService.java index f5e2e8d..6e9d720 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/StockComposeTaskService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/StockComposeTaskService.java @@ -41,7 +41,6 @@ import org.wcs.utils.AppUUIDUtils; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/StockSingleTaskService.java b/wcs/src/main/java/org/wcs/serve/service/impl/StockSingleTaskService.java index c262909..356a307 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/StockSingleTaskService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/StockSingleTaskService.java @@ -4,8 +4,6 @@ import cn.dev33.satoken.stp.StpUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.wcs.constant.enums.common.TrueOrFalseEnum; import org.wcs.constant.enums.database.StockSingleTaskStatusEnum; diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/TrayConveyLocationService.java b/wcs/src/main/java/org/wcs/serve/service/impl/TrayConveyLocationService.java index 79411c7..8428d98 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/TrayConveyLocationService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/TrayConveyLocationService.java @@ -23,6 +23,7 @@ import org.wcs.model.vo.serve.trayConveyLocation.QueryTrayConveyLocationVo; import org.wcs.model.vo.serve.trayConveyLocation.TrayConveyStatusVo; import org.wcs.plugin.excel.ExcelPoi; import org.wcs.plugin.plc.PlcCommunicationFactory; +import org.wcs.plugin.plc.communication.IPlcCommunication; import org.wcs.plugin.plc.model.TaskConveyStatus; import org.wcs.serve.service.intf.ITrayConveyLocationService; import org.wcs.utils.AppBeanUtils; @@ -145,7 +146,11 @@ public class TrayConveyLocationService implements ITrayConveyLocationService { return AppServeResponseFactory.fail("数据服务异常或者点位不存在", null); } AppTrayConveyLocation trayConveyLocation = locationList.getFirst(); - Tuple2 taskConveyStatusTuple2 = PlcCommunicationFactory.getPlcCommunicationByPlcId(trayConveyLocation.getPlcId()).readTaskConveyStatus(conveyId); + IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(trayConveyLocation.getPlcId()); + if(plcCommunicationByPlcId == null) { + return AppServeResponseFactory.fail("该PLCID对应的连接不存在", null); + } + Tuple2 taskConveyStatusTuple2 = plcCommunicationByPlcId.readTaskConveyStatus(conveyId); if(AppStringUtils.isNotEmpty(taskConveyStatusTuple2.item1)) { return AppServeResponseFactory.fail(taskConveyStatusTuple2.item1, null); } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/UserGroupService.java b/wcs/src/main/java/org/wcs/serve/service/impl/UserGroupService.java index 6086aff..6b88264 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/UserGroupService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/UserGroupService.java @@ -24,7 +24,6 @@ import org.wcs.utils.AppUUIDUtils; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java b/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java index 77b53da..4f5cda6 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java @@ -30,7 +30,6 @@ public class UserService implements IUserService { private final AppBaseUserService baseUserService; private final AppBaseMenuService baseMenuService; private final AppBaseGroupOperationPermissionService baseGroupOperationPermissionService; - private final AppBaseMenuPermissionService baseMenuPermissionService; private final SaTokenRedis saTokenRedis; diff --git a/wcs/src/main/java/org/wcs/serve/service/pub/impl/DeviceService.java b/wcs/src/main/java/org/wcs/serve/service/pub/impl/DeviceService.java index 2e665b8..71742ea 100644 --- a/wcs/src/main/java/org/wcs/serve/service/pub/impl/DeviceService.java +++ b/wcs/src/main/java/org/wcs/serve/service/pub/impl/DeviceService.java @@ -9,6 +9,7 @@ import org.wcs.model.po.app.AppStackerStand; import org.wcs.model.vo.pub.PubServeDataResponse; import org.wcs.model.vo.pub.deveice.ConveyStatusVo; import org.wcs.plugin.plc.PlcCommunicationFactory; +import org.wcs.plugin.plc.communication.IPlcCommunication; import org.wcs.plugin.plc.model.TaskConveyStatus; import org.wcs.serve.service.pub.intf.IDeviceService; import org.wcs.utils.AppBeanUtils; @@ -40,7 +41,11 @@ public class DeviceService implements IDeviceService { } AppStackerStand standInfo = stackerStands.getFirst(); // 这里需要修改 - Tuple2> multiConveyStatusResult = PlcCommunicationFactory.getPlcCommunicationByPlcId(standInfo.getPlcId()).readTaskMultiConveyStatus(conveyNo); + IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(standInfo.getPlcId()); + if(plcCommunicationByPlcId == null) { + return PubServeResponseFactory.fail("该PLCID对应的连接不存在", null); + } + Tuple2> multiConveyStatusResult = plcCommunicationByPlcId.readTaskMultiConveyStatus(conveyNo); if(AppStringUtils.isNotEmpty(multiConveyStatusResult.item1) || multiConveyStatusResult.item2 == null || multiConveyStatusResult.item2.isEmpty()) { return PubServeResponseFactory.fail("获取失败，信息：" + multiConveyStatusResult.getItem1(), null); } diff --git a/wcs/src/main/java/org/wcs/serve/service/pub/impl/TaskService.java b/wcs/src/main/java/org/wcs/serve/service/pub/impl/TaskService.java index 99224ec..80bfc11 100644 --- a/wcs/src/main/java/org/wcs/serve/service/pub/impl/TaskService.java +++ b/wcs/src/main/java/org/wcs/serve/service/pub/impl/TaskService.java @@ -260,7 +260,7 @@ public class TaskService implements ITaskService { if(newEtagTaskList.isEmpty()) { return PubServeResponseFactory.success("任务已存在，请勿重复发送"); } - Integer result = etagTaskService.insert(newEtagTaskList).result(); + int result = etagTaskService.insert(newEtagTaskList).result(); return result > 0 ? PubServeResponseFactory.success("添加成功") : PubServeResponseFactory.fail("数据服务异常，请重试"); }