测温列表修改为当天数据,仓房排序

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/common/ResultEnum.java

@@ -0,0 +1,98 @@
+package com.chinaitop.depot.intelligent.common;
+
+
+/**
+ * 结果枚举
+ */
+public enum ResultEnum {
+    /**
+     * 操作成功！
+     */
+    CODE_1(200, "操作成功！"),
+    /**
+     * 操作失败！
+     */
+    CODE_2(600, "操作失败！"),
+    /**
+     * 调用xxx服务失败！
+     */
+    CODE_3(3, "调用xxx服务失败！"),
+    /**
+     * 验证码错误或已过期！
+     */
+    CODE_4(4, "验证码错误或已过期！"),
+    /**
+     * 用户名或者密码错误！
+     */
+    CODE_5(5, "用户名或者密码错误！"),
+    /**
+     * 账号已存在！
+     */
+    CODE_6(6, "账号已存在！"),
+    /**
+     * 该client_id不存在
+     */
+    CODE_7(7, "该client_id不存在！"),
+    /**
+     * 文件格式不正确！
+     */
+    CODE_10(10, "文件格式不正确！"),
+    /**
+     * 业务常量2开头 --------------
+     */
+    /**
+     * 测温类型(检测类型0测温，1粮油,2测水分)
+     */
+    CODE_20(20, "查询类型不能为空数据(包含测温,粮油,水分)等数据！"),
+    /**
+     * token无效！
+     */
+    CODE_401(401, "token无效！"),
+    /**
+     * 抱歉，您没有访问权限！
+     */
+    CODE_403(403, "抱歉，您没有访问权限！"),
+
+    CODE_500(500, "服务器出错了，请联系后台开发人员！"),
+    /**
+     * 请求超时，请稍后再试！
+     */
+    CODE_504(504, "请求超时，请稍后再试！"),
+
+    /**
+     * 服务器神游中！
+     */
+    CODE_666(666, "服务器神游中！");
+
+
+    /**
+     * 状态码
+     */
+    private Integer code;
+
+    /**
+     * 消息
+     */
+    private String msg;
+
+    ResultEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/TemperatureRecordController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.intelligent.grainsituation.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.intelligent.common.ResultEnum;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
 import com.chinaitop.depot.intelligent.grainsituation.model.TempMetadata;
@@ -67,25 +68,27 @@ public class TemperatureRecordController {
         PageInfo<TTestdata> pageInfo = new PageInfo<TTestdata>(list);
         return ResponseEntity.ok(pageInfo);
     }
-    // 要求修改为->温湿度检测只显示最新的一次检测数据
+
+    // 要求修改为->温湿度检测只显示当天数据,按仓房排序
     @RequestMapping(value = "/getListOfGroup", method = RequestMethod.GET)
     @ApiOperation(value = "查询 测温 信息列表", notes = "查询 测温 信息列表，支持分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "vDatatime", value = "采集时间", paramType = "query"),
-            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query"),
-            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query"),
             @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query"),
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
-    public ResponseEntity getListOfGroup(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
+    public ResponseEntity getListOfGroup(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String tType, String orgId) {
         List<TTestdata> list = null;
         try {
+            // 查询检测类型不能为空(检测类型0测温，1粮油,2测水分)
+            if(StringUtils.isBlank(tType))
+                return ResponseEntity.failed(ResultEnum.CODE_20.getMsg());
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = temperatureRecordService.getListOfGroup(vCfCode, vDatatime, startTime, endTime, tType, orgId);
+            list = temperatureRecordService.getListOfGroup(vCfCode, vDatatime, tType, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed(e.getMessage());
@@ -93,7 +96,8 @@ public class TemperatureRecordController {
         PageInfo<TTestdata> pageInfo = new PageInfo<TTestdata>(list);
         return ResponseEntity.ok(pageInfo);
     }
-    // 要求修改为->分页列表数据(测温记录列表,时间仓房排序)
+
+    // 要求修改为->分页列表数据(测温历史记录列表)
     @RequestMapping(value = "/getTemHistoryPageInfoList", method = RequestMethod.GET)
     @ApiOperation(value = "查询 测温 信息列表", notes = "查询 测温 信息列表，支持分页")
     @ApiImplicitParams({

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TTestdataMapper.java

@@ -65,7 +65,7 @@ public interface TTestdataMapper {
     String findByTempTable(@Param("id") String id);
 
     /**
-     * 要求修改为->温湿度检测只显示最新的一次检测数据
+     * 要求修改为->温湿度检测只显示当天数据,按仓房排序
      * @param sMap
      * @return
      */

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TTestdataMapper.xml

@@ -482,12 +482,10 @@
     FROM
     t_testdata
     <where>
+      iLq_yq = #{tType}
       <if test="orgId != null">
         and org_id = #{orgId}
       </if>
-      <if test="tType != null">
-        AND iLq_yq = #{tType}
-      </if>
       <if test="vCfCode != null">
         AND storehouse = #{vCfCode}
       </if>
@@ -495,8 +493,7 @@
         AND time BETWEEN #{startTime} AND #{endTime}
       </if>
     </where>
-    ORDER BY
-    time DESC
+    ORDER BY storehouse ASC
   </select>
   <select id="selectByMapHistory" resultMap="BaseResultMap" parameterType="java.util.Map">
     SELECT

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/TemperatureRecordService.java

@@ -34,7 +34,15 @@ public interface TemperatureRecordService {
      */
     Map<Integer,List<TempMetadata>> findByTempTable(String id);
 
-    List<TTestdata> getListOfGroup(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId);
+    /**
+     * 分页列表数据(温湿度检测只显示当天数据,按仓房排序)
+     * @param vCfCode
+     * @param vDatatime
+     * @param tType
+     * @param orgId
+     * @return
+     */
+    List<TTestdata> getListOfGroup(String vCfCode, String vDatatime, String tType, String orgId);
 
     List<TTestdata> getTemHistoryPageInfoList(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId);
 }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TemperatureRecordServiceImpl.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -52,17 +54,15 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
     }
 
     /**
-     * 要求修改为->温湿度检测只显示最新的一次检测数据
+     * 要求修改为->温湿度检测只显示当天数据,按仓房排序
      * @param vCfCode
      * @param vDatatime
-     * @param startTime
-     * @param endTime
      * @param tType
      * @param orgId
      * @return
      */
     @Override
-    public List<TTestdata> getListOfGroup(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
+    public List<TTestdata> getListOfGroup(String vCfCode, String vDatatime, String tType, String orgId) {
         Map<String, Object> sMap = new HashMap<>();
         if (StringUtils.isNotEmpty(vCfCode)) {
             sMap.put("vCfCode", vCfCode);
@@ -70,10 +70,10 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         if (StringUtils.isNotEmpty(vDatatime)) {
             sMap.put("startTime", DateUtils.stringToData(vDatatime + DateUtils.startTime));
             sMap.put("endTime", DateUtils.stringToData(vDatatime + DateUtils.endTime));
-        }
-        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
-            sMap.put("startTime", DateUtils.stringToData(startTime + DateUtils.startTime));
-            sMap.put("endTime", DateUtils.stringToData(endTime + DateUtils.endTime));
+        } else {
+            vDatatime = LocalDate.now().toString(); // 当天时间date
+            sMap.put("startTime", DateUtils.stringToData(vDatatime + DateUtils.startTime));
+            sMap.put("endTime", DateUtils.stringToData(vDatatime + DateUtils.endTime));
         }
         if (StringUtils.isNotEmpty(tType)) {
             sMap.put("tType", tType);
@@ -83,7 +83,8 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         }
         return tTestdataMapper.selectByMap(sMap);
     }
-    // 分页列表数据(测温记录列表,时间仓房排序)
+
+    // 分页列表数据(历史数据)
     @Override
     public List<TTestdata> getTemHistoryPageInfoList(String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
         Map<String, Object> sMap = new HashMap<>();

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetectionCtrl.js

@@ -6,7 +6,7 @@ angular.module('app.intelligent').controller("humitureDetectionCtrl", function (
     // 筛选条件
     $scope.search = {};
 
-    // 加载列表(温湿度检测只显示最新的一次检测数据)
+    // 加载列表(温湿度检测只显示当天数据,按仓房排序)
     $scope.loadData = function () {
         // 检测类型0测温，1粮油,2测水分
         temperatureRecordService.getTemperRecordPageInfoList($scope.pageInfo, $scope.search,'0').then(function (data) {

depot-web/src/main/resources/static/app/intelligent/grainDetection/service/temperatureRecordService.js

@@ -27,7 +27,7 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
         return d.promise;
     };
 
-    // 分页列表数据(温湿度检测只显示最新的一次检测数据)
+    // 分页列表数据(温湿度检测只显示当天数据,按仓房排序)
     this.getTemperRecordPageInfoList = function (pageInfo,search,tType) {
         var d = $q.defer();
         $http({
@@ -37,8 +37,6 @@ angular.module('app.intelligent').service("temperatureRecordService", function($
                 pageNum : pageInfo.pageNum,
                 pageSize : pageInfo.pageSize,
                 vDatatime : search == undefined ? "":search.time,
-                startTime : search == undefined ? "":search.startTime,
-                endTime : search == undefined ? "":search.endTime,
                 vCfCode : search == undefined ? "":search.vCfCode,
                 tType: tType,
                 orgId : $rootScope.orgInfo.orgId