浏览代码

增加熏蒸和卖猪2个分类查询

zhuoning 3 年之前
父节点
当前提交
9f195253b5

+ 10 - 1
huimv-farm-video/pom.xml

@@ -47,7 +47,16 @@
             <artifactId>commons-io</artifactId>
             <version>2.8.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>
             <artifactId>json-lib</artifactId>

+ 1 - 1
huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientAllEventController.java

@@ -131,7 +131,7 @@ public class ClientAllEventController {
      * @Date        : 2021/12/24       
      * @Time        : 13:34
      */
-    @RequestMapping(value = "/getEventBySort",method = RequestMethod.GET)
+    @RequestMapping(value = "/listEventBySort",method = RequestMethod.GET)
     public R getEventBySort(Integer farmId, Integer sort, String startDateText, String endDateText, Integer pageNum, Integer pageSize, HttpServletRequest request) throws ClientException {
         //牧场id
         if(farmId != 1){

+ 3 - 3
huimv-farm-video/src/main/java/com/huimv/video/dhicc/service/impl/ClientAllEventServiceImpl.java

@@ -109,15 +109,15 @@ public class ClientAllEventServiceImpl implements IClientAllEventService {
 
     //熏蒸事件
     private R getFumigateChannel(Map paramsMap) throws ClientException {
-        //绑定大门通道
-        String[] fumigateChannel = CommonConstant.FUMIGATE_CHANNEL;
+        //绑定熏蒸通道
+        String[] fumigateChannel = CommonConstant.XunZhengChannle;
         return R.ok("请求成功").put("data", getEventList(paramsMap, fumigateChannel)).put("total", CountTimes(paramsMap, fumigateChannel)).put("isVideo",true);
     }
 
     //卖猪事件
     private R getSellPigsChannel(Map paramsMap) throws ClientException {
         //卖猪通道
-        String[] sellPigsChannel = CommonConstant.SELL_PIGS_CHANNEL;
+        String[] sellPigsChannel = CommonConstant.MaiZhuChannle;
         return R.ok("请求成功").put("data", getEventList(paramsMap, sellPigsChannel)).put("total", CountTimes(paramsMap, sellPigsChannel)).put("isVideo",true);
     }