Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23

杜润昆

2024-08-02 1b6e22266fc9b225fff1db32d9a9c144d8943747

Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23

 Client/ºÎСºÀ/code/Permissions.rar

Binary files differ

 Client/ºÎСºÀ/code/quanxian.sql

New file
@@ -0,0 +1,56 @@
-- --------------------------------------------------------
-- ä¸»æœº:                           127.0.0.1
-- æœåŠ¡å™¨ç‰ˆæœ¬:                        8.0.37 - MySQL Community Server - GPL
-- æœåŠ¡å™¨æ“ä½œç³»ç»Ÿ:                      Win64
-- HeidiSQL ç‰ˆæœ¬:                  12.6.0.6765
-- --------------------------------------------------------

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
/*!50503 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;


-- å¯¼å‡º uesr çš„数据库结构
DROP DATABASE IF EXISTS `uesr`;
CREATE DATABASE IF NOT EXISTS `uesr` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
USE `uesr`;

-- å¯¼å‡º  è¡¨ uesr.permissions ç»“æž„
DROP TABLE IF EXISTS `permissions`;
CREATE TABLE IF NOT EXISTS `permissions` (
  `user_id` int NOT NULL COMMENT '用户id',
  `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '用户名',
  `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '角色',
  KEY `FK_permissions_roles` (`role`),
  CONSTRAINT `FK_permissions_roles` FOREIGN KEY (`role`) REFERENCES `roles` (`role`) ON DELETE SET NULL ON UPDATE SET NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

-- æ•°æ®å¯¼å‡ºè¢«å–消选择。

-- å¯¼å‡º  è¡¨ uesr.roles ç»“æž„
DROP TABLE IF EXISTS `roles`;
CREATE TABLE IF NOT EXISTS `roles` (
  `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色',
  `Permissions_admin` tinyint unsigned DEFAULT '0' COMMENT '权限管理权限',
  `Permissions_query` tinyint unsigned DEFAULT '0' COMMENT '历史查询分析权限',
  `Permissions_alert` tinyint unsigned DEFAULT '0' COMMENT '警报管理权限',
  `Permissions_Log` tinyint unsigned DEFAULT '0' COMMENT '日志查询权限',
  `Permissions_map` tinyint unsigned DEFAULT '0' COMMENT '地图标注权限',
  `Permissions_produce` tinyint unsigned DEFAULT '0' COMMENT '生产计划权限',
  `Permissions_equipment` tinyint unsigned DEFAULT '0' COMMENT '设备管理权限',
  `Permissions_version` tinyint unsigned DEFAULT '0' COMMENT '版本管理权限',
  KEY `role` (`role`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

-- æ•°æ®å¯¼å‡ºè¢«å–消选择。

/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;

 Client/ºÎСºÀ/code/test_tcp_server_0620.rar

Binary files differ

 Client/ºÎСºÀ/log/ÈÕÖ¾_ºÎСºÀ_0801.doc

Binary files differ

 Client/ÕŽ¡îÚ/log/µØͼ±ê×¢ÈÕÖ¾_ÕŽ¡îÚ_0801.docx

Binary files differ

 Client/ÀîÓ±âù/log/ÈÕ־ģ°å_ÀîÓ±âù_20240731.doc

Binary files differ

 Client/ÀîÓ±âù/log/ÈÕ־ģ°å_ÀîÓ±âù_20240801.doc

Binary files differ

 Client/ÍõÒ»²©/log/ÍõÒ»²©-0801.doc

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Client/\347\216\213\344\270\200\345\215\232/log/\347\216\213\344\270\200\345\215\232-0801.doc"
Binary files differ

 Client/ºúÏü/log/~WRL3045.tmp

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
Binary files differ

 Client/ºúÏü/log/ÀúÊ·²éѯ·ÖÎö_ºúÏü_2024.7.31.doc

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.7.31.doc"
Binary files differ

 Client/ºúÏü/log/ÀúÊ·²éѯ·ÖÎö_ºúÏü_2024.8.1.doc

Binary files differ

 Client/·¶ÈØ/log/·¶ÈØ_2024.7.31.doc

Binary files differ

 Client/·¶ÈØ/log/·¶ÈØ_2024.8.1.doc

Binary files differ

 Server/ÎâÔóÁÖ/log/ÈÕ±¨_ÎâÔóÁÖ_0801.doc

Binary files differ

 Server/×ÚÂêµÛ/log/EF-PÈÕÖ¾_×ÚÂêµÛ_202040731.doc

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040731.doc"
Binary files differ

 Server/×ÚÂêµÛ/log/EF-PÈÕÖ¾_×ÚÂêµÛ_202040801.doc

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040801.doc"
Binary files differ

 Server/Ô¬³¿ÁÕ/log/ÈÕÖ¾_Ô¬³¿ÁÕ_0801.doc

copy from "Client/\350\203\241\345\256\265/log/~WRL1919.tmp"
copy to "Server/\350\242\201\346\231\250\347\220\263/log/\346\227\245\345\277\227_\350\242\201\346\231\250\347\220\263_0801.doc"
Binary files differ