From 7c4fa0b57d45926a5328e1650605f30c46b63341 Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期二, 11 十月 2022 18:56:58 +0800 Subject: [PATCH] #lsh --- src/main/java/com/zy/asrs/task/handler/FireHeartHandler.java | 64 ++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/controller/OpenController.java | 14 ------- src/main/java/com/zy/asrs/task/FireHeartScheduler.java | 33 ++++++++++++++++ 3 files changed, 97 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index b987afe..103054e 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -294,20 +294,6 @@ } return R.ok(map); } - @PostMapping("/rpv/test/open/auth") - @AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛") - public synchronized R test1(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) Object param, - HttpServletRequest request){ - - auth(appkey, param, request); - - System.out.println(param); - - Map<String,Boolean> map=new HashMap<>(); - map.put("isComplete",true); - return R.ok(map); - } /*...........................璧e窞鏂板..............浠ヤ笂.............璧e窞鏂板...........................*/ diff --git a/src/main/java/com/zy/asrs/task/FireHeartScheduler.java b/src/main/java/com/zy/asrs/task/FireHeartScheduler.java new file mode 100644 index 0000000..1c1e043 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/FireHeartScheduler.java @@ -0,0 +1,33 @@ +package com.zy.asrs.task; + +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.FireHeartHandler; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class FireHeartScheduler { + + @Value("${wcs-slave.doubleDeep}") + private boolean confirmDeep; + @Autowired + private FireHeartHandler fireHeartHandler; + + /** + * + */ + @Scheduled(cron = "0/60 * * * * ? ") + private void execute() { + if (confirmDeep) return; + + ReturnT<String> result = fireHeartHandler.start(); + if (!result.isSuccess()) { + log.error("绱ф�ユ秷闃插嚭搴撳け璐�"); + } + } + +} diff --git a/src/main/java/com/zy/asrs/task/handler/FireHeartHandler.java b/src/main/java/com/zy/asrs/task/handler/FireHeartHandler.java new file mode 100644 index 0000000..858047f --- /dev/null +++ b/src/main/java/com/zy/asrs/task/handler/FireHeartHandler.java @@ -0,0 +1,64 @@ +package com.zy.asrs.task.handler; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.core.exception.CoolException; +import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ; +import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.LocDetlService; +import com.zy.asrs.service.LocMastService; +import com.zy.asrs.service.WrkDetlService; +import com.zy.asrs.service.WrkMastService; +import com.zy.asrs.task.AbstractHandler; +import com.zy.asrs.task.core.ReturnT; +import com.zy.common.model.enums.WorkNoType; +import com.zy.common.service.CommonService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import java.util.Date; +import java.util.List; + +/** + * Created by vincent on 2020/7/6 + */ +@Service +@Slf4j +public class FireHeartHandler extends AbstractHandler<String> { + + @Autowired + private LocDetlService locDetlService; + @Autowired + private LocMastService locMastService; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private CommonService commonService; + @Autowired + private WrkDetlService wrkDetlService; + + @Transactional + public ReturnT<String> start() { + try { + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>() + .eq("loc_no", "0101804")); + if (!Cools.isEmpty(locMast)){ + locMast.setChannel(locMast.getChannel()+60); + locMastService.update(locMast,new EntityWrapper<LocMast>() + .eq("loc_no", "0101804")); + } + } catch (Exception e) { + e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return FAIL.setMsg(e.getMessage()); + } + return SUCCESS; + } + +} -- Gitblit v1.9.1