Merge remote-tracking branch 'origin/master'

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -93,7 +93,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
 
     // Batch size for database inserts, configurable via application.properties
-    private final int BATCH_SIZE = 1000;
+    private final int BATCH_SIZE = 500;
 
     @Autowired
     private IFsCourseLinkService courseLinkService;

fs-service/src/main/java/com/fs/his/service/impl/FsHfpayConfigServiceImpl.java

@@ -1,8 +1,11 @@
 package com.fs.his.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsHfpayConfigMapper;
@@ -51,6 +54,12 @@ public class FsHfpayConfigServiceImpl extends ServiceImpl<FsHfpayConfigMapper, F
     @Override
     public int insertFsHfpayConfig(FsHfpayConfig fsHfpayConfig)
     {
+        if(StringUtils.isNotEmpty(fsHfpayConfig.getAppId())) {
+            FsHfpayConfig config = baseMapper.selectOne(Wrappers.<FsHfpayConfig>lambdaQuery()
+                    .eq(FsHfpayConfig::getAppId, fsHfpayConfig.getAppId()));
+            if(config != null)
+                throw new RuntimeException("appId已存在");
+        }
         fsHfpayConfig.setCreateTime(DateUtils.getNowDate());
         return baseMapper.insertFsHfpayConfig(fsHfpayConfig);
     }
@@ -64,6 +73,13 @@ public class FsHfpayConfigServiceImpl extends ServiceImpl<FsHfpayConfigMapper, F
     @Override
     public int updateFsHfpayConfig(FsHfpayConfig fsHfpayConfig)
     {
+        if(StringUtils.isNotEmpty(fsHfpayConfig.getAppId())) {
+            FsHfpayConfig config = baseMapper.selectOne(Wrappers.<FsHfpayConfig>lambdaQuery()
+                    .eq(FsHfpayConfig::getAppId, fsHfpayConfig.getAppId())
+                    .ne(FsHfpayConfig::getId, fsHfpayConfig.getId()));
+            if(config != null)
+                throw new RuntimeException("appId已存在");
+        }
         fsHfpayConfig.setUpdateTime(DateUtils.getNowDate());
         return baseMapper.updateFsHfpayConfig(fsHfpayConfig);
     }

fs-service/src/main/java/com/fs/sop/service/impl/QwSopLogsServiceImpl.java

@@ -2043,7 +2043,7 @@ public class QwSopLogsServiceImpl extends ServiceImpl<QwSopLogsMapper, QwSopLogs
                     log.setRemark(remark);
                     log.setReceivingStatus(0L);
                     log.setSendTime(sendTime);
-                    log.setSort(nowSort);
+                    log.setSort(30000001);
                 }
                 updateQueue.add(log);
             }