linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
liutao 2 weeks ago
parent 9585c9eb96 380a4a3bd1
commit 0af3e8757f
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

6
yudao-module-common/yudao-module-common-biz/src/main/resources/mapper/moldticketresults/MoldTicketResultsMapper.xml
Unescape Escape View File

@ -16,9 +16,9 @@
mtm.task_time, mtm.task_time,
CONCAT( '(', su.username, ')', su.nickname) as operator CONCAT( '(', su.username, ')', su.nickname) as operator
from from
besure.mes_mold_ticket_results mtr mes_mold_ticket_results mtr
left join besure.mes_mold_ticket_management mtm on mtm.id = mtr.management_id left join mes_mold_ticket_management mtm on mtm.id = mtr.management_id
left join besure.system_users su on mtm.operator = su.id left join system_users su on mtm.operator = su.id
WHERE 1=1 WHERE 1=1
<!-- ID集合过滤 --> <!-- ID集合过滤 -->
<if test="ids != null and ids != ''"> <if test="ids != null and ids != ''">

8
yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/DeviceMapper.xml
Unescape Escape View File

@ -87,14 +87,14 @@
SUM(CASE WHEN latest_status.rule = '3' THEN 1 ELSE 0 END) AS faultCount, SUM(CASE WHEN latest_status.rule = '3' THEN 1 ELSE 0 END) AS faultCount,
SUM(CASE WHEN latest_status.rule = '4' THEN 1 ELSE 0 END) AS warningCount SUM(CASE WHEN latest_status.rule = '4' THEN 1 ELSE 0 END) AS warningCount
FROM besure.iot_device ide FROM iot_device ide
LEFT JOIN ( LEFT JOIN (
-- 获取每个设备的最新状态 -- 获取每个设备的最新状态
SELECT SELECT
device_id, device_id,
rule, rule,
ROW_NUMBER() OVER (PARTITION BY device_id ORDER BY create_time DESC) AS rn ROW_NUMBER() OVER (PARTITION BY device_id ORDER BY create_time DESC) AS rn
FROM besure.iot_device_operation_record FROM iot_device_operation_record
WHERE rule IN ('1', '2', '3', '4') WHERE rule IN ('1', '2', '3', '4')
AND deleted = 0 AND deleted = 0
) latest_status ON ide.id = latest_status.device_id AND latest_status.rn = 1 ) latest_status ON ide.id = latest_status.device_id AND latest_status.rn = 1
@ -194,13 +194,13 @@
</select> </select>
<select id="getTotalDeviceCount" resultType="java.lang.Integer"> <select id="getTotalDeviceCount" resultType="java.lang.Integer">
SELECT COUNT(DISTINCT id) SELECT COUNT(DISTINCT id)
FROM besure.iot_device FROM iot_device
WHERE deleted = 0 WHERE deleted = 0
</select> </select>
<select id="getAllDeviceIds" resultType="java.lang.Long"> <select id="getAllDeviceIds" resultType="java.lang.Long">
SELECT id SELECT id
FROM besure.iot_device FROM iot_device
WHERE deleted = 0 WHERE deleted = 0
ORDER BY id ORDER BY id
</select> </select>

12
yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/deviceoperationrecord/DeviceOperationRecordMapper.xml
Unescape Escape View File

@ -24,8 +24,8 @@
-- 每条 rule=3 的记录计数 * 60 秒 -- 每条 rule=3 的记录计数 * 60 秒
SUM(CASE WHEN idor.rule = '3' THEN 1 ELSE 0 END) * 60 AS totalFaultTime SUM(CASE WHEN idor.rule = '3' THEN 1 ELSE 0 END) * 60 AS totalFaultTime
FROM besure.iot_device ide FROM iot_device ide
LEFT JOIN besure.iot_device_operation_record idor LEFT JOIN iot_device_operation_record idor
ON idor.device_id = ide.id ON idor.device_id = ide.id
AND idor.deleted = 0 AND idor.deleted = 0
<!-- 时间筛选条件 --> <!-- 时间筛选条件 -->
@ -129,8 +129,8 @@
-- 每条 rule=3 的记录计数 * 60 秒 -- 每条 rule=3 的记录计数 * 60 秒
SUM(CASE WHEN idor.rule = '3' THEN 1 ELSE 0 END) * 60 AS totalFaultTime SUM(CASE WHEN idor.rule = '3' THEN 1 ELSE 0 END) * 60 AS totalFaultTime
FROM besure.iot_device ide FROM iot_device ide
LEFT JOIN besure.iot_device_operation_record idor LEFT JOIN iot_device_operation_record idor
ON idor.device_id = ide.id ON idor.device_id = ide.id
AND idor.deleted = 0 AND idor.deleted = 0
<!-- 时间筛选条件 --> <!-- 时间筛选条件 -->
@ -165,7 +165,7 @@
ide.id, ide.id,
ide.device_code AS deviceCode, ide.device_code AS deviceCode,
ide.device_name AS deviceName ide.device_name AS deviceName
FROM besure.iot_device ide FROM iot_device ide
WHERE ide.deleted = 0 WHERE ide.deleted = 0
<!-- 设备编码筛选条件 --> <!-- 设备编码筛选条件 -->
<if test="pageReqVO.deviceCode != null and pageReqVO.deviceCode != ''"> <if test="pageReqVO.deviceCode != null and pageReqVO.deviceCode != ''">
@ -216,7 +216,7 @@
ide.id, ide.id,
ide.device_code AS deviceCode, ide.device_code AS deviceCode,
ide.device_name AS deviceName ide.device_name AS deviceName
FROM besure.iot_device ide FROM iot_device ide
WHERE ide.deleted = 0 WHERE ide.deleted = 0
<!-- 设备编码筛选条件 --> <!-- 设备编码筛选条件 -->
<if test="deviceTotalTimeRecordReqVO.deviceCode != null and deviceTotalTimeRecordReqVO.deviceCode != ''"> <if test="deviceTotalTimeRecordReqVO.deviceCode != null and deviceTotalTimeRecordReqVO.deviceCode != ''">

2
yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/devicewarinningrecord/DeviceWarinningRecordMapper.xml
Unescape Escape View File

@ -13,7 +13,7 @@
SELECT SELECT
DATE_FORMAT(create_time, '%Y-%m-%d %H:00') as hour, DATE_FORMAT(create_time, '%Y-%m-%d %H:00') as hour,
COUNT(*) as count COUNT(*) as count
FROM besure.iot_device_warinning_record FROM iot_device_warinning_record
WHERE create_time >= DATE_SUB(NOW(), INTERVAL 7 HOUR) WHERE create_time >= DATE_SUB(NOW(), INTERVAL 7 HOUR)
GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d %H:00') GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d %H:00')
ORDER BY hour ORDER BY hour

12
yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/moldrepairtems/MoldRepairTemsMapper.xml
Unescape Escape View File

@ -26,9 +26,9 @@
mrt.project_content, mrt.project_content,
mml.name as moldName, <!-- device_name 改为 mold_name，别名对应修改 --> mml.name as moldName, <!-- device_name 改为 mold_name，别名对应修改 -->
CONCAT('(', su.username, ')', su.nickname) as creatorName CONCAT('(', su.username, ')', su.nickname) as creatorName
FROM besure.mes_mold_repair_tems mrt FROM mes_mold_repair_tems mrt
left join besure.erp_mold mml on mml.id = mrt.mold_id <!-- device_ledger 改为 mold_ledger，关联字段改为 mold_id --> left join erp_mold mml on mml.id = mrt.mold_id <!-- device_ledger 改为 mold_ledger，关联字段改为 mold_id -->
left join besure.system_users su on su.id = mrt.creator left join system_users su on su.id = mrt.creator
WHERE 1=1 WHERE 1=1
AND mrt.deleted = 0 AND mrt.deleted = 0
<if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''"> <if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''">
@ -77,9 +77,9 @@
mrt.tenant_id, mrt.tenant_id,
mml.name as moldName, <!-- device_name 改为 mold_name，别名对应修改 --> mml.name as moldName, <!-- device_name 改为 mold_name，别名对应修改 -->
CONCAT('(', su.username, ')', su.nickname) as creatorName CONCAT('(', su.username, ')', su.nickname) as creatorName
FROM besure.mes_mold_repair_tems mrt FROM mes_mold_repair_tems mrt
left join besure.erp_mold mml on mml.id = mrt.mold_id <!-- device_ledger 改为 mold_ledger，关联字段改为 mold_id --> left join erp_mold mml on mml.id = mrt.mold_id <!-- device_ledger 改为 mold_ledger，关联字段改为 mold_id -->
left join besure.system_users su on su.id = mrt.creator left join system_users su on su.id = mrt.creator
WHERE mrt.deleted = 0 WHERE mrt.deleted = 0
<if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''"> <if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''">
AND mrt.subject_code = #{pageReqVO.subjectCode} AND mrt.subject_code = #{pageReqVO.subjectCode}

2
yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/plan/PlanMapper.xml
Unescape Escape View File

@ -13,7 +13,7 @@
SELECT SELECT
DATE(end_time) as date, DATE(end_time) as date,
IFNULL(SUM(wangong_number), 0) as totalWangong IFNULL(SUM(wangong_number), 0) as totalWangong
FROM besure.mes_plan FROM mes_plan
WHERE end_time >= CURDATE() - INTERVAL 6 DAY WHERE end_time >= CURDATE() - INTERVAL 6 DAY
GROUP BY DATE(end_time) GROUP BY DATE(end_time)
</select> </select>

16
yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/repairtems/RepairTemsMapper.xml
Unescape Escape View File

@ -39,10 +39,10 @@
GROUP_CONCAT(DISTINCT mdl.device_name ORDER BY mdl.id) AS deviceName, GROUP_CONCAT(DISTINCT mdl.device_name ORDER BY mdl.id) AS deviceName,
mcc.name as componentName, mcc.name as componentName,
CONCAT('(', su.username, ')', su.nickname) as creatorName CONCAT('(', su.username, ')', su.nickname) as creatorName
FROM besure.mes_repair_tems mrt FROM mes_repair_tems mrt
left join besure.mes_device_ledger mdl on FIND_IN_SET(mdl.id, mrt.device_id) > 0 left join mes_device_ledger mdl on FIND_IN_SET(mdl.id, mrt.device_id) > 0
left join besure.mes_critical_component mcc on mcc.id = mrt.component_id left join mes_critical_component mcc on mcc.id = mrt.component_id
left join besure.system_users su on su.id = mrt.creator left join system_users su on su.id = mrt.creator
WHERE 1=1 WHERE 1=1
AND mrt.deleted = 0 AND mrt.deleted = 0
<if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''"> <if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''">
@ -108,10 +108,10 @@
GROUP_CONCAT(DISTINCT mdl.device_name ORDER BY mdl.id) AS deviceName, GROUP_CONCAT(DISTINCT mdl.device_name ORDER BY mdl.id) AS deviceName,
mcc.name as componentName, mcc.name as componentName,
CONCAT('(', su.username, ')', su.nickname) as creatorName CONCAT('(', su.username, ')', su.nickname) as creatorName
FROM besure.mes_repair_tems mrt FROM mes_repair_tems mrt
left join besure.mes_device_ledger mdl on FIND_IN_SET(mdl.id, mrt.device_id) > 0 left join mes_device_ledger mdl on FIND_IN_SET(mdl.id, mrt.device_id) > 0
left join besure.mes_critical_component mcc on mcc.id = mrt.component_id left join mes_critical_component mcc on mcc.id = mrt.component_id
left join besure.system_users su on su.id = mrt.creator left join system_users su on su.id = mrt.creator
WHERE mrt.deleted = 0 WHERE mrt.deleted = 0
<if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''"> <if test="pageReqVO.subjectCode != null and pageReqVO.subjectCode != ''">
AND mrt.subject_code = #{pageReqVO.subjectCode} AND mrt.subject_code = #{pageReqVO.subjectCode}

6
yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/ticketresults/TicketResultsMapper.xml
Unescape Escape View File

@ -16,9 +16,9 @@
mtm.task_time, mtm.task_time,
CONCAT( '(', su.username, ')', su.nickname) as operator CONCAT( '(', su.username, ')', su.nickname) as operator
from from
besure.mes_ticket_results mtr mes_ticket_results mtr
left join besure.mes_ticket_management mtm on mtm.id = mtr.management_id left join mes_ticket_management mtm on mtm.id = mtr.management_id
left join besure.system_users su on mtm.operator = su.id left join system_users su on mtm.operator = su.id
WHERE 1=1 WHERE 1=1
<!-- ID集合过滤 --> <!-- ID集合过滤 -->
<if test="ids != null and ids != ''"> <if test="ids != null and ids != ''">

10
yudao-server/src/main/resources/application-prod.yaml
Unescape Escape View File

@ -48,17 +48,17 @@ spring:
strict: false # 设置为false，当切换数据源失败时使用默认数据源 strict: false # 设置为false，当切换数据源失败时使用默认数据源
datasource: datasource:
master: master:
name: besure name: besure_mcs_prod
url: jdbc:mysql://192.168.21.2:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true url: jdbc:mysql://47.106.185.127:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
password: bst123@QWE password: T4ke2vckDABYrDR4PFft
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
tdengine: tdengine:
name: tdengine name: tdengine
url: jdbc:TAOS-RS://192.168.21.2:6041/besure_server?charset=UTF-8&locale=en_US.UTF-8 url: jdbc:TAOS-RS://47.106.185.127:6042/besure_server?charset=UTF-8&locale=en_US.UTF-8
username: root username: root
password: taosdata password: bs@ngsktdxb1021
driver-class-name: com.taosdata.jdbc.rs.RestfulDriver driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
druid: # TDengine专用配置 druid: # TDengine专用配置
initial-size: 1 initial-size: 1

Write Preview
Loading…
Cancel
Save