app接口更新

xufenglei

2018-07-11 3bfdde73c91647e59687b49758a54df5a0d0962d

app接口更新

 src/main/java/com/moral/controller/MobileController.java

@@ -305,9 +305,9 @@
    @GetMapping("sensors")

    @ApiOperation(value = "获取设备传感器信息")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "deviceVersionId", value = "设备版本Id", required = true, paramType = "query", dataType = "Integer"),

            @ApiImplicitParam(name = "deviceVersionId", value = "设备版本Id", required = true, paramType = "query", dataType = "int"),

            @ApiImplicitParam(name = "mac", value = "设备mac", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, paramType = "query", dataType = "Integer"),

            @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, paramType = "query", dataType = "int"),

    })

    public ResultBean<List<Map<String, Object>>> getSensorsDataByDevice(HttpServletRequest request){

        Map<String, Object> parameters = getParametersStartingWith(request, null);

@@ -320,7 +320,7 @@
    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "mac", value = "设备mac", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "size", value = "获取数据条数", required = true, paramType = "query", dataType = "Integer"),

            @ApiImplicitParam(name = "size", value = "获取数据条数", required = true, paramType = "query", dataType = "int"),

    })

    public ResultBean<List<Map<String, Object>>> getSensorDataBySensorKey(HttpServletRequest request){

        Map<String, Object> parameters = getParametersStartingWith(request, null);


 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -22,6 +22,7 @@
import com.moral.common.exception.BusinessException;

import com.moral.common.util.Crypto;

import com.moral.common.util.ResourceUtil;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Account;

import com.moral.entity.Organization;

import com.moral.mapper.AccountMapper;

@@ -182,6 +183,8 @@


    @Override

    public Account companyLogin(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("account"), "param.is.null");

        ValidateUtil.notNull(parameters.get("password"), "param.is.null");

        Account account = new Account();

        account.setIsDelete(Constants.IS_DELETE_FALSE);

        account.setAccountName(parameters.get("account").toString());


 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -476,6 +476,7 @@


    @Override

    public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");

        return deviceMapper.getDevicesByOrganizationId(parameters);

    }




 src/main/java/com/moral/service/impl/HistoryServiceImpl.java

@@ -221,20 +221,32 @@
    

    @Override

    public List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("deviceVersionId"), "param.is.null");

        ValidateUtil.notNull(parameters.get("mac"), "param.is.null");

        ValidateUtil.notNull(parameters.get("deviceId"), "param.is.null");

        List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(parameters);

        parameters.put("size", 1);

        List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);

        JSONObject map = JSON.parseObject(values.get(0).get("value").toString());

        JSONObject map = null;

        if (!ObjectUtils.isEmpty(values)) {

            map = JSON.parseObject(values.get(0).get("value").toString());

        }

        Device device = deviceMapper.selectByPrimaryKey(Integer.valueOf((String) parameters.get("deviceId")));

        for (Map<String, Object> sensor : sensors) {

            sensor.put("value", map.remove(sensor.get("sensor_key")));

            if (!ObjectUtils.isEmpty(map)) {

                sensor.put("value", map.remove(sensor.get("sensor_key")));

            }

            sensor.put("state", device.getState());

            sensor.put("name", sensor.get("description"));

        }

        return sensors;

    }



    @Override

    public List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters) {

        ValidateUtil.notNull(parameters.get("sensorKey"), "param.is.null");

        ValidateUtil.notNull(parameters.get("mac"), "param.is.null");

        ValidateUtil.notNull(parameters.get("size"), "param.is.null");

        parameters.put("size", Integer.valueOf(parameters.remove("size").toString()));

        List<Map<String, Object>> values = historyMapper.getValueByMacAndSize(parameters);

        for (Map<String, Object> value : values) {