南昌市物联网技防平台-后台
Administrator
2021-04-13 f89b68efc5ab927b2ec7bbb5b01f2f576e803329
新增健康码统计接口,供 report模块调用获取数据
3 files modified
2 files added
57 ■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java 8 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java 2 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java 10 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java 36 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/JfptApplication.java
@@ -23,6 +23,7 @@
import org.springblade.jfpt.webscoket.WebSocketServer;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
 * Desk启动器
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -4,24 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.mapper.AnimalHeatMapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.animalheat.vo.StatisVo;
import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import static org.springblade.core.tool.utils.DateUtil.now;
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -253,4 +253,6 @@
        List<HealthcodeExcel> list = ihealthcodeService.exportHealthcode(healthcodeVO);
        ExcelUtil.export(response, "健康码数据" + DateUtil.time(), "健康码数据表", list, HealthcodeExcel.class);
    }
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/entity/HealthcodeReturnData.java
New file
@@ -0,0 +1,10 @@
package org.springblade.jfpt.healthcode.entity;
import lombok.Data;
@Data
public class HealthcodeReturnData {
    private String type;
    private Integer num;
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java
New file
@@ -0,0 +1,36 @@
package org.springblade.jfpt.healthcode.feign;
import lombok.AllArgsConstructor;
import org.springblade.jfpt.healthcode.entity.HealthcodeReturnData;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@AllArgsConstructor
public class HealthcodeFeign {
    /**
     * 获取健康码数据集合
     * @param beanName 调用名称
     * @param dataName 返回数据名称
     * @param map map集合数据
     * @return
     */
    @GetMapping("getHealthcodeList")
    public List<HealthcodeReturnData> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
        List<HealthcodeReturnData> list = new ArrayList<>();
        HealthcodeReturnData healthcodeReturnData = new HealthcodeReturnData();
        healthcodeReturnData.setType("绿色健康码");
        healthcodeReturnData.setNum(900);
        list.add(healthcodeReturnData);
        //返回数据
        return list;
    }
}