优化巡检功能

java110-bean/src/main/java/com/java110/dto/inspection/InspectionRoutePointRelDto.java

@@ -41,6 +41,10 @@ public class InspectionRoutePointRelDto extends PageDto implements Serializable
 
     private Date createTime;
 
+    private String lng;
+
+    private String lat;
+
     private String statusCd = "0";
 
     public String getInspectionId() {
@@ -227,4 +231,20 @@ public class InspectionRoutePointRelDto extends PageDto implements Serializable
     public void setSortNumber(String sortNumber) {
         this.sortNumber = sortNumber;
     }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
 }

java110-db/src/main/resources/mapper/community/InspectionRoutePointRelServiceDaoImplMapper.xml

@@ -77,7 +77,8 @@
         ip.inspection_id inspectionId,ip.remark,td.name pointTypeName,
         ip.inspection_name inspectionName,ip.point_obj_type,ip.point_obj_id,ip.point_obj_name,
         ip.point_obj_type pointObjType,ip.point_obj_id pointObjId,ip.point_obj_name pointObjName,
-        t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber
+        t.point_start_time,t.point_start_time pointStartTime,t.point_end_time,t.point_end_time pointEndTime,t.sort_number,t.sort_number sortNumber,
+        ip.lng,ip.lat
         from inspection_route_point_rel t,inspection_point ip
         left join t_dict td on ip.point_obj_type = td.status_cd and td.table_name = 'inspection_point'
         and td.table_columns = 'point_obj_type'

service-community/src/main/java/com/java110/community/dao/impl/InspectionRoutePointRelServiceDaoImpl.java

@@ -89,9 +89,9 @@ public class InspectionRoutePointRelServiceDaoImpl extends BaseServiceDao implem
     public List<Map> getInspectionRoutePointRelInfo(Map info) throws DAOException {
         logger.debug("查询巡检路线巡检点关系信息 入参 info : {}", info);
 
-        List<Map> businessInspectionRoutePointRelInfos = sqlSessionTemplate.selectList("inspectionRoutePointRelServiceDaoImpl.getInspectionRoutePointRelInfo", info);
+        List<Map> infos = sqlSessionTemplate.selectList("inspectionRoutePointRelServiceDaoImpl.getInspectionRoutePointRelInfo", info);
 
-        return businessInspectionRoutePointRelInfos;
+        return infos;
     }
 
 

service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java

@@ -278,7 +278,7 @@ public class MachinePaymentNoticeAdapt extends DatabusAdaptImpl {
                 content.put("feeName", paramIn.getString("feeName"));
                 content.put("payFeeTime", paramIn.getString("payFeeTime"));
                 content.put("receivedAmount", paramIn.getString("receivedAmount") + "元");
-                content.put("url", wechatUrl);
+                //content.put("url", wechatUrl);
                 MsgNotifyFactory.sendPayFeeMsg(payFeeDetailPo.getCommunityId(), userDto.getUserId(), content, MsgNotifyFactory.ROLE_STAFF);
             } catch (Exception e) {
                 logger.error("发送缴费信息失败", e);
@@ -309,7 +309,7 @@ public class MachinePaymentNoticeAdapt extends DatabusAdaptImpl {
             content.put("feeTypeCdName", paramIn.getString("feeTypeCdName"));
             content.put("payFeeTime", paramIn.getString("payFeeTime"));
             content.put("receivedAmount", paramIn.getString("receivedAmount") + "元");
-            content.put("url", paramIn.getString("wechatUrl"));
+            //content.put("url", paramIn.getString("wechatUrl"));
             MsgNotifyFactory.sendPayFeeMsg(payFeeDetailPo.getCommunityId(), userId, content, MsgNotifyFactory.ROLE_STAFF);
 
         } catch (Exception e) {
@@ -410,7 +410,7 @@ public class MachinePaymentNoticeAdapt extends DatabusAdaptImpl {
         } else {
             wechatUrl += ("?wAppId=" + smallWeChatDtos.get(0).getAppId());
         }
-        content.put("url", wechatUrl);
+//        content.put("url", wechatUrl);
         MsgNotifyFactory.sendPayFeeMsg(payFeeDetailPo.getCommunityId(), ownerAppUserDtos.get(0).getUserId(), content, MsgNotifyFactory.ROLE_OWNER);
 
     }