Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/MapDataController.java

@@ -82,10 +82,12 @@ public class MapDataController {
         mapErrorLog.put("sMapId", request.getParameter("sMapId"));
         mapErrorLog.put("addressName", request.getParameter("addressName"));
         mapErrorLog.put("originalAddress", request.getParameter("originalAddress"));
+        mapErrorLog.put("originalLongitude", request.getParameter("originalLongitude"));
+        mapErrorLog.put("originalLatitude", request.getParameter("originalLatitude"));
         mapErrorLog.put("originalCoordinates", request.getParameter("originalCoordinates"));
         mapErrorLog.put("newAddress", request.getParameter("newAddress"));
-        mapErrorLog.put("newCoordinates", request.getParameter("newCoordinates"));
-        mapErrorLog.put("errorState", request.getParameter("errorState"));
+        mapErrorLog.put("newLongitude", request.getParameter("newLongitude"));
+        mapErrorLog.put("newLatitude", request.getParameter("newLatitude"));
         try {
             return mapDataService.saveErrorLog(mapErrorLog);
         } catch (Exception e) {

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/MapDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.example.nngkxxdp.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.example.nngkxxdp.dao.MapDataDao;
 import com.example.nngkxxdp.entity.MapData;
@@ -10,6 +11,8 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 
 import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +40,8 @@ import org.springframework.util.ResourceUtils;
 @Transactional
 public class MapDataServiceImpl implements MapDataService {
 
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     @Autowired
     private MapDataDao mapDataDao;
 
@@ -98,6 +103,8 @@ public class MapDataServiceImpl implements MapDataService {
         if(Blank.isEmpty(mapErrorLog.get("sMapId"))){
             return SendUtil.send(false, ConstStr.ADD_FAILED, "sMapId为空");
         }
+        mapErrorLog.put("errorState", 0);
+        mapErrorLog.put("createTime", DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
         if (mapDataDao.saveErrorLog(mapErrorLog) <= 0) {
             return SendUtil.send(false, ConstStr.ADD_FAILED, "");
         }

nngkxxdp/src/main/resources/application.yml

@@ -28,7 +28,7 @@ sms:
   # 下降
   down: http://data.cqna.gov.cn/app/evaluation.html
   #自定义短信接口
-  custom: http://173.10.3.103:8081/sms/sendSms
+  custom: http://localhost:8081/sms/sendSms
 huaweiAddress:
   requestUrl: https://iam.cn-north-4.myhuaweicloud.com/v3/auth/tokens
   name: hw65077913

nngkxxdp/src/main/resources/mapper/MapDataDao.xml

@@ -46,8 +46,14 @@
 
     <!-- 根据地图数据所有的字典类型 -->
     <insert id="saveErrorLog" parameterType="map">
-        INSERT INTO s_map_errorlog (s_map_id, address_name, original_address, original_coordinates, new_address, new_coordinates, error_state)
-            VALUE (sMapId, addressName, originalAddress, originalCoordinates, newAddress, newCoordinates, errorState)
+        INSERT INTO s_map_errorlog
+        (s_map_id, address_name, original_address,
+         original_longitude, original_latitude, new_address,
+         new_longitude, new_latitude, error_state, create_time)
+            VALUE
+            (#{sMapId},#{addressName},#{originalAddress},
+            #{originalLongitude},#{originalLatitude},
+            #{newAddress},#{newLongitude},#{newLatitude},#{errorState},#{createTime})
     </insert>
 
 </mapper>