修改token与key验证

src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java

@@ -20,6 +20,7 @@ import com.dreamchaser.depository_manage.utils.CrudUtil;
 import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.Md5;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
+import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
@@ -350,6 +351,8 @@ public class StockTakingController {
         int success = 0;
         int size = 0;
         if (keys != null && keys.size() > 0) {
+            Object mainId = null;
+
             size = keys.size();
             // 定义用于插入的盘点记录
             Map<String, Object> param = new HashMap<>();
@@ -397,6 +400,7 @@ public class StockTakingController {
                         param.remove("id");
 
                     }
+                    mainId = param.get("mainId");
                     redisTemplateForHash.opsForHash().put(key, "flagForSubmit", "true");
                 }
             }
@@ -405,7 +409,58 @@ public class StockTakingController {
                 success = stockTakingService.insertStockTakingByMaterial(map, keys, userToken);
 
             }
+
+            // 用于设置企业微信接收人
+            String departmentManagerId = (String) map.get("departmentManager");
+            StringBuilder QyWxDepartmentManager = new StringBuilder();
+            String[] split = departmentManagerId.split(",");
+            for (String s : split) {
+                if ("".equals(s)) {
+                    continue;
+                }
+                UserByPort departmentManager = PortConfig.findUserByPortByNumber(s);
+//            QyWxDepartmentManager.append(departmentManager.getWorkwechat()+",");
+            }
+            QyWxDepartmentManager.append("PangFuZhen");
+            if(map.containsKey("mainIdList")){
+                List<Object> mainIdList = (List<Object>) map.get("mainIdList");
+                for (Object main:mainIdList
+                     ) {
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(main), QyWxDepartmentManager.toString());
+                            String sp_no = jsonObject.getString("sp_no");
+                            Map<String, Object> QyWxApprovalMap = new HashMap<>();
+                            QyWxApprovalMap.put("sp_no", sp_no);
+                            QyWxApprovalMap.put("mainId", main.toString());
+                            redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap);
+                            // 设置过期时间为7天
+                            redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
+                        }
+                    }).start();
+                }
+            }else{
+                // 用于发送审批
+                Object finalMainId = mainId;
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(finalMainId), QyWxDepartmentManager.toString());
+                        String sp_no = jsonObject.getString("sp_no");
+                        Map<String, Object> QyWxApprovalMap = new HashMap<>();
+                        QyWxApprovalMap.put("sp_no", sp_no);
+                        QyWxApprovalMap.put("mainId", finalMainId.toString());
+                        redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap);
+                        // 设置过期时间为7天
+                        redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
+                    }
+                }).start();
+            }
+
+
         }
+
         return CrudUtil.putHandle(success, size);
     }
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -170,6 +170,7 @@ public class StockTakingServiceImpl implements StockTakingService {
             }
         }
         if (paramForDepositoryAndPid.size() > 0) {
+            List<Object> mainIdList = new ArrayList<>();
             Set<String> strings = paramForDepositoryAndPid.keySet();
             for (String string : strings
             ) {
@@ -213,7 +214,9 @@ public class StockTakingServiceImpl implements StockTakingService {
 
                     redisTemplate.opsForHash().put(key, "flagForSubmit", "true");
                 }
+                mainIdList.add(param.get("mainId"));
             }
+            map.put("mainIdList",mainIdList);
         }
         return success;
     }

src/test/java/com/dreamchaser/depository_manage/TestForOther.java

@@ -7,6 +7,7 @@ import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.Ap
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
 import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
 import com.dreamchaser.depository_manage.service.DepositoryRecordService;
+import com.dreamchaser.depository_manage.service.StockTakingService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +29,7 @@ public class TestForOther {
     RedisTemplate<String, String> redisTemplate;
 
     @Autowired
-    DepositoryRecordService depositoryRecordService;
+    StockTakingService stockTakingService;
 
     @Test
     public void run() {
@@ -36,6 +37,7 @@ public class TestForOther {
         ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
         approver.setUserId("PangFuZhen");
         approvalInfo_details.setApprover(approver);
-        depositoryRecordService.reviewByQyWxApprovalOut("1", approvalInfo_details, "ebc12ec71c6571ad86cd5497581e2262", "2", "202303130012", false, 2);
+        stockTakingService.reviewByQyWxApproval("9", approvalInfo_details, "ebc12ec71c6571ad86cd5497581e2262", "2", "202303130024");
+
     }
 }