Переглянути джерело

修复获取回路历史数据的异常

zhj 10 місяців тому
батько
коміт
aae66c7d48

+ 5 - 5
src/main/java/com/welampiot/utils/ToolUtils.java

@@ -235,12 +235,12 @@ public class ToolUtils {
     public BaseResult response(InterfaceResultEnum resultEnum,Integer version,Object obj){
         String msg;
         String code = resultEnum.getCode();
-        if (version == 0){
-            msg = resultEnum.getMsgCn();
-        } else if (version == 1) {
-            msg = resultEnum.getMsgEn();
-        }else {
+        if (version != null && version == 2) {
             msg = resultEnum.getMsgRu();
+        } else if (version != null && version == 1) {
+            msg = resultEnum.getMsgEn();
+        } else {
+            msg = resultEnum.getMsgCn();
         }
         BaseResult<Object> objectBaseResult = new BaseResult<>(code, msg, obj);
         Logger paramLog =  LoggerFactory.getLogger("param_log");

+ 2 - 2
src/main/resources/mapper/LoopDataLogMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.welampiot.dto.LoopDataLogDao">
+<mapper namespace="com.welampiot.dao.LoopDataLogDao">
 
     <select id="getLoopDataLogListByLoopDataLogVO" resultType="LoopDataLogDTO">
         select l.id,l.cura AS curA,l.curb AS curB,l.curc AS curC,
                l.insPa,l.insPb,l.insPc,l.volPa,l.volPb,l.volPc,
                l.updatetime AS updateTime,l.status
         from loop_data_log l
-        where l.loop_id = #{loopId}
+        where l.loop_id = #{id}
         order by l.updatetime desc
         <if test="page != null and count != null">
             limit #{page},#{count}