From 3e2a8cc2dd16f66415ee7f300b8a5ca56b1432ad Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 3 Apr 2024 21:11:34 +0800 Subject: [PATCH] fix job --- .../Services/Implements/GainfoUpdateService.cs | 14 ++++++-------- .../Common/Services/Implements/JinkoSapService.cs | 2 ++ Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs index ca165d1f..c08a520e 100644 --- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs +++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs @@ -48,7 +48,7 @@ public class GainfoUpdateService : IGainfoUpdateService try { - //var pJson = "{\"KOSTL\":\"157010304\",\"ZLZRQ\":null,\"ZZ_SFZH\":\"622826198504271711\",\"STELL\":\"40301704\",\"STELL_NM\":\"设备工程师\",\"ZZ_KLX\":null,\"PERNR\":\"00144331\",\"ZWORKCODE\":\"SC005537\",\"MASSN\":\"ZE\",\"MNTXT\":\"数据变更\",\"MASSG\":\"50\",\"MGTXT\":\"数据变更\",\"ZSTATUS\":\"1\",\"STAT2\":\"3\",\"BEGDA\":\"2024-04-03\",\"ENDDA\":\"9999-12-31\",\"WERKS\":\"1570\",\"PERSG\":\"1\",\"PERSK\":\"30\",\"BTRTL\":\"16\",\"ANSVH\":\"3\",\"MOABW\":\"28\",\"ORGEH\":\"00400090\",\"PLANS\":\"40301704\",\"ZZ_ZYSF\":null,\"ZZ_AQJB\":\"10\",\"ZZ_ZD\":\"6\",\"ZZ_SJGH\":\"SC007804\",\"ZZ_BGZT\":null,\"Z_ZJ\":\"T1\",\"ZZ_XSQY\":null,\"ZZ_LOC\":null,\"ZZ_COUN\":\"越南\",\"ZZ_CITY\":\"乐山\",\"NACHN\":\"杨\",\"VORNA\":\"文涛\",\"NAME\":\"杨文涛\",\"GESCH\":\"1\",\"GBDAT\":\"1985-04-27T00:00:00\",\"NATIO\":\"CN\",\"ZZ_QFRQ\":\"2019-01-09\",\"ZMOBILE\":\"15861181314\",\"ZEMAIL\":\"wentao.yang@jinkosolar.com\",\"ZADZH\":null,\"ZRZRQ\":\"2021-03-15T00:00:00\",\"DAT01\":\"2021-03-15\",\"ZCJRQ\":\"2021-03-15\",\"ZZZRQ\":\"2021-06-01\",\"ZXUELI\":\"高中/中专【失效】\",\"ZZ_ZPQD\":\"22\",\"ZZ_COUNNM\":null,\"ZZ_GZDJDNM\":\"越南基地\",\"ZZ_GZDCQNM\":\"越南AMATA\"}"; + //var pJson = "{\"KOSTL\":\"156020336\",\"ZLZRQ\":\"2023-10-30T00:00:00\",\"ZZ_SFZH\":\"\\\"140105200112051318\n\",\"STELL\":null,\"STELL_NM\":null,\"ZZ_KLX\":\"3\",\"PERNR\":\"00281800\",\"ZWORKCODE\":\"098250\",\"MASSN\":\"ZD\",\"MNTXT\":\"离职\",\"MASSG\":\"41\",\"MGTXT\":\"自离【失效】\",\"ZSTATUS\":\"5\",\"STAT2\":\"0\",\"BEGDA\":\"2023-10-30\",\"ENDDA\":\"9999-12-31\",\"WERKS\":\"1560\",\"PERSG\":\"2\",\"PERSK\":\"30\",\"BTRTL\":\"1560\",\"ANSVH\":\"4\",\"MOABW\":\"29\",\"ORGEH\":\"00210591\",\"PLANS\":\"99999999\",\"ZZ_ZYSF\":\"2\",\"ZZ_AQJB\":\"10\",\"ZZ_ZD\":\"3\",\"ZZ_SJGH\":\"30042938\",\"ZZ_BGZT\":\"2000\",\"Z_ZJ\":\"T0\",\"ZZ_XSQY\":null,\"ZZ_LOC\":\"海宁尖山\",\"ZZ_COUN\":\"中国\",\"ZZ_CITY\":\"海宁\",\"NACHN\":\"岳\",\"VORNA\":\"文超\",\"NAME\":\"岳文超\",\"GESCH\":\"1\",\"GBDAT\":\"2001-12-05T00:00:00\",\"NATIO\":\"CN\",\"ZZ_QFRQ\":\"2019-04-11\",\"ZMOBILE\":\"13773151205\",\"ZEMAIL\":\"wenchao.yue@jinkosolar.com\",\"ZADZH\":null,\"ZRZRQ\":\"2023-05-05T00:00:00\",\"DAT01\":\"2023-05-05\",\"ZCJRQ\":\"2023-05-05\",\"ZZZRQ\":\"2023-08-04\",\"ZXUELI\":\"高中/中专【失效】\",\"ZZ_ZPQD\":\"8\",\"ZZ_COUNNM\":null,\"ZZ_GZDJDNM\":\"海宁基地\",\"ZZ_GZDCQNM\":\"海宁尖山\"}"; //var personResp = new SapPersonResponse //{ // Person = new SapPerson @@ -106,17 +106,15 @@ public class GainfoUpdateService : IGainfoUpdateService await _dbContext.UpdateAsync(werkInfo); } } - } - catch (Exception ex) - { - werkInfo.HandleMessage = ex.Message; + + werkInfo.HandleMessage = "同步结束"; werkInfo.LastSyncEndTime = DateTime.Now; werkInfo.BackgroundJobKey = string.Empty; await _dbContext.UpdateAsync(werkInfo); } - finally + catch (Exception ex) { - werkInfo.HandleMessage = "同步结束"; + werkInfo.HandleMessage = ex.Message; werkInfo.LastSyncEndTime = DateTime.Now; werkInfo.BackgroundJobKey = string.Empty; await _dbContext.UpdateAsync(werkInfo); @@ -377,7 +375,7 @@ public class GainfoUpdateService : IGainfoUpdateService private List LoadData() { - //var pJson = "{\"id\":0,\"ano\":null,\"class\":\"C\",\"passwd\":null,\"question\":null,\"answer\":null,\"gname\":\"杨文涛\",\"ename\":\"SC005537\",\"country\":null,\"idcls\":\"ID\",\"idno\":\"622826198504271711\",\"native\":\"622826\",\"sex\":\"M\",\"birthday\":\"1985-04-27T00:00:00\",\"address\":\"\",\"postcode\":null,\"occupation\":\"99\",\"appellation\":\"00400090\",\"nation\":\"01\",\"phone\":\"15861181314\",\"fax\":null,\"mobile\":null,\"email\":\"高中/中专【失效】\",\"web\":\"40301704\",\"vip\":null,\"sec\":null,\"cropsno\":null,\"cropname\":null,\"fancy\":null,\"remark\":\"入职时间:2021-03-15 变更原因:数据变更\",\"amount\":0,\"days\":0,\"consume01\":0.0000,\"consume02\":0.0000,\"consume03\":0.0000,\"consume04\":0.0000,\"log_id\":\"XX\",\"log_shift\":\"1\",\"log_date\":null,\"log_ip\":\"127.0.0.1\",\"times\":0,\"logmark\":0,\"rmcode\":null,\"mkt\":null,\"src\":null,\"isowner\":\"T\",\"createdate\":\"2021-03-15T00:00:00\",\"PERNR\":\"00144331\",\"WERKS\":\"1570\",\"ZSTATUS\":\"1\",\"KOSTL\":\"157010304\",\"ZZ_ZD\":\"6\",\"Z_ZJ\":\"T1\",\"STELL\":\"40301704\",\"STELL_NM\":\"设备工程师\",\"ZLZRQ\":null,\"MASSN\":\"ZE\",\"MNTXT\":\"数据变更\",\"MASSG\":null,\"MGTXT\":null,\"logdate\":\"2024-03-14T00:32:00\",\"updatelogdate\":null,\"guestno\":null,\"ZZ_KLX\":null,\"DAT01\":null,\"ZZ_COUNNM\":null,\"ZZ_GZDJDNM\":\"越南基地\",\"ZZ_GZDCQNM\":\"越南AMATA\"}"; + //var pJson = "{\"id\":0,\"ano\":null,\"class\":\"C\",\"passwd\":null,\"question\":null,\"answer\":null,\"gname\":\"岳文超\",\"ename\":\"098250\",\"country\":null,\"idcls\":\"ID\",\"idno\":\"\\\"140105200112051318\n\",\"native\":\"14010\",\"sex\":\"M\",\"birthday\":\"2001-12-05T00:00:00\",\"address\":\"\",\"postcode\":null,\"occupation\":\"99\",\"appellation\":\"00210591\",\"nation\":\"01\",\"phone\":\"13773151205\",\"fax\":null,\"mobile\":null,\"email\":\"高中/中专【失效】\",\"web\":\"\",\"vip\":null,\"sec\":null,\"cropsno\":null,\"cropname\":null,\"fancy\":null,\"remark\":\"入职时间:2023-05-05 离职时间:2023-10-30 变更原因:自离【失效】\",\"amount\":0,\"days\":0,\"consume01\":0.0000,\"consume02\":0.0000,\"consume03\":0.0000,\"consume04\":0.0000,\"log_id\":\"XX\",\"log_shift\":\"1\",\"log_date\":null,\"log_ip\":\"127.0.0.1\",\"times\":0,\"logmark\":0,\"rmcode\":null,\"mkt\":null,\"src\":null,\"isowner\":\"F\",\"createdate\":\"2023-05-05T00:00:00\",\"PERNR\":\"00281800\",\"WERKS\":\"1560\",\"ZSTATUS\":\"5\",\"KOSTL\":\"156020336\",\"ZZ_ZD\":\"3\",\"Z_ZJ\":\"T0\",\"STELL\":null,\"STELL_NM\":null,\"ZLZRQ\":\"2023-10-30T00:00:00\",\"MASSN\":\"ZD\",\"MNTXT\":\"离职\",\"MASSG\":null,\"MGTXT\":null,\"logdate\":\"2024-03-14T00:02:34\",\"updatelogdate\":null,\"guestno\":null,\"ZZ_KLX\":\"3\",\"DAT01\":null,\"ZZ_COUNNM\":null,\"ZZ_GZDJDNM\":\"海宁基地\",\"ZZ_GZDCQNM\":\"海宁尖山\"}"; //var gainfos = new List() { pJson.ToObject() }; var gainfos = _dbContext.Queryable().ToList(); diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoSapService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoSapService.cs index 07638119..b2aa5196 100644 --- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoSapService.cs +++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoSapService.cs @@ -81,6 +81,7 @@ public class JinkoSapService : IJinkoSapService { var body = new { + I_ALLINFO = "X", T_WERKS = new { item = new List @@ -152,6 +153,7 @@ public class JinkoSapService : IJinkoSapService var body = new { + I_ALLINFO = "X", T_WERKS = Array.Empty(), T_PERSON = Array.Empty(), T_PNO = new diff --git a/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs b/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs index 5d7179ec..97561c9c 100644 --- a/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/HangfirePack.cs @@ -21,7 +21,9 @@ public class HangfirePack : BaseAppPack .UseRedisStorage(sp.GetService(), new RedisStorageOptions { Db = 5, - Prefix = "hangfire" + Prefix = "hangfire", + InvisibilityTimeout = TimeSpan.FromHours(2), + SucceededListSize = 5000, }) .UseSerilogLogProvider();