优化

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -2,34 +2,17 @@ package com.platform.rest.controller.yongyou;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
-import com.platform.dao.dto.store.SparePickFormDTO;
-import com.platform.dao.dto.store.SpareRestoreFormDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
-import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
-import com.platform.dao.entity.store.SparePickForm;
-import com.platform.dao.entity.store.SpareRestoreForm;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.store.ExportSparePickFormVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
-import com.platform.dao.vo.query.store.SparePickFormVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.store.SparePickFormService;
 import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**
  * @Description 备件领用登记单 控制器
  * @Author liuyu

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -1,58 +1,42 @@
 package com.platform.service.yongyou.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
-import com.platform.common.model.UserInfo;
-import com.platform.common.util.*;
+import com.platform.common.util.DateUtils;
+import com.platform.common.util.RedisUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.common.yongyou.request.*;
 import com.platform.common.yongyou.response.*;
-import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
-import com.platform.dao.dto.store.SparePickDetailDTO;
-import com.platform.dao.dto.store.SparePickFormDTO;
-import com.platform.dao.dto.store.SpareRestoreFormDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
-import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
-import com.platform.dao.entity.store.*;
+import com.platform.dao.entity.store.OutStoreDetail;
+import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.OutStoreStatusEnum;
-import com.platform.dao.enums.SparePickFormStatusEnum;
 import com.platform.dao.enums.YesNoEnum;
-import com.platform.dao.mapper.sqarepartmanage.SparePartInfoMapper;
-import com.platform.dao.mapper.store.SparePickDetailMapper;
-import com.platform.dao.mapper.store.SparePickFormMapper;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
-import com.platform.dao.vo.query.store.*;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.store.*;
+import com.platform.dao.vo.query.store.OutStoreDetailVO;
+import com.platform.dao.vo.query.store.OutStoreFormVO;
+import com.platform.dao.vo.query.store.SpareStoreVO;
+import com.platform.service.store.OutStoreDetailService;
+import com.platform.service.store.OutStoreFormService;
 import com.platform.service.yongyou.YongyouService;
 import handler.yongyou.GetCurrentStockHandler;
 import handler.yongyou.GetInventoryListHandler;
 import handler.yongyou.LoginHandler;
 import handler.yongyou.OtherOutHandler;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import tk.mybatis.mapper.weekend.Weekend;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description 用友 service 实现类
@@ -70,6 +54,8 @@ public class YongyouServiceImpl implements YongyouService {
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
+    private String cAcc_ID_key1 = "yongyou-cAcc_ID_1";
+    private String cAcc_ID_key2 = "yongyou-cAcc_ID_2";
     private String token_key1 = "yongyou-token-1";
     private String token_key2 = "yongyou-token-2";
     private String Conn_key1 = "yongyou-Conn-1";
@@ -148,9 +134,11 @@ public class YongyouServiceImpl implements YongyouService {
         if (type==1){
             RedisUtils.setString(token_key1, token, 1800);
             RedisUtils.setString(Conn_key1, login.getConn(), 1800);
+            RedisUtils.setString(cAcc_ID_key1, login.getCAcc_ID(), 1800);
         }else if (type==2){
             RedisUtils.setString(token_key2, token, 1800);
             RedisUtils.setString(Conn_key2, login.getConn(), 1800);
+            RedisUtils.setString(cAcc_ID_key2, login.getCAcc_ID(), 1800);
         }
 //        RedisUtils.setString(Conn_key, login.getConn(), 1800);
 //        RedisUtils.setString(cAcc_ID_key, login.getCAcc_ID(), 1800);
@@ -169,6 +157,15 @@ public class YongyouServiceImpl implements YongyouService {
         return null;
     }
 
+    private String getCAccId2(Integer type) {
+        if (type==1) {
+            return RedisUtils.getString(cAcc_ID_key1);
+        }else if (type==2){
+            return RedisUtils.getString(cAcc_ID_key2);
+        }
+        return null;
+    }
+
     private String getCAccId() {
         return RedisUtils.getString(cAcc_ID_key);
     }
@@ -378,8 +375,8 @@ public class YongyouServiceImpl implements YongyouService {
         OtherOutAddRequest req = new OtherOutAddRequest();
         req.setOtherOutVouch(otherOutVouch);
         req.setToken(geToken(outStoreFormVO.getOldOrNew()));
-        req.setConn(getConn());
-        req.setCAcc_ID(getCAccId());
+        req.setConn(getConn2(outStoreFormVO.getOldOrNew()));
+        req.setCAcc_ID(getCAccId2(outStoreFormVO.getOldOrNew()));
         req.setTradeID("");
         handler.setRequest(req);
         String responseStr = handler.handler();