18756
2024-08-22 0b9605b411d7aa07c704153d8c3ff4baa0dc1a66
会议室功能签到信息8.22
已修改3个文件
168 ■■■■ 文件已修改
src/main/java/com/product/administration/controller/ConferenceManagerController.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/ConferenceManagerService.java 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -518,19 +518,19 @@
     * @throws IOException
     * @throws WriterException
     */
    @GetMapping("/get_QrCode/{version}")
    @PostMapping("/get_QrCode/{version}")
    @ApiVersion(1)
    public void getQrCode(String uuid,HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException {
    public void getQrCode(HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException {
        //获取参数
        FieldSetEntity fse = null;
      /*  Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
            if(fse!=null &&  !StringUtils.isEmpty(fse.getString("uuid"))){*/
              //  String uuid = fse.getString("uuid");
            if(fse!=null &&  !StringUtils.isEmpty(fse.getString("uuid"))){
                String uuid = fse.getString("uuid");
                // 设置响应流信息
                response.setContentType("image/jpg");
                response.setHeader("Pragma", "no-cache");
@@ -549,9 +549,8 @@
                BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString());
                //以流的形式输出到前端
                MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream);
           // }
        //}
           }
        }
    }
@@ -580,12 +579,18 @@
    }
    /**
     * 会议签到功能
     * @param request
     * @return
     * @throws ParseException
     */
    @PostMapping("/conference_sign/{version}")
    @ApiVersion(1)
    public  String ConferenceSign(HttpServletRequest request) throws ParseException {
        //获取参数
        FieldSetEntity fse = null;
        /*Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
@@ -593,11 +598,36 @@
        //判断参数是否为空
        if (bean == null || fse == null) {
            return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
        }*/
        }
        String s = conferenceManagerService.ConferenceSign(fse);
        return OK(s);
    }
    /**
     * 获取签到信息
     * @param request
     * @return
     */
    @PostMapping("/get_sign_info/{version}")
    @ApiVersion(1)
    public String getSignInfo(HttpServletRequest request){
        FieldSetEntity fse = null;
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
        }
        //判断参数是否为空
        if (bean == null || fse == null) {
            return this.error(com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getValue(), com.product.admin.config.SystemCode.SYSTEM_FORM_NODATA.getText());
        }
        HashMap signInfo = conferenceManagerService.getSignInfo(fse);
        return OK(signInfo);
    }
}
src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -467,19 +467,19 @@
        JSONObject jsonObject = new JSONObject();
       /* if(!StringUtils.isEmpty(fse.getString("uuid"))&&!StringUtils.isEmpty(fse.getString("date"))){*/
            /*String uuid = fse.getString("uuid");
        if(!StringUtils.isEmpty(fse.getString("uuid"))&&!StringUtils.isEmpty(fse.getString("date"))){
            String uuid = fse.getString("uuid");
            String date = fse.getString("date");
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date parseDate = dateFormat.parse(date);
            long between = DateUtil.between(parseDate, new Date(), DateUnit.SECOND);*/
               String uuid="5591f2ea-b7bd-49c4-999a-9a1045edc717";
           /* if(between>20){
            long between = DateUtil.between(parseDate, new Date(), DateUnit.SECOND);
            if(between>20){
                jsonObject.put("code","200");
                jsonObject.put("msg","二维码已失效");
                jsonObject.put("status","fail");
            }else {*/
            }else {
                SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
                FieldSetEntity fieldSetEntity = new FieldSetEntity();
@@ -493,17 +493,115 @@
                fieldSetEntity.setValue("sign_status","已签到");
                fieldSetEntity.setValue("meeting_uuid",uuid);
               // BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
                BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fse);
                baseDao.add(fieldSetEntity);
                jsonObject.put("code","200");
                jsonObject.put("msg","签到成功");
                jsonObject.put("status","sucess");
           /* }*/
      /*  }*/
            }
        }
        return jsonObject.toString();
    }
    @Override
    public HashMap getSignInfo(FieldSetEntity fse) throws BaseException {
       String meeting_uuid = fse.getString("meeting_uuid");
        List<Object> params=new ArrayList<>();
        params.add(meeting_uuid);
        params.add(meeting_uuid);
        StringBuilder sb=new StringBuilder();
        sb.append(" SELECT c.* FROM ( ");
        sb.append(" SELECT b.staff_id,b.uuid as meeting_uuid,f.show_name,l.uuid as dept_uuid,l.org_level_name,n.sign_status ");
        sb.append(" FROM (" );
        sb.append(" SELECT y.*, ");
        sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( participator, ',', n ), ',', - 1 ) AS staff_id");
        sb.append(" FROM product_oa_conference_apply y, ");
        sb.append(" ( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, product_oa_conference_apply ) x ");
        sb.append(" WHERE 1 = 1 ");
        sb.append(" AND n <= ( LENGTH( participator ) - LENGTH( REPLACE ( participator, ',', '' ) ) + 1 )");
        sb.append(" and y.uuid= ? ");
        sb.append(" )b ");
        sb.append(" LEFT JOIN product_sys_staffs f on b.staff_id=f.user_id ");
        sb.append(" LEFT JOIN product_sys_org_levels l on f.dept_uuid=l.uuid ");
        sb.append(" LEFT JOIN product_oa_conference_sign n on b.staff_id=n.user_id and n.meeting_uuid=? ");
        sb.append(" )c");
        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),params.toArray());
        List<HashMap> listDate=new ArrayList<>();
        List<HashMap> listDateSign=new ArrayList<>();
        List<HashMap> listDateNoSign=new ArrayList<>();
        List<String> list=new ArrayList();
        int sign_count=0;
        int sign_all=0;
        int sign_down=0;
        HashMap<String,Object> hashMapResult=new HashMap<>();
        for (int i = 0; i < dataTableEntity.getRows(); i++) {
            FieldSetEntity fieldSetEntity = dataTableEntity.getFieldSetEntity(i);
            if(!list.contains(fieldSetEntity.getString("org_level_name"))){
                HashMap<String,Object> hashMap=new HashMap<>();
                hashMap.put("dept_uuid",fieldSetEntity.getString("dept_uuid"));
                hashMap.put("org_level_name",fieldSetEntity.getString("org_level_name"));
                list.add(fieldSetEntity.getString("org_level_name"));
                listDate.add(hashMap);
            }
            fieldSetEntity.setValue("parent",fieldSetEntity.getString("dept_uuid"));
            HashMap<String,Object> hashMap=new HashMap<>();
            for (int j = 0; j < fieldSetEntity.getValues().keySet().size(); j++) {
                hashMap.put(fieldSetEntity.getValues().keySet().toArray()[j].toString(),fieldSetEntity.getValue(fieldSetEntity.getValues().keySet().toArray()[j].toString()));
            }
            listDate.add(hashMap);
        }
        sign_all=listDate.size();
        List<String> list1=new ArrayList();
        List<String> list2=new ArrayList();
        for (int j = 0; j < listDate.size(); j++) {
            if(ObjectUtil.isNotEmpty(listDate.get(j).get("sign_status"))&&listDate.get(j).get("sign_status").equals("已签到")){
                if(!list1.contains(listDate.get(j).get("org_level_name"))){
                    list1.add(listDate.get(j).get("org_level_name").toString());
                    HashMap<String,Object> hashMap=new HashMap<>();
                    hashMap.put("dept_uuid",listDate.get(j).get("dept_uuid"));
                    hashMap.put("org_level_name",listDate.get(j).get("org_level_name"));
                    listDateSign.add(hashMap);
                }
                sign_count++;
                //避免重复添加部门
                if(listDate.get(j).size()!=2){
                    listDateSign.add(listDate.get(j));
                }
            }else {
                if(!list2.contains(listDate.get(j).get("org_level_name"))){
                    list2.add(listDate.get(j).get("org_level_name").toString());
                    HashMap<String,Object> hashMap=new HashMap<>();
                    hashMap.put("dept_uuid",listDate.get(j).get("dept_uuid"));
                    hashMap.put("org_level_name",listDate.get(j).get("org_level_name"));
                    listDateNoSign.add(hashMap);
                }
                //避免重复添加部门
                if(listDate.get(j).size()!=2){
                    listDateNoSign.add(listDate.get(j));
                }
            }
        }
        sign_down=sign_all-sign_count;
        hashMapResult.put("sign_down",sign_count);
        hashMapResult.put("no_sign",sign_down);
        hashMapResult.put("listDateNoSign",listDateNoSign);
        hashMapResult.put("listDateSign",listDateSign);
        return  hashMapResult;
    }
    /**
     * 会议室使用情况
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -49,6 +49,8 @@
    String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException;
    HashMap  getSignInfo(FieldSetEntity fse) throws  BaseException;