首页地图点位信息2

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

@@ -2,10 +2,7 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
-import com.bizmatics.model.DeviceAnalogVariableList;
-import com.bizmatics.model.Route;
-import com.bizmatics.model.Site;
-import com.bizmatics.model.TemplateData;
+import com.bizmatics.model.*;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
@@ -59,7 +56,7 @@ public class SiteController {
      * @return
      */
     @GetMapping("list2")
-    public ApiResult<List<Site>> list2(@RequestParam(required = false) String name) {
+    public ApiResult<List<SiteTwo>> list2(@RequestParam(required = false) String name) {
         return ApiResult.success(siteService.list2(name));
     }
 

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

@@ -1,6 +1,7 @@
 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;
@@ -120,9 +121,5 @@ public class Site implements Serializable {
      */
     private Integer groupingId;
 
-    /**
-     * 站点状态
-     */
-    private Integer deviceStatus;
 
 }

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

@@ -0,0 +1,130 @@
+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 SiteTwo 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;
+
+    /**
+     * 站点状态
+     */
+    @TableField("device_status")
+    private Integer deviceStatus;
+
+}

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

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

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

@@ -60,7 +60,7 @@
         </where>
     </select>
 
-    <select id="list2" resultType="com.bizmatics.model.Site">
+    <select id="list2" resultType="com.bizmatics.model.SiteTwo">
         SELECT
         a.*, b.device_status
         FROM

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

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

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

@@ -73,7 +73,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
     @Override
-    public List<Site> list2(String name) {
+    public List<SiteTwo> list2(String name) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         return baseMapper.list2(userId, name);
     }