1.修复缺陷；2.insertEventByReport接口添加查询参数

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/AlarmEventController.java

@@ -147,7 +147,7 @@ public class AlarmEventController {
             logger.error(e.getMessage());
         }
         if (StringUtils.isBlank(eventCode)) {
-            eventCode = String.valueOf(System.currentTimeMillis())+"_";
+            eventCode = String.valueOf(System.currentTimeMillis()) + "_";
         }
         try {
             String[] array = eventCode.split("_");
@@ -191,11 +191,11 @@ public class AlarmEventController {
 //    }
 
     @PostMapping("/insertEventByReport")
-    public R insertEventByReport(String start, String end) {
+    public R insertEventByReport(String start, String end, String source) {
         if (StringUtils.isBlank(start) || StringUtils.isBlank(end)) {
             return R.fail("请检查参数");
         }
-        List<CentereventTReportmessage> reportmessages = centereventTReportmessageService.selectCentereventTReportmessageListRange(start, end);
+        List<CentereventTReportmessage> reportmessages = centereventTReportmessageService.selectCentereventTReportmessageListRange(start, end, source);
         int i = 0;
         for (CentereventTReportmessage message : reportmessages) {
             String eventCode = null;

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/dahua/InfoVO.java

@@ -97,7 +97,7 @@ public class InfoVO {
         }
         double angleStr = Double.parseDouble(str);//转成double进行比较
         DecimalFormat df = new DecimalFormat(".00");
-        String newangle = df.format(angle);//保留两位小数 转成字符串进行拼接
+        String newangle = df.format(angleStr);//保留两位小数 转成字符串进行拼接
         String outAngle = "";
         if (67d <= angleStr && angleStr <= 111d) {
             outAngle = "东" + newangle + "°";

src/main/java/com/sooka/sponest/event/centereventtreportmessage/mapper/CentereventTReportmessageMapper.java

@@ -21,7 +21,7 @@ public interface CentereventTReportmessageMapper {
      */
     List<CentereventTReportmessage> selectCentereventTReportmessageList(CentereventTReportmessage centereventTReportmessage);
 
-    List<CentereventTReportmessage> selectCentereventTReportmessageListRange(@Param("start") String start, @Param("end") String end);
+    List<CentereventTReportmessage> selectCentereventTReportmessageListRange(@Param("start") String start, @Param("end") String end, @Param("end") String source);
 
     /**
      * 查询报文日志

src/main/java/com/sooka/sponest/event/centereventtreportmessage/service/ICentereventTReportmessageService.java

@@ -20,7 +20,7 @@ public interface ICentereventTReportmessageService {
      */
     List<CentereventTReportmessage> selectCentereventTReportmessageList(CentereventTReportmessage centereventTReportmessage);
 
-    List<CentereventTReportmessage> selectCentereventTReportmessageListRange(String start, String end);
+    List<CentereventTReportmessage> selectCentereventTReportmessageListRange(String start, String end, String source);
 
     /**
      * 查询报文日志

src/main/java/com/sooka/sponest/event/centereventtreportmessage/service/impl/CentereventTReportmessageServiceImpl.java

@@ -34,8 +34,8 @@ public class CentereventTReportmessageServiceImpl implements ICentereventTReport
     }
 
     @Override
-    public List<CentereventTReportmessage> selectCentereventTReportmessageListRange(String start, String end) {
-        return centereventTReportmessageMapper.selectCentereventTReportmessageListRange(start, end);
+    public List<CentereventTReportmessage> selectCentereventTReportmessageListRange(String start, String end, String source) {
+        return centereventTReportmessageMapper.selectCentereventTReportmessageListRange(start, end, source);
     }
 
     /**

src/main/resources/mapper/centereventtreportmessage/CentereventTReportmessageMapper.xml

@@ -28,6 +28,7 @@
     <select id="selectCentereventTReportmessageListRange" resultMap="CentereventTReportmessageResult">
         select id, source, context, create_time from centerevent_t_reportmessage
         where create_time between #{start} and #{end}
+        <if test="source != null and source != ''">and source like concat('%',#{source},'%')</if>
         order by create_time desc
     </select>