From 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 八月 2024 17:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 4 ++--
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 4 ++--
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 2 +-
ycl-common/src/main/java/constant/CheckSnapCountConstants.java | 18 ++++++++++++++----
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 3 +--
ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml | 14 +++++++-------
6 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/ycl-common/src/main/java/constant/CheckSnapCountConstants.java b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java
index 12fc795..dee9d2c 100644
--- a/ycl-common/src/main/java/constant/CheckSnapCountConstants.java
+++ b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java
@@ -3,13 +3,23 @@
public class CheckSnapCountConstants {
/**
- * 2022骞村悓鏈熸姄鎷嶉噺(鐪佸巺)
+ * 2022骞村悓鏈熻溅杈嗘姄鎷嶉噺(鐪佸巺)
*/
- public final static String City = "check.snapCount.city";
+ public final static String Car_City = "check.snapCount.car.city";
/**
- * 2022骞村悓鏈熸姄鎷嶉噺(鍖哄幙)
+ * 2022骞村悓鏈熻溅杈嗘姄鎷嶉噺(鍖哄幙)
*/
- public final static String County = "check.snapCount.county";
+ public final static String Car_County = "check.snapCount.car.county";
+
+ /**
+ * 2022骞村悓鏈熶汉鑴告姄鎷嶉噺(鐪佸巺)
+ */
+ public final static String Face_City = "check.snapCount.face.city";
+ /**
+ * 2022骞村悓鏈熶汉鑴告姄鎷嶉噺(鍖哄幙)
+ */
+ public final static String Face_County = "check.snapCount.face.city";
+
/**
* 2022鎶撴媿鏁拌绠楀�嶇巼
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index d58653c..f26b39c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -79,8 +79,8 @@
}
//鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
- BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
- BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
+ BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index e657f62..633223a 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -80,8 +80,8 @@
}
//鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
- BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
- BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City);
+ BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County);
// 鏌ヨ浠婃棩鏁版嵁
List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index 7eee993..b236ef2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -215,7 +215,7 @@
job.setJobGroup("CHECK");
jobService.deleteJob(job);
}
- return checkTemplateMapper.updateCheckTemplate(new CheckTemplate().setId(id));
+ return checkTemplateMapper.deleteCheckTemplateById(id);
}
@Override
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
index 0ee96f4..0052166 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckTemplateMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckTemplateMapper">
-
+
<resultMap type="com.ycl.platform.domain.entity.CheckTemplate" id="CheckTemplateResult">
<result property="id" column="id" />
<result property="templateName" column="template_name" />
@@ -42,12 +42,12 @@
</where>
order by examine_tag DESC, examine_category , create_time
</select>
-
+
<select id="selectCheckTemplateById" resultMap="CheckTemplateResult">
<include refid="selectCheckTemplateVo"/>
where id = #{id}
</select>
-
+
<insert id="insertCheckTemplate" useGeneratedKeys="true" keyProperty="id">
insert into t_check_template
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -117,9 +117,9 @@
where id = #{id}
</update>
- <delete id="deleteCheckTemplateById" parameterType="Long">
- delete from t_check_template where id = #{id}
- </delete>
+ <update id="deleteCheckTemplateById">
+ update t_check_template set deleted = 1 where id = #{id}
+ </update>
<delete id="deleteCheckTemplateByIds" parameterType="String">
delete from t_check_template where id in
@@ -129,4 +129,4 @@
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 5968d66..446a57b 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -337,12 +337,11 @@
t_monitor m
LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
LEFT JOIN t_yw_unit u ON p.unit_id = u.id
- LEFT JOIN t_work_order w ON p.id = w.point_id
+ LEFT JOIN t_work_order w ON w.serial_number = p.serial_number
WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
<if test="dateRange != null and dateRange.size > 0">
AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
</if>
- GROUP BY months
ORDER BY months
</select>
--
Gitblit v1.8.0