整理

nidapeng

2024-03-11 0bf22f2cfb8f6d74be1680db17944b44602c65a1

整理

 server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -81,6 +81,7 @@
    public static final Integer FOUR =4 ;
    public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
    public static final String VIRTUAL_CARD_INDEX = "02098469790";
    public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
    public static  boolean DEALING_HK_SYNCDEVICE = false;
    public static  boolean DEALING_HK_SYNCPARK = false;

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java

@@ -61,6 +61,8 @@

    @ApiModelProperty(value = "下发人员", example = "1")
    private Integer sendUserId;
    @ApiModelProperty(value = "下发次数", example = "1")
    private Integer tryNum;

    @ApiModelProperty(value = "取消人员", example = "1")
    private Integer cancelUserId;

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java

@@ -66,6 +66,9 @@
    @ExcelColumn(name="车牌号")
    private String carCode;

    @ApiModelProperty(value = "下发次数", example = "1")
    private Integer tryNum;

    @ApiModelProperty(value = "车库编码（关联parks)", example = "1")
    @ExcelColumn(name="车库编码（关联parks)")
    private Integer parkId;
@@ -135,4 +138,5 @@
    @TableField(exist = false)
    private String parkHkId;


}

 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;
@@ -58,6 +61,12 @@
            List<Empower>  list = getDealListDetail();
           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();
@@ -112,6 +121,19 @@
                               .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() )
@@ -119,6 +141,15 @@
                            .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());
               }
           }