命令日志查询增加一个state属性，并优化SQL

liurunyu

2024-10-29 c9f39a721e2e0320012d0b15a931f33160ac51ae

命令日志查询增加一个state属性，并优化SQL

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java

@@ -21,7 +21,7 @@
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long comId;

    private String commandName;
    private String commandName; //命令名称

    private String intakeName;

@@ -35,7 +35,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date resultTime;

    private String result;
    private String state;//执行状态

    private String userName;
    private String result;//命令结果

    private String userName;//操作人
}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml

@@ -275,8 +275,6 @@
        SELECT COUNT(*) AS recordCount
        FROM rm_command_history his
                 INNER JOIN pr_intake inta ON inta.id = his.intake_id
                 LEFT JOIN se_client cli ON cli.id = his.operator
                 LEFT JOIN ba_user user ON user.id = his.operator
        <where>
            <if test="intakeId != null">
                AND his.intake_id = #{intakeId}
@@ -296,17 +294,17 @@
    <!--根据指定条件获取命令日志历史记录-->
    <select id="getCommandHistories" resultType="com.dy.pipIrrGlobal.voRm.VoCommand">
        SELECT his.com_id                  AS comId,
               his.command_name            AS commandName,
               CONCAT(his.command_name, '(', his.command_code, ')') AS commandName,
               inta.name                   AS intakeName,
               his.rtu_addr                AS rtuAddr,
               his.protocol,
               his.protocol                AS protocol,
               his.send_time               AS sendTime,
               his.result_time             AS resultTime,
               (CASE
                    WHEN his.result = 1 THEN '成功'
                    ELSE '失败'
                   END)                    AS result,
               his.result_text,
                   END)                    AS state,
               his.result_text             AS result,
               IFNULL(cli.name, user.name) AS userName
        FROM rm_command_history his
                 INNER JOIN pr_intake inta ON inta.id = his.intake_id
@@ -327,7 +325,7 @@
                AND his.send_time BETWEEN #{timeStart} AND #{timeStop}
            </if>
        </where>
        ORDER BY his.send_time DESC
        ORDER BY his.com_id DESC
        <trim prefix="limit ">
            <if test="start != null and count != null">
                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java

@@ -228,16 +228,7 @@
     */
    public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
        // 完善查询起止时间
        String timeStart = query.getTimeStart();
        String timeStop = query.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            query.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            query.setTimeStop(timeStop);
        }
        query.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(query);


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java

@@ -42,4 +42,15 @@
     * 查询截止时间
     */
    private String timeStop;


    public void completionTime(){
        if(timeStart != null && !timeStart.trim().equals("")) {
            timeStart = timeStart + " 00:00:00";
        }
        if(timeStop != null && !timeStop.trim().equals("")) {
            timeStop = timeStop + " 23:59:59";
        }

    }
}