体温统计数据返回参数修改

Administrator

2021-03-09 f8674819f382d22724333d69c2dc79f2b2fad636

体温统计数据返回参数修改

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java

@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -34,7 +35,10 @@
     * @return
     */
    @GetMapping("/getAnimalStatis")
    public R getAnimalStatis(AnimalHeatVo animalHeatVo){
    public R getAnimalStatis(AnimalHeatVo animalHeatVo,HttpServletResponse response){
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        return R.data(animalHeatService.getAnimalStatis(animalHeatVo));
    }

@@ -47,7 +51,10 @@
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    public R<IPage<BladeAnimalHeat>> page(AnimalHeatVo animalHeatVo, Query query) {
    public R<IPage<BladeAnimalHeat>> page(AnimalHeatVo animalHeatVo, Query query,HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        return R.data(animalHeatService.selectAnimalHeatPage(Condition.getPage(query), animalHeatVo));
    }

@@ -56,7 +63,10 @@
     * @return
     */
    @GetMapping("/selWeekDayAnimalStatis")
    public R selWeekDayAnimalStatis(){
    public R selWeekDayAnimalStatis(HttpServletResponse response){
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        return R.data(animalHeatService.selWeekDayAnimalStatis());
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml

@@ -4,19 +4,19 @@

    <!--查询当天体温数据统计-->
    <select id="getAnimalStatis" resultType="java.util.HashMap">
        SELECT 1 `status`,count(`status`) number FROM `blade_animal_heat` where
        SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
             TO_DAYS(create_time)=TO_DAYS(now())  and `status`=1
        UNION
        SELECT 0 `status`,count(`status`) number FROM `blade_animal_heat` where
        SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
            TO_DAYS(create_time)=TO_DAYS(now())  and `status`=0
    </select>

    <!--获取本周的体温统计数据-->
    <select id="getAnimalStatisWeek" resultType="java.util.HashMap">
        SELECT 1 `status`,count(`status`) number FROM `blade_animal_heat` where
        SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
            YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now()) and `status`=1
        UNION
        SELECT 0 `status`,count(`status`) number FROM `blade_animal_heat` where
        SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
            YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now()) and `status`=0
    </select>