From 0bf22f2cfb8f6d74be1680db17944b44602c65a1 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 15:23:14 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java |  105 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 68 insertions(+), 37 deletions(-)

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 da9086c..a5c0441 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
@@ -38,6 +39,8 @@
     @Autowired
     private EmpowerJoinMapper empowerMapper;
     @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
     private MemberMapper memberMapper;
     @Autowired
     private DeviceMapper deviceMapper;
@@ -59,6 +62,12 @@
            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);
@@ -76,49 +85,71 @@
                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")){
-                       //鏇存柊宸插畬鎴愪笅杞戒换鍔�
+                       ) {
+                   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+"锛屼汉鑴镐笅鍙戞垚鍔燂紒";
+                           if (d.getCards() != null && d.getCards().size() > 0) {
+                               cardInfo = "鍗$墖锛氥��";
+                               for (TaskPersonDetailCardInfoResponse card : d.getCards()) {
+                                   cardInfo += card.getId() + " ";
+                               }
+                               cardInfo += "銆戜笅鍙戞垚鍔�";
                            }
-                           empowerMapper.update(null,new UpdateWrapper<Empower>()
+                           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) );
+                                   .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{
-                    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,  "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
+//                                   .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));
+                       }
+
+                      /* 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());
                }
            }

--
Gitblit v1.9.3