Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -1,5 +1,6 @@
package com.yihu.iot.controller.monitorPlatform;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.iot.service.monitorPlatform.MonitorPlatformService;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -52,12 +53,18 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
    @RequestMapping(value = "/smartDeviceDistribution",method = RequestMethod.GET)
    @ApiOperation("智能设备发放")
    public MixEnvelop smartDeviceDistribution(@ApiParam(name="type",value="设备类型")
                                              @RequestParam(value="type",required = false) String type,
                                              @ApiParam(name="name",value="产品名称")
                                              @RequestParam(value="name",required = false) String name){
    public MixEnvelop smartDeviceDistribution(@ApiParam(name="startTime",value="开始时间",defaultValue = "")
                                                  @RequestParam(value="startTime",required = false) String startTime,
                                              @ApiParam(name="endTime",value="结束时间",defaultValue = "")
                                                  @RequestParam(value="endTime",required = false) String endTime,
                                              @ApiParam(name="deviceType",value="设备类型",defaultValue = "")
                                                  @RequestParam(value="deviceType",required = false) String deviceType,
                                              @ApiParam(name="area",value="地区",defaultValue = "")
                                                  @RequestParam(value="area",required = false) String area,
                                              @ApiParam(name="hospital",value="机构",defaultValue = "")
                                                  @RequestParam(value="hospital",required = false) String hospital){
        try {
            return MixEnvelop.getSuccess("查询成功",monitorPlatformService.smartDeviceDistribution(type,name));
            return MixEnvelop.getSuccess("查询成功",monitorPlatformService.smartDeviceDistribution(startTime,endTime,deviceType,area,hospital));
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
@@ -159,8 +166,8 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
            if(pageSize==null){
                pageSize = 10;
            }
            return MixEnvelop.getSuccess("查询成功",monitorPlatformService.deviceUseData(page,pageSize,deviceSn));
            JSONObject jsonObject = monitorPlatformService.deviceUseData(page,pageSize,deviceSn);
            return MixEnvelop.getSuccess("查询成功",jsonObject.getJSONArray("list"),jsonObject.getInteger("total"));
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
@@ -197,7 +204,7 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
            if(pageSize==null){
                pageSize = 10;
            }
            return MixEnvelop.getSuccess("查询成功",monitorPlatformService.deviceOverhaulList(page,pageSize,deviceSn));
            return MixEnvelop.getSuccess("查询成功",monitorPlatformService.deviceOverhaulList(page,pageSize,deviceSn),monitorPlatformService.deviceOverhaulListTotal(deviceSn));
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -281,6 +281,16 @@ public class MonitorPlatformService  {
        return myJdbcTemplate.queryJson(sql.toString(),new Object[]{(page-1)*pageSize,pageSize});
    }
    public Integer deviceOverhaulListTotal(String deviceSn){
        String sql = "SELECT count(o.id) c from iot_patient_device d,iot_device_overhaul o" +
                " WHERE d.device_sn = '"+deviceSn+"' and d.id = o.patient_device_id ";
        List<JSONObject> list = myJdbcTemplate.queryJson(sql.toString(),new Object[]{});
        if(list.size()>0){
            return list.get(0).getInteger("c");
        }
        return 0;
    }
    /**
     * 入住情况
     * @return
@@ -404,11 +414,15 @@ public class MonitorPlatformService  {
    /**
     * 智能设备发放
     */
    public JSONArray smartDeviceDistribution(String type,String name){
    public JSONArray smartDeviceDistribution(String startTime,String endTime,
                                             String deviceType,String area,String hospital){
        String url = "/wlyygc/iot_monitoring/smartDeviceDistribution";
        Map<String, Object> params = new HashMap<>();
        params.put("type",type);
        params.put("name",name);
        params.put("startTime",startTime);
        params.put("endTime",endTime);
        params.put("deviceType",deviceType);
        params.put("area",area);
        params.put("hospital",hospital);
        String response = sendGet(url,params);
        JSONObject json = JSONObject.parseObject(response);
        if(json.getInteger("status")==200){
@@ -440,7 +454,7 @@ public class MonitorPlatformService  {
     * @param deviceSn
     * @return
     */
    public JSONArray deviceUseData(Integer page,Integer pageSize,String deviceSn){
    public JSONObject deviceUseData(Integer page,Integer pageSize,String deviceSn){
        String url = "/wlyygc/iot_monitoring/deviceUseData";
        Map<String, Object> params = new HashMap<>();
        params.put("page",page);
@@ -449,10 +463,10 @@ public class MonitorPlatformService  {
        String response = sendGet(url,params);
        JSONObject json = JSONObject.parseObject(response);
        if(json.getInteger("status")==200){
            return json.getJSONArray("data");
            return json.getJSONObject("data");
        }
        return new JSONArray();
        return new JSONObject();
    }
    /**
@@ -469,7 +483,25 @@ public class MonitorPlatformService  {
        String response = sendGet(url,params);
        JSONObject json = JSONObject.parseObject(response);
        if(json.getInteger("status")==200){
            return json.getJSONObject("data");
            JSONObject tmp = json.getJSONObject("data");
            //查询物联网获取设备信息
            String sql = "SELECT d.device_sn,b.supplier_name supplierName,b.origin_place originPlace,e.product_img productImg" +
                    ",e.description  from iot_device d,iot_product_base_info b,iot_product_extend_info e" +
                    " WHERE d.device_sn = '"+deviceSn+"' and d.product_id = b.id and d.product_id = e.product_id";
            List<JSONObject> list = myJdbcTemplate.queryJson(sql.toString(),new Object[]{});
            if(list!=null&&list.size()>0){
                JSONObject js = list.get(0);
                tmp.put("supplierName",js.getString("supplierName"));
                tmp.put("originPlace",js.getString("originPlace"));
                tmp.put("productImg",js.getString("productImg"));
                tmp.put("description",js.getString("description"));
            }else{
                tmp.put("supplierName","");
                tmp.put("originPlace","");
                tmp.put("productImg","");
                tmp.put("description","");
            }
            return tmp;
        }
        return new JSONObject();