首页地图点位信息4

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteMapper.java

@@ -1,7 +1,7 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.*;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ya
@@ -19,7 +19,6 @@ import java.util.List;
 public interface SiteMapper extends CrudMapper<Site> {
 
 
-
     int selectCount(@Param("userId") Integer userId,
                     @Param("siteId") Integer siteId,
                     @Param("siteStatus") Integer siteStatus);
@@ -28,13 +27,14 @@ public interface SiteMapper extends CrudMapper<Site> {
                     @Param("name") String name);
 
     List<SiteTwo> list2(@Param("userId") Integer userId,
-                    @Param("name") String name);
+                        @Param("name") String name);
+
 
     List<Device> getDeviceListOne(@Param("siteId") Integer siteId);
 
 
     List<Site> idList(@Param("userId") Integer userId,
-                        @Param("name") String name);
+                      @Param("name") String name);
 
     List<SiteList> Sitelist(@Param("userId") Integer userId,
                             @Param("name") String name);

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -62,7 +62,7 @@
 
     <select id="list2" resultType="com.bizmatics.model.SiteTwo">
         SELECT
-        a.*, max(b.device_status)  as device_status
+        a.*, b.device_status
         FROM
         (
         SELECT