云南bug修改

src/main/java/com/chinaitop/depot/agent/quality/controller/AgentQualityController.java

@@ -105,7 +105,7 @@ public class AgentQualityController {
         }
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
-        qualityCheck.setSealStatus("0");
+        //qualityCheck.setSealStatus("0");
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }

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

@@ -81,10 +81,16 @@ public class AgentTemperatureController {
             map.put("startTime", startTime + " 00:00:00");
             map.put("endTime", endTime + " 23:59:59");
         }
+        PageHelper.clearPage();
 
-        PageHelper.startPage(pageNum, pageSize);
-        List<Map<String, Object>> list = agentTemperatureService.getAgentTemperatureList(map);
-        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        List<Map<String, Object>> dataList = this.getDataByMap(map);
+        if(dataList.size() == 0){
+            PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(dataList);
+            return pageInfo;
+        }
+
+        List<Map<String, Object>> list = agentTemperatureService.getAgentTemperatureList(dataList,map);
+        PageInfo<Map<String,Object>> pageInfo = ParameterUtil.list2PageInfo(list,pageNum,pageSize);
         return pageInfo;
     }
 
@@ -248,4 +254,8 @@ public class AgentTemperatureController {
         return map;
     }
 
+    public List<Map<String, Object>> getDataByMap(Map<String, Object> map) {
+        List<Map<String, Object>> dataList = agentTemperatureService.getDataByExample(map);
+        return dataList;
+    }
 }

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

@@ -37,6 +37,7 @@ public interface BusinessAgentTemperatureMapper {
     int updateByPrimaryKey(BusinessAgentTemperature record);
 
     List<Map<String,Object>> getDataByExample(Map<String,Object> map);
+    List<Map<String,Object>> getTestDataList(Map<String,Object> map);
 
     List<BusinessAgentTemperature> getById(@Param("id") String id);
 

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

@@ -126,7 +126,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -588,72 +588,46 @@
   </update>
 
   <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
-    SELECT
-    temperAll.*
-    FROM
-    (
     SELECT DISTINCT
-    temper.id id,
-    temper.org_id orgId,
     depot.depot_id agentOrgId,
     depot.depot_id agentStoreOrgId,
-    '1' sign,
     agent.agent_name agentName,
     depot.agent_depot_name agentDepotName,
+    depot.updatetime,
     store.storehouse_name storehouseName,
-    temper.lspz lspz,
-    temper.detection_time detectionTime,
-    temper.house_temperature houseTemperature,
-    temper.house_humidity houseHumidity,
-    temper.max max,
-    temper.min min,
-    temper.avg avg,
     store.storehouse_type storehouseType,
     store.design_capacity designCapacity,
-    temper.enter_time enterTime,
-    temper.nature nature,
-    temper.level level,
-    temper.actual_amount actualAmount,
-    temper.harvest_year harvestYear,
-    temper.gas_temperature gasTemperature,
-    temper.gas_humidity gasHumidity,
-    temper.keeper keeper,
-    temper.updatetime updatetime
+    store.storehouse_code storehouseCode,
+    store.storehouse_id storehouseId,
+    keeper.name keeper
     FROM
-    business_agent_temperature temper
-    LEFT JOIN business_agent agent ON agent.id = temper.agent_id
+    business_agent_depot depot
+    LEFT JOIN business_agent agent ON depot.agent_id = agent.id
     AND agent.org_id = #{orgId,jdbcType=INTEGER}
-    LEFT JOIN business_agent_depot depot ON depot.id = temper.agent_depot_id
-    AND depot.org_id = #{orgId,jdbcType=INTEGER}
-    LEFT JOIN basic_storehouse store ON store.storehouse_id = temper.storehouse_id
-    AND store.library_type = 1
-    AND store.org_id = #{orgId,jdbcType=INTEGER}
-    WHERE temper.org_id = #{orgId,jdbcType=INTEGER}
+    INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
+    INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
+    AND store.del_flag = 1
+    LEFT JOIN basic_keeper_house keepHouse ON keepHouse.house_Id = agentStore.storehouse_id
+    AND depot.depot_id = keepHouse.org_id
+    LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
+    WHERE depot.org_id = #{orgId,jdbcType=INTEGER}
+    AND depot.del_flag = 1
     <if test="agentId != null">
-      AND temper.agent_id = #{agentId,jdbcType=INTEGER}
+      AND agent.id = #{agentId,jdbcType=INTEGER}
     </if>
     <if test="agentDepotId != null">
-      AND temper.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+      AND depot.id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND temper.storehouse_id = #{storehouseId,jdbcType=INTEGER}
-    </if>
-    <if test="startTime != null and endTime != null">
-      AND temper.detection_time BETWEEN #{startTime} AND #{endTime}
-    </if>
-    <if test="temperId != null">
-      AND temper.id = #{temperId,jdbcType=INTEGER}
+      AND store.storehouse_id = #{storehouseId,jdbcType=INTEGER}
     </if>
-    UNION ALL
+    order by depot.depot_id
+  </select>
+
+  <select id="getTestDataList" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT DISTINCT
     tt.id id,
     tt.org_id orgId,
-    depot.depot_id agentOrgId,
-    depot.depot_id agentStoreOrgId,
-    '0' sign,
-    agent.agent_name agentName,
-    depot.agent_depot_name agentDepotName,
-    store.storehouse_name storehouseName,
     tt.storehouse lspz,
     tt.time detectionTime,
     tt.inTemp houseTemperature,
@@ -661,8 +635,6 @@
     tt.max max,
     tt.min min,
     tt.avg avg,
-    store.storehouse_type storehouseType,
-    store.design_capacity designCapacity,
     tt.storehouse enterTime,
     tt.storehouse nature,
     tt.storehouse level,
@@ -670,45 +642,21 @@
     tt.storehouse harvestYear,
     tt.outTemp gasTemperature,
     tt.outH gasHumidity,
-    keeper.name keeper,
     tt.updatetime updatetime
     FROM
-    business_agent_depot depot
-    LEFT JOIN business_agent agent ON depot.agent_id = agent.id
-    AND agent.org_id = #{orgId,jdbcType=INTEGER}
-    INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
-    INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
-    AND store.del_flag = 1
-    LEFT JOIN basic_keeper_house keepHouse ON keepHouse.house_Id = agentStore.storehouse_id
-    AND depot.depot_id = keepHouse.org_id
-    LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
-    LEFT JOIN (SELECT A.id,A.storehouse,A.org_id,A.time,A.updatetime,A.iLq_yq,A.inTemp, A.inH,A.max, A.min, A.avg,A.t_points ,A.outTemp,A.outH FROM t_testdata A INNER JOIN (
-    SELECT storehouse,MAX(updatetime) updatetime,inTemp, inH, max, min, avg ,outTemp,outH
-    FROM t_testdata GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
-    ) B ON A.storehouse = B.storehouse AND A.updatetime = B.updatetime) tt ON depot.depot_id = tt.org_id
-    AND tt.storehouse = store.storehouse_code
+    t_testdata tt
+    WHERE tt.iLq_yq = '0'
+    AND tt.org_id = #{depotId,jdbcType=VARCHAR}
+    AND tt.storehouse in
+    <foreach collection="houseCode" item="listItem" open="(" close=")" separator="," >
+      #{listItem}
+    </foreach>
     AND tt.org_id != #{orgId,jdbcType=INTEGER}
-    AND tt.updatetime >= depot.updatetime
-    WHERE
-    tt.iLq_yq = '0'
-    AND depot.org_id = #{orgId,jdbcType=INTEGER}
-    AND depot.del_flag = 1
-    <if test="agentId != null">
-      AND agent.id = #{agentId,jdbcType=INTEGER}
-    </if>
-    <if test="agentDepotId != null">
-      AND depot.id = #{agentDepotId,jdbcType=INTEGER}
-    </if>
-    <if test="storehouseId != null">
-      AND store.storehouse_id = #{storehouseId,jdbcType=INTEGER}
-    </if>
     <if test="startTime != null and endTime != null">
       AND tt.time BETWEEN #{startTime} AND #{endTime}
     </if>
-    ) temperAll
-    WHERE temperAll.orgId IS NOT NULL AND temperAll.id IS NOT NULL
-    ORDER BY
-    temperAll.updatetime DESC
+    order by tt.updatetime desc
+    LIMIT 100
   </select>
 
   <select id="getById" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String">

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

@@ -13,7 +13,7 @@ public interface agentTemperatureService {
      * @param map
      * @return
      */
-    List<Map<String, Object>> getAgentTemperatureList(Map<String, Object> map);
+    List<Map<String, Object>> getAgentTemperatureList(List<Map<String, Object>> dataList,Map<String, Object> map);
 
     void add(BusinessAgentTemperature user);
 
@@ -41,4 +41,6 @@ public interface agentTemperatureService {
      * @return map
      */
     Map<String,Object> getAgentStoreInfoMap(Integer orgId);
+
+    List<Map<String, Object>> getDataByExample(Map<String, Object> map);
 }

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

@@ -1,12 +1,16 @@
 package com.chinaitop.depot.agent.temperature.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQc;
 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.service.agentTemperatureService;
+import com.chinaitop.utils.HTTPUtils;
 import com.chinaitop.utils.ParameterUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -33,8 +37,94 @@ public class AgentTemperatureServiceImpl implements agentTemperatureService {
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAgentTemperatureList(Map<String, Object> map) {
-        return businessAgentTemperatureMapper.getDataByExample(map);
+    public List<Map<String, Object>> getAgentTemperatureList(List<Map<String, Object>> dataList,Map<String, Object> map) {
+        List<String> houseCode = new ArrayList<>();
+        String depotId = "";
+        String updatetime = "";
+        Integer idNum = 0;
+        List<Map<String, Object>> AllList = new ArrayList<Map<String, Object>>();
+        String houseIds = "";
+        for (int i = 0; i <= dataList.size(); i++) {
+            //如果是最后一次循环则直接查询数据，不往下走
+            if(i == dataList.size()){
+                map.put("depotId",depotId);
+                map.put("updatetime",updatetime);
+                map.put("houseCode",houseCode);
+                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
+                Map<String, Object> modelMap = new HashMap<String, Object>();
+                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
+                    for (Map<String, Object> testData:testList) {
+                        modelMap = testData;
+                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
+                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
+                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
+                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
+                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
+                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
+                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
+                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
+                        AllList.add(modelMap);
+                        if(AllList.size() == 100){
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+            houseIds += dataList.get(i).get("storehouseId") + ",";
+            if(idNum == 0){//判断算是否是一个库的仓房编号
+                depotId = dataList.get(i).get("agentOrgId").toString();
+                updatetime = dataList.get(i).get("updatetime").toString();
+                houseCode.add(dataList.get(i).get("storehouseCode").toString());
+                idNum++;
+            }else if(ParameterUtil.isequal(depotId,dataList.get(i).get("agentOrgId").toString())){//如果是一个库的则组成字符串
+                houseCode.add(dataList.get(i).get("storehouseCode").toString());
+            }else{//不是一个库的还原idNum值，以便下回循环，然后把这个库的100条温度数据查出来加入list集合，继续循环查下一个库
+                idNum = 0;
+                map.put("depotId",depotId);
+                map.put("updatetime",updatetime);
+                map.put("houseCode",houseCode);
+                List<Map<String, Object>> testList = businessAgentTemperatureMapper.getTestDataList(map);
+                Map<String, Object> modelMap = new HashMap<String, Object>();
+                if(ParameterUtil.isnotnull(testList) && testList.size() != 0){
+                    for (Map<String, Object> testData:testList) {
+                        modelMap = testData;
+                        modelMap.put("agentOrgId",dataList.get(i-1).get("agentOrgId"));
+                        modelMap.put("agentStoreOrgId",dataList.get(i-1).get("agentStoreOrgId"));
+                        modelMap.put("agentName",dataList.get(i-1).get("agentName"));
+                        modelMap.put("agentDepotName",dataList.get(i-1).get("agentDepotName"));
+                        modelMap.put("designCapacity",dataList.get(i-1).get("designCapacity"));
+                        modelMap.put("storehouseName",dataList.get(i-1).get("storehouseName"));
+                        modelMap.put("storehouseId",dataList.get(i-1).get("storehouseId"));
+                        modelMap.put("keeper",dataList.get(i-1).get("keeper"));
+                        AllList.add(modelMap);
+                        if(AllList.size() == 100){
+                            break;
+                        }
+                    }
+                }
+            }
+            if(AllList.size() == 100){
+                break;
+            }
+        }
+
+        String url = "http://localhost:9026/agile/kcsw/getDateByHouseIds";
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        dataMap.put("houseIds",houseIds.substring(0,houseIds.length()-1));
+        String strResult = HTTPUtils.doPost(url,dataMap);
+        JSONArray json = JSONArray.parseArray(strResult);
+        if(ParameterUtil.isnotnull(json) && json.size() != 0){
+            for (int i = 0; i < AllList.size(); i++) {
+                for (int j = 0; j < json.size(); j++) {
+                    JSONObject job = json.getJSONObject(j);
+                    if(ParameterUtil.isequal(AllList.get(i).get("storehouseId").toString(),job.get("ch").toString())){
+                        AllList.get(i).put("lspz",Integer.parseInt(job.get("pz").toString()));
+                    }
+                }
+            }
+        }
+        return AllList;
     }
 
     @Override
@@ -263,4 +353,8 @@ public class AgentTemperatureServiceImpl implements agentTemperatureService {
         return reMap;
     }
 
+    @Override
+    public List<Map<String, Object>> getDataByExample(Map<String, Object> map) {
+        return businessAgentTemperatureMapper.getDataByExample(map);
+    }
 }

src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -2,6 +2,8 @@ package com.chinaitop.utils;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +25,7 @@ public class ParameterUtil {
         System.out.println("获取当前时间"+temp_str);
         return temp_str;
     }
-    
+
     public static String getDateYMDHMS(Date date) {
     	String str = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -31,7 +33,7 @@ public class ParameterUtil {
         System.out.println("获取当前时间"+str);
         return str;
     }
-    
+
     public static String getSysDate(){
         String temp_str="";
         Date dt = new Date();
@@ -115,7 +117,7 @@ public class ParameterUtil {
     public static boolean isnotnull(Object name){
         return (null!=name&&!"".equals(name) && !"null".equals(name) && "null" != name);
     }
-    
+
     //判断字段值是为空,为空返回ture
     public static boolean isnull(Object name){
         return (null==name || "".equals(name) || "null".equals(name) || "null" == name);
@@ -277,4 +279,44 @@ public class ParameterUtil {
         // 返回
         return sbf.toString();
     }
+
+    public static <T> PageInfo<T> list2PageInfo(List<T> arrayList, Integer pageNum, Integer pageSize) {
+        //实现list分页
+        PageHelper.startPage(pageNum, pageSize);
+        int pageStart = pageNum == 1 ? 0 : (pageNum - 1) * pageSize;
+        int pageEnd = arrayList.size() < pageSize * pageNum ? arrayList.size() : pageSize * pageNum;
+        List<T> pageResult = new LinkedList<T>();
+        if (arrayList.size() > pageStart) {
+            pageResult = arrayList.subList(pageStart, pageEnd);
+        }
+        PageInfo<T> pageInfo = new PageInfo<T>(pageResult);
+        //获取PageInfo其他参数
+        pageInfo.setTotal(arrayList.size());
+        int endRow = pageInfo.getEndRow() == 0 ? 0 : (pageNum - 1) * pageSize + pageInfo.getEndRow() + 1;
+        pageInfo.setEndRow(endRow);
+        boolean hasNextPage = arrayList.size() <= pageSize * pageNum ? false : true;
+        pageInfo.setHasNextPage(hasNextPage);
+        boolean hasPreviousPage = pageNum == 1 ? false : true;
+        pageInfo.setHasPreviousPage(hasPreviousPage);
+        pageInfo.setIsFirstPage(!hasPreviousPage);
+        boolean isLastPage = (arrayList.size() > pageSize * (pageNum - 1) && arrayList.size() <= pageSize * pageNum) ? true : false;
+        pageInfo.setIsLastPage(isLastPage);
+        int pages = arrayList.size() % pageSize == 0 ? arrayList.size() / pageSize : (arrayList.size() / pageSize) + 1;
+        pageInfo.setNavigateLastPage(pages);
+        int[] navigatePageNums = new int[pages];
+        for (int i = 1; i < pages; i++) {
+            navigatePageNums[i - 1] = i;
+        }
+        pageInfo.setNavigatepageNums(navigatePageNums);
+        int nextPage = pageNum < pages ? pageNum + 1 : 0;
+        pageInfo.setNextPage(nextPage);
+        pageInfo.setPageNum(pageNum);
+        pageInfo.setPageSize(pageSize);
+        pageInfo.setPages(pages);
+        pageInfo.setPrePage(pageNum - 1);
+        pageInfo.setSize(pageInfo.getList().size());
+        int starRow = arrayList.size() < pageSize * pageNum ? 1 + pageSize * (pageNum - 1) : 0;
+        pageInfo.setStartRow(starRow);
+        return pageInfo;
+    }
 }