From f2d095dd7f3df56b09564ba46dcaa36d912ae4a8 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 18 三月 2024 18:05:45 +0800
Subject: [PATCH] 整理
---
server/admin_timer/src/main/java/com/doumee/TimerApplication.java | 25 ++
server/admin_timer/src/main/java/com/doumee/Main.java | 7
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 16
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java | 33 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 3
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java | 32 +++
server/pom.xml | 1
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 310 +++++++++++++++++++-----------
server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java | 44 ++++
server/dmvisit_admin/pom.xml | 2
server/admin_timer/src/main/resources/application.yml | 75 +++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 3
14 files changed, 425 insertions(+), 132 deletions(-)
diff --git a/server/admin_timer/src/main/java/com/doumee/Main.java b/server/admin_timer/src/main/java/com/doumee/Main.java
new file mode 100644
index 0000000..ada0d0d
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/Main.java
@@ -0,0 +1,7 @@
+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/admin_timer/src/main/java/com/doumee/TimerApplication.java b/server/admin_timer/src/main/java/com/doumee/TimerApplication.java
new file mode 100644
index 0000000..ac450ce
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/TimerApplication.java
@@ -0,0 +1,25 @@
+package com.doumee;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * 鍚姩绫�
+ * @author Eva.Caesar Liu
+ * @date 2023/03/21 14:49
+ */
+@Slf4j
+@EnableAsync
+@SpringBootApplication
+@MapperScan("com.doumee.dao.*")
+public class TimerApplication {
+
+ public static void main(String[] args) {
+ ApplicationContext context = SpringApplication.run(TimerApplication.class);
+ context.getEnvironment();
+ }
+}
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java
new file mode 100644
index 0000000..6a9623f
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleSendTaskTool.java
@@ -0,0 +1,44 @@
+package com.doumee.task;
+
+
+import com.doumee.config.DataSyncConfig;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂浠诲姟
+ * @author jiangping
+ * @date 2021-10-10 14:40:35
+ * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
+ */
+@Component
+@EnableScheduling
+public class ScheduleSendTaskTool {
+ @Autowired
+ private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
+
+ public static int endId = 0;
+ /**
+ * 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay= 30*1000)
+ public void syncEmpowerData() {
+ endId = hkSyncEmpowerService.syncEmpowerData(0);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ endId = hkSyncEmpowerService.syncEmpowerData(endId);
+ }
+
+}
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java
new file mode 100644
index 0000000..c6a2ee4
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskDetailTool.java
@@ -0,0 +1,33 @@
+package com.doumee.task;
+
+
+import com.doumee.config.DataSyncConfig;
+import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂浠诲姟
+ * @author jiangping
+ * @date 2021-10-10 14:40:35
+ * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
+ */
+@Component
+@EnableScheduling
+public class ScheduleTaskDetailTool {
+
+ @Autowired
+ private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
+
+ /**
+ * 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay= 3*1000)
+ public void syncEmpowerDetailData() {
+ hkSyncEmpowerService.syncEmpowerDetailData();
+ }
+}
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
new file mode 100644
index 0000000..f95b694
--- /dev/null
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
@@ -0,0 +1,32 @@
+package com.doumee.task;
+
+
+import com.doumee.config.DataSyncConfig;
+import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂浠诲姟
+ * @author jiangping
+ * @date 2021-10-10 14:40:35
+ * https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
+ */
+@Component
+@EnableScheduling
+public class ScheduleTaskProgressTool {
+ @Autowired
+ private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
+ /**
+ * 瀹氭椂鏌ヨ浜哄憳涓嬪彂娴峰悍缁撴灉锛堜换鍔℃槸鍚﹀凡涓嬭浇缁撴潫锛�
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay=60*1000)
+ public void syncEmpowerResultData() {
+ hkSyncEmpowerService.syncEmpowerResultData();
+ }
+
+}
diff --git a/server/admin_timer/src/main/resources/application.yml b/server/admin_timer/src/main/resources/application.yml
new file mode 100644
index 0000000..de16cc7
--- /dev/null
+++ b/server/admin_timer/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+# 椤圭洰淇℃伅閰嶇疆
+project:
+ name: 璁垮绯荤粺
+ version: 1.0.0
+ env: development
+# env: production
+
+
+spring:
+ # application:
+ # name: doumeemes
+ profiles:
+ active: proHS
+
+ # JSON杩斿洖閰嶇疆
+ jackson:
+ # 榛樿鏃跺尯
+ time-zone: GMT+8
+ # 榛樿鏃ユ湡鏍煎紡鍖�
+ date-format: yyyy-MM-dd HH:mm:ss
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+ enabled: true
+# MyBatis閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:/mappers/**/*.xml
+ configuration:
+ map-underscore-to-camel-case: true
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+# 缂撳瓨鍐呭璁剧疆
+cache:
+ session:
+ # 浼氳瘽杩囨湡鏃堕暱(s)
+ expire: 18000
+ captcha:
+ # 楠岃瘉鐮佽繃鏈熸椂闀�(s)
+ expire: 300
+
+# 璺熻釜鏃ュ織
+trace:
+ # 寮�鍚櫤鑳借窡韪ā寮�
+ smart: true
+ # 鎺掗櫎璺熻釜鐨刄RL姝ｅ垯
+ exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
+
+# 鏃ュ織閰嶇疆
+logback:
+ level: INFO
+ appender: ${project.env}
+# dao灞傜殑鏃ュ織璁剧疆涓篸ebug锛屾柟渚挎煡鐪媠ql
+logging:
+ level:
+ doumeemes.dao: debug
+
+knife4j:
+ enable: true
+ basic:
+ enable: true
+ username: admin
+ password: 111111
+
+# WEB鏈嶅姟鍣ㄩ厤缃�
+server:
+ compression:
+ enabled: true
+ mime-types: application/json
+ port: 10031
+ tomcat:
+ max-swallow-size: -1
+ servlet:
+ session:
+ timeout: PT3H #琛ㄧず12灏忔椂
diff --git a/server/dmvisit_admin/pom.xml b/server/dmvisit_admin/pom.xml
index cb948d9..b95d772 100644
--- a/server/dmvisit_admin/pom.xml
+++ b/server/dmvisit_admin/pom.xml
@@ -74,7 +74,7 @@
</pluginManagement>
</build>-->
<build>
- <finalName>dmvisit_admin</finalName>
+ <finalName>admin_interface</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 30104fd..5fa143f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -127,30 +127,30 @@
public void syncVisitData() {
hkSyncVisitService.syncVisitData();
}
- /**
+ /* *//**
* 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
* @throws Exception
- */
- @Scheduled(fixedDelay= 10*1000)
+ *//*
+ @Scheduled(fixedDelay= 3*1000)
public void syncEmpowerData() {
hkSyncEmpowerService.syncEmpowerData();
}
- /**
+ *//**
* 瀹氭椂鏌ヨ浜哄憳涓嬪彂娴峰悍缁撴灉锛堜换鍔℃槸鍚﹀凡涓嬭浇缁撴潫锛�
* @throws Exception
- */
+ *//*
@Scheduled(fixedDelay= 60*1000)
public void syncEmpowerResultData() {
hkSyncEmpowerService.syncEmpowerResultData();
}
- /**
+ *//**
* 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
* @throws Exception
- */
+ *//*
@Scheduled(fixedDelay= 60*1000)
public void syncEmpowerDetailData() {
hkSyncEmpowerService.syncEmpowerDetailData();
- }
+ }*/
/**
* 瀹氭椂鍚屾杞﹁締鍖呮湡鍒版捣搴风郴缁�
* @throws Exception
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
index 484a96b..8fe26cf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -69,7 +69,7 @@
void syncVisitData();
void getOutTimeVisitRecord( );
- void syncEmpowerData();
+ Integer syncEmpowerData(Integer startPage);
void syncEmpowerDataNew(int start,int end);
void syncParkBookData();
void syncParkBookBySingleModel(ParkBook c);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 7899ef0..9984ab1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -233,7 +233,7 @@
queryWrapper.lambda().eq(DeviceRole::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(DeviceRole::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(DeviceRole::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getIsDefault() != null) {
queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
@@ -270,6 +270,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
+ queryWrapper.lambda().orderByAsc( DeviceRole::getName);
IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
if(null != newPage && newPage.getRecords().size() > 0) {
List<DeviceRole> deviceRoleList = newPage.getRecords();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 4d94b81..ba74240 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -642,8 +642,8 @@
.like(Member::getPhone,pageWrap.getModel().getKeyword())
.or().like(Member::getName,pageWrap.getModel().getKeyword())
.or().like(Member::getCode,pageWrap.getModel().getKeyword()))
- .isNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
- .isNotNull(!Objects.isNull(pageWrap.getModel().getHasFace())&&Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
+ .isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
+ .isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
.eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index 6ffb08e..e666793 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -115,7 +115,8 @@
public void getOutTimeVisitRecord(){
}
@Override
- public void syncEmpowerData() {
+ public Integer syncEmpowerData(Integer startPage) {
+ return null;
}
@Override
public void syncEmpowerDataNew(int start,int end) {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index b503299..a0b2d69 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -63,101 +63,105 @@
if(list == null || list.size() ==0){
return;
}
- int tryNum = 1;
- try {
- tryNum = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.RETRY_CONNECT_NUM).getCode());
- }catch (Exception e){
-
- }
- for(Empower c : list){
- TaskPersonDetailRequest param = new TaskPersonDetailRequest();
- param.setPageNo(1);
- param.setPageSize(100);
+ Thread t1=new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ for(Empower c : list){
+ TaskPersonDetailRequest param = new TaskPersonDetailRequest();
+ param.setPageNo(1);
+ param.setPageSize(100);
// param.setPersonIds(new ArrayList<>());
- param.setPersonIds(new String[]{c.getMemberHkId()});
- param.setTaskId(c.getHkId());
- TaskDataAdditionResourceRequest rec = new TaskDataAdditionResourceRequest();
- rec.setResourceIndexCode(c.getDeviceIndexCode());
- rec.setResourceType(c.getDeviceType());
+ param.setPersonIds(new String[]{c.getMemberHkId()});
+ param.setTaskId(c.getHkId());
+ TaskDataAdditionResourceRequest rec = new TaskDataAdditionResourceRequest();
+ rec.setResourceIndexCode(c.getDeviceIndexCode());
+ rec.setResourceType(c.getDeviceType());
// rec.setChannelNos(c.getDeviceChannelNo().split(","));
- param.setResourceInfo(rec);
- //鏌ヨ涓嬪彂鐘舵��
- BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
- if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
- ) {
- if (response.getData().getList() != null
- && response.getData().getList().size() > 0) {
- TaskPersonDetailResponse model = response.getData().getList().get(0);
- if (model != null && StringUtils.equals(model.getPersondownloadResult(), "0")) {
- //鏇存柊宸插畬鎴愪笅杞戒换鍔�
- String remark = "";
- String cardInfo = "鍗＄墖涓嬪彂澶辫触";
- TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
- if (d.getCards() != null && d.getCards().size() > 0) {
- cardInfo = "鍗＄墖锛氥��";
- for (TaskPersonDetailCardInfoResponse card : d.getCards()) {
- cardInfo += card.getId() + " ";
- }
- cardInfo += "銆戜笅鍙戞垚鍔�";
- }
- if (d.getFaces() == null || d.getFaces().size() == 0) {
- remark = cardInfo + "锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
- } else {
- remark = "" + cardInfo + "锛屼汉鑴镐笅鍙戞垚鍔燂紒";
- }
- empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, remark)
- .set(Empower::getSendInfo, remark)
- .set(Empower::getSendStatus, Constants.EmpowerStatus.pass));
- } else {
- empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, "涓嬪彂澶辫触")
- .set(Empower::getSendInfo, "涓嬪彂澶辫触")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
- }
- } else {
- //濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
- if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
+ param.setResourceInfo(rec);
+ //鏌ヨ涓嬪彂鐘舵��
+ BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
+ if(response!=null
+ && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
+ ) {
+ if (response.getData().getList() != null
+ && response.getData().getList().size() > 0) {
+ TaskPersonDetailResponse model = response.getData().getList().get(0);
+ if (model != null && StringUtils.equals(model.getPersondownloadResult(), "0")) {
+ //鏇存柊宸插畬鎴愪笅杞戒换鍔�
+ String remark = "";
+ String cardInfo = "鍗＄墖涓嬪彂澶辫触";
+ TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
+ if (d.getCards() != null && d.getCards().size() > 0) {
+ cardInfo = "鍗＄墖锛氥��";
+ for (TaskPersonDetailCardInfoResponse card : d.getCards()) {
+ cardInfo += card.getId() + " ";
+ }
+ cardInfo += "銆戜笅鍙戞垚鍔�";
+ }
+ if (d.getFaces() == null || d.getFaces().size() == 0) {
+ remark = cardInfo + "锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
+ } else {
+ remark = "" + cardInfo + "锛屼汉鑴镐笅鍙戞垚鍔燂紒";
+ }
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, remark)
+ .set(Empower::getSendInfo, remark)
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.pass));
+ } else {
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "涓嬪彂澶辫触")
+ .set(Empower::getSendInfo, "涓嬪彂澶辫触")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
+ }
+ } else {
+ //濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
+ if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
// && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
- empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
// .set(Empower::getHkId,null)
// .set(Empower::getSendDate,null)
- .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
- .set(Empower::getSendInfo, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));
- }else{
- empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, "涓嬪彂澶辫触")
- .set(Empower::getSendInfo, "涓嬪彂澶辫触")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
- }
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
+ .set(Empower::getSendInfo, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
+ .set(Empower::getSendInfo, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
+ }else{
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "涓嬪彂澶辫触")
+ .set(Empower::getSendInfo, "涓嬪彂澶辫触")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
+ }
+ }
+ checkDelMemberTask(c.getMemberId());
+ }
+ }
+ }catch (Exception e){
- /* empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, Constants.equalsInteger(c.getIsdeleted(), Constants.ZERO) ? "涓嬪彂澶辫触" : "鍒犻櫎鏉冮檺鎴愬姛")
- .set(Empower::getSendInfo, "鍒犻櫎鏉冮檺鎴愬姛")
- .set(Empower::getSendStatus, Constants.equalsInteger(c.getIsdeleted(), Constants.ZERO) ? Constants.EmpowerStatus.fail : Constants.EmpowerStatus.pass));
- */
- }
- checkDelMemberTask(c.getMemberId());
- }
- }
+ }finally {
+ Constants.DEALING_HK_EMPOWER_DETAIL=false;
+ }
+ }
+ });
+ t1.start();
+
+
}catch (Exception e){
e.printStackTrace();
- }finally {
- Constants.DEALING_HK_EMPOWER_DETAIL=false;
}
}
@@ -279,30 +283,41 @@
if(list == null || list.size() ==0){
return;
}
- for(Empower c : list){
- TaskProgressRequest param = new TaskProgressRequest();
- param.setTaskId(c.getHkId());
- //鏌ヨ涓嬪彂鐘舵��
- BaseResponse<TaskProgressNumResponse> response = HKService.taskProgressNum(param);
- if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
- && response.getData()!=null
- && response.getData().getIsDownloadFinished() != null
- && response.getData().getIsDownloadFinished() ){
- //鏇存柊宸插畬鎴愪笅杞戒换鍔�
- empowerMapper.update(null,new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getHkId,c.getHkId() )
- .set(Empower::getSendInfo,"浠诲姟宸蹭笅杞藉畬鎴�" )
- .set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) );
- }
- }
+ Thread t1=new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ for(Empower c : list){
+ TaskProgressRequest param = new TaskProgressRequest();
+ param.setTaskId(c.getHkId());
+ //鏌ヨ涓嬪彂鐘舵��
+ BaseResponse<TaskProgressNumResponse> response = HKService.taskProgressNum(param);
+ if(response!=null
+ && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null){
+ //鏇存柊宸插畬鎴愪笅杞戒换鍔�
+ if( response.getData().getIsDownloadFinished() != null
+ && response.getData().getIsDownloadFinished() ){
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getHkId,c.getHkId() )
+ .set(Empower::getSendInfo,"浠诲姟宸蹭笅杞藉畬鎴�" )
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) );
+
+ }
+ }
+ }
+ }catch (Exception e1){
+ e1.printStackTrace();
+ }finally {
+ Constants.DEALING_HK_EMPOWER_RESULT =false;
+ }
+ }
+ });
+ t1.start();
}catch (Exception e){
e.printStackTrace();
- }finally {
- Constants.DEALING_HK_EMPOWER_RESULT =false;
}
-
}
@@ -311,21 +326,47 @@
* 澶勭悊浜哄憳鎺堟潈鏁版嵁锛屽畾鏃朵笅鍙�
*/
@Override
- public void syncEmpowerData() {
- if(Constants.DEALING_HK_EMPOWER){
- return ;
- }
- Constants.DEALING_HK_EMPOWER =true;
+ public Integer syncEmpowerData(Integer endId) {
+// if(Constants.DEALING_HK_EMPOWER){
+// return null ;
+// }
+// Constants.DEALING_HK_EMPOWER =true;
try {
//鍏堝垹闄ゆ墍鏈夐渶瑕佸彇娑堟巿鏉冪殑鏁版嵁
- dealDelListTask(getDealList(Constants.ONE));
- //鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑鏁版嵁,閲嶆柊涓嬪彂鏈�鏂颁汉鍛樻潈闄愬嵆鍙�
- dealNewListTask(getDealList(Constants.ZERO));
+ List<Empower> allList =getAllWaitDealList( endId);
+ if(allList !=null && allList.size()>0){
+ //鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑鏁版嵁,閲嶆柊涓嬪彂鏈�鏂颁汉鍛樻潈闄愬嵆鍙�
+// dealNewListTask(getDealList(Constants.ZERO,endId));
+ List<Empower> dellist = new ArrayList<>();
+ List<Empower> addlist = new ArrayList<>();
+ for(Empower e : allList){
+ if(Constants.equalsInteger(e.getIsdeleted(),Constants.ONE)){
+ dellist.add(e);
+ }else {
+ addlist.add(e);
+ }
+ }
+ Thread t1=new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(dellist!=null &&dellist.size()>0) {
+ dealDelListTask(dellist);
+ }
+ if(addlist!=null &&addlist.size()>0) {
+ dealNewListTask(addlist);
+ }
+ }
+ });
+ t1.start();
+ return allList.get(allList.size()-1).getId();
+ }
+
}catch (Exception e){
e.printStackTrace();
}finally {
- Constants.DEALING_HK_EMPOWER =false;
+// Constants.DEALING_HK_EMPOWER =false;
}
+ return null;
}
@Override
public void syncEmpowerDataNew(int start,int end) {
@@ -405,7 +446,21 @@
.set(Empower::getEditDate,date)
.in(Empower::getId,errorList));
}
+ public class TaskRuner implements Runnable{
+ private List<Empower> list ;
+ @Override
+ public void run() {
+ dealNewListTask(list);
+ }
+ public List<Empower> getList() {
+ return list;
+ }
+
+ public void setList(List<Empower> list) {
+ this.list = list;
+ }
+ }
private void dealNewListTask(List<Empower> list) {
//鎸夌収鐖剁骇鐢宠鍒嗘壒澶勭悊姣忔鐢宠鏁版嵁
if(list ==null || list.size()==0){
@@ -520,7 +575,7 @@
return false;
}
}
- private List<Empower> getDealList(int del ) {
+ private List<Empower> getDealList(int del ,Integer endId ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
@@ -530,7 +585,26 @@
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
- queryWrapper.eq( Empower::getIsdeleted,del);
+// queryWrapper.eq( Empower::getIsdeleted,del);
+ queryWrapper.gt(Empower::getId,endId);
+ queryWrapper.orderByAsc(Empower::getId );
+// queryWrapper.orderByAsc(Empower::getCreateDate );
+ queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
+ return list;
+ }
+ private List<Empower> getAllWaitDealList(int endId ) {
+ MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Empower.class);
+ queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
+ queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
+ queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
+ queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
+ queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
+ queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
+ queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
+// queryWrapper.eq( Empower::getIsdeleted,del);
+ queryWrapper.gt(Empower::getId,endId);
queryWrapper.orderByAsc(Empower::getId );
// queryWrapper.orderByAsc(Empower::getCreateDate );
queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
diff --git a/server/pom.xml b/server/pom.xml
index 288e272..9eadd6c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -15,6 +15,7 @@
<module>dmvisit_service</module>
<module>dmvisit_web</module>
<module>openapi</module>
+ <module>admin_timer</module>
</modules>
--
Gitblit v1.9.3