k94314517
2023-12-15 5b889f9db0a0f130e7bf8a8fe273dfe8153aed65
ERP接口
已修改6个文件
102 ■■■■ 文件已修改
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,11 +12,11 @@
 */
@Data
@ApiModel("访客申请审批结果通知请求信息")
public class ApproveNoticeRequest {
public class ApproveNoticeRequest extends BaseRequst {
    @ApiModelProperty(value = "审批记录唯一标识(ERP端ID)" ,example = "1")
    private Integer id;
    @ApiModelProperty(value = "审批结果 0-不通过 1-通过,默认 0" ,example = "1")
    private Integer status;
    @ApiModelProperty(value = "审核时间" )
    @ApiModelProperty(value = "审核时间 yyyy-MM-dd HH:mm:ss" )
    private String approveDate ;
}
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.dao.business.model.MemberRole;
import java.util.List;
/**
 * @author 江蹄蹄
@@ -9,4 +12,5 @@
 */
public interface MemberCardMapper extends BaseMapper<MemberCard> {
    void insertBatchSomeColumn(List<MemberCard> list);
}
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.business.model.VisitEvent;
import java.util.List;
/**
 * @author 江蹄蹄
@@ -9,4 +12,6 @@
 */
public interface MemberRoleMapper extends BaseMapper<MemberRole> {
    void insertBatchSomeColumn(List<MemberRole> list);
}
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
@@ -89,4 +89,6 @@
    void orgUpdate(OrgUpdateRequest param);
    void userUpdate(UserUpdateRequest param);
    void approveApply(ApproveNoticeRequest param);
}
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -26,6 +26,7 @@
import com.doumee.core.model.openapi.response.erp.OrgListRespone;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.admin.response.MemberInfoDTO;
@@ -99,6 +100,9 @@
    @Autowired
    private MemberCardMapper memberCardMapper;
    @Autowired
    private VisitsMapper visitsMapper;
    @Autowired
    private InterfaceLogService interfaceLogService;
@@ -506,26 +510,40 @@
                memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
                //TODO 海康数据更新
            }
            //添加人员角关联数据
            //添加人员角色关联数据
            if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
                //查询数据库存在的权限
                List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getId,param.getRoleIds()));
                List<Integer> roleIds = Arrays.asList(param.getRoleIds());
//                List<MemberRole> memberRoleList = new ArrayList<>();
//
//                for (Integer id:roleIds) {
//
//                }
                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);
                }
            }
            //添加人员卡片数据
            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);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }finally {
@@ -534,6 +552,36 @@
    }
    @Override
    public void approveApply(ApproveNoticeRequest param){
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||Objects.isNull(param.getStatus())
            ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(!(param.getStatus()==Constants.ZERO||param.getStatus()==Constants.ONE)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"状态码错误");
            }
            if(visitsMapper.selectCount(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId())
                    .ne(Visits::getStatus,Constants.VisitStatus.submitCheck))>Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态码错误");
            }
            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
            if(CollectionUtils.isNotEmpty(visitsList)){
                visitsList.forEach(i->{
                    i.setStatus(param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
                    i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
                    visitsMapper.updateById(i);
                });
            }
        }catch (Exception e){
            e.printStackTrace();
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
        }
    }
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -151,7 +151,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "授权token值", required = true)
    })
    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest account ) {
    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest param) {
        param.setToken(this.getToken());
        erpSyncService.approveApply(param);
        return  ApiResponse.success(null);
    }
}