代储点bug修改

src/main/java/com/chinaitop/depot/agent/temperature/controller/AgentTemperatureController.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.chinaitop.depot.agent.temperature.model.TempMetadata;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -66,7 +67,7 @@ public class AgentTemperatureController {
             @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getAgentTemperatureList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
-                                                                 Integer storehouseId, String startTime, String endTime, String temperId, String orgid) {
+                                                                 String storehouseId, String startTime, String endTime, String temperId, String orgid) {
         Map<String, Object> map = new HashMap<>();
         map.put("orgId", orgid);
         if (ParameterUtil.isnotnull(agentId)) {
@@ -254,4 +255,27 @@ public class AgentTemperatureController {
         return map;
     }
 
+    /**
+     * 根据id获取带标杆号温度表格
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/findByTempTable", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "根据id查询粮情点温,带标杆号.", notes = "根据id查询检测记录包括层，行，列各个节点的值")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "粮情id", paramType = "query"),
+            @ApiImplicitParam(name = "sign", value = "1是第三方库，0是本系统库", paramType = "query")
+    })
+    public Map<Integer, List<TempMetadata>> findByTempTable(String id,String sign) {
+        Map<Integer, List<TempMetadata>> tempTable = null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", id);
+        map.put("sign", sign);
+        try {
+            tempTable = agentTemperatureService.findByTempTable(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return tempTable;
+    }
 }

src/main/java/com/chinaitop/depot/agent/temperature/mapper/BusinessAgentTemperatureMapper.java

@@ -54,4 +54,10 @@ public interface BusinessAgentTemperatureMapper {
      * @return map
      */
     List<Map<String,Object>> getAgentStoreInfoMap(Integer orgId);
+
+    /**
+     * 根据仓号和检测时间获取带标杆号温度表格
+     * @param map
+     */
+    String findByTempTable(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/agent/temperature/mapper/BusinessAgentTemperatureMapper.xml

@@ -749,4 +749,26 @@
     GROUP BY
       t2.storehouse_code
   </select>
+
+  <select id="findByTempTable" resultType="java.lang.String" parameterType="java.util.Map">
+    SELECT
+    t_points
+    FROM
+    business_agent_temperature
+    <where>
+      <if test="id != null">
+        id = #{id} AND '1' = #{sign}
+      </if>
+    </where>
+    UNION ALL
+    SELECT
+    t_points
+    FROM
+    t_testdata
+    <where>
+      <if test="id != null">
+        id = #{id} AND '0' = #{sign}
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/agent/temperature/model/TempMetadata.java

@@ -0,0 +1,59 @@
+package com.chinaitop.depot.agent.temperature.model;
+
+/**
+ * @author qingsong.han
+ * @description: 测温设备返回源数据(获取带标杆号温度表格)
+ * @create 2020-05-25 15:56
+ */
+public class TempMetadata {
+    // 温度
+    private float temp;
+    // 列号
+    private String x;
+    // 行号
+    private String y;
+    // 层号
+    private String z;
+    // 标杆号
+    private int marking;
+
+    public int getMarking() {
+        return marking;
+    }
+
+    public void setMarking(int marking) {
+        this.marking = marking;
+    }
+
+    public float getTemp() {
+        return temp;
+    }
+
+    public void setTemp(float temp) {
+        this.temp = temp;
+    }
+
+    public String getX() {
+        return x;
+    }
+
+    public void setX(String x) {
+        this.x = x;
+    }
+
+    public String getY() {
+        return y;
+    }
+
+    public void setY(String y) {
+        this.y = y;
+    }
+
+    public String getZ() {
+        return z;
+    }
+
+    public void setZ(String z) {
+        this.z = z;
+    }
+}

src/main/java/com/chinaitop/depot/agent/temperature/service/agentTemperatureService.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.agent.temperature.service;
 
 import com.chinaitop.depot.agent.temperature.model.BusinessAgentTemperature;
+import com.chinaitop.depot.agent.temperature.model.TempMetadata;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,4 +42,11 @@ public interface agentTemperatureService {
      * @return map
      */
     Map<String,Object> getAgentStoreInfoMap(Integer orgId);
+
+    /**
+     * 根据id获取带标杆号温度表格
+     * @param map
+     * @return
+     */
+    Map<Integer,List<TempMetadata>> findByTempTable(Map<String,Object> map);
 }

src/main/java/com/chinaitop/depot/agent/temperature/service/impl/AgentTemperatureServiceImpl.java

@@ -1,11 +1,13 @@
 package com.chinaitop.depot.agent.temperature.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
 import com.chinaitop.depot.agent.temperature.mapper.BusinessAgentTemperatureMapper;
 import com.chinaitop.depot.agent.temperature.model.BusinessAgentTemperature;
 import com.chinaitop.depot.agent.temperature.model.BusinessAgentTemperatureExample;
 import com.chinaitop.depot.agent.temperature.model.TPoints;
+import com.chinaitop.depot.agent.temperature.model.TempMetadata;
 import com.chinaitop.depot.agent.temperature.service.agentTemperatureService;
 import com.chinaitop.utils.ParameterUtil;
 import com.google.common.collect.Lists;
@@ -263,4 +265,41 @@ public class AgentTemperatureServiceImpl implements agentTemperatureService {
         return reMap;
     }
 
+    /**
+     * 根据仓id获取带标杆号温度表格
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public Map<Integer, List<TempMetadata>> findByTempTable(Map<String,Object> map) {
+        // 根据id查询表格数据
+        String str = businessAgentTemperatureMapper.findByTempTable(map);
+        // json字符串数组转list对象
+        List<TempMetadata> tempMetadata = JSONArray.parseArray(str, TempMetadata.class);
+        // 先排序在分组
+        Map<Integer, List<TempMetadata>> collect2 = tempMetadata.stream()
+                .sorted(Comparator.comparing(t -> Integer.parseInt(t.getX())))
+                .collect(Collectors.groupingBy(t -> Integer.parseInt(t.getZ())));
+        // 创建list对象缓存数据
+        List<TempMetadata> lists = new LinkedList<>();
+        // 获取值
+        for (Map.Entry<Integer, List<TempMetadata>> values : collect2.entrySet()) {
+            // 初始标杆号
+            int bgh = 1;
+            // 获取标杆号对等数量对象值
+            List<TempMetadata> tempMetadataList = values.getValue();
+            for (TempMetadata metadata : tempMetadataList) {
+                // 添加标杆号
+                metadata.setMarking(bgh);
+                // 把所有值添加到list
+                lists.add(metadata);
+                bgh++;
+            }
+        }
+        // 用标杆号分组,获取到值(x:为列号,y:行号,z:为每行有多少个测温点).
+        Map<Integer, List<TempMetadata>> collect = lists.stream()
+                .collect(Collectors.groupingBy(t -> t.getMarking()));
+        return collect;
+    }
 }