Merge branch 'dev' of depot-qinghai/depot-storage-qinghai into master

src/main/java/com/chinaitop/depot/common/HystrixClientFallback.java

@@ -37,4 +37,10 @@ public class HystrixClientFallback implements BasicFeignClient {
 		return null;
 	}
 
+	@Override
+	public void deleteFile(String deleteFileIds) {
+		// TODO Auto-generated method stub
+		logger.info("文件删除: " + deleteFileIds);
+	}
+
 }

src/main/java/com/chinaitop/depot/feign/BasicFeignClient.java

@@ -29,6 +29,9 @@ public interface BasicFeignClient {
     @RequestMapping(value = "/depot/basic/file/updateFile", method = RequestMethod.POST)
     void updateFile(@RequestParam(value = "fileIds") String fileIds,@RequestParam(value = "bid") Integer bid,
     		@RequestParam(value = "fileType") String fileType);
+    
+    @RequestMapping(value = "/depot/basic/file/deleteFile", method = RequestMethod.POST)
+    void deleteFile(@RequestParam(value = "deleteFileIds") String deleteFileIds);
 
     @RequestMapping(value = "/depot/basic/file/getList", method = RequestMethod.GET)
 	List<BusinessFile> getList(@RequestParam(value = "bid") Integer bid, @RequestParam(value = "fileType") String fileType,@RequestParam(value = "order") String order,@RequestParam(value = "orgId") Integer orgId);

src/main/java/com/chinaitop/depot/risk/service/impl/StorageSafeManageServiceImpl.java

@@ -76,6 +76,7 @@ public class StorageSafeManageServiceImpl implements StorageSafeManageService {
             storageSafeManageMapper.updateByPrimaryKeyWithBLOBs(storageSafeManage);
             //附件
             basicFeignClient.updateFile(fileIds, storageSafeManage.getId(),"safeManage");
+            basicFeignClient.deleteFile(deleteFileIds);
             
             this.gjjjk(storageSafeManage.getId()+"", storageSafeManage.getOrgId(), "u");
             

src/main/java/com/chinaitop/depot/storage/controller/StorageThreetempCheckController.java

@@ -46,12 +46,12 @@ public class StorageThreetempCheckController {
             @ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
             @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query")
     })
-    public PageInfo<Map<String, Object>> listPage(Integer pageNum, Integer pageSize, String houseId, String searchStartDate, String searchEndDate, Integer orgId) {
+    public PageInfo<Map<String, Object>> listPage(Integer pageNum, Integer pageSize, String houseCode, String searchStartDate, String searchEndDate, Integer orgId) {
         // 查询条件map
         Map<String, Object> map = new HashMap<>();
         // 仓房编码
-        if (ParameterUtil.isnotnull(houseId))
-            map.put("storehouse", houseId);
+        if (ParameterUtil.isnotnull(houseCode))
+            map.put("storehouse", houseCode);
         // 查询开始时间
         if (StringUtils.isNotBlank(searchStartDate))
             map.put("startDate", ParameterUtil.string2datetime(searchStartDate + " 00:00:00"));

src/main/java/com/chinaitop/depot/storage/mapper/StorageThreetempcheckMapper.xml

@@ -490,36 +490,37 @@
     SELECT
         id id,
         org_id orgId,
-        storehouse houseId,
-        t_time checkDate,
-        inTemp inTemp,
-        outTemp outTemp,
-        inH inWater,
-        outH outWater,
-        t_max maxTemp,
-        t_min minTemp,
-        t_avg avgTemp,
-        t_avg lsTemp
+        storehouse_code houseCode,
+        storehouse_name houseName,
+        gather_time checkDate,
+        in_temp inTemp,
+        out_temp outTemp,
+        in_h inWater,
+        out_temp outWater,
+        temp_max maxTemp,
+        temp_min minTemp,
+        temp_avg avgTemp,
+        temp_avg lsTemp
     FROM
-        t_testdata
+        t_lq_data 
     <where>
       iLq_yq = '0'
       <if test="storehouse != null">
-        AND storehouse = #{storehouse}
+        AND storehouse_code = #{storehouse}
       </if>
       <if test="orgId != null">
         AND org_id = #{orgId}
       </if>
       <if test="startDate != null and endDate != null">
-        AND t_time BETWEEN #{startDate} AND #{endDate}
+        AND gather_time BETWEEN #{startDate} AND #{endDate}
       </if>
       <if test="endDate != null">
-        AND t_time &lt;= #{endDate}
+        AND gather_time &lt;= #{endDate}
       </if>
     </where>
       <if test="weekParams != null">
          GROUP BY  DATE(checkDate)
       </if>
-    ORDER BY t_time DESC
+    ORDER BY id DESC
   </select>
 </mapper>