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

lizijie

2021-06-04 e384609b41fe6434de81cfbb1663a501ad9fbc75

 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();
@@ -118,13 +118,33 @@
            monitorPointMap.put("createTime",createTime);
            monitorPointMap.put("updateTime",updateTime);
            monitorPointMap.put("key",monitorPoint.getId());
            monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
            monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
            monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
            Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
            if (!ObjectUtils.isEmpty(organization)) {
                String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                monitorPointMap.put("organizationId",organizationArr);
            if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
                monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("provinceCode",arr);
            }
            if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
                monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("cityCode",arr);
            }
            if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
                monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("areaCode",arr);
            }
            if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
                Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
                if (!ObjectUtils.isEmpty(organization)) {
                    String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                    monitorPointMap.put("organizationId",organizationArr);
                }
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("organizationId",arr);
            }
            monitorPointtList.add(monitorPointMap);
        }
@@ -266,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();
@@ -281,10 +301,38 @@
            monitorPointMap.put("createTime",createTime);
            monitorPointMap.put("updateTime",updateTime);
            monitorPointMap.put("key",monitorPoint.getId());
            Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
            if (monitorPointMap.get("provinceCode")!=null&&monitorPointMap.get("provinceCode")!=""){
                monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("provinceCode",arr);
            }
            if (monitorPointMap.get("cityCode")!=null&&monitorPointMap.get("cityCode")!=""){
                monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("cityCode",arr);
            }
            if (monitorPointMap.get("areaCode")!=null&&monitorPointMap.get("areaCode")!=""){
                monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("areaCode",arr);
            }
            /*Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
            if (!ObjectUtils.isEmpty(organization)) {
                String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                monitorPointMap.put("organizationId",organizationArr);
            }*/
            if (monitorPointMap.get("organizationId")!=null&&monitorPointMap.get("organizationId")!=""){
                Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
                if (!ObjectUtils.isEmpty(organization)) {
                    String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                    monitorPointMap.put("organizationId",organizationArr);
                }
            }else {
                String[] arr = {null,null};
                monitorPointMap.put("organizationId",arr);
            }
            monitorPointtList.add(monitorPointMap);
        }