From 3a9aa33cdf2cc5e6081df5b3c94ac8372ec12b0b Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Thu, 13 May 2021 11:29:15 +0800 Subject: [PATCH] 站点增删改查接口 --- screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java | 4 + screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 73 +++++++++++++++++++++++- screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 3 screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java | 3 + screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java | 12 ++-- screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 14 ++-- screen-manage/src/main/resources/mapper/MonitorPointMapper.xml | 41 +++++++++++++ 7 files changed, 133 insertions(+), 17 deletions(-) diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java index 4b02195..5c6b8d6 100644 --- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java +++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java @@ -50,7 +50,8 @@ ORGANIZATION_USER_NOT_EXIST(-36,"���������������������"), SENSOR_IS_NOT_EXIST(-37, "���������������"), UNIT_CONVERSION_EXIST(-38,"������������������������"), - MONITOR_POINT_IS_EXIST(-39,"���������������") + MONITOR_POINT_IS_EXIST(-39,"���������������"), + MONITOR_POINT_IS_NOT_EXIST(-40,"���������������") ; private final Integer code; private final String msg; diff --git a/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java index 9fbaa7f..30b5290 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/MonitorPointController.java @@ -42,10 +42,10 @@ //return null; } - @RequestMapping(value = "updateSensor", method = RequestMethod.POST) + @RequestMapping(value = "updateMonitorPoint", method = RequestMethod.POST) @ResponseBody - public ResultMessage updateSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) { - Map<String,Object> resultMap = sensorService.updateSensor(parameters); + public ResultMessage updateMonitorPoint(@RequestBody Map<String, Object> parameters,HttpServletRequest request) { + Map<String,Object> resultMap = monitorPointService.updateMonitorPoint(parameters); String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ @@ -65,13 +65,13 @@ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString()); } - @RequestMapping(value = "deleteSensor", method = RequestMethod.POST) + @RequestMapping(value = "deleteMonitorPoint", method = RequestMethod.POST) @ResponseBody - public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) { + public ResultMessage deleteMonitorPoint(@RequestBody Map<String, Object> parameters,HttpServletRequest request) { if (!parameters.containsKey("id")){ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } - Map<String,Object> resultMap = sensorService.deleteSensor(parameters); + Map<String,Object> resultMap = monitorPointService.deleteMonitorPoint(parameters); String msg = resultMap.get("msg").toString(); int code = Integer.parseInt(resultMap.get("code").toString()); if (code == 0){ diff --git a/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java index 2b8d27e..c8e05dc 100644 --- a/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java +++ b/screen-manage/src/main/java/com/moral/api/mapper/MonitorPointMapper.java @@ -3,6 +3,8 @@ import com.moral.api.entity.MonitorPoint; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Map; + /** * <p> * Mapper ������ @@ -13,4 +15,6 @@ */ public interface MonitorPointMapper extends BaseMapper<MonitorPoint> { + void updateMonitorPoint(Map map); + } diff --git a/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java index 3ebf0c0..25412d5 100644 --- a/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java +++ b/screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java @@ -25,4 +25,7 @@ @Transactional Map<String,Object> updateMonitorPoint(Map<String,Object> updateMap); + @Transactional + Map<String,Object> deleteMonitorPoint(Map map); + } diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java index eead367..1df34a2 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.entity.MonitorPoint; import com.moral.api.entity.Organization; @@ -128,6 +129,7 @@ } @Override + @Transactional public Map<String, Object> updateMonitorPoint(Map<String,Object> updateMap) { Map resultMap = new HashMap(); if(!updateMap.containsKey("id")){ @@ -145,7 +147,7 @@ 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().equals(updateMap.get("id"))){ + 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; @@ -154,7 +156,72 @@ QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>(); wapper_id.eq("id",updateMap.get("id")); wapper_id.eq("is_delete",Constants.NOT_DELETE); - monitorPointMapper.selectOne(wapper_id); - return null; + MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id); + if (oldMonitorPoint==null){ + resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode()); + resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg()); + return resultMap; + } + monitorPointMapper.updateMonitorPoint(updateMap); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String content = "���������������:"+oldMonitorPoint.getName()+";"; + for (Object key:updateMap.keySet()) { + if (key.toString().equals("name")){ + content = content+"������������:"+oldMonitorPoint.getName()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("longitude")){ + content = content+"������:"+oldMonitorPoint.getLongitude()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("latitude")){ + content = content+"������:"+oldMonitorPoint.getLatitude()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("province_code")){ + content = content+"������������:"+oldMonitorPoint.getProvinceCode()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("city_code")){ + content = content+"���������������:"+oldMonitorPoint.getCityCode()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("area_code")){ + content = content+"���/���/���������:"+oldMonitorPoint.getAreaCode()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("address")){ + content = content+"������:"+oldMonitorPoint.getAddress()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("organization_id")){ + content = content+"������id:"+oldMonitorPoint.getOrganizationId()+"->"+updateMap.get(key)+";"; + } + if (key.toString().equals("desc")){ + content = content+"������:"+oldMonitorPoint.getDesc()+"->"+updateMap.get(key)+";"; + } + } + logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE); + resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode()); + resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg()); + return resultMap; + } + + @Override + @Transactional + public Map<String, Object> deleteMonitorPoint(Map map) { + Map resultMap = new HashMap(); + QueryWrapper<MonitorPoint> wrapper = new QueryWrapper<>(); + wrapper.eq("id",map.get("id")); + wrapper.eq("is_delete","0"); + MonitorPoint monitorPoint = monitorPointMapper.selectOne(wrapper); + if(ObjectUtils.isEmpty(monitorPoint)){ + resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode()); + resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg()); + return resultMap; + } + MonitorPoint deleteMonitorPoint = new MonitorPoint(); + deleteMonitorPoint.setIsDelete("1"); + monitorPointMapper.update(deleteMonitorPoint,wrapper); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String content = "���������������:"+monitorPoint.getName()+";"; + logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE); + resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode()); + resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg()); + return resultMap; } } diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java index 1f72e2e..6dab246 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java @@ -154,17 +154,17 @@ 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>> sensotList = new ArrayList<>(); + List<Map<String,Object>> sensorList = new ArrayList<>(); for (Sensor sensor:sensors) { - Map manageRoleMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class); + Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class); String createTime = SDF.format(sensor.getCreateTime()); String updateTime = SDF.format(sensor.getUpdateTime()); - manageRoleMap.put("createTime",createTime); - manageRoleMap.put("updateTime",updateTime); - manageRoleMap.put("key",sensor.getId()); - sensotList.add(manageRoleMap); + sensorMap.put("createTime",createTime); + sensorMap.put("updateTime",updateTime); + sensorMap.put("key",sensor.getId()); + sensorList.add(sensorMap); } - resultMap.put("manageRoles",sensotList); + resultMap.put("manageRoles",sensorList); int totalNumber = sensors.size(); resultMap.put("totalNumber",totalNumber); resultMap.put("current",current); diff --git a/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml b/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml index 5e9c800..44233f3 100644 --- a/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml +++ b/screen-manage/src/main/resources/mapper/MonitorPointMapper.xml @@ -19,4 +19,45 @@ <result column="desc" property="desc" /> </resultMap> + <sql id="Base_Column_List"> + mp.id,mp.name,mp.longitude,mp.latitude,mp.province_code,mp.city_code,mp.area_code,mp.address,mp.organization_id,mp.create_time,mp.update_time,mp.is_delete,mp.desc + </sql> + + <update id="updateMonitorPoint" parameterType="java.util.Map"> + update monitor_point + <set> + <if test="name != null"> + name = #{name}, + </if> + <if test="longitude != null"> + longitude = #{longitude}, + </if> + <if test="latitude != null"> + latitude = #{latitude}, + </if> + <if test="province_code != null"> + province_code = #{province_code}, + </if> + <if test="city_code != null"> + city_code = #{city_code}, + </if> + <if test="area_code != null"> + area_code = #{area_code}, + </if> + <if test="address != null"> + address = #{address}, + </if> + <if test="organization_id != null"> + organization_id = #{organization_id}, + </if> + <if test="desc != null"> + `desc` = #{desc}, + </if> + <if test="isDelete != null"> + is_delete = #{isDelete}, + </if> + </set> + where id = #{id} + </update> + </mapper> \ No newline at end of file -- Gitblit v1.8.0