machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交到处修改

Browse Source
This commit is contained in:
15666619788
2025-08-02 11:31:42 +08:00
parent 34d3a965d7
commit 6bc5fcb2aa
31 changed files with 237 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/domain/AlertLog.java
View File

@@ -73,4 +73,6 @@ public class AlertLog extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
private Long respPersonId; //负责人
private String procPersonName; //处理人
}

2
xinda-service/xinda-iot-service/src/main/java/com/xinda/iot/service/impl/DataCenterServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.xinda.iot.model.dto.ThingsModelDTO;
import com.xinda.iot.model.param.DataCenterParam;
import com.xinda.iot.model.scenemodel.SceneHistoryParam;
import com.xinda.iot.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
* @description: 数据中心服务类
* @date 2024-06-13 15:29
*/
@Slf4j
@Service
public class DataCenterServiceImpl implements DataCenterService {

14
xinda-service/xinda-iot-service/src/main/resources/mapper/iot/AlertLogMapper.xml
View File

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sceneName" column="scene_name"/>
<result property="enable" column="enable"/>
<result property="orderId" column="order_id"/>
<result property="respPersonId" column="resp_person_id"/>
<result property="procPersonName" column="proc_person_name"/>
</resultMap>
<resultMap type="com.xinda.iot.model.DeviceAlertCount" id="DeviceAlertCount">
@@ -36,11 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectAlertLogVo">
select alert_log_id, alert_name, alert_level, status, product_id, detail, serial_number, create_by, create_time, remark, device_name, user_id,enable,order_id from iot_alert_log
select alert_log_id, alert_name, alert_level, status, product_id, detail, serial_number, create_by, create_time, remark, device_name, user_id,enable,order_id,resp_person_id,proc_person_name from iot_alert_log
</sql>
<select id="selectAlertLogList" parameterType="com.xinda.iot.domain.AlertLog" resultMap="AlertLogResult">
select distinct al.alert_log_id, al.alert_name, al.alert_level, al.status, al.product_id, al.detail, al.serial_number, al.create_time, al.remark, al.device_name, al.user_id,al.enable,al.order_id
select distinct al.alert_log_id, al.alert_name, al.alert_level, al.status, al.product_id, al.detail, al.serial_number, al.create_time, al.remark, al.device_name, al.user_id,al.enable,al.order_id,al.resp_person_id,al.proc_person_name
from iot_alert_log al
<where>
<if test="alertName != null and alertName != ''"> and al.alert_name like concat('%', #{alertName}, '%')</if>
@@ -51,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null "> and al.user_id = #{userId}</if>
<if test="createBy != null "> and al.create_by = #{createBy}</if>
<if test="remark != null "> and al.remark = #{remark}</if>
<if test="respPersonId != null "> and al.resp_person_id = #{respPersonId}</if>
<if test="procPersonName != null "> and al.proc_person_name = #{procPersonName}</if>
</where>
order by al.create_time desc
</select>
@@ -191,6 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="userId != null">user_id,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="respPersonId != null">resp_person_id,</if>
<if test="procPersonName != null and procPersonName != ''">proc_person_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="alertName != null and alertName != ''">#{alertName},</if>
@@ -206,6 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="userId != null">#{userId},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="respPersonId != null">#{respPersonId},</if>
<if test="procPersonName != null and procPersonName != ''">#{procPersonName},</if>
</trim>
</insert>
@@ -243,6 +251,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="enable != null">enable =#{enable},</if>
<if test="orderId != null">orderId =#{orderId},</if>
<if test="respPersonId != null">resp_person_id =#{respPersonId},</if>
<if test="procPersonName != null and procPersonName != ''">proc_person_name,</if>
</trim>
where alert_log_id = #{alertLogId}
</update>