订单 用户

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineWarrayEndpoint.java

@@ -42,8 +42,8 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
    public PageEnvelop getTemperature(
            @ApiParam(name = "idDevice", value = "设备id")
            @RequestParam(value = "idDevice", required = false) String idDevice,
            @ApiParam(name = "equClass", value = "设备分类")
            @RequestParam(value = "equClass", required = false) String equClass,
            @ApiParam(name = "equType", value = "设备分类")
            @RequestParam(value = "equType", required = false) String equType,
            @ApiParam(name = "networkStatus", value = "网络状态")
            @RequestParam(value = "networkStatus", required = false) String networkStatus,
            @ApiParam(name = "lowT", value = "温度下限", required = false, defaultValue = "")
@@ -60,7 +60,7 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getTemperature(idDevice, equClass,networkStatus, lowT, heightT, content,startTime, endTime,page,size,wechatId);
        JSONObject result = warraytService.getTemperature(idDevice, equType,networkStatus, lowT, heightT, content,startTime, endTime,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -45,7 +45,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
    private HibenateUtils hibenateUtils;
    public JSONObject getTemperature(
            String idDevice, String equClass, String netStatus, String lowT, String heightT,
            String idDevice, String equType, String netStatus, String lowT, String heightT,
                String content, String startTime, String endTime, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT\n" +
@@ -96,8 +96,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = '" + idDevice + "'";
        }
        if (!StringUtils.isEmpty(equClass)){
            conditionSql += " and t.equ_class = '" + equClass + "'";
        if (!StringUtils.isEmpty(equType)){
            conditionSql += " and t.equ_type = '" + equType + "'";
        }
        if (!StringUtils.isEmpty(netStatus)){
            conditionSql += " and t.network_status = '" + netStatus + "'";

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -983,6 +983,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    String id = (String) map.get("id");
                    if (map.get("id")!=null){
                        areaDOList = userAreaDao.findAllByUserId(id);
                        map.put("area",areaDOList);
                    }
                }
            }else {
@@ -1009,6 +1010,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                    String id = (String) map.get("id");
                    if (map.get("id")!=null){
                        areaDOList = userAreaDao.findAllByUserId(id);
                        map.put("area",areaDOList);
                    }
                }
            }
@@ -1021,6 +1023,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                String id = (String) map.get("id");
                if (map.get("id")!=null){
                    areaDOList = userAreaDao.findAllByUserId(id);
                    map.put("area",areaDOList);
                }
            }
        }
@@ -1052,13 +1055,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                .replace("{saasid}",  saasidValue )
                .replace("{roleId}",  roleIdValue );
        Logger.getAnonymousLogger().info("finalCountSql="+finalCountSql);
        Map<String,Object> areaMap =new HashMap<>();
        areaMap.put("area",areaDOList);
        JSONArray jsonArray = JavaBeanUtils.getInstance().mapListJson(list);
        jsonArray.add(areaMap);
        Integer count = jdbcTemplate.queryForObject(finalCountSql, Integer.class);
        result.put("count", count);
        result.put("msg", jsonArray);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }