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

Celine

2024-08-08 385b44f8c9704c5051676904223917d464998033

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

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

@@ -30,12 +30,16 @@
  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.permissions çš„数据：~1 rows (大约)
DELETE FROM `permissions`;
INSERT INTO `permissions` (`user_id`, `user_name`, `role`) VALUES
    (1, 'admin', 'role_admin');

-- å¯¼å‡º  è¡¨ 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 '角色',
  `role_id` int NOT NULL AUTO_INCREMENT,
  `role` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '角色',
  `Permissions_admin` tinyint unsigned DEFAULT '0' COMMENT '权限管理权限',
  `Permissions_query` tinyint unsigned DEFAULT '0' COMMENT '历史查询分析权限',
  `Permissions_alert` tinyint unsigned DEFAULT '0' COMMENT '警报管理权限',
@@ -44,10 +48,21 @@
  `Permissions_produce` tinyint unsigned DEFAULT '0' COMMENT '生产计划权限',
  `Permissions_equipment` tinyint unsigned DEFAULT '0' COMMENT '设备管理权限',
  `Permissions_version` tinyint unsigned DEFAULT '0' COMMENT '版本管理权限',
  PRIMARY KEY (`role_id`),
  KEY `role` (`role`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

-- æ•°æ®å¯¼å‡ºè¢«å–消选择。
-- æ­£åœ¨å¯¼å‡ºè¡¨  uesr.roles çš„数据：~8 rows (大约)
DELETE FROM `roles`;
INSERT INTO `roles` (`role_id`, `role`, `Permissions_admin`, `Permissions_query`, `Permissions_alert`, `Permissions_Log`, `Permissions_map`, `Permissions_produce`, `Permissions_equipment`, `Permissions_version`) VALUES
    (1, 'role_admin', 1, 1, 1, 1, 1, 1, 1, 1),
    (2, 'role_query', 0, 1, 0, 0, 0, 0, 0, 0),
    (3, 'role_alert', 0, 0, 1, 0, 0, 0, 0, 0),
    (4, 'role_Log', 0, 0, 0, 1, 0, 0, 0, 0),
    (5, 'role_map', 0, 0, 0, 0, 1, 0, 0, 0),
    (6, 'role_produce', 0, 0, 0, 0, 0, 1, 0, 0),
    (7, 'role_equipment', 0, 0, 0, 0, 0, 0, 1, 0),
    (8, 'role_version', 0, 0, 0, 0, 0, 0, 0, 1);

/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;

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

Binary files differ

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

Binary files differ

 Client/Ãφ´/code/Real_time_translation.zip

Binary files differ

 Client/Ãφ´/log/´óÆÁÏÔʾÈÕÖ¾0807.doc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

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

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

Binary files differ

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

copy from "Client/\350\203\241\345\256\265/log/~WRL3045.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.8.2.doc"
Binary files differ

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

copy from "Client/\350\203\241\345\256\265/log/~WRL3045.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.8.7.doc"
Binary files differ

 Client/·¶ÈØ/document/Éú²ú¼Æ»®ºÍÉ豸¹ÜÀí .docx

Binary files differ

 Client/·¶ÈØ/document/É豸½á¹¹Ìå.txt

New file
@@ -0,0 +1,150 @@
enum TypeInfo{
    DEVICESELECT_REQ, //查看设备请求
    DEVICESELECT_RES, //查看设备响应

    DEVICEADD_REQ, //增加设备请求
    DEVICEADD_RES, //增加设备响应

    DEVICEDELETE_REQ, //删除设备请求
    DEVICEDELETE_RES, //删除设备响应

    DEVICEUPDATE_REQ, //修改设备请求
    DEVICEUPDATE_RES, //修改设备响应

    DEVICESELECTALL_REQ,//查看全部设备请求
    DEVICESELECTALL_RES//查看全部设备响应
};

struct Head
{
    int type;//区分不同功能结构体
    int lenth;//表示当前封包长度，主要解决年粘包、拆包的操作
  //  int flag;
};

//设备信息
struct DeviceData {
    int   id;  // è®¾å¤‡ç¼–号
    char name[32];  // è®¾å¤‡åç§°
    double longitude; // è®¾å¤‡æ‰€åœ¨ä½ç½®ï¼ˆç»åº¦ï¼‰
    double latitude;  //设备所在位置（纬度）
    int status;  // è®¾å¤‡çŠ¶æ€ 0：设备正常 1：设备异常 2：设备损坏
    double currentEnvironment_humidity;//当前生产环境湿度
    double currentEnvironment_temperature;//当前生产环境温度
};

//全部设备查询请求结构体
struct DeviceSelectAllReq
{
    Head head;
    DeviceData dev;
    DeviceSelectAllReq() {//构造函数
        head.type = DEVICESELECTALL_REQ;
        head.lenth = sizeof(DeviceSelectAllReq);
    }
};


//全部设备查询响应结构体
struct DeviceSelectAllRes
{
    Head head;
    int state;//0：查询成功 1：查询失败
    DeviceData dev[0]; // æŸ”性数组
    DeviceSelectAllRes() {
        head.type = DEVICESELECTALL_RES;
        head.lenth = sizeof(DeviceSelectAllRes);
    }
};
//设备查询请求结构体
struct DeviceSelectReq
{
    Head head;
    DeviceData dev;
    DeviceSelectReq() {//构造函数
        head.type = DEVICESELECT_REQ;
        head.lenth = sizeof(DeviceSelectReq);
    }
};


//设备查询响应结构体
struct DeviceSelectRes
{
    Head head;
    int state;//0：查询成功 1：查询失败
    DeviceData dev[0]; // æŸ”性数组
    DeviceSelectRes() {
        head.type = DEVICESELECT_RES;
        head.lenth = sizeof(DeviceSelectRes);
    }
};

//设备增加请求结构体
struct DeviceAddReq
{
    Head head;
    DeviceData dev;
    DeviceAddReq() {
        head.type = DEVICEADD_REQ;
        head.lenth = sizeof(DeviceAddReq);
    }
};

//设备增加响应结构体
struct DeviceAddRes
{
    Head head;
    int state;//0：添加成功 1：失败
    DeviceAddRes() {
        head.type = DEVICEADD_RES;
        head.lenth = sizeof(DeviceAddRes);
    }
};

//设备删除请求结构体
struct DeviceDeleteReq
{
    Head head;
    DeviceData dev;
    DeviceDeleteReq() {
        head.type = DEVICEDELETE_REQ;
        head.lenth = sizeof(DeviceDeleteReq);
    }
};

//设备删除响应结构体
struct DeviceDeleteRes
{
    Head head;
    int state;//0：删除成功 1：删除失败
    DeviceDeleteRes() {
        head.type = DEVICEDELETE_RES;
        head.lenth = sizeof(DeviceDeleteRes);
    }
};


//设备修改更新请求结构体
struct DeviceUpdateReq
{
    Head head;
    DeviceData dev;
    DeviceUpdateReq() {
        head.type = DEVICEUPDATE_REQ;
        head.lenth = sizeof(DeviceUpdateReq);
    }
};


//设备修改更新响应结构体
struct DeviceUpdateRes
{
    Head head;
    DeviceData dev;
    int state;//0：修改成功 1：修改失败
    DeviceUpdateRes() {
        head.type = DEVICEUPDATE_RES;
        head.lenth = sizeof(DeviceUpdateRes);
    }
};

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

copy from "Client/\350\203\241\345\256\265/log/~WRL3045.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_202040802.doc"
Binary files differ

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

copy from "Client/\350\203\241\345\256\265/log/~WRL3045.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_202040803.doc"
Binary files differ

 Server/×ÚÂêµÛ/log/~WRL0003.tmp

copy from "Client/\350\203\241\345\256\265/log/~WRL3045.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
Binary files differ

 Server/¶ÅÈóÀ¥/log/ÈÕ±¨_¶ÅÈóÀ¥_0807.doc

Binary files differ

 ²Î¿¼Îĵµ/ÐèÇó·ÖÎöÄ£°å/Éú²ú¼Æ»®ºÍÉ豸¹ÜÀí.docx

Binary files differ