From 1b7a35ff790fc52bfecb4e7a0fb318eac986ac46 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 14:41:15 +0800
Subject: [PATCH] 会议室功能访问签到记录8.22
---
src/main/java/com/product/administration/service/ide/IConferenceManagerService.java | 2 +
src/main/java/com/product/administration/controller/ConferenceManagerController.java | 27 +++++++++++--
src/main/java/com/product/administration/service/ConferenceManagerService.java | 90 ++++++++++++++++++++++++++++++++++++++++----
3 files changed, 106 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index b12bb1f..f44c41b 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -11,7 +11,6 @@
import com.product.administration.service.ide.IConferenceManagerService;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
-import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.entity.RequestParameterEntity;
import com.product.core.exception.BaseException;
@@ -19,9 +18,7 @@
import com.product.module.sys.config.SystemErrorCode;
import com.product.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;
-import org.omg.CORBA.DATA_CONVERSION;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -605,7 +602,7 @@
/**
- * 鑾峰彇绛惧埌淇℃伅
+ * 鑾峰彇绛惧埌鎴栬�呰闂俊鎭�
* @param request
* @return
*/
@@ -628,6 +625,28 @@
}
+ /**
+ * 鍙戦�佹秷鎭�
+ * @param request
+ * @return
+ */
+ @PostMapping("/sendMsg/{version}")
+ @ApiVersion(1)
+ public String sendMsg(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.sendMsg(fse);
+ return OK();
+ }
+
}
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 262acdc..dbcc4c3 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -4,7 +4,6 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
-import com.google.errorprone.annotations.Var;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
@@ -19,25 +18,19 @@
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;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.omg.CORBA.OBJ_ADAPTER;
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;
@@ -509,7 +502,7 @@
String meeting_uuid = fse.getString("meeting_uuid");
//type=1灏辨槸绛惧埌鏁版嵁锛宼ype=2灏辨槸璁块棶鏁版嵁
- String type = fse.getString("type");
+ String type = fse.getString("type");
List<Object> params=new ArrayList<>();
params.add(meeting_uuid);
params.add(meeting_uuid);
@@ -614,6 +607,85 @@
return hashMapResult;
}
+ @Override
+ public void sendMsg(FieldSetEntity fse) throws BaseException {
+
+ String meeting_uuid= fse.getString("meeting_uuid");
+ String type = fse.getString("type");
+ FieldSetEntity product_oa_conference_apply = baseDao.getFieldSetEntity("product_oa_conference_apply", meeting_uuid, false);
+
+ 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,");
+ if(type.equals("1")){
+ sb.append(" n.sign_status");
+ }else {
+ sb.append(" n.visit_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 ");
+ if(type.equals("1")){
+ sb.append(" LEFT JOIN product_oa_conference_sign n ");
+ }else {
+ sb.append(" LEFT JOIN product_oa_conference_visit n ");
+ }
+ sb.append(" on b.staff_id=n.user_id and n.meeting_uuid=? ");
+ sb.append(" )c");
+ if(type.equals("1")){
+ sb.append(" where c.sign_status is NULL");
+ }else {
+ sb.append(" where c.visit_status is NULL");
+ }
+
+ DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), params.toArray());
+ String user_ids = "";
+ for (int i = 0; i < dataTableEntity.getRows(); i++) {
+ FieldSetEntity fieldSetEntity = dataTableEntity.getFieldSetEntity(i);
+ if((i+1)==dataTableEntity.getRows()){
+ user_ids=user_ids+fieldSetEntity.getString("staff_id");
+ }else {
+ user_ids=user_ids+fieldSetEntity.getString("staff_id")+",";
+ }
+
+ }
+ String content="";
+ if(type.equals("1")){
+ content="浼氳灏嗗紑濮嬬鍒�,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",璇锋寜鏃剁鍒�";
+ }else {
+ content="鎮ㄦ湁鍦轰細璁渶瑕佸弬涓�,"+product_oa_conference_apply.getString("meeting_topic")+"-"+product_oa_conference_apply.getString("start_time")+",璇锋煡鐪嬩細璁鎯�";
+ }
+ SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
+ int user_id = currentUser.getUser_id();
+ String send_user=user_id+"";
+ String reminder_mode = product_oa_conference_apply.getString("reminder_mode");
+ /* //鐭俊
+ if(reminder_mode.equals("0")){
+ }
+ //閭欢
+ if(reminder_mode.equals("1")){
+
+ }
+ //绯荤粺娑堟伅
+ if(reminder_mode.equals("2")){
+
+ }*/
+ WebsocketMesssageServiceThread.getInstance().appendMessage(user_ids, content, "浼氳鎻愰啋", 1,"1", "", "", send_user, 1, 0, 0);
+
+ }
+
/**
* 浼氳瀹や娇鐢ㄦ儏鍐�
diff --git a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
index d2fe0ae..13db868 100644
--- a/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ide/IConferenceManagerService.java
@@ -51,6 +51,8 @@
HashMap getSignOrVisitInfo(FieldSetEntity fse) throws BaseException;
+ void sendMsg(FieldSetEntity fse) throws BaseException;
+
--
Gitblit v1.9.2