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 |   76 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 3fd11f8..1aada00 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/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");
+        //瀹归敊绾у埆涓篐
+        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);
+        }
+
+    }
+
 
     /**
      * 浼氳瀹や娇鐢ㄦ儏鍐�

--
Gitblit v1.9.2