修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -43,8 +43,8 @@
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
         where a.is_delete=0
-        AND a.coordinate_x IS NOT NULL
-        AND a.coordinate_y IS NOT NULL
+    <!--AND a.coordinate_x IS NOT NULL
+    AND a.coordinate_y IS NOT NULL-->
     <if test='par.status==0'>
         and a.alert_status =0
     </if>
@@ -79,10 +79,10 @@
     <if test='pageNum!=null and pageSize !=null'>
         limit #{pageNum},#{pageSize}
     </if>
-    </select>
+</select>
 
 
-    <select id="alertCalledListByAlertStatusCount" resultType="Integer">
+<select id="alertCalledListByAlertStatusCount" resultType="Integer">
     SELECT
     COUNT(*)
     FROM jc_alert_called a
@@ -105,10 +105,10 @@
         and a.call_time &gt;= (NOW() - interval 24 hour)
     </if>
 
-    </select>
+</select>
 
 
-    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
+<select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
     SELECT
     a.sequence_nbr,
     a.alert_status,
@@ -173,9 +173,9 @@
             order by a.call_time DESC  limit #{current},#{size}
         </if>
     </where>
-    </select>
+</select>
 
-    <select id="selectAllCount" resultType="int">
+<select id="selectAllCount" resultType="int">
     SELECT
     count(b.num)
     FROM
@@ -207,10 +207,10 @@
             GROUP BY a.sequence_nbr
         </if>
     </where>) b
-    </select>
+</select>
 
 
-    <select id="AlertCalledcountTime" resultType="Integer">
+<select id="AlertCalledcountTime" resultType="Integer">
 
     select COUNT(*) from jc_alert_called where is_delete=0
 
@@ -227,10 +227,10 @@
         and TO_DAYS( NOW( ) ) - TO_DAYS( call_time) = 1
     </if>
 
-    </select>
+</select>
 
 
-    <select id="getTodayAlertCalled" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto">
+<select id="getTodayAlertCalled" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto">
 
     select jc_alert_called.alert_type alarmType,
            jc_alert_called.address,
@@ -240,10 +240,10 @@
       and to_days(call_time) = to_days(now())
     ORDER BY call_time DESC
 
-    </select>
+</select>
 
 
-    <!--统计未结束的警情数量-->
+<!--统计未结束的警情数量-->
 
     <select id="AlertCalledcount" resultType="Integer">
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -629,7 +629,7 @@ public class CommandController extends BaseController {
 
             String time = DateUtil.formatDate(alertCalledZhDto.getCallTime(), "yyyy-MM-dd HH:mm:ss");
 
-            st.append("【").append(alertCalledZhDto.getAlertType()).append("】").append(" ").append(time).append(" ").append(alertCalledZhDto.getAddress());
+            st.append("【").append(alertCalledZhDto.getAlertType()).append("】").append(" ").append(time).append(" ").append(alertCalledZhDto.getAddress()!=null?alertCalledZhDto.getAddress():"");
 
             SeismometeorologyDto sto = new SeismometeorologyDto(alertCalledZhDto.getSequenceNbr(), "1", "警情通知", null, alertCalledZhDto.getCallTime(), null, st.toString());
             li.add(sto);