整理

jiangping

2024-01-08 a38fdd9386498594b7b5c226f3ddb985079b050b

整理

 .gitignore

@@ -6,7 +6,7 @@
server/.idea/
*.xml
*.class

target/
# Mobile Tools for Java (J2ME)
.mtj.tmp/


 server/dmvisit_admin/target/classes/META-INF/MANIFEST.MF

ÎļþÒÑɾ³ý

 server/dmvisit_admin/target/classes/application.yml

ÎļþÒÑɾ³ý

 server/dmvisit_admin/target/dmvisit_admin.jar.original

Binary files differ

 server/dmvisit_admin/target/maven-archiver/pom.properties

ÎļþÒÑɾ³ý

 server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

 server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

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

@@ -65,6 +65,7 @@
    public static final Integer THREE =3 ;
    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  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

@@ -117,9 +117,11 @@
    @ExcelColumn(name="操作人",index= 7)
    @TableField(exist = false)
    private String createrName;
    @ApiModelProperty(value = "卡片集合（英文逗号隔开）")
    private String cardNos;

    @ApiModelProperty(value = "一卡通授权下发状态 0待下发 1任务执行 2下发成功 3已取消 4下发失败 5任务下载已结束 ", example = "1")
    @ExcelColumn(name="下发状态",index= 8,valueMapping ="0=待下发;1=已下发;2=下发成功;3=已取消;4=下发失败;5=任务下载已结束" )
    @ApiModelProperty(value = "一卡通授权下发状态 0待下发 1任务执行 2下发成功 3已取消 4下发失败 5任务下载已结束 6不符合下发条件 ", example = "1")
    @ExcelColumn(name="下发状态",index= 8,valueMapping ="0=待下发;1=已下发;2=下发成功;3=已取消;4=下发失败;5=任务下载已结束;6==不符合下发条件" )
    private Integer sendStatus;

    @ApiModelProperty(value = "下发类型 0实时 1定时 ", example = "1")

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

@@ -141,8 +141,8 @@
    @ExcelColumn(name="海康标识")
    private String hkId;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步 2同步失败 ", example = "1")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步 2同步失败")
    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件  ", example = "1")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件")
    private Integer hkStatus;

    @ApiModelProperty(value = "海康最近同步时间")

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

@@ -361,7 +361,11 @@
        Member member = new Member();
        BeanUtils.copyProperties(param,member);
        member.setCreateDate(new Date());
        member.setHkStatus(Constants.ZERO);
        if(StringUtils.isBlank(param.getFaceImg())){
            member.setHkStatus(Constants.THREE);
        }else{
            member.setHkStatus(Constants.ZERO);
        }
        member.setErpStatus(Constants.ONE);
        member.setErpDate(new Date());
        member.setErpId(param.getId());
@@ -371,7 +375,6 @@
        String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
        member.setIdcardNo(encryptIdNo);
        member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
        member.setHkStatus(Constants.ZERO);
        member.setRoleIds(param.getRoleIds());
        member.setCompanyId(Objects.isNull(company)?null:company.getId());
        member.setErpOrgId(param.getOrgId());
@@ -783,8 +786,6 @@
        }
    }



    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
@@ -874,7 +875,6 @@
            }
        }
    }

    /**
     * //如果有授权门禁数据，进行用户授权数据下发任务创建
     * @param member
@@ -891,6 +891,9 @@
        if(doorIds==null || doorIds.size() == 0){
          return;
        }
        if(StringUtils.isBlank(member.getFaceImg())){
          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){
@@ -905,6 +908,8 @@
            model.setSendStatus(Constants.ZERO);
            model.setStartTime(startTime);
            model.setEndTime(endTime);
            //默认给于虚拟卡
            model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
            model.setSendType(Constants.ZERO);
            list.add(model);
        }

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

@@ -293,6 +293,19 @@
        personInfos.add(pinfo);//
        param.setResourceInfos(resourceInfos);
        param.setPersonInfos(personInfos);

        //--------------卡片添加----------
        if(StringUtils.isNotBlank(c.getCardNos())){
            List<TaskDataAdditionCardRequest> cards = new ArrayList<>();
            for(String s : c.getCardNos().split(",")){
                TaskDataAdditionCardRequest tc = new TaskDataAdditionCardRequest();
                tc.setCard(s);
                tc.setStatus(HKConstants.OPERA_TYPE.ADD.getKey());
                tc.setCardType(HKConstants.CARD_TYPE.NORMAL.getKey());
                cards.add(tc);
            }
            param.setCards(cards);
        }
        BaseResponse response =  HKService.taskDataAddition(param);
        if(response!=null
                && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){

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

@@ -430,7 +430,7 @@
        UserDelRequest request = new UserDelRequest();
        request.setPersonIds(new String[]{delHkIds});
        BaseResponse<List<UserDelResponse>> result =  HKService.delBatchUser(request);
        if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
        if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
            List<String> fIds = new ArrayList<>();
            //标记删除成功的数据（海康对接状态为已同步，，同步失败的仍为待同步，等下一次继续处理，知道全部删除完毕）
            if(result.getData()!=null && result.getData().size()>0){

 server/dmvisit_service/target/classes/META-INF/spring-configuration-metadata.json

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/classes/application-dev.yml

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/classes/application-pro.yml

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/classes/application-test.yml

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/classes/banner.txt

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/maven-archiver/pom.properties

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

 server/dmvisit_service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

 server/dmvisit_web/target/classes/application.yml

ÎļþÒÑɾ³ý

 server/dmvisit_web/target/maven-archiver/pom.properties

ÎļþÒÑɾ³ý

 server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

ÎļþÒÑɾ³ý

 server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

 server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

 server/dmvisit_web/target/visit_web.jar.original

Binary files differ

 server/openapi/target/classes/application.yml

ÎļþÒÑɾ³ý

 server/openapi/target/maven-archiver/pom.properties

ÎļþÒÑɾ³ý

 server/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

ÎļþÒÑɾ³ý

 server/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

ÎļþÒÑɾ³ý

 server/openapi/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

 server/openapi/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

 server/openapi/target/openapi.jar.original

Binary files differ