首页地图点位信息3

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

@@ -0,0 +1,94 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceTwo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备信息表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+    /**
+     * 所属站点
+     */
+    private Integer siteId;
+
+    /**
+     * 设备安装位置
+     */
+    private String deviceAddress;
+
+    /**
+     * 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他
+     */
+    private String deviceType;
+
+    /**
+     * 安装时间
+     */
+    private Date installTime;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 使能标识（0 不生效，1生效）
+     */
+    private Integer enable;
+
+    /**
+     * sim卡号
+     */
+    private String sim;
+
+
+
+    @TableField("device_status")
+    private Integer deviceStatus;
+
+    /**
+     * 站点里面字段信息
+     */
+    @TableField(exist = false)
+    private String installedCapacity;
+
+}

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

@@ -30,6 +30,8 @@ public interface SiteMapper extends CrudMapper<Site> {
     List<SiteTwo> list2(@Param("userId") Integer userId,
                     @Param("name") String name);
 
+    List<Device> getDeviceListOne(@Param("siteId") Integer siteId);
+
 
     List<Site> idList(@Param("userId") Integer userId,
                         @Param("name") String name);

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

@@ -101,6 +101,19 @@
         a.id
     </select>
 
+    <select id="getDeviceListOne" resultType="com.bizmatics.model.Device">
+        SELECT
+        a.*, b.device_status
+        FROM
+        device AS a
+        JOIN device_status AS b ON a.device_code = b.device_code
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
+
     <select id="Sitelist" resultType="com.bizmatics.model.SiteList">
         select
         a.user_id,

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

@@ -106,9 +106,10 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         Site site = baseMapper.selectOne(Wrappers.lambdaQuery(Site.class).eq(Site::getId, siteId));
         return Optional.ofNullable(site)
                 .map(st -> {
-                    LambdaQueryWrapper<Device> deviceLambdaQueryWrapper = Wrappers.lambdaQuery();
-                    deviceLambdaQueryWrapper.eq(Device::getSiteId, site.getId());
-                    List<Device> list = deviceService.list(deviceLambdaQueryWrapper);
+//                    LambdaQueryWrapper<Device> deviceLambdaQueryWrapper = Wrappers.lambdaQuery();
+//                    deviceLambdaQueryWrapper.eq(Device::getSiteId, site.getId());
+//                    List<Device> list = deviceService.list(deviceLambdaQueryWrapper);
+                    List<Device> list = baseMapper.getDeviceListOne(site.getId());
                     Integer count = alarmPowerMapper.selectCount(null, site.getId(), null, null, null, null, 1);
                     SiteVO siteVO = enhanceSite(list, site, null);
                     siteVO.setAlarmPowerCount(count);