luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:6428039c708c83a3fd907211/hzwmiot/hzwmiot24_java

Browse Source 
# Conflicts:
#	fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java
#	fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/TableMapper.java
#	fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java
This commit is contained in:
wyw
2024-08-12 19:11:48 +08:00
parent 76f1bcaa73 e0389a15da
commit 1d8ddf58b9
32 changed files with 1785 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ThingsModelMapper.xml
View File

@ -17,6 +17,7 @@
<result property="datatype" column="datatype"/>
<result property="formula" column="formula"/>
<result property="specs" column="specs"/>
<result property="group" column="group"/>
<result property="isChart" column="is_chart"/>
<result property="isSharePerm" column="is_share_perm"/>
<result property="isHistory" column="is_history"/>
@ -58,6 +59,7 @@
datatype,
formula,
specs,
group,
is_chart,
is_share_perm,
is_history,
@ -83,7 +85,7 @@
end as model_name,
m.model_name as model_name_zh_cn, t.en_us as model_name_en_us,
m.product_id, m.product_name, m.tenant_id, m.tenant_name, m.identifier, m.type, m.datatype, m.formula,
m.specs, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.specs,m.group, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.create_time, m.update_by, m.update_time, m.remark, m.is_readonly, m.model_order
from iot_things_model m
left join iot_things_model_translate t on m.model_id = t.id
@ -138,7 +140,7 @@
else m.model_name
end as model_name,
m.product_id, m.product_name, m.tenant_id, m.tenant_name, m.identifier, m.type, m.datatype, m.formula,
m.specs, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.specs,m.group, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.create_time, m.update_by, m.update_time, m.remark, m.is_readonly, m.model_order
from iot_things_model m
left join iot_things_model_translate t on m.model_id = t.id
@ -156,7 +158,7 @@
else m.model_name
end as model_name,
m.product_id, m.product_name, m.tenant_id, m.tenant_name, m.identifier, m.type, m.datatype, m.formula,
m.specs, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.specs, m.group,m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.create_time, m.update_by, m.update_time, m.remark, m.is_readonly, m.model_order
from iot_things_model m
left join iot_things_model_translate t on m.model_id = t.id
@ -171,7 +173,7 @@
else m.model_name
end as model_name,
m.product_id, m.product_name, m.tenant_id, m.tenant_name, m.identifier, m.type, m.datatype, m.formula,
m.specs, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.specs,m.group, m.is_chart, m.is_share_perm, m.is_history, m.is_monitor, m.is_app, m.del_flag, m.create_by,
m.create_time, m.update_by, m.update_time, m.remark, m.is_readonly, m.model_order
from iot_things_model m
left join iot_things_model_translate t on m.model_id = t.id
@ -219,6 +221,9 @@
<if test="specs != null and specs != ''">
specs,
</if>
<if test="group != null and group != ''">
group,
</if>
<if test="isChart != null">
is_chart,
</if>
@ -290,6 +295,9 @@
<if test="specs != null and specs != ''">
#{specs},
</if>
<if test="group != null and group != ''">
#{group},
</if>
<if test="isChart != null">
#{isChart},
</if>
@ -344,6 +352,7 @@
type,
datatype,
specs,
group,
is_chart,
is_share_perm,
is_history,
@ -359,7 +368,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
#{model.modelName},#{model.productId},#{model.productName},#{model.tenantId},
#{model.tenantName},#{model.identifier},#{model.type},#{model.datatype},
#{model.specs},#{model.isChart},#{model.isSharePerm},#{model.isHistory},
#{model.specs},#{model.group},#{model.isChart},#{model.isSharePerm},#{model.isHistory},
#{model.isMonitor},#{model.isApp},#{model.isReadonly},#{model.createBy},#{model.createTime},
#{model.formula}
</trim>
@ -399,6 +408,9 @@
<if test="specs != null and specs != ''">
specs = #{specs},
</if>
<if test="group != null and group != ''">
group = #{group},
</if>
<if test="isChart != null">
is_chart = #{isChart},
</if>