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

@@ -19,10 +19,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import iot.device.LocationDataVO;
import jxl.demo.Write;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.io.Writer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -672,4 +675,15 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        return success( iotPatientDeviceService.getNameAndCode(idCard,snCode));
    }
    @GetMapping(value="/getEquipmentDetail")
    @ApiOperation("健康小屋详情")
    public Envelop getEquipmentDetail(@RequestParam(value = "deviceSn",required = true)
                             @ApiParam(name="deviceSn",value ="设备SN码",required = true)String deviceSn){
        return success(monitorPlatformService.getEquipmentDetail(deviceSn));
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/equipment/IotEquipmentDetailDao.java

@@ -14,4 +14,6 @@ public interface IotEquipmentDetailDao extends PagingAndSortingRepository<IotEqu
    @Query(value = "select * from iot_equipment_detail t",nativeQuery = true)
    List<IotEquipmentDetailDO> getAllEquipment();
    @Query("from IotEquipmentDetailDO i where i.deviceCode =?1 ")
     IotEquipmentDetailDO findByDeviceCode(String deviceCode);
}

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

@@ -11,6 +11,7 @@ import com.yihu.iot.service.equipment.IotEqtDetailService;
import com.yihu.iot.service.label.FigureLabelSerachService;
import com.yihu.iot.util.excel.HibenateUtils;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.http.HttpClientUtil;
import io.swagger.annotations.ApiOperation;
@@ -961,4 +962,20 @@ public class MonitorPlatformService  {
        return null;
    }
    /**
     * 返回健康小屋详情信息
     */
    public JSONObject getEquipmentDetail(String deviceSn){
        try {
            IotEquipmentDetailDO iotEquipmentDetailDO= iotEquipmentDetailDao.findByDeviceCode(deviceSn);
            JSONObject obj = (JSONObject)JSONObject.toJSON(iotEquipmentDetailDO);
            obj.put("deviceSn",iotEquipmentDetailDO.getDeviceCode());
            return obj;
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }
}