diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml index 30beef4..b4965d6 100644 --- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml +++ b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml @@ -4,22 +4,65 @@ - - - - - - - + + + + + + + + + + ${paramStr} + + + + TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + id, Pid, devcode, config_json, status, update_time, create_time, create_user_id diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml index 30beef4..b4965d6 100644 --- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml +++ b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml @@ -4,22 +4,65 @@ - - - - - - - + + + + + + + + + + ${paramStr} + + + + TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + id, Pid, devcode, config_json, status, update_time, create_time, create_user_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml index 30beef4..b4965d6 100644 --- a/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml +++ b/casic-iot-dao/src/resource/mapper/BusConfigMapper.xml @@ -4,22 +4,65 @@ - - - - - - - + + + + + + + + + + ${paramStr} + + + + TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone + + + + TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi') + + id, Pid, devcode, config_json, status, update_time, create_time, create_user_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@ - + select bc.id,bc.devcode,config_type AS "configType", config_json AS "configJson",bc.status, + send_time as "sendTime",bc.create_time AS "createTime",bc.create_user_id AS "createUserId", + bc.create_user_name AS "createUserName",dg.deptid + FROM ( + SELECT * + FROM bus_config + WHERE 1=1 + + AND config_type =#{request.configType} + + + AND devcode =#{request.devcode} + + + AND status =#{request.status} + + + AND send_time = ]]> + + + + + + AND send_time + + + + + )bc + JOIN device d ON d.devcode=bc.devcode + JOIN device_group dg ON dg.id= d.group_id diff --git a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml index b124015..0a4adee 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceDataMapper.xml @@ -35,7 +35,7 @@ SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id + data_value AS "dataValue",model,imei,d.cell,name AS "deviceName",status,d.id,create_user_id AS "createUserId", + create_user_name AS "createUserName" FROM ( SELECT * FROM device @@ -76,9 +77,9 @@ FROM device_data ddd JOIN ( - SELECT Max(logtime) AS logtime,devcode - FROM device_data - GROUP BY devcode + SELECT Max(logtime) AS logtime,devcode + FROM device_data + GROUP BY devcode )dd ON dd.logtime=ddd.logtime AND dd.devcode=ddd.devcode )dd ON dd.devcode=d.devcode order by create_time desc diff --git a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml index 2f96661..415a670 100644 --- a/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml +++ b/casic-iot-dao/src/resource/mapper/SubscribeStoreMapper.xml @@ -25,7 +25,8 @@