功能调优

src/main/java/com/chinaitop/depot/DepotGrainAnalysisApplication.java

@@ -5,11 +5,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
+@EnableTransactionManagement
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotGrainAnalysisApplication {
 

src/main/java/com/chinaitop/depot/grainAnalysis/controller/MonthStorageGrainAnalysisController.java

@@ -8,11 +8,15 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import com.chinaitop.utils.ParameterUtil;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import com.chinaitop.depot.grainAnalysis.service.StorageGrainAnalysisService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
@@ -115,6 +119,24 @@ public class MonthStorageGrainAnalysisController {
 		return map;
 	}
 
+	@RequestMapping(value = "/monthEditTwo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "查询月粮情分析的三温数据", notes = "查询一条月粮情分析数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "threeTempJson", value = "数据集合", paramType = "query")
+    })
+    public Map<String, Object> monthEditTwo(String threeTempJson) {
+
+        Map<String, Object> threeTempMap = null;
+
+        try {
+			threeTempMap = analysisService.getMonthThreeTempDateNews(threeTempJson);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+        return threeTempMap;
+    }
+
 	/**
 	 * 查询三温检查数据
 	 *

src/main/java/com/chinaitop/depot/grainAnalysis/controller/StorageGrainAnalysisController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
@@ -107,6 +109,23 @@ public class StorageGrainAnalysisController {
 		return map;
 	}
 
+	@RequestMapping(value="/queryLqzkData", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一粮情专卡数据", notes = "")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="orgId", value="单位ID", paramType="query"),
+    	@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+    	@ApiImplicitParam(name="wareId", value="货位ID", paramType="query")
+    })
+	public Map<String, Object> queryLqzkData(Integer orgId, Integer houseId, Integer wareId) {
+		Map<String, Object> map = null;
+		try {
+			map = analysisService.queryLqzkData(orgId, houseId, wareId);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return map;
+	}
+
 	@RequestMapping(value="/getThreeTempDate", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
 	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
     @ApiImplicitParams({
@@ -132,6 +151,31 @@ public class StorageGrainAnalysisController {
 		return map;
 	}
 
+	@RequestMapping(value = "/editTwo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "查询周粮情分析", notes = "查询一条周粮情分析数据")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "map", value = "参数数据集合", paramType = "query"),
+        @ApiImplicitParam(name = "weekParams", value = "查询的数据类型(1:周粮情)", paramType = "query")
+    })
+    public Map<String, Object> editTwo(String map, Integer weekParams) {
+
+        JSONObject jsonMap = JSON.parseObject(map, JSONObject.class);
+
+        if (jsonMap.size() == 0) {
+            return null;
+        }
+
+        Map<String, Object> threeTempMap = null;
+
+        try {
+			threeTempMap = analysisService.getWeekThreeTempDate(jsonMap, weekParams);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+        return threeTempMap;
+    }
+
 	/**
 	 * 提交
 	 * 

src/main/java/com/chinaitop/depot/grainAnalysis/controller/YearStorageGrainAnalysisController.java

@@ -138,7 +138,7 @@ public class YearStorageGrainAnalysisController {
 
 		List<StorageExceptionAndOnfore> exceptionAndOnforeList = new ArrayList<>();
 		StorageExceptionAndOnfore exceptionAndOnfore = new StorageExceptionAndOnfore();
-		exceptionAndOnfore.setCheckDate(ParameterUtil.stringTodatetime(jsonMap.getString("checkDate")));
+		exceptionAndOnfore.setCheckDate(ParameterUtil.string2date(jsonMap.getString("checkDate")));
 		exceptionAndOnforeList.add(exceptionAndOnfore);
 
 		map.put("exceptionAndOnforeList", exceptionAndOnforeList);

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageGrainAnalysisMapper.java

@@ -37,4 +37,19 @@ public interface StorageGrainAnalysisMapper {
      * @return
      */
     Map<String, Object> selectStoreHouseObj(Map<String, Object> map);
+
+    /**
+     * 查询粮情专卡的数据
+     * 
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> queryLqzkData(Map<String, Object> map);
+
+    /**
+     * 获取智能仓房三温数据
+     * @param map
+     * @return
+     */
+    List<Map<String,Object>> getThreeTempData(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageGrainAnalysisMapper.xml

@@ -560,4 +560,53 @@
   <select id="selectStoreHouseObj" resultType="java.util.Map" parameterType="java.util.Map">
     SELECT * FROM basic_storehouse WHERE storehouse_id=#{house_id}
   </select>
+  <!-- 查询粮情专卡的数据 -->
+  <select id="queryLqzkData" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT house_type "houseType",sub_type "subType" ,recorder "recorder" FROM storage_foodbasicinfo 
+    WHERE 1=1 AND seal_status=1 AND history_status=0 
+    <if test="orgId != null">
+     and org_id=#{orgId}
+    </if>
+    <if test="houseId != null">
+     and house_id=#{houseId}
+    </if>
+    <if test="wareId != null">
+     and warehouse_id=#{wareId}
+    </if>
+    ORDER BY id DESC
+  </select>
+  <!-- 查询周粮情分析数据 -->
+  <select id="getThreeTempData" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+        id id,
+        org_id orgId,
+        storehouse houseId,
+        time checkDate,
+        inTemp inTemp,
+        outTemp outTemp,
+        inH inWater,
+        outH outWater,
+        max maxTemp,
+        min minTemp,
+        avg avgTemp,
+        avg lsTemp
+    FROM
+        t_testdata
+    <where>
+      iLq_yq = '0'
+      <if test="orgId != null">
+        AND org_id = #{orgId}
+      </if>
+      <if test="storehouse != null">
+        AND storehouse = #{storehouse}
+      </if>
+      <if test="startDate != null and endDate != null">
+        AND time BETWEEN #{startDate} AND #{endDate}
+      </if>
+    </where>
+      <if test="weekParams != null">
+         GROUP BY  DATE(checkDate)
+      </if>
+    ORDER BY time DESC
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/grainAnalysis/service/StorageGrainAnalysisService.java

@@ -3,8 +3,7 @@ package com.chinaitop.depot.grainAnalysis.service;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
 import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
 
@@ -91,4 +90,34 @@ public interface StorageGrainAnalysisService {
 	 */
 	Map<String, Object> getYearThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer orgId,
 			Map<String, Object> map);
+
+	/**
+	 * 查询一条粮情专卡数据
+	 * 
+	 * @param orgId
+	 * @param houseId
+	 * @param wareId
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String, Object> queryLqzkData(Integer orgId, Integer houseId, Integer wareId) throws Exception;
+
+	/**
+	 * 查询周粮情的三温数据
+	 * 
+	 * @param jsonMap
+	 * @param weekParams
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String, Object> getWeekThreeTempDate(JSONObject jsonMap, Integer weekParams) throws Exception;
+
+	/**
+	 * 查询月粮情的三温数据
+	 * 
+	 * @param threeTempJson
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String, Object> getMonthThreeTempDateNews(String threeTempJson) throws Exception;
 }

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/StorageGrainAnalysisServiceImpl.java

@@ -8,8 +8,12 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.grainAnalysis.mapper.StorageExceptionAndOnforeMapper;
 import com.chinaitop.depot.grainAnalysis.mapper.StorageGrainAnalysisMapper;
 import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore;
@@ -22,6 +26,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
+@SuppressWarnings("all")
 public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisService {
 
 	@Resource
@@ -263,4 +268,109 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
 		}
 	}
 
+	@SuppressWarnings("null")
+	@Override
+	@Transactional
+	public Map<String, Object> queryLqzkData(Integer orgId, Integer houseId, Integer wareId) throws Exception {
+		Map<String, Object> param_map = new HashMap<>();
+
+        if(null != houseId){
+        	param_map.put("houseId", houseId);
+        }
+        if(null != wareId){
+        	param_map.put("wareId", wareId);
+        }
+        if(null != orgId){
+        	param_map.put("wareId", wareId);
+        }
+
+        List<Map<String, Object>> basicInfo = analysisMapper.queryLqzkData(param_map);
+
+        Map<String, Object> rtn_map = null;
+        if (null != basicInfo && basicInfo.size() > 0) {
+        	Map<String, Object> obj = basicInfo.get(0);
+        	rtn_map = new HashMap<String, Object>();
+        	rtn_map.put("houseType", Integer.parseInt(obj.get("houseType")+""));
+        	rtn_map.put("subType", Integer.parseInt(obj.get("subType")+""));
+        	rtn_map.put("recorder", obj.get("recorder")+"");
+        }
+        return rtn_map;
+	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> getWeekThreeTempDate(JSONObject jsonMap, Integer weekParams) throws Exception {
+
+		Map<String, Object> threeTempMap = new HashMap<>();
+
+		/* 参数对象 */
+        Map<String, Object> parementMap = new HashMap<>();
+        if (StringUtils.isNotBlank(jsonMap.getString("houseId")))
+        	parementMap.put("storehouse", jsonMap.getString("houseId"));
+        if(StringUtils.isNotBlank(jsonMap.getString("startDate"))) {
+        	parementMap.put("startDate", ParameterUtil.string2date(jsonMap.getString("startDate") + " 00:00:00"));
+        }
+        if(StringUtils.isNotBlank(jsonMap.getString("endDate"))) {
+        	parementMap.put("endDate", ParameterUtil.string2date(jsonMap.getString("endDate") + " 23:59:59"));
+        }
+        if(null != weekParams){
+        	parementMap.put("weekParams",weekParams); //用于周粮情的判断，以区分智能仓房的三温检查
+        }
+        parementMap.put("orders", " time asc");
+        List<Map<String, Object>> list = analysisMapper.getThreeTempData(parementMap);
+        
+
+//        StorageThreetempcheckExample example = new StorageThreetempcheckExample();
+//        StorageThreetempcheckExample.Criteria criteria = example.createCriteria();
+//        criteria.andHouseIdEqualTo(Integer.parseInt(jsonMap.getString("houseId")));
+//        criteria.andCheckDateGreaterThanOrEqualTo(ParameterUtil.string2date(jsonMap.getString("startDate") + " 00:00:00"));
+//        criteria.andCheckDateLessThanOrEqualTo(ParameterUtil.string2date(jsonMap.getString("endDate") + " 23:59:59"));
+//        criteria.andOrgIdEqualTo(Integer.parseInt(jsonMap.getString("orgId")));
+//        example.setOrderByClause("check_date asc");
+//
+//        List<StorageThreetempcheck> threeTempList = threetempCheckService.selectByExample(example);
+
+        threeTempMap.put("threeTempCheckList", list);
+		return threeTempMap;
+	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> getMonthThreeTempDateNews(String threeTempJson) throws Exception {
+
+		if (threeTempJson.length() == 0) {
+            return null;
+        }
+
+        Map<String, Object> threeTempMap = new HashMap<String, Object>();
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+
+
+        List<JSONObject> array = JSON.parseArray(threeTempJson, JSONObject.class);
+        for (JSONObject obj : array) {
+
+            /* 参数对象 */
+            Map<String, Object> parementMap = new HashMap<>();
+            if (StringUtils.isNotBlank(obj.getString("houseId")))
+            	parementMap.put("storehouse", obj.getString("houseId"));
+            if(StringUtils.isNotBlank(obj.getString("startDate"))) {
+            	parementMap.put("startDate", ParameterUtil.string2date(obj.getString("startDate") + " 00:00:00"));
+            }
+            if(StringUtils.isNotBlank(obj.getString("endDate"))) {
+            	parementMap.put("endDate", ParameterUtil.string2date(obj.getString("endDate") + " 23:59:59"));
+            }
+            parementMap.put("orders", " time asc");
+            List<Map<String, Object>> threeTempList = analysisMapper.getThreeTempData(parementMap);
+            list.add(threeTempList.get(0));
+        }
+
+        if (null == list || list.size() == 0) {
+            list = new ArrayList<Map<String, Object>>();
+        }
+
+        threeTempMap.put("threeTempCheckList", list);
+
+		return threeTempMap;
+	}
+
 }