Browse Source

根据 org_id 和 depot_id 查询油罐信息

gaodandan 6 years ago
parent
commit
da453a317d

+ 19 - 0
src/main/java/com/chinaitop/depot/agent/basic/controller/AgentTankController.java

@@ -222,4 +222,23 @@ public class AgentTankController {
222 222
         fileMap.put("errormsg",errormsg);
223 223
         return fileMap;
224 224
     }
225
+    
226
+    
227
+    /**
228
+     * 根据agent_depot_id、orgId 获取油罐信息
229
+     * @return
230
+     */
231
+    @RequestMapping(value = "/getAgentTankInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
232
+    @ApiOperation(value="代储油罐信息", notes = "代储点油罐信息列表")
233
+    @ApiImplicitParams({
234
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
235
+    })
236
+    public List<Map<String, Object>> getAgentTankInfo(Integer agentDepotId,Integer orgId){
237
+        Map<String,Object> map = new HashMap<>();
238
+        map.put("orgId",orgId);
239
+        map.put("agentDepotId",agentDepotId);
240
+        List<Map<String, Object>> list = agentTankService.getAgentTank(map);
241
+        return list;
242
+    }
243
+
225 244
 }

+ 4 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.agent.basic.mapper;
3 3
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
4 4
 import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
5 5
 import java.util.List;
6
+import java.util.Map;
7
+
6 8
 import org.apache.ibatis.annotations.Param;
7 9
 
8 10
 public interface BusinessAgentTankMapper {
@@ -27,4 +29,6 @@ public interface BusinessAgentTankMapper {
27 29
     int updateByPrimaryKeySelective(BusinessAgentTank record);
28 30
 
29 31
     int updateByPrimaryKey(BusinessAgentTank record);
32
+
33
+	List<Map<String, Object>> getAgentTank(Map<String, Object> map);
30 34
 }

+ 27 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.xml

@@ -320,4 +320,31 @@
320 320
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
321 321
     where id = #{id,jdbcType=INTEGER}
322 322
   </update>
323
+  
324
+  
325
+  <!-- 根据 org_id 和 depot_id 查询油罐信息-->
326
+  <select id="getAgentTank" resultType="java.util.Map" parameterType="java.util.Map">
327
+  SELECT
328
+	a.*, e.tank_id storehouseId,
329
+	e.agent_depot_id,
330
+	e.del_flag,
331
+	t.storageTank_name storehouseName
332
+FROM
333
+	(
334
+		SELECT
335
+			d.id,
336
+			d.depot_id,
337
+			d.agent_depot_name,
338
+			d.org_id,
339
+			d.del_flag
340
+		FROM
341
+			business_agent_depot d
342
+		WHERE
343
+			d.org_id = #{orgId,jdbcType=INTEGER} AND
344
+			d.depot_id = #{agentDepotId,jdbcType=INTEGER} AND
345
+			d.del_flag=1
346
+	) a
347
+LEFT JOIN business_agent_tank_exist e ON a.id = e.agent_depot_id AND e.del_flag = 1
348
+LEFT JOIN basic_tank t ON t.id = e.tank_id
349
+  </select>
323 350
 </mapper>

+ 3 - 0
src/main/java/com/chinaitop/depot/agent/basic/service/agentTankService.java

@@ -6,6 +6,7 @@ import com.chinaitop.depot.agent.basic.model.TLevel;
6 6
 import com.chinaitop.depot.agent.basic.model.TOiltank;
7 7
 
8 8
 import java.util.List;
9
+import java.util.Map;
9 10
 
10 11
 public interface agentTankService {
11 12
 
@@ -36,4 +37,6 @@ public interface agentTankService {
36 37
     List<TOiltank> getTankTemperatureList(String vCfCode, String vDatatime, String startTime, String endTime, String orgId);
37 38
     List<TLevel> getLevelDetectionList(String vCfCode, String vDatatime, String startTime, String endTime, String orgId);
38 39
 
40
+	List<Map<String, Object>> getAgentTank(Map<String, Object> map);
41
+
39 42
 }

+ 6 - 0
src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -236,4 +236,10 @@ public class AgentTankServiceImpl implements agentTankService {
236 236
         map.put("orderByClause", "levels.t_time desc");
237 237
         return levelMapper.getLevelDetectionList(map);
238 238
     }
239
+
240
+    @Override
241
+	public List<Map<String, Object>> getAgentTank(Map<String, Object> map) {
242
+		// TODO Auto-generated method stub
243
+		return BusinessAgentTankMapper.getAgentTank(map);
244
+	}
239 245
 }