From 1a7a451e82e99cc0c0d56d44fc4b981c5d8a06ee Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 27 三月 2024 15:40:28 +0800 Subject: [PATCH] #测试特殊处理 --- src/main/java/com/zy/system/controller/LicenseCreatorController.java | 3 src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 5 src/main/java/com/zy/common/web/AuthController.java | 12 +- src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 12 +- src/main/webapp/views/index.html | 2 6 files changed, 334 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java new file mode 100644 index 0000000..0dc9943 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java @@ -0,0 +1,315 @@ +package com.zy.asrs.task; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.zy.asrs.entity.*; +import com.zy.asrs.service.*; +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.WrkMastStaInItHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Monkey D. Luffy on 2023.07.25 + * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉� + */ +@Component +public class WrkMastStaInIt2Scheduler { + + private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class); + + @Autowired + private WrkMastStaInItHandler wrkMastStaInItHandler; + @Autowired + private BasDevpService basDevpService; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private RgvOneSignService rgvOneSignService; + @Autowired + private WrkMastStaService wrkMastStaService; + @Autowired + private WrkDetlService wrkDetlService; + @Autowired + private LocDetlService locDetlService; + + + public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{ + add(110);add(111);add(113);add(114);add(116);add(117); + }}; + + public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{ + add(120);add(121); + }}; + + public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{ + add(120);add(121); + }}; + public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{ + add(120); + }}; + public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{ + add(121); + }}; + + public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ + add(120);add(121);add(122);add(123); + }}; + + + @Scheduled(cron = "0/3 * * * * ? ") + private void execute(){ + for(Integer staNo : STA_WORK_CU){ + try{ + BasDevp basDevp = basDevpService.selectById(staNo); + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); + if(Cools.isEmpty(wrkMast)){ + continue; + } + if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){ + if (!wrkMast.getStaNo().equals(122)){ + continue; + } + } + if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){ + continue; + } + if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){ + continue; + } + boolean wrkTypeSign = fullKM(wrkMast); + if (!Cools.isEmpty(wrkMast)){ + if (wrkTypeSign) { + ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀� + if (result.getCode()==200){ + continue; + }else { + System.out.println(staNo+"澶辫触锛�"); + } + } else { + ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙� + if (result.getCode()==200){ + continue; + }else { + System.out.println(staNo+"澶辫触锛�"); + } + } + } + } + }catch (Exception e){ + log.error("鑷姩琛ョ┖鏉縎TA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e); + } + } + + for(Integer staNo : STA_WORK_RU){ + try{ + BasDevp basDevp = basDevpService.selectById(staNo); + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); + if (Cools.isEmpty(wrkMast)){ + continue; + } + + if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ + continue; + } +// boolean wrkTypeSign = fullKM(wrkMast); + + if (!Cools.isEmpty(wrkMast)){ +// if (wrkTypeSign){ + ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13); + if (result.getCode()==200) { + continue; + } else { + System.out.println(staNo+"澶辫触锛�"); + } + } + } + }catch (Exception e){ + log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e); + } + } + } + + @Scheduled(cron = "0/3 * * * * ? ") + private void execute2(){ + try{ + for(Integer staNo : STA_WORK_CU){ + try{ + BasDevp basDevp = basDevpService.selectById(staNo); + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); + if(Cools.isEmpty(wrkMast)){ + continue; + } + if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){ + continue; + } + if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){ + continue; + } + if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){ + continue; + } + int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNo()).or().eq("sta_end", wrkMast.getStaNo())); + if (count!=0){ + continue; + } + int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo())); + if (countStart!=0){ + continue; + } + BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo()); + if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){ + continue; + } + if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){ + RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign")); + if (rgvOneSign.getRgvOneSign()==1){ + continue; + } + } + if (wrkMast.getIoType()!=101){ + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + if (wrkDetls.size()!=0){ + String origin = wrkDetls.get(0).getOrigin(); + if (origin.equals("1")){ + if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){ + continue; + } + }else { + if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNo())){ + continue; + } + } + }else { + log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏"); + continue; + } + } +// + boolean wrkTypeSign = fullKM(wrkMast); + if (!Cools.isEmpty(wrkMast)){ + if (wrkTypeSign) { + ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀� + if (result.getCode()==200){ + continue; + }else { + System.out.println(staNo+"澶辫触锛�"); + } + } + } + } + }catch (Exception e){ + log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e); + } + } + + for(Integer staNo : STA_WORK_CU){ + try{ + BasDevp basDevp = basDevpService.selectById(staNo); + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ + List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR; + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); + if(Cools.isEmpty(wrkMast)){ + continue; + } + if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){ + continue; + } + if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){ + continue; + } + Integer wrkMastStaNo = wrkMast.getStaNo(); + if (wrkMastStaNo<118 || wrkMastStaNo>121){ + continue; + } + String origin = null; + boolean sign = false; + if (wrkMast.getIoType()!=101){ + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + if (wrkDetls.size()!=0){ + origin = wrkDetls.get(0).getOrigin(); + if (origin.equals("1")){ + if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){ + sign = true; + } + }else { + if (!STA_WORK_CU_CAR_THREE.contains(wrkMastStaNo)){ + sign = true; + } + } + }else { + log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏"); + continue; + } + } + int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo)); + if (count!=0){ + continue; + } + int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo())); + if (countStart!=0){ + continue; + } + RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign")); + if (rgvOneSign.getRgvOneSign()==1){ + STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO; + } + + BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo); + if (sign || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) { + for (Integer staNoOther : STA_WORK_CU_CAR_NOW) { + if (staNoOther.equals(wrkMastStaNo)) continue; + + if (sign){ + if (origin.equals("1")){ + if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){ + continue; + } + }else { + if (!STA_WORK_CU_CAR_THREE.contains(staNoOther)){ + continue; + } + } + } + + int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther)); + if (countOther!=0){ + continue; + } + BasDevp basDevpOther = basDevpService.selectById(staNoOther); + if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) { + continue; + } + wrkMast.setStaNo(staNoOther); + wrkMastService.updateById(wrkMast); + log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo); + return; + } + } + } + }catch (Exception e){ + log.error("STA_WORK_CU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e); + } + } + }catch (Exception e){ + log.error("鐩爣涓烘媶鍨涗綅缃殑浠诲姟鐢熸垚灏忚溅宸ヤ綔妗f澶辫触锛侊紒"+e); + } + } + + public boolean fullKM(WrkMast wrkMast){ + if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){ + return true; + } + return false; + } + +} diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java index eb36dc9..3e2fe35 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java @@ -41,25 +41,25 @@ public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{ - add(101);add(102);add(104);add(105);add(107);add(108);add(110);add(111);add(113);add(114);add(116);add(117); + add(101);add(102);add(104);add(105);add(107);add(108); }}; public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{ - add(118);add(119);add(120);add(121); + add(118);add(119); }}; public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{ - add(120);add(121); + }}; public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{ - add(118);add(120); + add(118); }}; public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{ - add(119);add(121); + add(119); }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ - add(118);add(119);add(120);add(121);add(122);add(123); + add(118);add(119);add(122); }}; diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java index c8bca4a..4a59b2e 100644 --- a/src/main/java/com/zy/common/web/AuthController.java +++ b/src/main/java/com/zy/common/web/AuthController.java @@ -50,12 +50,12 @@ @RequestMapping("/login.action") @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍") public R loginAction(String username, String password){ - //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁� - LicenseVerify licenseVerify = new LicenseVerify(); - boolean verify = licenseVerify.verify(); - if (!verify) {//璁稿彲璇佸凡澶辨晥 - return R.parse(CodeRes.SYSTEM_20001); - } +// //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁� +// LicenseVerify licenseVerify = new LicenseVerify(); +// boolean verify = licenseVerify.verify(); +// if (!verify) {//璁稿彲璇佸凡澶辨晥 +// return R.parse(CodeRes.SYSTEM_20001); +// } if (username.equals("super") && password.equals(Cools.md5(superPwd))) { Map<String, Object> res = new HashMap<>(); res.put("username", username); diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java index b8862a7..da5701a 100644 --- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java +++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java @@ -69,6 +69,9 @@ */ @RequestMapping(value = "/getLicenseDays") public R getLicenseDays() { + if (true){ + return R.ok().add(0); + } LicenseVerify licenseVerify = new LicenseVerify(); LicenseContent verifyInfo = licenseVerify.getVerifyInfo(); if (verifyInfo == null) { diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java index 1659df2..071ef11 100644 --- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java +++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java @@ -79,11 +79,12 @@ LicenseVerify licenseVerify = new LicenseVerify(); //瀹夎璇佷功 - LicenseContent install = licenseVerify.install(param); +// LicenseContent install = licenseVerify.install(param); logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++"); - return install != null; +// return install != null; + return true; } catch (Exception e) { return false; } diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html index 1295d6b..274b0d4 100644 --- a/src/main/webapp/views/index.html +++ b/src/main/webapp/views/index.html @@ -45,7 +45,7 @@ <!-- <a ew-event="note" title="渚跨"><i class="layui-icon layui-icon-note"></i></a>--> <!-- </li>--> <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;"> - <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div> +<!-- <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>--> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a ew-event="fullScreen" title="鍏ㄥ睆"><i class="layui-icon layui-icon-screen-full"></i></a> -- Gitblit v1.9.1