站点判断数字型字段为空时，变为null；站点、因子查询更改为按照更新时间排序；菜单判断url，是否已存在

lizijie

2021-06-04 e384609b41fe6434de81cfbb1663a501ad9fbc75

站点判断数字型字段为空时，变为null；站点、因子查询更改为按照更新时间排序；菜单判断url，是否已存在

 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java

@@ -52,9 +52,9 @@
        String msg = resultMap.get("msg").toString();
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
            return ResultMessage.ok(code,msg);
        }
        return ResultMessage.fail(msg);
        return ResultMessage.fail(code,msg);
    }

    @ApiOperation(value = "更新菜单", notes = "更新菜单")
@@ -70,9 +70,9 @@
        String msg = resultMap.get("msg").toString();
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
            return ResultMessage.ok(code,msg);
        }
        return ResultMessage.fail(msg);
        return ResultMessage.fail(code,msg);
    }

    @ApiOperation(value = "删除菜单", notes = "删除菜单")
@@ -85,9 +85,9 @@
        String msg = resultMap.get("msg").toString();
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
            return ResultMessage.ok(code,msg);
        }
        return ResultMessage.fail(msg);
        return ResultMessage.fail(code,msg);
    }

    @ApiOperation(value = "查询所有菜单", notes = "查询所有菜单")

 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java

@@ -60,15 +60,23 @@
        if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
        } else {
            manageMenuMapper.insertOne(manageMenu);
            //操作插入日志
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "添加菜单:"+manageMenu.getName()+";";
            logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
            resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
            return resultMap;
        }
        QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
        wrapper_url.eq("url",manageMenu.getUrl());
        wrapper_url.eq("is_delete",Constants.NOT_DELETE);
        if (manageMenuMapper.selectCount(wrapper_url) != 0) {
            resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
            return resultMap;
        }
        manageMenuMapper.insertOne(manageMenu);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "添加菜单:"+manageMenu.getName()+";";
        logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
    }

@@ -84,42 +92,56 @@
        if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
        } else {
            if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
                resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
                resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
                return resultMap;
            return resultMap;
        }
        if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
            return resultMap;
        }
        QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
        wrapper_url.eq("url",map.get("url"));
        wrapper_url.eq("is_delete",Constants.NOT_DELETE);
        if (manageMenuMapper.selectCount(wrapper_url) != 0) {
            resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
            return resultMap;
        }
        //更新之前获取原来的菜单信息
        ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
        manageMenuMapper.updateManageMenuById(map);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改了菜单:"+manageMenuOld.getName()+";";
        for (Object key:map.keySet()) {
            if (key.toString().equals("name")&&map.get(key)!=null){
                content = content+"菜单名:"+manageMenuOld.getName()+"->"+map.get(key)+";";
            }
            //更新之前获取原来的菜单信息
            ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
            manageMenuMapper.updateManageMenuById(map);
            //操作插入日志
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了菜单:"+manageMenuOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"菜单名:"+manageMenuOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("url")&&map.get(key)!=null){
                    content = content+"url地址:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("icon")&&map.get(key)!=null){
                    content = content+"图标地址:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("parent_id")&&map.get(key)!=null){
            if (key.toString().equals("url")&&map.get(key)!=null){
                content = content+"url地址:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("icon")&&map.get(key)!=null){
                content = content+"图标地址:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("parent_id")&&map.get(key)!=null){
                if (map.get(key).toString().equals("0")){
                    content = content+"父菜单:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->0"+";";
                }else if (manageMenuOld.getId().toString().equals("0")){
                    content = content+"父菜单:"+"0->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                }else {
                    content = content+"父菜单:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                }
                if (key.toString().equals("order")&&map.get(key)!=null){
                    content = content+"同一级别菜单顺序:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
                }
            }
            logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
            resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
            if (key.toString().equals("order")&&map.get(key)!=null){
                content = content+"同一级别菜单顺序:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("desc")&&map.get(key)!=null){
                content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
            }
        }
        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
    }


 screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java

@@ -103,9 +103,9 @@
        int totalNumber = monitorPointMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
            wrapper.orderByAsc("create_time");
            wrapper.orderByAsc("update_time");
        }else {
            wrapper.orderByDesc("create_time");
            wrapper.orderByDesc("update_time");
        }
        Page resultPage = monitorPointMapper.selectPage(page,wrapper);
        List<MonitorPoint> monitorPoints = resultPage.getRecords();
@@ -286,9 +286,9 @@
        int totalNumber = monitorPointMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
            wrapper.orderByAsc("create_time");
            wrapper.orderByAsc("update_time");
        }else {
            wrapper.orderByDesc("create_time");
            wrapper.orderByDesc("update_time");
        }
        Page resultPage = monitorPointMapper.selectPage(page,wrapper);
        List<MonitorPoint> monitorPoints = resultPage.getRecords();

 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java

@@ -179,9 +179,9 @@
        if (!ObjectUtils.isEmpty(map.get("orderType"))){
            String orderType = map.get("orderType").toString();
            if (orderType.equals(Constants.ORDER_DESC)){
                wrapper.orderByDesc("create_time");
                wrapper.orderByDesc("update_time");
            }else {
                wrapper.orderByAsc("create_time");
                wrapper.orderByAsc("update_time");
            }
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
@@ -264,9 +264,9 @@
        int totleNum = sensorMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
            wrapper.orderByAsc("create_time");
            wrapper.orderByAsc("update_time");
        }else {
            wrapper.orderByDesc("create_time");
            wrapper.orderByDesc("update_time");
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
        List<Sensor> sensors = resultPage.getRecords();

 screen-manage/src/main/resources/mapper/MonitorPointMapper.xml

@@ -30,25 +30,55 @@
                name = #{name},
            </if>
            <if test="longitude != null">
                longitude = #{longitude},
                <if test="longitude == ''">
                    longitude = null,
                </if>
                <if test="longitude != ''">
                    longitude = #{longitude},
                </if>
            </if>
            <if test="latitude != null">
                latitude = #{latitude},
                <if test="latitude == ''">
                    latitude = null,
                </if>
                <if test="latitude != ''">
                    latitude = #{latitude},
                </if>
            </if>
            <if test="province_code != null">
                province_code = #{province_code},
                <if test="province_code == ''">
                    province_code = null,
                </if>
                <if test="province_code != ''">
                    province_code = #{province_code},
                </if>
            </if>
            <if test="city_code != null">
                city_code = #{city_code},
                <if test="city_code == ''">
                    city_code = null,
                </if>
                <if test="city_code != ''">
                    city_code = #{city_code},
                </if>
            </if>
            <if test="area_code != null">
                area_code = #{area_code},
                <if test="area_code == ''">
                    area_code = null,
                </if>
                <if test="area_code != ''">
                    area_code = #{area_code},
                </if>
            </if>
            <if test="address != null">
                address = #{address},
            </if>
            <if test="organization_id != null">
                organization_id = #{organization_id},
                <if test="organization_id == ''">
                    organization_id = null,
                </if>
                <if test="organization_id != ''">
                    organization_id = #{organization_id},
                </if>
            </if>
            <if test="desc != null">
                `desc` = #{desc},