接处警信息修改

src/main/java/com/ssf/mysqloracletest/domain/MetaAlarmInfo.java

@@ -22,86 +22,103 @@ public class MetaAlarmInfo implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @TableField(value = "alarm_code")
     private String alarmCode;
 
     /**
      * 接警人姓名
      */
+    @TableField(value = "police_receiver_name")
     private String policeReceiverName;
 
     /**
      * 接警单位
      */
+    @TableField(value = "alarm_response_unit")
     private String alarmResponseUnit;
 
     /**
      * 接警时间
      */
+    @TableField(value = "alarm_response_time")
     private String alarmResponseTime;
 
     /**
      * 报警内容
      */
+    @TableField(value = "alarm_response_content")
     private String alarmResponseContent;
 
     /**
      * 报警类型名称
      */
+    @TableField(value = "alarm_response_type_name")
     private String alarmResponseTypeName;
 
     /**
      * 报警人姓名
      */
+    @TableField(value = "informant_name")
     private String informantName;
 
     /**
      * 报警人联系方式
      */
+    @TableField(value = "informant_phone")
     private String informantPhone;
 
     /**
      * 报警时间
      */
+    @TableField(value = "informant_time")
     private String informantTime;
 
     /**
      * 接警事发地址
      */
+    @TableField(value = "alarm_address")
     private String alarmAddress;
 
     /**
      * 经度
      */
+    @TableField(value = "longitude")
     private BigDecimal longitude;
 
     /**
      * 纬度
      */
+    @TableField(value = "latitude")
     private BigDecimal latitude;
 
     /**
      * 创建时间
      */
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 创建者
      */
+    @TableField(value = "create_by")
     private Integer createBy;
 
     /**
      * 更新时间
      */
+    @TableField(value = "update_time")
     private Date updateTime;
 
     /**
      * 更新者
      */
+    @TableField(value = "update_by")
     private Integer updateBy;
 
     /**
      * 0:不活跃,1:活跃
      */
+    @TableField(value = "is_active")
     private Integer isActive;
 
 //    @TableField(exist = false)

src/main/java/com/ssf/mysqloracletest/domain/MetaHandleAlarmInfo.java

@@ -24,65 +24,78 @@ public class MetaHandleAlarmInfo implements Serializable {
     /**
      * 警情编码
      */
+    @TableField(value = "alarm_code")
     private String alarmCode;
     /**
      * 处警单位名称
      */
+    @TableField(value = "handle_alarm_unit")
     private String handleAlarmUnit;
 
     /**
      * 处警时间
      */
+    @TableField(value = "handle_alarm_time")
     private String handleAlarmTime;
 
     /**
      * 处警简要警情
      */
+    @TableField(value = "handle_alarm_content")
     private String handleAlarmContent;
 
     /**
      * 处警详细地点
      */
+    @TableField(value = "handle_alarm_address")
     private String handleAlarmAddress;
 
     /**
      * 处警人姓名
      */
+    @TableField(value = "handle_alarm_user")
     private String handleAlarmUser;
 
     /**
      * 处境人姓名和编码
      */
+    @TableField(value = "handle_alarm_user_code")
     private String handleAlarmUserCode;
 
     /**
      * 处警结果
      */
+    @TableField(value = "handle_alarm_result")
     private String handleAlarmResult;
 
     /**
      * 创建时间
      */
+    @TableField(value = "create_time")
     private Date createTime;
 
     /**
      * 创建者
      */
+    @TableField(value = "create_by")
     private Integer createBy;
 
     /**
      * 更新时间
      */
+    @TableField(value = "update_time")
     private Date updateTime;
 
     /**
      * 更新者
      */
+    @TableField(value = "update_by")
     private Integer updateBy;
 
     /**
      * 0:不活跃,1:活跃
      */
+    @TableField(value = "is_active")
     private Integer isActive;
 
     @TableField(exist = false)

src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java

@@ -7,6 +7,7 @@ import com.ssf.mysqloracletest.domain.MetaAlarmInfo;
 import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
 import com.ssf.mysqloracletest.service.MetaAlarmInfoService;
 import com.ssf.mysqloracletest.utils.ConfigParam;
+import com.ssf.mysqloracletest.utils.NumKit;
 import com.ssf.mysqloracletest.utils.StringKit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -106,23 +107,15 @@ public class AlarmInfoTask {
             //alarm_response_unit<-----JJDWMC接警单位名称
             alarmInfo.setAlarmResponseUnit(jjxxViewMysqlCp.getJJDWMC());
 
-            if (jjxxViewMysqlCp.getWDZB() != null) {
-                //转换类型
-                BigDecimal WDZBDecimal = new BigDecimal(jwd.getWDZB());
-                //latitude(纬度)<-----WDZB纬度坐标
-                alarmInfo.setLatitude(WDZBDecimal);
-            } else {
+            if (jwd.getGIS_Y() != null) {
+
                 //latitude(纬度)<-----WDZB纬度坐标
-                alarmInfo.setLatitude(null);
+                alarmInfo.setLatitude(NumKit.checkBigDecimal(jwd.getGIS_Y()));
             }
 
-            if (jjxxViewMysqlCp.getJDZB() != null) {
-                BigDecimal JDZBDecimal = new BigDecimal(jwd.getJDZB());
-                //longitude(经度)<-----JDZB经度坐标
-                alarmInfo.setLatitude(JDZBDecimal);
-            } else {
+            if (jwd.getGIS_X() != null) {
                 //longitude(经度)<-----JDZB经度坐标
-                alarmInfo.setLongitude(null);
+                alarmInfo.setLongitude(NumKit.checkBigDecimal(jwd.getGIS_X()));
             }
 
             boolean b = alarmInfoService.save(alarmInfo);

src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java

@@ -165,7 +165,7 @@ public class JcjCjxxTask {
             //1  去mysql查出当前最大时间
             JcjCjxxViewMysql cjxxViewMysql = cjxxMysqlService.selectRecordOrderByRksj();
             //2  用得到的最大时间去oracle 查询大于这个时间的记录
-            List<JcjCjxxViewOracle> list = cjxxOracleService.getRealTimeRecording(cjxxViewMysql.getCJSJ());
+            List<JcjCjxxViewOracle> list = cjxxOracleService.getRealTimeRecording(cjxxViewMysql.getWS_RKSJ());
             //3  解析入库
             for (JcjCjxxViewOracle cjxx : list) {
                 JcjCjxxViewMysql sBean = new JcjCjxxViewMysql();