最新版本541200007

doum

14 小时以前 df0bfe5ad02fa6d7d956e566799b62327f0425a8

最新版本541200007

 server/visits/admin_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: test
    active: pro
  application:
    name: visitsTimer
    # 安全配置

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

@@ -430,7 +430,7 @@
        String[] findDeviceStatistics= new String[]{"/api/v1/device/findDeviceStatistics","分页查询设备的以及下属传感器数据的状态统计"};// 分页查询设备的以及下属传感器数据的状态统计
        String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","【海康消防看板】根据条件查询目录下有权限的资源列表"};// 【海康消防看板】根据条件查询目录下有权限的资源列表
        String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm访客签离"};// iccm访客签离
        String[] authResultPage= new String[]{"/open/v1/auth/result/businessNo/page","按业务编号查询下发记录"};// 1.4.7.3按业务编号查询下发记录
        String[] authResultPage= new String[]{"/api/acps/auth/open/v1/auth/result/businessNo/page","按业务编号查询下发记录"};// 1.4.7.3按业务编号查询下发记录
        String[] wxAuthUrl= new String[]{"dps/web/wxAuth/loginV2?oaId=atwl&redirectUrl=","待办考勤跳转地址"};// 待办考勤跳转地址
    }
    /**

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

@@ -421,7 +421,7 @@
    public static String startDoPostStringArtemis(String[] pathStr,String body ){
        Map<String, String> path = getPath(pathStr[0]);
        Map<String, String> header = new HashMap<>();
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
        header.put("tagId","frs");
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path,pathStr[1]);
        return result;
@@ -440,7 +440,7 @@
    public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
        Map<String, String> path = getPath(pathStr[0]);
        Map<String, String> header = new HashMap<>();
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
        header.put("tagId", "frs");
        String result = ArtemisHttpUtil.doGetArtemis(path, body, null, null,  header);
        saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
        return result;
@@ -461,7 +461,7 @@
    public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
        Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
        Map<String, String> header = new HashMap<>();
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
        header.put("tagId","frs");
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path,pathStr[1]);
        return result;
@@ -470,7 +470,7 @@

    public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
        Map<String, String> path = getPath(pathStr[0]);
        header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
        header.put("tagId","frs");
        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post请求application/json类型参数
        saveInterfaceLog(body,result,path,pathStr[1]);
        return result;

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

@@ -150,15 +150,15 @@

                                if (Constants.equalsInteger(model.getDownCardStatus(),0)) {
                                    cardInfo = "卡片下发未变更";
                                }else  if (!Constants.equalsInteger(model.getDownCardStatus(),1)) {
                                }else  if (Constants.equalsInteger(model.getDownCardStatus(),1)) {
                                    cardInfo = "卡片下发成功";
                                }else {
                                    cardInfo = "卡片下发失败";
                                }

                                if ( Constants.equalsInteger(model.getDownFaceStatus(),0)) {
                                    remark = "人脸为变更！";
                                } else  if (!Constants.equalsInteger(model.getDownFaceStatus(),1)) {
                                    remark = "人脸下发未变更！";
                                } else  if (Constants.equalsInteger(model.getDownFaceStatus(),1)) {
                                    remark = "人脸下发成功！";
                                }else{
                                    remark = "人脸下发失败！";
@@ -691,7 +691,7 @@
        if(list ==null || list.size()==0){
            return;
        }
//        clearAllEmpowerFirst(list);
//      clearAllEmpowerFirst(list);
        Date date = new Date();
        //创建任务
        String taskId = hkTaskAddtion();