修改数据库操作返回类结果变更为值类型

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);
     }

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<AppBaseGroup
      * @return 删除结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppBaseGroupOperationPermission> 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<AppBaseGroup
      * @return 插入结果
      */
     @Override
-    public DataBaseActionResult<Integer> insert(List<AppBaseGroupOperationPermission> appBaseGroupOperationPermissionList) {
+    public DataBaseActionIntResult insert(List<AppBaseGroupOperationPermission> 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);
         }
     }
 }

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<AppBaseMenuPermissionM
      * @return 添加结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppBaseMenuPermissionM
      * @return 删除结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppBaseMenuPermission> 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);
         }
     }
 }

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<AppConveyCheckStandMappe
      * @return 添加结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppConveyCheckStandMappe
      * @return 删除结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppConveyCheckStand> 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<AppConveyCheckStandMappe
      * @return 修改结果
      */
     @Override
-    public DataBaseActionResult<Integer> update(AppConveyCheckStand appConveyCheckStand) {
+    public DataBaseActionIntResult update(AppConveyCheckStand appConveyCheckStand) {
         if(appConveyCheckStand == null) {
-            return new DataBaseActionResult<>(0, new Exception("参数错误"));
+            return new DataBaseActionIntResult(0, new Exception("参数错误"));
         }
         LambdaUpdateWrapper<AppConveyCheckStand> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(AppConveyCheckStand::getStandId, appConveyCheckStand.getStandId());
@@ -130,10 +130,10 @@ public class AppConveyCheckStandDao extends ServiceImpl<AppConveyCheckStandMappe
         updateWrapper.set(AppConveyCheckStand::getRouter, appConveyCheckStand.getRouter());
         try {
             int update = baseMapper.update(appConveyCheckStand, updateWrapper);
-            return new DataBaseActionResult<>(update);
+            return new DataBaseActionIntResult(update);
         } catch (Exception e) {
             log.error("复核台基础数据修改数据失败", e);
-            return new DataBaseActionResult<>(0, e);
+            return new DataBaseActionIntResult(0, e);
         }
     }
 }

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<AppConveyDeliverS
      * @return 添加结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppConveyDeliverS
      * @return 修改结果
      */
     @Override
-    public DataBaseActionResult<Integer> update(AppConveyDeliverStand appConveyDeliverStand) {
+    public DataBaseActionIntResult update(AppConveyDeliverStand appConveyDeliverStand) {
         if(appConveyDeliverStand == null) {
-            return new DataBaseActionResult<>(0, new Exception("参数错误"));
+            return new DataBaseActionIntResult(0, new Exception("参数错误"));
         }
         LambdaUpdateWrapper<AppConveyDeliverStand> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(AppConveyDeliverStand::getStandId, appConveyDeliverStand.getStandId());
@@ -103,9 +103,9 @@ public class AppConveyDeliverStandStandDao extends ServiceImpl<AppConveyDeliverS
                 .set(AppConveyDeliverStand::getRemark, appConveyDeliverStand.getRemark());
         try {
             int update = baseMapper.update(appConveyDeliverStand, updateWrapper);
-            return new DataBaseActionResult<>(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<AppConveyDeliverS
      * @return 删除结果
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppConveyDeliverStand> 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);
         }
     }
 }

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<AppEtagTagInfoMapper, AppEtag
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppEtagTagInfoMapper, AppEtag
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> update(AppEtagTagInfo appEtagTagInfo) {
+    public DataBaseActionIntResult update(AppEtagTagInfo appEtagTagInfo) {
         if(appEtagTagInfo == null) {
-            return new DataBaseActionResult<>(null, new Exception("修改参数不能为空"));
+            return new DataBaseActionIntResult(0, new Exception("修改参数不能为空"));
         }
         LambdaUpdateWrapper<AppEtagTagInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(AppEtagTagInfo::getTagName, appEtagTagInfo.getTagName());
@@ -143,9 +143,9 @@ public class AppEtagTagInfoDao extends ServiceImpl<AppEtagTagInfoMapper, AppEtag
         updateWrapper.set(AppEtagTagInfo::getRemark, appEtagTagInfo.getRemark());
         try {
             int update = baseMapper.update(appEtagTagInfo, updateWrapper);
-            return new DataBaseActionResult<>(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<AppEtagTagInfoMapper, AppEtag
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> deleteByTagName(String tagName) {
+    public DataBaseActionIntResult deleteByTagName(String tagName) {
         if(tagName == null) {
-            return new DataBaseActionResult<>(null, new Exception("标签名称不能为空"));
+            return new DataBaseActionIntResult(0, new Exception("标签名称不能为空"));
         }
         LambdaQueryWrapper<AppEtagTagInfo> 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);
         }
     }
 }

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<AppEtagTagLocationMapper,
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppEtagTagLocationMapper,
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppEtagTagLocation> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(AppEtagTagLocation::getRecordId, appEtagTagLocation.getRecordId());
@@ -134,9 +134,9 @@ public class AppEtagTagLocationDao extends ServiceImpl<AppEtagTagLocationMapper,
                 .set(AppEtagTagLocation::getStand, appEtagTagLocation.getStand())
                 .set(AppEtagTagLocation::getRemark, appEtagTagLocation.getRemark());
         try {
-            return new DataBaseActionResult<>(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<AppEtagTagLocationMapper,
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> deleteWithRecordId(String recordId) {
+    public DataBaseActionIntResult deleteWithRecordId(String recordId) {
         if(recordId == null) {
-            return new DataBaseActionResult<>(0, new Exception("传入的数据不正确"));
+            return new DataBaseActionIntResult(0, new Exception("传入的数据不正确"));
         }
         LambdaQueryWrapper<AppEtagTagLocation> 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);
         }
     }
 

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<AppEtagTaskMapper, AppEtagTask>
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppEtagTaskMapper, AppEtagTask>
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> insert(List<AppEtagTask> appEtagTaskList) {
+    public DataBaseActionIntResult insert(List<AppEtagTask> 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<AppEtagTaskMapper, AppEtagTask>
      * @return 响应
      */
     @Override
-    public DataBaseActionResult<Integer> 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<AppEtagTask> updateWrapper = new LambdaUpdateWrapper<>();
@@ -133,10 +131,10 @@ public class AppEtagTaskDao extends ServiceImpl<AppEtagTaskMapper, AppEtagTask>
             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);
         }
     }
 

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<AppBaseGroupOperationPermission> {
 
     List<JoinOperationPermission> queryByGroupId(String groupId); // 根据用户组ID查询
-    DataBaseActionResult<Integer> deleteByGroupId(String groupId); // 根据用户组ID删除
+    DataBaseActionIntResult deleteByGroupId(String groupId); // 根据用户组ID删除
-    DataBaseActionResult<Integer> insert(List<AppBaseGroupOperationPermission> appBaseGroupOperationPermissionList); // 批量插入
+    DataBaseActionIntResult insert(List<AppBaseGroupOperationPermission> appBaseGroupOperationPermissionList); // 批量插入
 
 }

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<AppBaseMenuPermis
     List<AppBaseMenuPermission> queryAll(); // 查询所有
     List<AppBaseMenuPermission> queryByMenuId(String menuId); // 查询菜单权限
     List<AppBaseMenuPermission> queryByPermissionId(String permissionId); // 查询权限菜单
-    DataBaseActionResult<Integer> insert(AppBaseMenuPermission appBaseMenuPermission); // 添加菜单权限
+    DataBaseActionIntResult insert(AppBaseMenuPermission appBaseMenuPermission); // 添加菜单权限
-    DataBaseActionResult<Integer> deleteByPermissionId(String permissionId);
+    DataBaseActionIntResult deleteByPermissionId(String permissionId);
 }

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<AppConveyCheckStand
 
     Tuple2<Long, List<AppConveyCheckStand>> query(QueryCheckStandReq request, Integer pageSize, Integer pageIndex);
     List<AppConveyCheckStand> queryByStandId(String standId); // 根据站台ID查询
-    DataBaseActionResult<Integer> insert(AppConveyCheckStand appConveyCheckStand); // 添加一条数据
+    DataBaseActionIntResult insert(AppConveyCheckStand appConveyCheckStand); // 添加一条数据
-    DataBaseActionResult<Integer> deleteByStandId(String standId); // 删除一条数据
+    DataBaseActionIntResult deleteByStandId(String standId); // 删除一条数据
-    DataBaseActionResult<Integer> update(AppConveyCheckStand appConveyCheckStand); // 修改一条数据
+    DataBaseActionIntResult update(AppConveyCheckStand appConveyCheckStand); // 修改一条数据
 }

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<AppConveyDeliverS
 
     Tuple2<Long, List<AppConveyDeliverStand>> query(QueryDeliverStandReq request, Integer pageSize, Integer pageIndex); // 查询
     List<AppConveyDeliverStand> queryByStandId(String standId); // 根据站台ID查询
-    DataBaseActionResult<Integer> insert(AppConveyDeliverStand appConveyDeliverStand); // 添加输送机发货站台
+    DataBaseActionIntResult insert(AppConveyDeliverStand appConveyDeliverStand); // 添加输送机发货站台
-    DataBaseActionResult<Integer> update(AppConveyDeliverStand appConveyDeliverStand); // 修改站台信息
+    DataBaseActionIntResult update(AppConveyDeliverStand appConveyDeliverStand); // 修改站台信息
-    DataBaseActionResult<Integer> delete(String standId); // 删除一个站台
+    DataBaseActionIntResult delete(String standId); // 删除一个站台
 }

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<AppEtagTagInfo> {
     List<AppEtagTagInfo> queryEtagTagInfoByTagName(String tagName); // 通过标签名称查询
     List<AppEtagTagInfo> queryAll(); // 查询所有
     List<AppEtagTagInfo> queryIgnoreNull(AppEtagTagInfo appEtagTagInfo); // 忽略空字段查询
-    DataBaseActionResult<Integer> insert(AppEtagTagInfo appEtagTagInfo); // 添加电子标签小标签基础信息
+    DataBaseActionIntResult insert(AppEtagTagInfo appEtagTagInfo); // 添加电子标签小标签基础信息
-    DataBaseActionResult<Integer> update(AppEtagTagInfo appEtagTagInfo); // 修改电子标签小标签基础信息
+    DataBaseActionIntResult update(AppEtagTagInfo appEtagTagInfo); // 修改电子标签小标签基础信息
-    DataBaseActionResult<Integer> deleteByTagName(String tagName); // 删除电子标签小标签基础信息
+    DataBaseActionIntResult deleteByTagName(String tagName); // 删除电子标签小标签基础信息
 
 }

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<AppEtagTagLocation>
 
     Tuple2<Long, List<AppEtagTagLocation>> queryEtagTagLocation(EtagLocationQueryReq request, Integer pageIndex, Integer pageSize); // 分页查询
     List<AppEtagTagLocation> queryWithLocationAndType(String location, Integer locationType); // 查询指定货位和货位类型的数据
-    DataBaseActionResult<Integer> insert(AppEtagTagLocation appEtagTagLocation); // 插入一条数据
+    DataBaseActionIntResult insert(AppEtagTagLocation appEtagTagLocation); // 插入一条数据
     List<AppEtagTagLocation> queryWithRecordId(String recordId); // 查询指定记录ID的数据
     List<AppEtagTagLocation> queryAll(); // 查询所有数据
-    DataBaseActionResult<Integer> updateAll(AppEtagTagLocation appEtagTagLocation); // 更新一条数据
+    DataBaseActionIntResult updateAll(AppEtagTagLocation appEtagTagLocation); // 更新一条数据
-    DataBaseActionResult<Integer> deleteWithRecordId(String recordId); // 删除指定记录ID的数据
+    DataBaseActionIntResult deleteWithRecordId(String recordId); // 删除指定记录ID的数据
 }

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<AppEtagTask> {
 
     Tuple2<Long, List<AppEtagTask>> queryEtagTask(EtagTaskQueryReq request, Integer pageIndex, Integer pageSize);
-    DataBaseActionResult<Integer> insert(AppEtagTask appEtagTask); // 插入新数据
+    DataBaseActionIntResult insert(AppEtagTask appEtagTask); // 插入新数据
-    DataBaseActionResult<Integer> insert(List<AppEtagTask> appEtagTaskList); // 插入新数据
+    DataBaseActionIntResult insert(List<AppEtagTask> appEtagTaskList); // 插入新数据
-    DataBaseActionResult<Integer> updateIgnoreNull(AppEtagTask appEtagTask); // 更新数据,忽略Null值
+    DataBaseActionIntResult updateIgnoreNull(AppEtagTask appEtagTask); // 更新数据,忽略Null值
     List<AppEtagTask> queryByTaskId(String taskId); // 通过任务ID查询
     List<AppEtagTask> queryByTagAreaIdAndVehicleAndStatus(String areaId, String vehicleNo, List<Integer> status); // 通过标签区域ID和载具号和状态查询
     List<AppEtagTask> queryByVehicleAndStatus(String vehicleNo, List<Integer> status); // 通过标签]载具号和状态查询

wcs/src/main/java/org/wcs/model/bo/db/DataBaseActionIntResult.java

@@ -2,14 +2,13 @@ package org.wcs.model.bo.db;
 
 /**
  * 数据库操作结果
- * @param <T> 数据类型
  */
-public class DataBaseActionResult<T> {
+public class DataBaseActionIntResult {
 
     /**
-     * 数据
+     * 影响的数据行
      */
-    private final T data;
+    private final int result;
 
     /**
      * 异常
@@ -19,17 +18,17 @@ public class DataBaseActionResult<T> {
     /**
      * 创建一个空结果，禁止普通初始化
      */
-    private DataBaseActionResult() {
+    private DataBaseActionIntResult() {
-        this.data = null;
+        this.result = 0;
         this.exception = null;
     }
 
     /**
      * 创建一个成功结果
-     * @param data 数据
+     * @param result 结果
      */
-    public DataBaseActionResult(T data) {
+    public DataBaseActionIntResult(int result) {
-        this.data = data;
+        this.result = result;
         this.exception = null;
     }
 
@@ -37,27 +36,27 @@ public class DataBaseActionResult<T> {
      * 创建一个失败结果
      * @param exception 异常
      */
-    public DataBaseActionResult(Exception exception) {
+    public DataBaseActionIntResult(Exception exception) {
-        this.data = null;
+        this.result = 0;
         this.exception = exception;
     }
 
     /**
      * 创建一个结果
-     * @param data 数据
+     * @param result 结果
      * @param exception 异常
      */
-    public DataBaseActionResult(T data, Exception exception) {
+    public DataBaseActionIntResult(int result, Exception exception) {
-        this.data = data;
+        this.result = result;
         this.exception = exception;
     }
 
     /**
-     * 获取数据
+     * 获取结果
      * @return 数据
      */
-    public T result() {
+    public int result() {
-        return data;
+        return result;
     }
 
     /**

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的连接");
     }
 
 

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<String, TaskConveyStatus> taskConveyStatusTuple2 = PlcCommunicationFactory.getPlcCommunicationByPlcId(conveyLocation.getPlcId()).readTaskConveyStatus(conveyId);
+        IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(conveyLocation.getPlcId());
+        if(plcCommunicationByPlcId == null) {
+            return AppServeResponseFactory.fail("该PLCID对应的PLC不存在", null);
+        }
+        Tuple2<String, TaskConveyStatus> taskConveyStatusTuple2 = plcCommunicationByPlcId.readTaskConveyStatus(conveyId);
         if(AppStringUtils.isNotEmpty(taskConveyStatusTuple2.item1)) {
             return AppServeResponseFactory.fail(taskConveyStatusTuple2.item1, null);
         }

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("数据服务异常");
     }
 }

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;

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();
+        int value = etagTagInfoService.insert(appEtagTagInfo).result();
-        if(value == null || value <= 0) {
+        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();
+        int result = etagTagInfoService.update(appEtagTagInfo).result();
-        if(result == null || result <= 0) {
+        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();
+        int result = etagTagInfoService.deleteByTagName(tagName).result();
-        if(result == null || result <= 0) {
+        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();
+        int insertResult = etagLocationService.insert(appEtagTagLocation).result();
-        if(insertResult == null || insertResult <= 0) {
+        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();
+        int updateResult = etagLocationService.updateAll(appEtagTagLocation).result();
-        if(updateResult == null || updateResult <= 0) {
+        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();
+        int deleteResult = etagLocationService.deleteWithRecordId(recordId).result();
-        if(deleteResult == null || deleteResult <= 0) {
+        if(deleteResult <= 0) {
             return AppServeResponseFactory.fail("数据服务异常", null);
         }
         return AppServeResponseFactory.success();

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);
         }

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;

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));

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;

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;

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

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;

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<String, TaskConveyStatus> taskConveyStatusTuple2 = PlcCommunicationFactory.getPlcCommunicationByPlcId(trayConveyLocation.getPlcId()).readTaskConveyStatus(conveyId);
+        IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(trayConveyLocation.getPlcId());
+        if(plcCommunicationByPlcId == null) {
+            return AppServeResponseFactory.fail("该PLCID对应的连接不存在", null);
+        }
+        Tuple2<String, TaskConveyStatus> taskConveyStatusTuple2 = plcCommunicationByPlcId.readTaskConveyStatus(conveyId);
         if(AppStringUtils.isNotEmpty(taskConveyStatusTuple2.item1)) {
             return AppServeResponseFactory.fail(taskConveyStatusTuple2.item1, null);
         }

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

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;
 

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<String, List<TaskConveyStatus>> multiConveyStatusResult = PlcCommunicationFactory.getPlcCommunicationByPlcId(standInfo.getPlcId()).readTaskMultiConveyStatus(conveyNo);
+        IPlcCommunication plcCommunicationByPlcId = PlcCommunicationFactory.getPlcCommunicationByPlcId(standInfo.getPlcId());
+        if(plcCommunicationByPlcId == null) {
+            return PubServeResponseFactory.fail("该PLCID对应的连接不存在", null);
+        }
+        Tuple2<String, List<TaskConveyStatus>> multiConveyStatusResult = plcCommunicationByPlcId.readTaskMultiConveyStatus(conveyNo);
         if(AppStringUtils.isNotEmpty(multiConveyStatusResult.item1) || multiConveyStatusResult.item2 == null || multiConveyStatusResult.item2.isEmpty()) {
             return PubServeResponseFactory.fail("获取失败，信息：" + multiConveyStatusResult.getItem1(), null);
         }

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("数据服务异常，请重试");
     }