From ab7ddb13ba6ea769748d1ee67255a53ad7913554 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 21 八月 2024 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 96 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 5853818..1aada00 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -7,6 +7,7 @@
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;
@@ -15,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;
@@ -304,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,");
@@ -339,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);
}
@@ -400,49 +413,50 @@
}
@Override
- public String getQrCode(FieldSetEntity fse) throws BaseException, WriterException, IOException {
- String uuid="96f161b4-6360-40ba-8dc1-72bb39d56be4";
- int BLACK = 0xFF000000;
- int WHITE = 0xFFFFFFFF;
- Date date = new Date();
- String text = "http://127.0.0.1:9998/lx/api/conference/get_QrCode_Info/v1?uuid=" + uuid+"&date="+date;
- String path = "D:/QRCode"; // 鍥剧墖鐢熸垚鐨勪綅缃�
- int width = 400;
- int height = 400;
- // 浜岀淮鐮佸浘鐗囨牸寮�
- String format = "jpg";
- // 璁剧疆缂栫爜锛岄槻姝腑鏂囦贡鐮�
- Hashtable<EncodeHintType, Object> ht = new Hashtable<EncodeHintType, Object>();
- ht.put(EncodeHintType.CHARACTER_SET, "UTF-8");
- // 璁剧疆浜岀淮鐮佸弬鏁�(缂栫爜鍐呭锛岀紪鐮佺被鍨嬶紝鍥剧墖瀹藉害锛屽浘鐗囬珮搴�,鏍煎紡)
- BitMatrix bitMatrix = new MultiFormatWriter().encode(text, BarcodeFormat.QR_CODE, width, height, ht);
- // 鐢熸垚浜岀淮鐮�(瀹氫箟浜岀淮鐮佽緭鍑烘湇鍔″櫒璺緞)
- File outputFile = new File(path);
- if (!outputFile.exists()) {
- // 鍒涘缓鏂囦欢澶�
- outputFile.mkdir();
- }else {
- outputFile.delete();
- outputFile.mkdir();
+ 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");
+ //瀹归敊绾у埆涓篐
+ 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();
}
- int b_width = bitMatrix.getWidth();
- int b_height = bitMatrix.getHeight();
- // 寤虹珛鍥惧儚缂撳啿鍣�
- BufferedImage image = new BufferedImage(b_width, b_height, BufferedImage.TYPE_3BYTE_BGR);
- for (int x = 0; x < b_width; x++) {
- for (int y = 0; y < b_height; y++) {
- image.setRGB(x, y, bitMatrix.get(x, y) ? BLACK : WHITE);
- }
- }
- // 鐢熸垚浜岀淮鐮�
- ImageIO.write(image, format, new File(path + "/code." + format));
- // 浜岀淮鐮佺殑鍚嶇О
- // code.jpg
-
- return path + "/code." + format;
+ 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);
+ }
+
+ }
/**
@@ -477,8 +491,8 @@
sql.append(" b.end_time, ");
}
sql.append(" b.flow_flag, ");
- sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" FROM ");
+ sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
sql.append(" product_oa_CONFERENCE_room_config a ");
sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM ");
sql.append(" product_oa_conference_apply b WHERE ");
--
Gitblit v1.9.2