Merge branch 'dev' of huangxingmiao/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/device/DeviceManageEndpoint.java

@@ -3,18 +3,14 @@ package com.yihu.jw.base.endpoint.device;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.device.DeviceDao;
import com.yihu.jw.base.dao.device.DeviceDetailDao;
import com.yihu.jw.base.service.device.DeviceManageService;
import com.yihu.jw.base.service.device.DmDeviceService;
import com.yihu.jw.base.service.device.WlyyPatientDeviceService;
import com.yihu.jw.base.service.device.YsDeviceService;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.entity.care.device.DevicePatientDevice;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.iot.device.WlyyPatientDeviceVO;
@@ -27,37 +23,22 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jxl.Sheet;
import jxl.Workbook;
import jxl.write.Label;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import jxl.write.WriteException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.swing.*;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
/**
 * Created by Bing on 2021/9/22.
 */
@@ -393,4 +374,12 @@ public class DeviceManageEndpoint extends EnvelopRestEndpoint {
            return failedException2(e);
        }
    }
    @GetMapping("findDmDeviceDict")
    @ApiOperation("查询设备名称以及型号")
    public ObjEnvelop findDmDeviceDict(){
            return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDict()) ;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DeviceManageService.java

@@ -7,6 +7,7 @@ import com.yihu.jw.base.dao.device.DeviceDetailDao;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import jxl.Workbook;
import jxl.write.*;
@@ -32,6 +33,18 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
    @Autowired
    private DeviceDao deviceDao;
    public JSONObject findDmDeviceDict() {
        String deviceNameSql = "select deviceName from wlyy_devices";
        String deviceModelSql = "select deviceModel from wlyy_devices";
        List<Map<String, Object>> deviceName = jdbcTemplate.queryForList(deviceNameSql);
        List<Map<String, Object>> deviceModel = jdbcTemplate.queryForList(deviceModelSql);
        JSONObject result = new JSONObject();
        result.put("deviceName",deviceName);
        result.put("deviceModel",deviceModel);
        return result;
    }
    public JSONObject saveWlyyDevice(String json)throws Exception{
        JSONObject result = new JSONObject();
        DeviceDetail deviceDetail = objectMapper.readValue(json, DeviceDetail.class);

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DmDeviceService.java

@@ -25,6 +25,9 @@ public class DmDeviceService extends BaseJpaService<Device, DeviceDao> {
    @Autowired
    private ObjectMapper objectMapper;
    public static void findDmDeviceDict(String deviceName, String deviceModel) {
    }
    public JSONObject saveDmDevice(String json) throws IOException {
        JSONObject result = new JSONObject();
        Device device = objectMapper.readValue(json,Device.class);