From a0d0843edd6f3af2c1c4cb4bf07d5bd59d5609fe Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期四, 22 八月 2024 16:35:01 +0800
Subject: [PATCH] 会议室功能优化8.22
---
src/main/java/com/product/administration/service/ConferenceManagerService.java | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 282 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/product/administration/service/ConferenceManagerService.java b/src/main/java/com/product/administration/service/ConferenceManagerService.java
index 2478fad..6a9f6bb 100644
--- a/src/main/java/com/product/administration/service/ConferenceManagerService.java
+++ b/src/main/java/com/product/administration/service/ConferenceManagerService.java
@@ -1,5 +1,7 @@
package com.product.administration.service;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.google.zxing.BarcodeFormat;
@@ -16,28 +18,23 @@
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;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -307,7 +304,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,");
@@ -429,7 +426,7 @@
BitMatrix bitMatrix = null;
try {
- //鐢熸垚鐭╅樀锛屽洜涓烘垜鐨勪笟鍔″満鏅紶鏉ョ殑鏄紪鐮佷箣鍚庣殑URL锛屾墍浠ュ厛瑙ｇ爜
+
bitMatrix = new MultiFormatWriter().encode(content,
BarcodeFormat.QR_CODE, width, height, hints);
@@ -444,15 +441,252 @@
public void CancelAndStart(FieldSetEntity fse) throws BaseException {
String uuid = fse.getString("uuid");
- String filter=" status='"+uuid+"'";
+ String filter=" uuid='"+uuid+"'";
DataTableEntity product_oa_conference_apply = baseDao.listTable("product_oa_conference_apply", filter, new Object[]{});
- FieldSetEntity fieldSetEntity = product_oa_conference_apply.getFieldSetEntity(0);
- if(fieldSetEntity.getString("status").equals("宸插彇娑�")){
- fieldSetEntity.setValue("status","宸插惎鐢�");
- }else {
- fieldSetEntity.setValue("status","宸插彇娑�");
+ 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);
}
- baseDao.update(fieldSetEntity);
+
+ }
+
+ @Override
+ public String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException {
+
+
+ JSONObject jsonObject = new JSONObject();
+ 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);
+
+ if(between>20){
+ jsonObject.put("code","200");
+ jsonObject.put("msg","浜岀淮鐮佸凡澶辨晥");
+ jsonObject.put("status","fail");
+
+ }else {
+
+ SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
+ FieldSetEntity fieldSetEntity = new FieldSetEntity();
+ fieldSetEntity.setTableName("product_oa_conference_sign");
+ fieldSetEntity.setValue("sign_user",currentUser.getUser_name());
+ fieldSetEntity.setValue("user_id",currentUser.getUser_id());
+ fieldSetEntity.setValue("org_level_uuid","00000000-0000-0000-0000-000000000000");
+ fieldSetEntity.setValue("organization",currentUser.getDept_uuid());
+ fieldSetEntity.setValue("organization_name",currentUser.getCurrentDept().getString("org_level_name"));
+ fieldSetEntity.setValue("sign_date",new Date());
+ fieldSetEntity.setValue("sign_status","宸茬鍒�");
+ fieldSetEntity.setValue("meeting_uuid",uuid);
+
+ 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 getSignOrVisitInfo(FieldSetEntity fse) throws BaseException {
+
+ String meeting_uuid = fse.getString("meeting_uuid");
+ //type=1灏辨槸绛惧埌鏁版嵁锛宼ype=2灏辨槸璁块棶鏁版嵁
+ String type = fse.getString("type");
+ 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");
+
+ 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("宸茬鍒�")) || (ObjectUtil.isNotEmpty(listDate.get(j).get("visit_status"))&&listDate.get(j).get("visit_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("signOrvisit_down",sign_count);
+ hashMapResult.put("no_signOrvisit",sign_down);
+ hashMapResult.put("listDateNoSignOrVisit",listDateNoSign);
+ hashMapResult.put("listDateSignOrVisit",listDateSign);
+ return hashMapResult;
+ }
+
+ @Override
+ public void sendMsg(FieldSetEntity fse) throws BaseException {
+
+ String meeting_uuid= fse.getString("meeting_uuid");
+ String type = fse.getString("type");
+ String user_ids = fse.getString("user_ids");
+
+ 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);
}
@@ -695,6 +929,38 @@
fieldSetEntity.setValue(CmnConst.CREATED_BY, fieldSetEntity.getString(CmnConst.CREATED_BY + "_save_value"));
fieldSetEntity.setValue("meetint_type", fieldSetEntity.getString("meetint_type_save_value"));
}
+
+
+ //瀛樺偍璁块棶璁板綍
+ SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
+ String fliter="meeting_uuid='"+fse.getUUID()+"' and user_id='"+currentUser.getUser_id()+"'";
+ DataTableEntity product_oa_conference_visit = baseDao.listTable("product_oa_conference_visit", fliter);
+
+ if(product_oa_conference_visit.getRows()!=0){
+ FieldSetEntity fieldSetEntity1 = product_oa_conference_visit.getFieldSetEntity(0);
+ Integer visit_count = fieldSetEntity1.getInteger("visit_count");
+ visit_count++;
+ fieldSetEntity1.setValue("visit_count",visit_count);
+ fieldSetEntity1.setValue("visit_date_new",new Date());
+ baseDao.update(fieldSetEntity1);
+ }else {
+ FieldSetEntity fieldSetEntityVisit = new FieldSetEntity();
+ fieldSetEntityVisit.setTableName("product_oa_conference_visit");
+ fieldSetEntityVisit.setValue("visit_user",currentUser.getUser_name());
+ fieldSetEntityVisit.setValue("user_id",currentUser.getUser_id());
+ fieldSetEntityVisit.setValue("org_level_uuid","00000000-0000-0000-0000-000000000000");
+ fieldSetEntityVisit.setValue("organization",currentUser.getDept_uuid());
+ fieldSetEntityVisit.setValue("organization_name",currentUser.getCurrentDept().getString("org_level_name"));
+ fieldSetEntityVisit.setValue("visit_date_first",new Date());
+ fieldSetEntityVisit.setValue("visit_date_new",new Date());
+ fieldSetEntityVisit.setValue("visit_count",1);
+ fieldSetEntityVisit.setValue("visit_status","宸茶闂�");
+ fieldSetEntityVisit.setValue("meeting_uuid",fse.getUUID());
+ BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fieldSetEntityVisit);
+ baseDao.add(fieldSetEntityVisit);
+ }
+
+
return fieldSetEntity;
}
--
Gitblit v1.9.2