首页地图点位信息

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -52,6 +52,17 @@ public class SiteController {
         return ApiResult.success(siteService.list(name));
     }
 
+    /**
+     * 查看站点列表
+     *
+     * @param name 名称
+     * @return
+     */
+    @GetMapping("list2")
+    public ApiResult<List<Site>> list2(@RequestParam(required = false) String name) {
+        return ApiResult.success(siteService.list2(name));
+    }
+
     /**
      * 未知
      * @param name 站点名称

fiveep-model/src/main/java/com/bizmatics/model/Site.java

@@ -120,5 +120,9 @@ public class Site implements Serializable {
      */
     private Integer groupingId;
 
+    /**
+     * 站点状态
+     */
+    private Integer deviceStatus;
 
 }

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

@@ -27,6 +27,9 @@ public interface SiteMapper extends CrudMapper<Site> {
     List<Site> list(@Param("userId") Integer userId,
                     @Param("name") String name);
 
+    List<Site> list2(@Param("userId") Integer userId,
+                    @Param("name") String name);
+
 
     List<Site> idList(@Param("userId") Integer userId,
                         @Param("name") String name);

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

@@ -49,6 +49,7 @@
         inner join site as s
         on us.site_id = s.id
         <where>
+            s.enable=1
             <if test="userId != null and userId != 0">
                 and us.user_id = #{userId}
             </if>
@@ -58,6 +59,48 @@
 
         </where>
     </select>
+
+    <select id="list2" resultType="com.bizmatics.model.Site">
+        SELECT
+        a.*, b.device_status
+        FROM
+        (
+        SELECT
+        s.id,
+        s.site_name,
+        s.site_address,
+        s.company_code,
+        s.user_name,
+        s.phone,
+        s.station_area_id,
+        s.route_id,
+        s.installed_capacity,
+        s.rheological_change,
+        s.longitude,
+        s.latitude,
+        s.region,
+        s.create_time,
+        s.creator,
+        s. ENABLE
+        FROM
+        user_site AS us
+        INNER JOIN site AS s ON us.site_id = s.id
+        <where>
+            s.enable=1
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
+            <if test="name != null and name != ''">
+                and s.site_name LIKE CONCAT(CONCAT('%', #{name}), '%')
+            </if>
+        </where>) AS a
+        LEFT JOIN device_status AS b ON a.id = b.site_id
+        GROUP BY
+        a.id
+        ORDER BY
+        a.id
+    </select>
+
     <select id="Sitelist" resultType="com.bizmatics.model.SiteList">
         select
         a.user_id,

fiveep-service/src/main/java/com/bizmatics/service/SiteService.java

@@ -35,6 +35,13 @@ public interface SiteService extends CrudService<Site> {
      */
     List<Site> list(String name);
 
+    /**
+     * 查看站点列表
+     * @param name
+     * @return
+     */
+    List<Site> list2(String name);
+
     /**
      * 查看站点列表
      * @param name

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -72,6 +72,12 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         return baseMapper.list(userId, name);
     }
 
+    @Override
+    public List<Site> list2(String name) {
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
+        return baseMapper.list2(userId, name);
+    }
+
     @Override
     public List<Site> siteList(String name) {
         LambdaQueryWrapper<Site> QueryWrapper = Wrappers.lambdaQuery();