bugfix

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -15,12 +15,14 @@ import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.utils.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.util.*;
 
+/**
+ * @author czh
+ * @desc 合同远程接口实现
+ * @date 2023/7/31
+ */
 @DubboService(group = "design", version = "2.0.0")
-@Service
 public class RemoteContractServiceImpl implements RemoteContractService {
 
     @Autowired
@@ -34,7 +36,7 @@ public class RemoteContractServiceImpl implements RemoteContractService {
 
     @Override
     public Map<Long, ContractCommonInfoResDto> queryContractBaseInfo(List<Long> contractIds) {
-        HashMap<Long, ContractCommonInfoResDto> map = new HashMap<>();
+        HashMap<Long, ContractCommonInfoResDto> map = new HashMap<>(4);
         for (Long contractId : contractIds) {
             KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
             if (Objects.nonNull(kwcContractLogistics)) {
@@ -67,10 +69,10 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setContactName(kwcContractLogistics.getName());
         contractCommonInfoResDto.setContractCode(kwcContractLogistics.getContractNo());
         contractCommonInfoResDto.setSigningWay(kwcContractLogistics.getSigningWay());
-        contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractLogistics.getSigningWay()).getName());
+        contractCommonInfoResDto.setSigningWayName(Objects.requireNonNull(SigningWayEnum.getName(kwcContractLogistics.getSigningWay())).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
         contractCommonInfoResDto.setStatus(kwcContractLogistics.getStatus());
-        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractLogistics.getStatus()).getName());
+        contractCommonInfoResDto.setStatusName(Objects.requireNonNull(ContractStatusEnum.getName(kwcContractLogistics.getStatus())).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractLogistics.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {
@@ -91,10 +93,10 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setContactName(kwcContractTrade.getName());
         contractCommonInfoResDto.setContractCode(kwcContractTrade.getContractNo());
         contractCommonInfoResDto.setSigningWay(kwcContractTrade.getSigningWay());
-        contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractTrade.getSigningWay()).getName());
+        contractCommonInfoResDto.setSigningWayName(Objects.requireNonNull(SigningWayEnum.getName(kwcContractTrade.getSigningWay())).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
         contractCommonInfoResDto.setStatus(kwcContractTrade.getStatus());
-        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractTrade.getStatus()).getName());
+        contractCommonInfoResDto.setStatusName(Objects.requireNonNull(ContractStatusEnum.getName(kwcContractTrade.getStatus())).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractTrade.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -10,8 +10,6 @@ import com.sckw.manage.dao.KwmAddressMapper;
 import com.sckw.manage.model.entity.KwmAddress;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,7 +21,6 @@ import java.util.stream.Collectors;
  * @date 2023/7/31
  */
 @DubboService(group = "design", version = "2.0.0")
-@Service
 public class RemoteManageServiceImpl implements RemoteManageService {
 
     @Autowired
@@ -38,7 +35,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
      */
     @Override
     public Map<Long, List<EntAddressResDto>> queryEntAddressByEntIdList(List<Long> idList) {
-        Map<Long, List<EntAddressResDto>> map = new HashMap<>();
+        Map<Long, List<EntAddressResDto>> map = new HashMap<>(4);
         LambdaQueryWrapper<KwmAddress> kwmAddressLambdaQueryWrapper = new LambdaQueryWrapper<>();
         kwmAddressLambdaQueryWrapper.in(KwmAddress::getEntId, idList).
                                      eq(KwmAddress::getDelFlag, Global.NO);

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sckw.system.dubbo;
 
-import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -19,9 +18,7 @@ import com.sckw.system.model.vo.res.FindAreaTreeResVo;
 import com.sckw.system.service.KwsUserService;
 import com.sckw.system.service.SysAreaService;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -32,7 +29,6 @@ import java.util.stream.Collectors;
  * @date 2023/6/12
  */
 @DubboService(group = "design", version = "2.0.0")
-@Service
 public class RemoteSystemServiceImpl implements RemoteSystemService {
 
     @Autowired
@@ -303,7 +299,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      */
     @Override
     public Map<Long, EntCacheResDto> queryEntTreeByIds(List<Long> entIdList) {
-        Map<Long, EntCacheResDto> result = new HashMap<>();
+        Map<Long, EntCacheResDto> result = new HashMap<>(4);
         for (Long entId : entIdList) {
             EntCacheResDto entCacheResDto = queryEntCacheById(entId);
             if (Objects.isNull(entCacheResDto)) {
@@ -359,7 +355,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         }
 
         Map<Long, List<KwsEntDept>> collect = kwsEntDepts.stream().collect(Collectors.groupingBy(KwsEntDept::getEntPid));
-        Map<Long, List<EntCacheResDto>> map = new HashMap<>();
+        Map<Long, List<EntCacheResDto>> map = new HashMap<>(4);
         for (Long key : collect.keySet()) {
             List<KwsEntDept> kwsEntDepts1 = collect.get(key);
             List<Long> entIdList = kwsEntDepts1.stream().map(KwsEntDept::getEntId).toList();

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
  */
 
 @DubboService(group = "design", version = "2.0.0")
-@Service
 public class RemoteUserServiceImpl implements RemoteUserService {
 
     @Resource