From 61e4855523392fc3f84e3d8745320c10d29bed4f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 29 四月 2024 18:07:54 +0800
Subject: [PATCH] 最新版本
---
/dev/null | 31 ----------
server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java | 48 ++++++----------
server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java | 14 ++--
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 69 +++++++++++++++++++++++
4 files changed, 94 insertions(+), 68 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/Main.java b/server/meeting/meeting_admin/src/main/java/com/doumee/Main.java
deleted file mode 100644
index ada0d0d..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.doumee;
-
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
\ No newline at end of file
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/meeting/meeting_admin/src/main/java/com/doumee/task/ScheduleTool.java
deleted file mode 100644
index 73425ac..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.doumee.task;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.wx.WxPayProperties;
-import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.service.business.BookingsService;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 瀹氭椂浠诲姟
- * @author jiangping
- * @date 2021-10-10 14:40:35
- * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
- */
-@Component
-@EnableScheduling
-public class ScheduleTool {
-
- @Autowired
- private BookingsService bookingsService;
-
- @Autowired
- private WxPayProperties wxPayProperties;
-
- @Autowired
- private SystemDictDataBiz systemDictDataBiz;
- /**
- * 鏄惁寮�鍙戣��
- */
- @Value("${timing}")
- private Boolean timing;
-
-
- /**
- * 缂撳瓨鐪佸競鍖�
- * @throws Exception
- */
- @Scheduled(fixedDelay=24*60*60*1000)
- public void cacheCampus() throws Exception {
- }
- /**
- * 姣忓ぉ鍑屾櫒閲嶇疆鎵�鏈夎鍗昪ode绫诲垵濮嬪��
- * @throws Exception
- */
- @Scheduled(cron="0 0 0 * * ?")
- public void resetOrderCodes() throws Exception {
- }
-
-
- /**
- * 瀹氭椂鍙戦�侀�氱煡 鍙備細閫氱煡 涓� 浼氳寮�濮嬮�氱煡锛堝彂璧蜂汉锛�
- * @throws Exception
- */
- @Scheduled(fixedDelay=60*1000)
- public void sendNotice(){
- bookingsService.sendBookingsNotice();
- }
-
- /**
- * 鏇存柊寰俊 ACCESS_TOKEN
- */
- @Scheduled(fixedDelay = 1000L * 60L * 3L)
- public void updAccessToken(){
- DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
- ThreadContext.bind(manager);
-
- String appId = wxPayProperties.getAppId();
- String appSecret = wxPayProperties.getAppSecret();
- //鐢熸垚寰俊token
- String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
- String response = doGet(url,null);
- JSONObject json = JSONObject.parseObject(response);
- SystemDictData systemDictData = new SystemDictData();
- systemDictData.setId(106);
- systemDictData.setCode(json.getString("access_token"));
- systemDictData.setUpdateTime(new Date());
- systemDictDataBiz.updateByIdNew(systemDictData);
- }
-
-
- /**
- * 鍙戦�乬et璇锋眰
- * @param url 璇锋眰URL
- * @param param 璇锋眰鍙傛暟 key:value url鎼哄甫鍙傛暟 鎴栬�呮棤鍙傚彲涓嶅～
- * @return
- */
- public String doGet(String url, Map<String, String> param) {
- // 鍒涘缓Httpclient瀵硅薄
- CloseableHttpClient httpclient = HttpClients.createDefault();
- String resultString = "";
- CloseableHttpResponse response = null;
- try {
- // 鍒涘缓uri
- URIBuilder builder = new URIBuilder(url);
- if (param != null) {
- for (String key : param.keySet()) {
- builder.addParameter(key, param.get(key));
- }
- }
- URI uri = builder.build();
- // 鍒涘缓http GET璇锋眰
- HttpGet httpGet = new HttpGet(uri);
- // 鎵ц璇锋眰
- response = httpclient.execute(httpGet);
- // 鍒ゆ柇杩斿洖鐘舵�佹槸鍚︿负200
- if (response.getStatusLine().getStatusCode() == 200) {
- resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (response != null) {
- response.close();
- }
- httpclient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return resultString;
- }
-
-}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerJob.java b/server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java
similarity index 61%
rename from server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerJob.java
rename to server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java
index e5f13be..9564701 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerJob.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/biz/VisitServiceJobBiz.java
@@ -1,23 +1,23 @@
-package com.doumee.jobs.visits;
+package com.doumee.jobs.biz;
import com.doumee.jobs.JobService;
+import com.doumee.jobs.fegin.VisitServiceFegin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import java.lang.reflect.Method;
/**
* @author 鍏紬鍙�:鐭ヤ簡涓�绗�
* @since 2023-07-26 11:44
*/
-@Component("visitEmpowerJob")
-public class EmpowerJob implements JobService {
+@Component("visitServiceJob")
+public class VisitServiceJobBiz implements JobService {
@Autowired
- private EmpowerFegin fegin;
- private static final Logger log = LoggerFactory.getLogger(EmpowerJob.class);
+ private VisitServiceFegin fegin;
+ private static final Logger log = LoggerFactory.getLogger(VisitServiceJobBiz.class);
@Override
public void run(String params,String module) {
@@ -25,7 +25,7 @@
try {
method = fegin.getClass().getDeclaredMethod(module);
method.invoke(fegin);
- log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細visitEmpowerJob.========"+module);
+ log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細visitServiceJob.========"+module);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
new file mode 100644
index 0000000..6d0d8ea
--- /dev/null
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -0,0 +1,69 @@
+package com.doumee.jobs.fegin;
+
+import com.doumee.core.model.ApiResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author jiangping
+ */
+@Component("visitServiceJob")
+@FeignClient(value = "visitsTimer")
+public interface VisitServiceFegin {
+
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇汉鍛樿澶囨巿鏉冪粨鏋�")
+ @GetMapping("/timer/empower/syncEmpowerDetailData")
+ ApiResponse syncEmpowerDetailData();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴�")
+ @GetMapping("/timer/empower/syncEmpowerResultData")
+ ApiResponse syncEmpowerResultData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
+ @GetMapping("/timer/empower/syncEmpowerFailData")
+ ApiResponse syncEmpowerFailData();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
+ @GetMapping("/timer/empower/syncEmpowerData")
+ ApiResponse syncEmpowerData();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣澶囩姸鎬�")
+ @GetMapping("/timer/device/getAscDeviceStatus")
+ ApiResponse getAscDeviceStatus() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵笅杞芥捣搴风郴缁熷浘鐗囨暟鎹�")
+ @GetMapping("/timer/image/downHKImgs")
+ ApiResponse downHKImgs();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵帴鍙ｆ棩蹇楁竻鐞�")
+ @GetMapping("/timer/log/clearThreeMonthLog")
+ ApiResponse clearThreeMonthLog();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃惰溅杈嗗寘鏈熸巿鏉�")
+ @GetMapping("/timer/park/syncParkBookData")
+ ApiResponse syncParkBookData();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣溅杈嗘煡璇�")
+ @GetMapping("/timer/park/syncVehicleUpdateData")
+ ApiResponse syncVehicleUpdateData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�")
+ @GetMapping("/timer/orguser/syncOrgData")
+ ApiResponse syncOrgData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�")
+ @GetMapping("/timer/orguser/syncMemberDelData")
+ ApiResponse syncMemberDelData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�")
+ @GetMapping("/timer/orguser/syncUserData")
+ ApiResponse syncUserData();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺喕缁撲汉鍛�")
+ @GetMapping("/timer/orguser/memberFreeze")
+ ApiResponse memberFreeze();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵笅鍙戣瀹㈤绾︾敵璇�")
+ @GetMapping("/timer/visit/syncVisitData")
+ ApiResponse syncVisitData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣瀹㈤绾︾姸鎬�")
+ @GetMapping("/timer/visit/getOutTimeVisitRecord")
+ ApiResponse getOutTimeVisitRecord();
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁")
+ @GetMapping("/timer/visit/syncVistAppointData")
+ ApiResponse syncVistAppointData() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
+ @GetMapping("/timer/wxtoken/updateWxAccessToken")
+ public ApiResponse updateWxAccessToken();
+
+
+}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerFegin.java
deleted file mode 100644
index 0908f41..0000000
--- a/server/system_timer/src/main/java/com/doumee/jobs/visits/EmpowerFegin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.doumee.jobs.visits;
-
-import com.doumee.core.model.ApiResponse;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-
-/**
- * @author 鍏紬鍙�:鐭ヤ簡涓�绗�
- * @since 2023-07-26 11:44
- */
-@Component("visitEmpowerJob")
-@FeignClient(value = "visitsTimer")
-public interface EmpowerFegin {
-
- @ApiOperation("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冪粨鏋�")
- @GetMapping("/timer/empower/syncEmpowerDetailData")
- public ApiResponse syncEmpowerDetailData();
- @ApiOperation("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴�")
- @GetMapping("/timer/empower/syncEmpowerResultData")
- public ApiResponse syncEmpowerResultData() ;
-
- @ApiOperation("寮�鍚畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/timer/empower/syncEmpowerFailData")
- public ApiResponse syncEmpowerFailData();
-
- @ApiOperation("寮�鍚畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
- @GetMapping("/timer/empower/syncEmpowerData")
- public ApiResponse syncEmpowerData();
-}
diff --git a/server/visits/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
similarity index 65%
rename from server/visits/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
rename to server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
index 363cb0d..19131de 100644
--- a/server/visits/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
@@ -1,45 +1,37 @@
package com.doumee.api;
-
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import com.doumee.service.system.SystemDictDataService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import java.io.IOException;
-import java.net.URI;
import java.util.Date;
-import java.util.Map;
import java.util.Objects;
/**
- * 瀹氭椂浠诲姟
- * @author jiangping
- * @date 2021-10-10 14:40:35
- * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
*/
-//@Component
-//@EnableScheduling
-@Slf4j
-public class ScheduleTool {
-
+@Api(tags = "寰俊token瀹氭椂鍣ㄦ帴鍙�")
+@RestController
+@RequestMapping("/timer/wxtoken")
+public class WxTokenTimerController extends BaseController {
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -50,13 +42,9 @@
*/
@Value("${debug_model}")
private Boolean timing;
-
- /**
- * 鏇存柊寰俊鍏紬鍙� ACCESS_TOKEN
- * @throws Exception
- */
- @Scheduled(fixedDelay=1000 * 60 * 90)
- public void updAccessToken(){
+ @ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
+ @GetMapping("/updateWxAccessToken")
+ public ApiResponse updateWxAccessToken() {
DefaultSecurityManager securityManager = new DefaultSecurityManager();
SecurityUtils.setSecurityManager(securityManager);
@@ -72,8 +60,8 @@
systemDictData.setCode(json.getString("access_token"));
systemDictData.setUpdateTime(new Date());
systemDictDataService.updateById(systemDictData);
- log.info(" 鏇存柊寰俊鍏紬鍙� ACCESS_TOKEN =========> " + systemDictData.getCode() );
}
+ return ApiResponse.success("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken鎴愬姛");
}
--
Gitblit v1.9.3