From 465d1f03afa058d9ce210f2fc48e5c06ce291a68 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Tue, 31 Oct 2017 16:00:44 +0800
Subject: [PATCH] 手机api
---
src/main/java/com/moral/monitor/entity/EquipmentExample.java | 7 ++++---
src/main/resources/mapper/EquipmentMapper.xml | 21 ++++++++++++++++++++-
src/main/java/com/moral/monitor/entity/Equipment.java | 26 ++++++++++++++++++++++++++
src/main/java/com/moral/monitor/controller/ApiController.java | 4 ++--
4 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index e551a79..2ab3c43 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ApiController.java
@@ -59,8 +59,8 @@
@RequestParam(value ="longitude") String longitude,
@RequestParam(value ="latitude") String latitude,
@RequestParam(value ="mac") String mac,
- @RequestParam(value ="mpointId") String monitorpoint,
- @RequestParam(value ="orgId") String ownerId
+ @RequestParam(value ="monitorpoint") String monitorpoint,
+ @RequestParam(value ="ownerId") String ownerId
){
//������������������������������
ApiData apiData = new ApiData();
diff --git a/src/main/java/com/moral/monitor/entity/Equipment.java b/src/main/java/com/moral/monitor/entity/Equipment.java
index 5f85f86..70a330c 100644
--- a/src/main/java/com/moral/monitor/entity/Equipment.java
+++ b/src/main/java/com/moral/monitor/entity/Equipment.java
@@ -32,7 +32,33 @@
private String monitorpoint;
private String ownerId;
+ public MonitorPoint getMonitorpointDetail() {
+ return monitorpointDetail;
+ }
+ public void setMonitorpointDetail(MonitorPoint monitorpointDetail) {
+ this.monitorpointDetail = monitorpointDetail;
+ }
+
+ public Organization getOwnerDetail() {
+ return ownerDetail;
+ }
+
+ public void setOwnerDetail(Organization ownerDetail) {
+ this.ownerDetail = ownerDetail;
+ }
+
+ public User getInstallerDetail() {
+ return installerDetail;
+ }
+
+ public void setInstallerDetail(User installerDetail) {
+ this.installerDetail = installerDetail;
+ }
+
+ private MonitorPoint monitorpointDetail;
+ private Organization ownerDetail;
+ private User installerDetail;
public Integer getId() {
return id;
}
diff --git a/src/main/java/com/moral/monitor/entity/EquipmentExample.java b/src/main/java/com/moral/monitor/entity/EquipmentExample.java
index 9d0d255..fce2935 100644
--- a/src/main/java/com/moral/monitor/entity/EquipmentExample.java
+++ b/src/main/java/com/moral/monitor/entity/EquipmentExample.java
@@ -5,6 +5,7 @@
import java.util.List;
public class EquipmentExample {
+ private static String tableName = "equipment.";
protected String orderByClause;
protected boolean distinct;
@@ -88,21 +89,21 @@
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
- criteria.add(new Criterion(condition));
+ criteria.add(new Criterion(tableName+condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
- criteria.add(new Criterion(condition, value));
+ criteria.add(new Criterion(tableName+condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
- criteria.add(new Criterion(condition, value1, value2));
+ criteria.add(new Criterion(tableName+condition, value1, value2));
}
public Criteria andIdIsNull() {
diff --git a/src/main/resources/mapper/EquipmentMapper.xml b/src/main/resources/mapper/EquipmentMapper.xml
index 1839acb..b461129 100644
--- a/src/main/resources/mapper/EquipmentMapper.xml
+++ b/src/main/resources/mapper/EquipmentMapper.xml
@@ -17,6 +17,19 @@
<result column="area" jdbcType="VARCHAR" property="area" />
<result column="monitorpoint" jdbcType="VARCHAR" property="monitorpoint" />
<result column="owner_id" jdbcType="VARCHAR" property="ownerId" />
+ <!-- ������������������������������ -->
+ <association property="monitorpointDetail" javaType="com.moral.monitor.entity.MonitorPoint">
+ <result column="monitorpoint" property="id" jdbcType="VARCHAR" />
+ <result column="mpt_name" property="name" jdbcType="VARCHAR" />
+ </association>
+ <association property="ownerDetail" javaType="com.moral.monitor.entity.Organization">
+ <result column="owner_id" property="id" jdbcType="VARCHAR" />
+ <result column="org_name" property="name" jdbcType="VARCHAR" />
+ </association>
+ <association property="installerDetail" javaType="com.moral.monitor.entity.User">
+ <result column="installer" property="id" jdbcType="VARCHAR" />
+ <result column="user_name" property="name" jdbcType="VARCHAR" />
+ </association>
</resultMap>
<sql id="Example_Where_Clause">
<where>
@@ -85,8 +98,14 @@
<if test="distinct">
distinct
</if>
- <include refid="Base_Column_List" />
+ equipment.*,
+ mpt.name as mpt_name,
+ org.name as org_name,
+ user.name as user_name
from equipment
+ LEFT JOIN monitorpoint mpt on equipment.monitorpoint = mpt.id
+ LEFT JOIN organization org on equipment.owner_id = org.id
+ LEFT JOIN user on equipment.installer = user.id
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
--
Gitblit v1.8.0