【feat】 青山 openApi

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/**/my/*","/**/pig/*");
+                excludePathPatterns("/**/my/*","/**/pig/*","/**/eartagData/api/eartagData/*","/**/eartagData/api/qingshan/*");
     }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagData2Controller.java

@@ -52,4 +52,22 @@ public class EartagData2Controller {
         map.put("userId",userId+"");
         return eartagDataService.getEartagDataByEarmark(map);
     }
+
+    @PostMapping("/api/eartagData/getTemp")
+    public Result getTemp(@RequestBody Map<String,String> map){
+
+        return eartagDataService.getTemp(map);
+    }
+
+    @PostMapping("/api/eartagData/getAct")
+    public Result getAct(@RequestBody Map<String,String> map){
+
+        return eartagDataService.getAct(map);
+    }
+
+    @PostMapping("/api/qingshan/countEartag")
+    public Result countEartag(@RequestBody Map<String,String> map){
+
+        return eartagDataService.countEartag(map);
+    }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/OpenApi.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.controller;
+
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/openApi")
+public class OpenApi {
+
+    @Autowired
+    private IEartagData2Service eartagDataService;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagData2Mapper.java

@@ -1,7 +1,10 @@
 package com.huimv.eartag2.manage2.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,4 +20,6 @@ import java.util.List;
 public interface EartagData2Mapper extends BaseMapper<EartagData2> {
     //
     List<EartagData2> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
+
+    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagEartagRegister2Mapper.java

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -22,4 +23,6 @@ public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegi
     List<EartagEartagRegister2> getLastBatchPig(@Param("deviceCode") String deviceCode, @Param("createDate") Date createDate);
 
     List<EartagEartagRegister2> getEartagByDeviceCode(@Param("deviceCode") String deviceCode);
+
+    List<QingShanData> qingShanData(@Param("farmCode") String farmCode);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/EartagData2Mapper.xml

@@ -26,7 +26,11 @@
     <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.manage2.pojo.EartagData2">
         SELECT * FROM eartag_data2 WHERE earmark=${earmark} ORDER BY add_time DESC LIMIT ${recordCount}
     </select>
+    <select id="getAct" resultType="com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto">
+          SELECT SUM(act1) `value` ,DATE_FORMAT(  ask_time, '%m-%d' ) `time` FROM `eartag_data2`
+     ${ew.customSqlSegment}
 
+    </select>
 
 
 </mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/EartagEartagRegister2Mapper.xml

@@ -53,4 +53,15 @@
         SELECT * FROM eartag_eartag_register2 WHERE last_device=${deviceCode}  ORDER BY register_time DESC
     </select>
 
+
+    <select id="qingShanData" resultType="com.huimv.eartag2.manage2.pojo.pojovo.QingShanData"
+            parameterType="java.lang.String">
+        SELECT DATE_FORMAT(add_time,'%m-%d %H') add_time , ROUND(AVG(env_temp1),2) env_temp , ROUND(AVG(ear_temp1),2) ear_temp
+         FROM `eartag_data2` WHERE farm_id=#{farmCode}
+           GROUP BY  DATE_FORMAT(add_time,'%m-%d %H')
+           ORDER BY add_time DESC LIMIT 12
+
+
+    </select>
+
 </mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/pojovo/EartagDataDto.java

@@ -0,0 +1,13 @@
+package com.huimv.eartag2.manage2.pojo.pojovo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+@Data
+public class EartagDataDto {
+
+    @JsonFormat(pattern = "MM-dd",timezone = "GMT+8")
+    private String time;
+    private String value;
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/pojovo/QingShanData.java

@@ -0,0 +1,11 @@
+package com.huimv.eartag2.manage2.pojo.pojovo;
+
+import lombok.Data;
+
+
+@Data
+public class QingShanData {
+    private String  addTime;
+    private String  envTemp;
+    private String  earTemp;
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartagData2Service.java

@@ -23,4 +23,10 @@ public interface IEartagData2Service extends IService<EartagData2> {
     Result getEnvByTime(Map<String, String> map);
 
     Result getEartagDataByEarmark(Map<String, String> map);
+
+    Result getTemp(Map<String, String> map);
+
+    Result getAct(Map<String, String> map);
+
+    Result countEartag(Map<String, String> map);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagData2ServiceImpl.java

@@ -1,17 +1,20 @@
 package com.huimv.eartag2.manage2.service.impl;
 
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.eartag2.common.utils.Const;
+import com.huimv.eartag2.common.mq.Const;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
 import com.huimv.eartag2.manage2.mapper.SysAccountMultilevelMapper;
-import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
+import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
+import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
 import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,9 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     private EartagData2Mapper eartagData2Mapper;
 
     @Resource
+    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
+
+    @Resource
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
     @Override
@@ -122,7 +128,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         List<EartagData2> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
 
         if (eartagData2List.size() == 0) {
-            return new Result(Const.ERR_EMPTY_CODE, Const.ERR_EMPTY_INFO, false);
+            return new Result(10009, "数据为空", false);
         } else {
             List<EartagData2> newList = new ArrayList();
             for (int a = eartagData2List.size() - 1; a >= 0; a--) {
@@ -131,4 +137,46 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             return new Result(ResultCode.SUCCESS, newList);
         }
     }
+
+    @Override
+    public Result getTemp(Map<String, String> map) {
+        String earmark = map.get("earmark");
+        return  new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData2>().eq("earmark",  earmark).ge("ask_time", DateUtil.beginOfDay(new Date()))));
+
+    }
+
+    @Override
+    public Result getAct(Map<String, String> map) {
+        Date date = new Date();
+        String earmark = map.get("earmark");
+        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        wrapper.eq("earmark",earmark);
+        wrapper.between("ask_time",DateUtil.beginOfDay(DateUtil.offsetDay(date,-7)),date);
+        wrapper.groupBy("`time`");
+        List<EartagDataDto> list =   eartagData2Mapper.getAct(wrapper);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result countEartag(Map<String, String> map) {
+        String farmCode = map.get("farmCode");
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmCode);
+        Long countAll = eartagEartagRegister2Mapper.selectCount(wrapper);
+        wrapper.eq("live_status", 1);
+        Long countOn = eartagEartagRegister2Mapper.selectCount(wrapper);
+
+
+        Map endMap = new HashMap();
+        endMap.put("countAll",countAll);
+        endMap.put("countOn",countOn);
+        endMap.put("offCount",countAll -countOn);
+        endMap.put("qingShanData",new ArrayList<>());
+        List<QingShanData> shanDataList = eartagEartagRegister2Mapper.qingShanData(farmCode);
+        if (ObjectUtil.isNotEmpty(shanDataList)){
+            endMap.put("qingShanData",shanDataList);
+        }
+
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
 }