1109 Commits

Author	SHA1	Message	Date
jhonliu	71237914e6	feat: add bamis	2023-03-30 11:18:07 +08:00
jhonliu	0792963771	feat: add render	2023-03-28 09:32:29 +08:00
jonhliu	04cc4c3d98	feat: map template	2023-03-24 23:48:56 +08:00
jonhliu	440b3e90ab	feat: map template	2023-03-24 23:28:18 +08:00
jonhliu	e1173ae6f1	feat: map template	2023-03-24 23:15:27 +08:00
jonhliu	1e170c4fcb	feat: add dgiot_json:m	2023-03-23 23:41:46 +08:00
jonhliu	70a8154a7b	feat: add dgiot_json:m	2023-03-23 23:37:39 +08:00
jonhliu	6d51edd6c7	feat: add dgiot_json:map(). ... git add -A apps/dgiot/	2023-03-23 23:36:53 +08:00
jonhliu	8df0ed3dd7	Merge branch 'master' of github.com:dgiot/dgiot	2023-03-23 22:58:35 +08:00
jonhliu	55f981d9b4	Merge branch 'master' of https://gitee.com/dgiiot/dgiot	2023-03-23 22:56:30 +08:00
guo	39614dec56	fix:factory	2023-03-23 17:30:08 +08:00
jhonliu	12e5a079eb	feat: git	2023-03-21 20:36:19 +08:00
jhonliu	061fcd7b40	feat: json	2023-03-21 18:30:13 +08:00
jhonliu	a3b08b8ba3	feat: git	2023-03-21 18:29:43 +08:00
dawnwinterLiu	55fec9dcc9	fix: dgiot_evidence	2023-03-21 18:05:52 +08:00
jhonliu	6528502000	feat: add git	2023-03-21 12:32:55 +08:00
jonhliu	35371b6a99	feat: add license	2023-03-20 23:26:44 +08:00
guo	f7a663b207	fix:factory	2023-03-20 15:07:27 +08:00
dawnwinterLiu	a6384d8956	fix	2023-03-16 12:17:19 +08:00
dawnwinterLiu	9d7af6ca28	fix	2023-03-16 12:16:39 +08:00
jhonliu	c80908081d	feat: child spec	2023-03-16 11:20:47 +08:00
jhonliu	1f5096b5f4	feat: add bacnet_worker	2023-03-16 10:09:16 +08:00
jhonliu	2ea4fce06c	feat: add broadcast ipaddr	2023-03-15 21:40:55 +08:00
jhonliu	48cffccbfe	feat: add bacnet scan	2023-03-15 20:56:20 +08:00
jhonliu	30d60e87e6	feat: bacnet	2023-03-14 21:38:48 +08:00
dawnwinter	15943814e6	Update dgiot_opcua.erl	2023-03-14 13:48:34 +08:00
jhonliu	97ecc0cccf	feat: opcua	2023-03-13 17:01:42 +08:00
jhonliu	fb5a6fed78	feat: add bxor_sum	2023-03-10 12:30:32 +08:00
dawnwinterLiu	d3033bd547	feat: 物模型改变类型	2023-03-10 10:59:13 +08:00
dawnwinterLiu	4a194d0c96	mqtt subscribe_route_key	2023-03-09 20:00:38 +08:00
jhonliu	888da350f9	feat: add geoip	2023-03-09 12:34:15 +08:00
dawnwinterLiu	0b6c08a49f	feat: update user	2023-03-08 20:42:19 +08:00
dawnwinterLiu	f158a99843	fix: mqtt unsubscribe devicestate	2023-03-03 19:05:48 +08:00
dawnwinterLiu	7d641f8a78	feat: utils	2023-03-03 12:44:25 +08:00
dawnwinterLiu	5310178a20	feat: verify_code	2023-02-28 19:40:29 +08:00
dawnwinterLiu	b74f33aa83	feat: meter 645	2023-02-21 20:53:03 +08:00
guo	8bc4003778	fix:factory_secrrn	2023-02-20 10:51:12 +08:00
dawnwinterLiu	8c65097627	fix: task	2023-02-17 18:18:25 +08:00
dawnwinterLiu	8a74ec56d4	feat: task	2023-02-16 11:47:50 +08:00
guo	1ba275a360	six:factory_statis	2023-02-16 10:12:18 +08:00
guo	1ae18c0ba4	feature:factory_screen	2023-02-16 09:31:22 +08:00
dawnwinterLiu	4dd50feeb0	feat:update datetime	2023-02-10 17:29:09 +08:00
jhonliu	92b08a3787	feat: add aes	2023-02-10 11:12:25 +08:00
jhonliu	fc3f02a49b	feat: add datatime	2023-02-10 10:46:02 +08:00
jhonliu	1b502c2a45	Merge branch 'master' of github.com:dgiot/dgiot	2023-02-09 21:30:25 +08:00
jhonliu	d0139cf178	feat: add aes	2023-02-09 21:30:05 +08:00
guo	d88c47ef22	add:factory_screen	2023-02-09 20:32:41 +08:00
guo	eafe560288	fix:factory	2023-02-09 18:30:27 +08:00
guo	81158b4a76	fix:factory	2023-02-09 18:02:25 +08:00
dawnwinterLiu	33c0c0fbf9	fix: ota	2023-02-06 11:59:58 +08:00
dawnwinterLiu	d06fa11b78	feat: gitignore	2023-02-06 11:46:31 +08:00
dawnwinterLiu	46effb572b	fix: save_role_view	2023-02-03 18:03:59 +08:00
dawnwinterLiu	19333480d0	fix: save_td	2023-02-03 16:15:08 +08:00
dawnwinterLiu	23eb3eac56	feat: data_worker	2023-02-02 17:19:56 +08:00
dawnwinterLiu	0c4819f2b1	Merge branch 'master' of github.com:dgiot/dgiot	2023-02-02 17:18:09 +08:00
dawnwinterLiu	f1b66273a2	feat: update properties_tpl.json	2023-02-02 17:17:51 +08:00
guo	bbc7d5a91b	fix:dgiot_parse	2023-02-02 12:36:43 +08:00
dawnwinterLiu	b8f6ee7c7b	feat: aa	2023-02-02 10:59:07 +08:00
dawnwinterLiu	be82d62d3a	feat: add dgiot_location	2023-01-30 15:10:35 +08:00
dawnwinterLiu	4191b368e7	feat: dgiot_location;role_view;role_menuview	2023-01-30 15:08:40 +08:00
dawnwinterLiu	ecf5d14518	fix: get_baidu_gps	2023-01-18 15:44:21 +08:00
dawnwinterLiu	cfb7a3de46	feat: station import	2023-01-16 18:37:32 +08:00
dawnwinterLiu	6a6041fd44	feat: quality 65535	2023-01-13 20:00:25 +08:00
dawnwinterLiu	b1a0c59b6b	feat: pre-ci	2023-01-13 19:47:58 +08:00
dawnwinterLiu	5f60107eb2	fix: depart_session	2023-01-13 17:19:01 +08:00
dawnwinterLiu	8fc646dacc	fix: dgiot_bridge_loader keys	2023-01-11 12:14:48 +08:00
dawnwinterLiu	8da39bd032	fix: check_value	2023-01-09 20:44:43 +08:00
dawnwinterLiu	897cd401e3	fix: task 网关子设备采集	2023-01-09 15:23:28 +08:00
dawnwinterLiu	eb1ff70727	feat: 优化td insert	2023-01-07 16:48:02 +08:00
dawnwinterLiu	4305eaa059	upgrade TDengine 3.0，适配websocket	2023-01-07 10:56:06 +08:00
guo	55dcad09c1	fix:factory	2023-01-05 15:55:33 +08:00
jhonliu	4dbcc598c2	feat: rm odbc mqtt	2023-01-05 14:50:03 +08:00
jhonliu	e93c9d01ac	feat: add tdengine websokcet	2023-01-05 12:28:27 +08:00
jhonliu	444e9fc5ed	feat: add tdengine websokcet	2023-01-05 11:51:06 +08:00
jhonliu	d00054f124	feat: gun update to 2.0.0 and cowboy update to 2.9.1	2023-01-05 09:25:31 +08:00
jhonliu	bf940b6256	feat: rm emqx	2022-12-29 18:29:41 +08:00
jhonliu	32e6dee548	feat: v4.4.11	2022-12-29 18:13:09 +08:00
dawnwinterLiu	e0c47afed2	fix: evidence	2022-12-29 10:13:07 +08:00
dawnwinterLiu	d31c3aa195	feat: rebar	2022-12-28 15:47:29 +08:00
dawnwinterLiu	e1dc572419	feat: location	2022-12-28 09:54:45 +08:00
dawnwinterLiu	2b57bee05f	fix: evidence	2022-12-26 11:51:10 +08:00
dawnwinterLiu	b85ed341bb	fix: evidence	2022-12-26 11:34:12 +08:00
jonhliu	1a9962976c	feat: ssl	2022-12-22 17:23:53 +08:00
jonhliu	c228f59ca8	feat: add tdengine mqtt	2022-12-22 12:37:38 +08:00
guo	70824eedb6	fix:printer	2022-12-20 15:08:25 +08:00
guo	88eb3e5c28	fixx:factory	2022-12-19 10:07:06 +08:00
jhonliu	c29e1e5696	feat:add view session	2022-12-16 12:14:48 +08:00
jhonliu	44ef99f316	feat: add depart_token	2022-12-15 14:56:22 +08:00
guo	5e8b21211a	fix:printer	2022-12-14 21:26:25 +08:00
jhonliu	777c878acd	feat: add dgiot_rule	2022-12-14 19:29:52 +08:00
dawnwinterLiu	01de1f15e9	fix: parse	2022-12-13 18:54:06 +08:00
dawnwinterLiu	9332fb820a	fix: device迁移acl	2022-12-09 20:22:10 +08:00
dawnwinterLiu	7b8a37173a	fix: get_Emails	2022-12-09 18:14:20 +08:00
dawnwinterLiu	9c6ddf597c	fix: get_Mobile []	2022-12-09 17:46:57 +08:00
dawnwinterLiu	b9d3c139f5	fix: 告警等级部门	2022-12-09 17:39:29 +08:00
guo	18e7eedc9b	fix:factory	2022-12-09 16:04:15 +08:00
dawnwinterLiu	1c37289895	fix: device_count;modbus;告警恢复;dgiot_serial_client支持校验位；sendemail	2022-12-09 12:49:52 +08:00
dawnwinterLiu	f0dfed551e	fix: device_count;modbus;告警恢复;dgiot_serial_client支持校验位；sendemail	2022-12-09 12:48:22 +08:00
jhonliu	aee14b9136	feat: add dgiot_rule	2022-12-08 11:39:15 +08:00
jhonliu	b5c6e0d5d9	Merge branch 'master' of github.com:dgiot/dgiot	2022-12-07 16:44:42 +08:00