aa

jiangping

2023-12-13 4f03c6e3bea2ae7c1537fabe3e3bffc3f49b8e86

aa

 server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java

@@ -15,7 +15,7 @@
@Slf4j
@EnableAsync
@SpringBootApplication
@MapperScan("com.doumee.dao")
@MapperScan("com.doumee.dao.*")
public class AdminApplication {

    public static void main(String[] args) {

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java

@@ -78,7 +78,8 @@
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:carevent:exportExcel")
    public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "停车场事件推送记录表", response);
        ExcelExporter.build(CarEvent.class).exportWithFirstAndEnd (carEventService.findPage(pageWrap).getRecords(),"停车场事件推送记录表", null, "停车场事件推送记录导出报表",null , response);
//        ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "停车场事件推送记录表", response);
    }

    @ApiOperation("根据ID查询")

 server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java

@@ -10,6 +10,7 @@
import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@
 */
@Api(tags = "ERP数据同步接口")
@RestController
@RequestMapping("/business/erp")
@RequestMapping("/business/erpsync")
public class ERPSyncController extends BaseController {

    @Autowired
@@ -33,9 +34,9 @@
    private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;

    @PreventRepeat
    @ApiOperation("【海康】全量同步门禁设备接口")
    @PostMapping("/getDevices")
//    @RequiresPermissions("business:hksync:device")
    @ApiOperation("【ERP】全量同步组织信息接口")
    @PostMapping("/syncCompanies")
    @RequiresPermissions("business:erpsync:company")
    public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
        String result = hkSyncDeviceService.syncHkDevices(param);
        return ApiResponse.success(result);

 server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java

@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.EventSubRequest;
import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
@@ -40,25 +41,25 @@

    @PreventRepeat
    @ApiOperation("【海康】全量同步门禁设备接口")
    @PostMapping("/getDevices")
    @PostMapping("/syncDevices")
//    @RequiresPermissions("business:hksync:device")
    public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
    public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
        String result = hkSyncDeviceService.syncHkDevices(param);
        return ApiResponse.success(result);
    }
    @PreventRepeat
    @ApiOperation("【海康】全量同步停车库接口")
    @PostMapping("/getParks")
    @PostMapping("/syncParks")
//    @RequiresPermissions("business:hksync:park")
    public ApiResponse getParks(@RequestBody ParkListRequest param) {
    public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
        String result = hkSyncParkService.syncHkParks(param);
        return ApiResponse.success(result);
    }
    @PreventRepeat
    @ApiOperation("【海康】全量同步访客权限组接口")
    @PostMapping("/getPrivilege")
    @PostMapping("/syncPrivilege")
//    @RequiresPermissions("business:hksync:privilege")
    public ApiResponse getPrivilege(@RequestBody PrivilegeGroupRequest param) {
    public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
        String result = hkSyncPrivilegeService.syncPrivilege(param);
        return ApiResponse.success(result);
    }
@@ -83,4 +84,11 @@
        String result = hkSyncPushService.dealParkEvent(param,response);
        return ApiResponse.success(result);
    }
    @PreventRepeat
    @ApiOperation("【海康】取消订阅事件")
    @PostMapping("/cancelEventSub")
    public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response) {
         hkSyncPushService.cancelEventSub();
        return ApiResponse.success(null);
    }
}

 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

@@ -103,7 +103,7 @@

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @RequiresPermissions("business:member:query")
//    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    }

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -50,6 +50,7 @@
        String privilegeGroup= "/api/visitor/v1/privilege/group";//查询访客权限组
        String eventSub= "/api/eventService/v1/eventSubscriptionByEventTypes";//事件订阅
        String doorSearch= "/api/resource/v2/door/search";//查询门禁点列表v2
        String cancelEventSub= "/api/eventService/v1/eventUnSubscriptionByEventTypes";//取消事件订阅
    }

    /**

 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -390,6 +390,17 @@
        saveInterfaceLog(body,result,path);
        return  result;
    }
    /**
     *    å–消事件订阅
     * @param body
     * @return
     */
    public static String cancelEventSub(String body) {
        Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
        saveInterfaceLog(body,result,path);
        return  result;
    }




 server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -251,7 +251,7 @@
     * @return
     */
    public  static  BaseResponse<List<ParkListResponse>>   parkList(ParkListRequest param){
        log.info("【海获取车库列表数据】================开始===="+JSONObject.toJSONString(param));
        log.info("【海康获取车库列表数据】================开始===="+JSONObject.toJSONString(param));
        try {
            String res = HKTools.parkList(JSONObject.toJSONString(param));
            TypeReference typeReference =
@@ -501,6 +501,27 @@
        }
        return  null;
    }
    /**
     *事件订阅
     * @return
     */
    public  static  BaseResponse   cancelEventSub(EventSubRequest param){
        log.info("【海康取消事件订阅】================开始===="+JSONObject.toJSONString(param));
        String res = null;
        try {
            res = HKTools.cancelEventSub(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference< BaseResponse >(){};
            BaseResponse   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康取消事件订阅");
            return  result;
        }catch (Exception e){
            log.error("【海康取消事件订阅】================失败====：\n"+ e.getMessage());
        }finally {
           // saveInterfaceLog(param,res);
        }
        return  null;
    }

    private static void logResult(BaseResponse res,String name) {
        if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){

 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java

@@ -15,8 +15,8 @@
public class UserAuthorRequest {
    @ApiModelProperty(value = "人员唯一标识（ERP端ID）" , required = true)
    private String userId;
    @ApiModelProperty(value = "门禁组唯一标识（访客端ID）,如果为null，则清空人员授权信息"  )
    private Integer roleId;
    @ApiModelProperty(value = "授权门禁组编码集合门禁组唯一标识（访客端ID）,如果为null，则清空人员授权信息"  )
    private Integer[] roleIds;
    @ApiModelProperty(value = "授权有效期（开始时间），为空时默认长期有效，如2023-11-24 11:39:23"  )
    private Date validStartTime;
    @ApiModelProperty(value = "授权有效期（截止时间），为空时默认长期有效，如2023-11-24 11:39:23"  )

 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java

@@ -40,7 +40,7 @@
    private String phone;
    @ApiModelProperty(value = "卡号集合" )
    private List<String> cardList;
    @ApiModelProperty(value = "授权门禁组编码集合" )
    private Integer roleId;
    @ApiModelProperty(value = "授权门禁组编码集合,【访客端】唯一标识" )
    private Integer[] roleIds;

}

 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java

@@ -27,5 +27,7 @@
    private Date editDate;
    @ApiModelProperty(value = "所属父级组织编码")
    private String parentOrgId;
    @ApiModelProperty(value = "负责人编码")
    private String headId;

}

 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java

@@ -43,6 +43,6 @@
    private String phone;
    @ApiModelProperty(value = "卡号集合" )
    private List<String> cardList;
    @ApiModelProperty(value = "授权门禁组编码集合" )
    private Integer roleId;
    @ApiModelProperty(value = "授权门禁组编码集合,【访客端】唯一标识" )
    private Integer[] roleIds;
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java

@@ -7,6 +7,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface CarEventJoinMapper extends MPJJoinMapper<CarEvent> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java

@@ -8,6 +8,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java

@@ -7,6 +7,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface DeviceEventJoinMapper extends MPJJoinMapper<DeviceEvent> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java

@@ -8,6 +8,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface MemberCardJoinMapper extends MPJJoinMapper<MemberCard> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java

@@ -7,6 +7,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface MemberJoinMapper extends MPJJoinMapper<Member> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java

@@ -8,6 +8,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface ParkBookJoinMapper extends MPJJoinMapper<ParkBook> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java

@@ -8,6 +8,6 @@
/**
 * @author T14
 */
@Repository
//@Repository
public interface RetentionJoinMapper extends MPJJoinMapper<Retention> {
}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java

@@ -2,11 +2,10 @@

import com.doumee.dao.business.model.VisitEvent;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 */
@Repository
//@Repository
public interface VisitEventJoinMapper extends MPJJoinMapper<VisitEvent> {
}

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

@@ -82,9 +82,6 @@
    @ExcelColumn(name="分类编码(关联category)")
    private Integer categoryId;

    @ApiModelProperty(value = "分类编码名称")
    @TableField(exist = false)
    private String categoryName;

    @ApiModelProperty(value = "企业代码")
    @ExcelColumn(name="企业代码")
@@ -117,6 +114,9 @@
    @ApiModelProperty(value = "ERP标识")
    @ExcelColumn(name="ERP标识")
    private String erpId;
    @ApiModelProperty(value = "负责人编码（关联member)")
    @ExcelColumn(name="负责人编码")
    private String headId;

    @ApiModelProperty(value = "ERP同步时间")
    @ExcelColumn(name="ERP同步时间")
@@ -150,4 +150,14 @@
    @ExcelColumn(name="飞书最近同步时间")
    private Date fsDate;

    @ApiModelProperty(value = "分类编码名称")
    @TableField(exist = false)
    private String categoryName;
    @ApiModelProperty(value = "负责人名字")
    @TableField(exist = false)
    private String headName;
    @ApiModelProperty(value = "负责人手机号")
    @TableField(exist = false)
    private String headPhone;

}

 server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java

@@ -103,7 +103,6 @@
     * @return PageData<Company>
     */
    PageData<Company> findPage(PageWrap<Company> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
@@ -118,4 +117,5 @@
     * @return
     */
    List<CompanyDTO> findCompanyTreePage(Integer type);

}

 server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java

@@ -3,6 +3,9 @@
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
import com.doumee.core.model.openapi.request.erp.UserListRequest;

/**
 * åœè½¦åœºäº‹ä»¶æŽ¨é€è®°å½•è¡¨Service定义
@@ -11,24 +14,24 @@
 */
public interface ERPSyncService {
    /**
     * åŒæ­¥æµ·åº·é—¨ç¦è®¾å¤‡
     * åŒæ­¥ERP组织信息
     * @param param
     * @return
     */
    String syncErpOrg(AcsDeviceListRequest param);
    String syncCompany(OrgListRequest param);

    /**
     * åŒæ­¥æµ·åº·åœè½¦åº“
     * åŒæ­¥ERP人员信息
     * @param param
     * @return
     */

    String syncHkParks(ParkListRequest param);
    String syncUsers(UserListRequest param);

    /**
     * åŒæ­¥æµ·åº·è®¿å®¢æƒé™ç»„
     * èŽ·å–ERP人员信息
     * @param param
     * @return
     */
    String syncPrivilege(PrivilegeGroupRequest param);
    String syncUserInfo(UserInfoRequest param);
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java

@@ -51,4 +51,5 @@
    String dealVisitEvent(EventVisitRequest param, HttpServletResponse response);

    String dealParkEvent(EventParkRequest param, HttpServletResponse response);
    void cancelEventSub();
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -143,6 +144,7 @@
        IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(Company::getId, pageWrap.getModel().getId());
        }
@@ -238,11 +240,12 @@
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
                    .leftJoin(SystemUser.class,SystemUser::getId,Company::getCreator);
                    .leftJoin(Member.class, Member::getId,Company::getHeadId);
        queryWrapper.selectAll(Company.class)
                    .selectAs(Category::getName,Company::getCategoryName)
                    .select("count(t1.id) as countNum")
                    .selectAs(SystemUser::getRealname,Company::getCreatorName);
                    .selectAs(Member::getName,Company::getHeadName)
                    .selectAs(Member::getPhone,Company::getHeadPhone)
                    .select("count(t1.id) as countNum");
        IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
        return PageData.from(companyIPage);
    }

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -353,7 +353,7 @@
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        MemberInfoDTO model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
        Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
                .leftJoin(Empower.class,Empower::getMemberId,Member::getId);
@@ -368,7 +368,7 @@
                    .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
                    .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
                    .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
                    .having("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
                    .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.doumee.service.business.impl.erp;

import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.DoorsListRequest;
import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
import com.doumee.core.model.openapi.request.erp.UserListRequest;
import com.doumee.core.model.openapi.response.erp.OrgListRespone;
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.HkSyncService;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;

/**
 * è®¾å¤‡ä¿¡æ¯è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Service
public class ErpSyncServiceImpl implements ERPSyncService {

    /**
     * åŒæ­¥ERP组织信息
     * @param param
     * @return
     */
    @Override
    public String syncCompany(OrgListRequest param){
        List<OrgListRespone>  allList = new ArrayList<>();

        return  null;
    }

    /**
     * åŒæ­¥ERP人员信息
     * @param param
     * @return
     */
    @Override
    public    String syncUsers(UserListRequest param){
        return  null;
    }

    /**
     * èŽ·å–ERP人员信息
     * @param param
     * @return
     */
    @Override
    public  String syncUserInfo(UserInfoRequest param){
        return  null;
    }
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java

@@ -67,4 +67,6 @@
    public String   dealParkEvent(EventParkRequest param, HttpServletResponse response){
        return  null;
    }
    @Override
    public void   cancelEventSub(){   }
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java

@@ -90,4 +90,19 @@
        HKService.eventSub(param);//门禁事件

    }
    /**
     * å–消订阅门禁事件、访客事件、和停车场事件
     */
    @Override
    public void cancelEventSub(){
        EventSubRequest param = new EventSubRequest();
        param.setEventTypes(new Integer[]{HKConstants.EventTypes.PARK_LINE_IN.getKey()
                ,HKConstants.EventTypes.PARK_LINE_OUT.getKey()
                ,HKConstants.EventTypes.PARK_PASS_IN.getKey()
                ,HKConstants.EventTypes.PARK_PASS_OUT.getKey()
                ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey(),
                HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
        HKService.cancelEventSub(param);//停车场事件

    }
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -39,7 +39,6 @@
        String result = null;
        try {


            log.error("【海康门禁事件推送】========成功=======");
        }catch (Exception e) {