src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -2,6 +2,9 @@ import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; import com.google.zxing.WriterException; import com.google.zxing.client.j2se.MatrixToImageWriter; import com.google.zxing.common.BitMatrix; import com.product.administration.config.CmnConst; import com.product.administration.config.SystemCode; import com.product.administration.service.ConferenceManagerService; @@ -22,6 +25,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -422,6 +429,11 @@ } } /** * 会议预约看板功能 * @param request * @return */ @PostMapping("/get_kb_Data/{version}") @ApiVersion(1) public String getkbData(HttpServletRequest request){ @@ -443,6 +455,11 @@ } /** * 获取会议预约详情 * @param request * @return */ @PostMapping("/get_Meeting_Details/{version}") @ApiVersion(1) public String getMeetingDetails(HttpServletRequest request){ @@ -462,6 +479,11 @@ } /** * 会议室预约保存更新功能 * @param request * @return */ @PostMapping("/save_or_update_meeting_info/{version}") @ApiVersion(1) @@ -484,4 +506,74 @@ } /** * 会议管理签到二维码 * @param request * @param response * @throws IOException * @throws WriterException */ @PostMapping("/get_QrCode/{version}") @ApiVersion(1) public void getQrCode(HttpServletRequest request, HttpServletResponse response) throws IOException, WriterException { //获取参数 FieldSetEntity fse = null; 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"); // 设置响应流信息 response.setContentType("image/jpg"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); OutputStream stream = response.getOutputStream(); //后端跳转地址 // String content = ("http://www.baidu.com"); JSONObject jsonData = new JSONObject(); jsonData.put("uuid",uuid); jsonData.put("date",new Date()); //jsonData.put("url",content); //获取一个二维码图片 BitMatrix bitMatrix = conferenceManagerService.getQrCode(jsonData.toString()); //以流的形式输出到前端 MatrixToImageWriter.writeToStream(bitMatrix , "jpg" , stream); } } } /** * 预约会议取消开启功能 * @param request * @return */ @PostMapping("/cancel_and_start/{version}") @ApiVersion(1) public String CancelAndStart(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()); } conferenceManagerService.CancelAndStart(fse); return OK(); } } src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -2,6 +2,12 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; import com.google.zxing.MultiFormatWriter; import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.product.administration.config.CmnConst; import com.product.administration.config.SystemCode; import com.product.administration.service.ide.IConferenceManagerService; @@ -10,12 +16,14 @@ import com.product.core.dao.BaseDao; import com.product.core.entity.DataTableEntity; import com.product.core.entity.FieldSetEntity; import com.product.core.entity.RequestParameterEntity; import com.product.core.exception.BaseException; import com.product.core.permission.PermissionService; import com.product.core.service.support.AbstractBaseService; import com.product.core.service.support.QueryFilterService; import com.product.core.spring.context.SpringMVCContextHolder; import com.product.core.transfer.Transactional; import com.product.core.util.QuickResponUtil; import com.product.core.websocket.service.WebsocketMesssageServiceThread; import com.product.module.sys.entity.SystemUser; import com.product.util.BaseUtil; @@ -24,6 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; import java.text.Format; import java.text.SimpleDateFormat; @@ -295,7 +307,7 @@ param.add(meeting_room); param.add(meeting_date); StringBuilder sb=new StringBuilder(); sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status, "); sb.append(" SELECT b.uuid,b.start_time,b.end_time,b.meeting_topic,b.status,b.record_man as record_man_uuid, "); sb.append(" (select user_name from product_sys_users where user_id=b.record_man) as record_man,"); sb.append(" (select user_name from product_sys_users where user_id=b.record_master) as record_master,"); sb.append(" CONCAT(DATE_FORMAT(b.start_time,\"%H-%i-%S\"),'~',DATE_FORMAT(b.end_time,\"%H-%i-%S\")) as time_quantum,"); @@ -307,10 +319,10 @@ sb.append(" SELECT T1.*, "); sb.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.meeting_resource, ',', T2.digit + 1 ), ',',- 1 ) AS type "); sb.append(" FROM product_oa_conference_apply T1 "); sb.append(" JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ) T2"); sb.append(" LEFT JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 ) T2"); sb.append(" ON T2.digit < ( length( T1.meeting_resource )- length( REPLACE ( T1.meeting_resource, ',', '' ))+ 1 )"); sb.append(" WHERE t1.meeting_room = ? "); sb.append(" and DATE_FORMAT(t1.start_time,\"%Y-%m-%d\")=? "); sb.append(" WHERE T1.meeting_room = ? "); sb.append(" and DATE_FORMAT(T1.start_time,\"%Y-%m-%d\")=? "); sb.append(" ) a"); sb.append(" LEFT JOIN product_sys_dict t ON a.type = t.dict_value "); sb.append(" AND t.dict_name = '会议室资源'"); @@ -330,6 +342,16 @@ String end_time_date = dateFormat.format(end_time); MapValues.put("start_time",start_time_date); MapValues.put("end_time",end_time_date); } Date date = new Date(); //是否能够取消 if(date.before(fieldSetEntity.getDate("start_time"))){ MapValues.put("isCancel",true); } //是否执行开启功能 if(date.before(fieldSetEntity.getDate("start_time")) && fieldSetEntity.getString("status").equals("已取消")){ MapValues.put("isStart",true); } dataList.add(MapValues); } @@ -390,6 +412,52 @@ return hashMap; } @Override public BitMatrix getQrCode(String content) throws BaseException, WriterException, IOException { //二维码的宽高 int width = 200; int height = 200; //其他参数，如字符集编码 Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>(); hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); //容错级别为H hints.put(EncodeHintType.ERROR_CORRECTION , ErrorCorrectionLevel.H); //白边的宽度，可取0~4 hints.put(EncodeHintType.MARGIN , 0); BitMatrix bitMatrix = null; try { bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints); } catch (WriterException e) { e.printStackTrace(); } return bitMatrix; } @Override public void CancelAndStart(FieldSetEntity fse) throws BaseException { String uuid = fse.getString("uuid"); String filter=" uuid='"+uuid+"'"; DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{}); if(product_oa_conference_apply.getRows()!=0){ FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0); if(fieldSetEntity.getString("status").equals("已取消")){ fieldSetEntity.setValue("status","已启用"); }else { fieldSetEntity.setValue("status","已取消"); } baseDao.update(fieldSetEntity); } } /** * 会议室使用情况 src/main/java/com/product/administration/service/PunchRecordService.java
@@ -94,7 +94,7 @@ StringBuilder sbReplenish=new StringBuilder(); sbReplenish.append(" SELECT T1.id,T1.uuid,T1.created_by,T1.applicant,T1.replenish_date,T1.reason,"); sbReplenish.append(" SUBSTRING_INDEX( SUBSTRING_INDEX( T1.replacement_card_type, ',', T2.digit + 1 ), ',',- 1 ) AS type "); sbReplenish.append(" FROM product_oa_replenish_punch T1 "); sbReplenish.append(" FROM (select * from product_oa_replenish_punch where flow_flag=2) T1 "); sbReplenish.append(" JOIN ( SELECT 0 AS digit UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 ) T2"); sbReplenish.append(" ON T2.digit < ( length( T1.replacement_card_type )- length( REPLACE ( T1.replacement_card_type, ',', '' ))+ 1 )"); sbReplenish.append(" where t1.created_by=? "); src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -172,13 +172,13 @@ sb.append(" (SELECT 0 UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5) t4, "); sb.append(" (SELECT @row := -1) t0) d WHERE i < DAY(last_day(DATE_FORMAT(?, '%Y-%m-01')))) a "); param.add(yearAndMonth+"-01"); sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=?) b "); sb.append(" LEFT JOIN (SELECT * FROM product_oa_ask_for_leave WHERE user_id=? and flow_flag=2) b "); param.add(user_id); sb.append(" on DATE_FORMAT( a.punch_date, '%Y-%m-%d' )>= DATE_FORMAT( b.start_time, '%Y-%m-%d' ) and DATE_FORMAT( a.punch_date, '%Y-%m-%d' )<= DATE_FORMAT( b.end_time, '%Y-%m-%d' ) "); sb.append(" LEFT JOIN (SELECT * FROM product_sys_dict where dict_name='Leave_Type') c on b.leave_type =c.dict_value "); sb.append(" LEFT JOIN product_oa_punch_record d on a.punch_date=DATE_FORMAT( d.punch_time_one, '%Y-%m-%d' ) "); sb.append(" LEFT JOIN (SELECT applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d') replenish_date,max(replacement_card_type) bk FROM product_oa_replenish_punch "); sb.append(" where applicant=? GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date "); sb.append(" where applicant=? and flow_flag=2 GROUP BY applicant,DATE_FORMAT( replenish_date, '%Y-%m-%d')) e on a.punch_date=e.replenish_date "); param.add(user_id); sb.append(" LEFT JOIN product_oa_punch_time f on d.punch_congfig_uuid =f.punch_site_uuid "); sb.append(" where a.punch_date NOT IN (SELECT DATE_FORMAT( date_holiday, '%Y-%m-%d' ) FROM product_sys_company_holiday) "); @@ -385,7 +385,7 @@ sb.append(" sum(IF(leave_type=9,TRUE,0))marriage_leave,sum(IF(leave_type=4,TRUE,0))paid_leave, "); sb.append(" sum(IF(leave_type!=1 && leave_type!=2 && leave_type!=4 && leave_type!=9,TRUE,0))other_leave "); sb.append(" FROM product_oa_ask_for_leave "); sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? "); sb.append(" WHERE DATE_FORMAT(start_time,'%Y-%m')=? and flow_flag=2 "); sb.append(" GROUP BY created_by "); sb.append(" )c "); sb.append(" ON a.created_by=c.created_by "); @@ -422,7 +422,7 @@ sbReplenish.append(" SELECT DISTINCT replenish_date "); sbReplenish.append(" FROM product_oa_replenish_punch "); sbReplenish.append(" WHERE"); sbReplenish.append(" created_by =? "); sbReplenish.append(" created_by =? and flow_flag=2"); sbReplenish.append(" AND DATE_FORMAT( replenish_date, '%Y-%m' )=? "); sbReplenish.append(" and DATE_FORMAT( replenish_date, '%Y-%m-%d') "); sbReplenish.append(" not in ("); src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -1,9 +1,12 @@ package com.product.administration.service.ide; import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.product.core.entity.DataTableEntity; import com.product.core.entity.FieldSetEntity; import com.product.core.exception.BaseException; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -39,5 +42,11 @@ HashMap saveOrUpdateMeetingInfo(FieldSetEntity fse)throws BaseException; BitMatrix getQrCode(String content) throws BaseException, WriterException, IOException; void CancelAndStart(FieldSetEntity fse)throws BaseException; }
