screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -79,4 +79,15 @@ } return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } @RequestMapping(value = "getMonitorPointByFuzzy", method = RequestMethod.GET) @ResponseBody public ResultMessage getMonitorPointByFuzzy(HttpServletRequest request) { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); Map<String,Object> resultMap = monitorPointService.getMonitorPointByFuzzy(parameters); if (!resultMap.containsKey("code")){ return ResultMessage.ok(resultMap); } return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } } screen-manage/src/main/java/com/moral/api/controller/SensorController.java
@@ -86,4 +86,15 @@ } return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } @RequestMapping(value = "getSensorByFuzzy", method = RequestMethod.GET) @ResponseBody public ResultMessage getSensorByFuzzy(HttpServletRequest request) { Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); Map<String,Object> resultMap = sensorService.getSensorByFuzzy(parameters); if (!resultMap.containsKey("code")){ return ResultMessage.ok(resultMap); } return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } } screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -28,4 +28,6 @@ @Transactional Map<String,Object> deleteMonitorPoint(Map map); Map<String,Object> getMonitorPointByFuzzy(Map map); } screen-manage/src/main/java/com/moral/api/service/SensorService.java
@@ -28,4 +28,6 @@ @Transactional Map<String,Object> deleteSensor(Map map); Map<String,Object> getSensorByFuzzy(Map map); } screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -97,6 +97,7 @@ Page<MonitorPoint> page = new Page(current,size); QueryWrapper<MonitorPoint> wrapper = new QueryWrapper(); wrapper.eq("is_delete",0); int totalNumber = monitorPointMapper.selectCount(wrapper); String orderType = map.get("orderType").toString(); if (orderType.equals(Constants.ORDER_ASC)){ wrapper.orderByAsc("create_time"); @@ -117,7 +118,6 @@ monitorPointtList.add(monitorPointMap); } resultMap.put("manageRoles",monitorPointtList); int totalNumber = monitorPoints.size(); resultMap.put("totalNumber",totalNumber); resultMap.put("current",current); int totalPageNumber = totalNumber/size; @@ -137,21 +137,19 @@ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } if (updateMap.containsKey("name")){ if (updateMap.get("name")==null||updateMap.get("name")==""){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>(); wapper_name.eq("name",updateMap.get("name")); wapper_name.eq("is_delete",Constants.NOT_DELETE); MonitorPoint monitorPoint_name = monitorPointMapper.selectOne(wapper_name); if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode()); resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg()); return resultMap; } if (updateMap.get("name")==null||updateMap.get("name")==""){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>(); wapper_name.eq("name",updateMap.get("name")); wapper_name.eq("is_delete",Constants.NOT_DELETE); MonitorPoint monitorPoint_name = monitorPointMapper.selectOne(wapper_name); if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode()); resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg()); return resultMap; } QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>(); wapper_id.eq("id",updateMap.get("id")); @@ -224,4 +222,58 @@ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg()); return resultMap; } @Override public Map<String, Object> getMonitorPointByFuzzy(Map map) { Map<String,Object> resultMap = new HashMap<>(); if (!map.containsKey("current")||!map.containsKey("size")||!map.containsKey("orderType")){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } int current = Integer.parseInt(map.get("current").toString()); int size = Integer.parseInt(map.get("size").toString()); Page<MonitorPoint> page = new Page(current,size); QueryWrapper<MonitorPoint> wrapper = new QueryWrapper(); wrapper.eq("is_delete",0); if (map.containsKey("organization_id")){ String organization_id = ""; organization_id = map.get("organization_id").toString(); wrapper.eq("organization_id",organization_id); } if (map.containsKey("name")){ String name = ""; name = map.get("name").toString(); wrapper.like("name",name); } int totalNumber = monitorPointMapper.selectCount(wrapper); String orderType = map.get("orderType").toString(); if (orderType.equals(Constants.ORDER_ASC)){ wrapper.orderByAsc("create_time"); }else { wrapper.orderByDesc("create_time"); } Page resultPage = monitorPointMapper.selectPage(page,wrapper); List<MonitorPoint> monitorPoints = resultPage.getRecords(); SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List<Map<String,Object>> monitorPointtList = new ArrayList<>(); for (MonitorPoint monitorPoint:monitorPoints) { Map monitorPointMap = JSON.parseObject(JSON.toJSONString(monitorPoint),Map.class); String createTime = SDF.format(monitorPoint.getCreateTime()); String updateTime = SDF.format(monitorPoint.getUpdateTime()); monitorPointMap.put("createTime",createTime); monitorPointMap.put("updateTime",updateTime); monitorPointMap.put("key",monitorPoint.getId()); monitorPointtList.add(monitorPointMap); } resultMap.put("manageRoles",monitorPointtList); resultMap.put("totalNumber",totalNumber); resultMap.put("current",current); int totalPageNumber = totalNumber/size; if(totalNumber%size != 0){ totalPageNumber += 1; } resultMap.put("totalPageNumber",totalPageNumber); return resultMap; } } screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -87,19 +87,15 @@ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } if (updateSensorMap.containsKey("name")){ if (updateSensorMap.get("name")==null||updateSensorMap.get("name")==""){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } if (updateSensorMap.get("name")==""){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } if (updateSensorMap.containsKey("code")){ if(ObjectUtils.isEmpty(updateSensorMap.get("code"))){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } if(updateSensorMap.get("code")==""){ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); return resultMap; } Sensor oldSensor = sensorMapper.getSensorById(Integer.parseInt(updateSensorMap.get("id").toString())); if (ObjectUtils.isEmpty(oldSensor)){ @@ -111,7 +107,6 @@ wrapper_code.eq("code",updateSensorMap.get("code")); wrapper_code.eq("is_delete","0"); List<Sensor> sensorList = sensorMapper.selectList(wrapper_code); System.out.println(sensorList.get(0)); if (sensorList.size()!=0&&!sensorList.get(0).getId().toString().equals(updateSensorMap.get("id").toString())){ resultMap.put("code",ResponseCodeEnum.SENSOR_KEY_IS_USED.getCode()); resultMap.put("msg",ResponseCodeEnum.SENSOR_KEY_IS_USED.getMsg()); @@ -145,6 +140,7 @@ Page<Sensor> page = new Page(current,size); QueryWrapper<Sensor> wrapper = new QueryWrapper(); wrapper.eq("is_delete",0); int totleNum = sensorMapper.selectCount(wrapper); String orderType = map.get("orderType").toString(); if (orderType.equals(Constants.ORDER_ASC)){ wrapper.orderByAsc("create_time"); @@ -165,11 +161,10 @@ sensorList.add(sensorMap); } resultMap.put("manageRoles",sensorList); int totalNumber = sensors.size(); resultMap.put("totalNumber",totalNumber); resultMap.put("totalNumber",totleNum); resultMap.put("current",current); int totalPageNumber = totalNumber/size; if(totalNumber%size != 0){ int totalPageNumber = totleNum/size; if(totleNum%size != 0){ totalPageNumber += 1; } resultMap.put("totalPageNumber",totalPageNumber); @@ -200,4 +195,44 @@ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg()); return resultMap; } @Override public Map<String, Object> getSensorByFuzzy(Map map) { Map<String,Object> resultMap = new HashMap<>(); int current = Integer.parseInt(map.get("current").toString()); int size = Integer.parseInt(map.get("size").toString()); Page<Sensor> page = new Page(current,size); QueryWrapper<Sensor> wrapper = new QueryWrapper(); wrapper.eq("is_delete",Constants.NOT_DELETE); wrapper.like("name",map.get("key")).or().like("code",map.get("key")); int totleNum = sensorMapper.selectCount(wrapper); String orderType = map.get("orderType").toString(); if (orderType.equals(Constants.ORDER_ASC)){ wrapper.orderByAsc("create_time"); }else { wrapper.orderByDesc("create_time"); } Page resultPage = sensorMapper.selectPage(page,wrapper); List<Sensor> sensors = resultPage.getRecords(); SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List<Map<String,Object>> sensorList = new ArrayList<>(); for (Sensor sensor:sensors) { Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class); String createTime = SDF.format(sensor.getCreateTime()); String updateTime = SDF.format(sensor.getUpdateTime()); sensorMap.put("createTime",createTime); sensorMap.put("updateTime",updateTime); sensorMap.put("key",sensor.getId()); sensorList.add(sensorMap); } resultMap.put("manageRoles",sensorList); resultMap.put("totalNumber",totleNum); resultMap.put("current",current); int totalPageNumber = totleNum/size; if(totleNum%size != 0){ totalPageNumber += 1; } resultMap.put("totalPageNumber",totalPageNumber); return resultMap; } }