根据 org_id 和 depot_id 查询油罐信息

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentTankController.java

@@ -222,4 +222,23 @@ public class AgentTankController {
         fileMap.put("errormsg",errormsg);
         return fileMap;
     }
+    
+    
+    /**
+     * 根据agent_depot_id、orgId 获取油罐信息
+     * @return
+     */
+    @RequestMapping(value = "/getAgentTankInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储油罐信息", notes = "代储点油罐信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public List<Map<String, Object>> getAgentTankInfo(Integer agentDepotId,Integer orgId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        map.put("agentDepotId",agentDepotId);
+        List<Map<String, Object>> list = agentTankService.getAgentTank(map);
+        return list;
+    }
+
 }

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.java

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

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.xml

@@ -320,4 +320,31 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+  
+  <!-- 根据 org_id 和 depot_id 查询油罐信息-->
+  <select id="getAgentTank" resultType="java.util.Map" parameterType="java.util.Map">
+  SELECT
+	a.*, e.tank_id storehouseId,
+	e.agent_depot_id,
+	e.del_flag,
+	t.storageTank_name storehouseName
+FROM
+	(
+		SELECT
+			d.id,
+			d.depot_id,
+			d.agent_depot_name,
+			d.org_id,
+			d.del_flag
+		FROM
+			business_agent_depot d
+		WHERE
+			d.org_id = #{orgId,jdbcType=INTEGER} AND
+			d.depot_id = #{agentDepotId,jdbcType=INTEGER} AND
+			d.del_flag=1
+	) a
+LEFT JOIN business_agent_tank_exist e ON a.id = e.agent_depot_id AND e.del_flag = 1
+LEFT JOIN basic_tank t ON t.id = e.tank_id
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/agent/basic/service/agentTankService.java

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

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

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