台区详情1

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

@@ -7,6 +7,7 @@ import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.vo.DeviceVo;
 import com.bizmatics.model.vo.PlatformAreaVo;
 import com.bizmatics.model.vo.SiteDeviceList;
+import com.bizmatics.model.vo.SiteListVo;
 import com.bizmatics.service.PlatformAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -99,7 +100,7 @@ public class PlatformAreaController {
      * @return
      */
     @GetMapping("siteDeviceList")
-    public ApiResult<List<SiteDeviceList>> siteDeviceList(@RequestParam int stationAreaId) {
+    public ApiResult<List<SiteListVo>> siteDeviceList(@RequestParam Integer stationAreaId) {
         return ApiResult.success(platformAreaService.siteDeviceList(stationAreaId));
     }
 

fiveep-model/src/main/java/com/bizmatics/model/vo/SiteListVo.java

@@ -0,0 +1,129 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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 SiteListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 站点表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    /**
+     * 站点位置
+     */
+    private String siteAddress;
+
+    /**
+     * 所属单位
+     */
+    private Integer companyCode;
+
+    /**
+     * 联系人1
+     */
+    private String userName;
+
+    /**
+     * 手机号码1
+     */
+    private String phone;
+
+    /**
+     * 联系人2
+     */
+    private String spareUserName;
+
+    /**
+     * 手机号码2
+     */
+    private String sparePhone;
+
+    /**
+     * 所属台区
+     */
+    private Integer stationAreaId;
+
+    /**
+     * 所属线路
+     */
+    private Integer routeId;
+
+    /**
+     * 装机容量
+     */
+    private String installedCapacity;
+
+    /**
+     * 流变变化
+     */
+    private String rheologicalChange;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属区域（1 宝山，2 嘉定）
+     */
+    private Integer region;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 使能标识（0 不生效，1 生效）
+     */
+    private Integer enable;
+
+    /**
+     * 分组ID
+     */
+    private Integer groupingId;
+
+    /**
+     * 线路名称
+     */
+    private String routeName;
+
+
+}

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

@@ -4,6 +4,7 @@ import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.vo.PlatformAreaVo;
 import com.bizmatics.model.vo.SiteDeviceList;
+import com.bizmatics.model.vo.SiteListVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,6 +25,6 @@ public interface PlatformAreaMapper extends CrudMapper<PlatformArea> {
 
     List<PlatformAreaVo> deviceCount(@Param("platformAreaName") String platformAreaName);
 
-    List<SiteDeviceList> deviceList(@Param("stationAreaId") int stationAreaId);
+    List<SiteListVo> deviceList(@Param("stationAreaId") int stationAreaId);
 
 }

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

@@ -60,29 +60,14 @@
     </select>
 
 
-    <select id="deviceList" resultType="com.bizmatics.model.vo.SiteDeviceList">
+    <select id="deviceList" resultType="com.bizmatics.model.vo.SiteListVo">
         SELECT
-        a.id AS site_id,
-        a.site_name,
-        b.id AS device_id,
-        b.device_name,
-        IF (
-        d.device_status = 1,
-        '离线',
-        '在线'
-        ) AS device_statusr,
-        c.*,
-        d.id as device_status_id
+        a.*,b.route_name
         FROM
         site AS a
-        JOIN device AS b ON a.id = b.site_id
-        JOIN device_analog_variable_list AS s ON b.id = s.communication_equipment
-        JOIN device_attribute AS c ON s.monitoring_equipment = c.id
-        JOIN device_status AS d ON b.device_code = d.device_code
+        left JOIN route AS b ON a.route_id = b.id
         <where>
             a.enable = 1
-            and b.enable = 1
-            and c.status = 1
             <if test="stationAreaId != null and stationAreaId != 0">
                 AND a.station_area_id = #{stationAreaId}
             </if>

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

@@ -6,6 +6,7 @@ import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.vo.DeviceVo;
 import com.bizmatics.model.vo.PlatformAreaVo;
 import com.bizmatics.model.vo.SiteDeviceList;
+import com.bizmatics.model.vo.SiteListVo;
 
 import java.util.List;
 import java.util.Map;
@@ -29,7 +30,7 @@ public interface PlatformAreaService extends CrudService<PlatformArea> {
 
     void platformAreaDel(int id);
 
-    List<SiteDeviceList> siteDeviceList(int stationAreaId);
+    List<SiteListVo> siteDeviceList(Integer stationAreaId);
 
     void siteDeviceUpdate(DeviceVo deviceVo);
 

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

@@ -8,10 +8,7 @@ import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.PlatformArea;
 import com.bizmatics.model.Site;
-import com.bizmatics.model.vo.DeviceVo;
-import com.bizmatics.model.vo.PlatformAreaVo;
-import com.bizmatics.model.vo.ProcessingTimeVo;
-import com.bizmatics.model.vo.SiteDeviceList;
+import com.bizmatics.model.vo.*;
 import com.bizmatics.persistence.mapper.PlatformAreaMapper;
 import com.bizmatics.service.PlatformAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,8 +130,8 @@ public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMap
     }
 
     @Override
-    public List<SiteDeviceList> siteDeviceList(int stationAreaId){
-        List<SiteDeviceList> siteDeviceList = baseMapper.deviceList(stationAreaId);
+    public List<SiteListVo> siteDeviceList(Integer stationAreaId){
+        List<SiteListVo> siteDeviceList = baseMapper.deviceList(stationAreaId);
         return siteDeviceList;
     }