jiangping
2023-12-19 dc19e6b41d721836342e1219aa33087e57183417
海康接口对接开发
已修改7个文件
168 ■■■■ 文件已修改
server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java 146 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Empower;
import java.util.List;
/**
 * @author 江蹄蹄
 * @date 2023/11/30 15:33
 */
public interface EmpowerMapper extends BaseMapper<Empower> {
    void insertBatchSomeColumn(List<Empower> list);
}
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -63,9 +63,6 @@
    private String importInfo;
    @ApiModelProperty(value = "下发人员", example = "1")
    private Integer sendUserId;
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -188,9 +188,9 @@
    @ExcelColumn(name="是否高级审批人 0否 1是")
    private Integer highCheckor;
    @ApiModelProperty(value = "门禁角色编码(关联door_role)", example = "1")
    @ExcelColumn(name="门禁角色编码(关联door_role)")
    private Integer roleId;
    @ApiModelProperty(value = "门禁角色编码(关联device_role),多个英文逗号隔开", example = "1")
    @ExcelColumn(name="门禁角色编码 ")
    private String roleId;
    @ApiModelProperty(value = "门禁角色授权时间")
    @ExcelColumn(name="门禁角色授权时间")
@@ -206,4 +206,7 @@
    @ApiModelProperty(value = "组织海康编码")
    @TableField(exist = false)
    private String companyHkId;
    @ApiModelProperty(value = "角色编码查询")
    @TableField(exist = false)
    private String roleIdParam;
}
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -55,7 +55,7 @@
    @ExcelColumn(name="用户编码")
    private Integer memberId;
    @ApiModelProperty(value = "角色编码(关联door_role)")
    @ApiModelProperty(value = "角色编码(关联door_role),多个英文逗号隔开")
    @ExcelColumn(name="角色编码(关联door_role)")
    private String roleId;
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -252,7 +252,7 @@
            for (DeviceRole dto:deviceRoleList) {
                Member member = new Member();
                member.setIsdeleted(Constants.ZERO);
                member.setRoleId(dto.getId());
                member.setRoleIdParam("["+dto.getId()+"]");
                dto.setMemberNum((int) memberService.count(member));
            }
            newPage.setRecords(deviceRoleList);
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -463,7 +463,8 @@
    @Override
    public long count(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
        wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
        return memberMapper.selectCount(wrapper);
    }
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -40,6 +40,7 @@
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
@@ -91,6 +92,10 @@
    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private EmpowerMapper empowerMapper;
    @Autowired
    private ParkBookMapper parkBookMapper;
    @Autowired
    private MemberMapper memberMapper;
@@ -734,6 +739,7 @@
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
            List<Integer> doorIds = null;
            if(Objects.isNull(member)){
                member = new Member();
                BeanUtils.copyProperties(param,member);
@@ -748,6 +754,7 @@
                member.setIdcardNo(encryptIdNo);
                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                member.setCompanyId(param.getOrgId());
                doorIds = getRoleIdByParam(param,member);
                memberMapper.insert(member);
                //TODO 海康数据创建
            }else{
@@ -758,46 +765,17 @@
                member.setCompanyId(param.getOrgId());
                member.setEditDate(new Date());
                member.setErpDate(new Date());
                doorIds = getRoleIdByParam(param,member);
                memberMapper.updateById(member);
                //删除用户卡片数据  人员角色关联
                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
                memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
                //TODO 海康数据更新
            }
            //添加人员角色关联数据
            if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
                //查询数据库存在的权限
                List<DeviceRole> deviceRoleList
                        = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda().eq(DeviceRole::getId,param.getRoleIds()));
                if(CollectionUtils.isNotEmpty(deviceRoleList)){
                    List<MemberRole> memberRoleList = new ArrayList<>();
                    for (DeviceRole deviceRole:deviceRoleList) {
                        MemberRole memberRole = new MemberRole();
                        memberRole.setCreateDate(new Date());
                        memberRole.setMemberId(member.getId());
                        memberRole.setIsdeleted(Constants.ZERO);
                        memberRole.setRoleId(deviceRole.getId().toString());
                        memberRoleList.add(memberRole);
                    }
                    memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                }
            }
            //如果有授权门禁数据,进行用户授权数据下发任务创建
            dealMemberRoleEmpower(member,doorIds,param);
            //添加人员卡片数据
            if(!Objects.isNull(param.getCardList())&&param.getCardList().size()>Constants.ZERO){
                if(CollectionUtils.isNotEmpty(param.getCardList())){
                    List<MemberCard> memberCardList = new ArrayList<>();
                    for (String id:param.getCardList()) {
                        MemberCard memberCard = new MemberCard();
                        memberCard.setCreateDate(new Date());
                        memberCard.setMemberId(member.getId());
                        memberCard.setIsdeleted(Constants.ZERO);
                        memberCard.setCode(id);
                        memberCardList.add(memberCard);
                    }
                    memberCardMapper.insertBatchSomeColumn(memberCardList);
                }
            }
            dealMemberCard(member,param);
        }catch (Exception e){
            e.printStackTrace();
        }finally {
@@ -805,6 +783,108 @@
        }
    }
    /**
     * 添加人员卡片数据
     * @param member
     * @param param
     */
    private void dealMemberCard(Member member, UserUpdateRequest param) {
        if(!Objects.isNull(param.getCardList())&&param.getCardList().size()>Constants.ZERO){
            if(CollectionUtils.isNotEmpty(param.getCardList())){
                List<MemberCard> memberCardList = new ArrayList<>();
                for (String id:param.getCardList()) {
                    MemberCard memberCard = new MemberCard();
                    memberCard.setCreateDate(new Date());
                    memberCard.setMemberId(member.getId());
                    memberCard.setIsdeleted(Constants.ZERO);
                    memberCard.setCode(id);
                    memberCardList.add(memberCard);
                }
                memberCardMapper.insertBatchSomeColumn(memberCardList);
            }
        }
    }
    /**
     * //如果有授权门禁数据,进行用户授权数据下发任务创建
     * @param member
     */
    private void dealMemberRoleEmpower(Member member, List<Integer> doorids,UserUpdateRequest param) {
        //删除所有老的授权信息
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.ZERO)
                );
        if(doorids==null || doorids.size() == 0){
          return;
        }
        List<Empower> list = new ArrayList<>();
        List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorids));
        if(deviceList == null || deviceList.size() == 0){
            return;
        }
        for (Device deviceRole:deviceList) {
            Empower model = new Empower();
            model.setCreateDate(new Date());
            model.setMemberId(member.getId());
            model.setIsdeleted(Constants.ZERO);
            model.setDeviceId(deviceRole.getId());
            model.setSendStatus(Constants.ZERO);
            model.setStartTime(param.getValidStartTime());
            model.setEndTime(param.getValidEndTime());
            model.setSendType(Constants.ZERO);
            list.add(model);
        }
        //导入新增的授权信息
        empowerMapper.insertBatchSomeColumn(list);
    }
    private   List<Integer>  getRoleIdByParam(UserUpdateRequest param, Member member) {
        //添加人员角色关联数据
        if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
            //查询数据库存在的权限
            List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                    .eq(DeviceRole::getType,Constants.TWO)
                    .eq(DeviceRole::getId,param.getRoleIds()));
            if(CollectionUtils.isNotEmpty(deviceRoleList)){
                List<MemberRole> memberRoleList = new ArrayList<>();
                String ids = "";
                List<Integer> r = new ArrayList<>();
                for (int i = 0; i < deviceRoleList.size(); i++) {
                    DeviceRole deviceRole =deviceRoleList.get(i);
                    if(i>0){
                        ids += ",";
                    }
                    Integer id =deviceRole.getId();
                    ids += "["+id+"]";
                    String doorids =deviceRole.getDoorIds();
                    if(StringUtils.isNotBlank(doorids)){
                        String[] ss = doorids.split(",");
                        try {
                            for(String s :ss){
                                r.add(Integer.parseInt(s));
                            }
                        }catch (Exception e){
                            //脏数据不处理
                        }
                    }
                    MemberRole memberRole = new MemberRole();
                    memberRole.setCreateDate(new Date());
                    memberRole.setMemberId(member.getId());
                    memberRole.setIsdeleted(Constants.ZERO);
                    memberRole.setRoleId(deviceRole.getId().toString());
                    memberRoleList.add(memberRole);
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
                member.setRoleId(ids);
                return  r;
            }
        }
        return  null;
    }
    @Override
    public void approveApply(ApproveNoticeRequest param){