优化

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -57,20 +57,21 @@ public class IoCollectOrderBackupController extends BaseController {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
-        if (collectOrderRequest.getWorkPlaceCode() == null) {
+        // 上传医保不做登录权限限制
-            Long userId = getUserId();
+//        if (collectOrderRequest.getWorkPlaceCode() == null) {
-            BasicCollectUserRequest request = new BasicCollectUserRequest();
+//            Long userId = getUserId();
-            request.setPage(1);
+//            BasicCollectUserRequest request = new BasicCollectUserRequest();
-            request.setLimit(100);
+//            request.setPage(1);
-            request.setUserId(userId.toString());
+//            request.setLimit(100);
-            page = basicCollectUserService.filterList(request);
+//            request.setUserId(userId.toString());
-            if (page != null) {
+//            page = basicCollectUserService.filterList(request);
-                workPlaceCodes = page.stream()
+//            if (page != null) {
-                        .map(UserWorkResponse::getWorkplaceId)
+//                workPlaceCodes = page.stream()
-                        .collect(Collectors.toList());
+//                        .map(UserWorkResponse::getWorkplaceId)
-            }
+//                        .collect(Collectors.toList());
-            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
+//            }
-        }
+//            collectOrderRequest.setWorkPlaceCodes(workPlaceCodes);
+//        }
         log.error("collectOrderRequest"+collectOrderRequest);
         List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
         PageInfo<IoCollectOrderResponse> pageInfo = new PageInfo<>(orderResponses);

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -175,7 +175,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if(StringUtils.isEmpty(collectOrderBizResponse.getFinishUdiCode())){
                 List<IoCollectCodeBackup> ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper<IoCollectCodeBackup>()
                         .eq("billNo",collectOrderBizRequest.getOrderIdFk())
-                        .eq("relId",collectOrderBiz.getId())
+                        .eq("relId",collectOrderBiz.getRelId())
                         .groupBy("code")
                 );
 

src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java

@@ -108,7 +108,7 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                     if (CollUtil.isNotEmpty(ioCollectSetBustypes)) {
                         sysWorkplaceBus = sysWorkplaceBusService.getOne(new LambdaQueryWrapper<SysWorkplaceBus>().eq(SysWorkplaceBus::getBusTypeCode, sysWorkplaceDocumentEntity.getDocumentTypeCode()).last("limit 1"));
                     }
-                    if (sysWorkplaceBus == null) break;
+                    if (sysWorkplaceBus == null) continue;
                     collectOrderRequest.setWorkPlaceCode(sysWorkplaceBus.getWorkplaceCode());
                     collectOrderRequest.setBusType(sysWorkplaceBus.getBusTypeCode());
                     collectOrderRequest.setBillNo(collectOrder.getBillNo());

src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java

@@ -8,6 +8,7 @@ import com.glxp.api.dao.schedule.ScheduledDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.collect.IoCollectSet;
 import com.glxp.api.entity.collect.IoCollectSetBustype;
+import com.glxp.api.entity.system.ScheduledEntity;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.system.ScheduledRequest;
 import com.glxp.api.res.collect.IoCollectOrderResponse;
@@ -53,25 +54,32 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
                 triggerContext -> {
                     ScheduledRequest scheduledRequest = new ScheduledRequest();
                     scheduledRequest.setCronName("ioCollectOrderUploadTask");
-                    // 使用设置的轮询时间为准 这边进行转换
+                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    IoCollectSet ioCollectSet = collectSetService.getSet();
                     String cron = null;
-                    if (ioCollectSet != null
-                            && ioCollectSet.getStartUploadHour() != null
-                            && ioCollectSet.getStartUploadHour() > 0
-                    ) {
-                        if (ioCollectSet.getStartUploadHour() <= 24) {
-                            cron = "0 0 */" + ioCollectSet.getStartUploadHour() + " * * ? ";
 
+                    if(scheduledEntity==null){
+                        // 使用设置的轮询时间为准 这边进行转换
+                        IoCollectSet ioCollectSet = collectSetService.getSet();
+                        if (ioCollectSet != null
+                                && ioCollectSet.getStartUploadHour() != null
+                                && ioCollectSet.getStartUploadHour() > 0
+                        ) {
+                            if (ioCollectSet.getStartUploadHour() <= 24) {
+                                cron = "0 0 */" + ioCollectSet.getStartUploadHour() + " * * ? ";
+
+                            }
+                        } else {
+                            cron = "0 0 0 */1 * ?";
                         }
-                    } else {
+                        logger.info("已完成单据自动上传轮询设置cron表达式===" + cron);
-                        cron = "0 0 0 */1 * ?";
-                    }
-                    logger.info("已完成单据自动上传轮询设置cron表达式===" + cron);
 
-                    if (cron.isEmpty()) {
+                        if (cron.isEmpty()) {
-                        logger.error("cron is null");
+                            logger.error("cron is null");
+                        }
+                    }else {
+                         cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 */30 * * * ?";
                     }
+
                     return new CronTrigger(cron).nextExecutionTime(triggerContext);
                 });
     }