src/main/java/com/moral/monitor/controller/ApiController.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/com/moral/monitor/entity/Equipment.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/com/moral/monitor/entity/EquipmentExample.java | ●●●●● patch | view | raw | blame | history | |
src/main/resources/mapper/EquipmentMapper.xml | ●●●●● patch | view | raw | blame | history |
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(); 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; } 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() { 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>