Merge remote-tracking branch 'origin/dev' into dev

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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);
        }
@@ -161,7 +181,7 @@
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        if (updateMap.get("name").equals("")){
        if (updateMap.get("name")!=null&&updateMap.get("name").equals("")){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
@@ -181,31 +201,31 @@
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改了站点:"+oldMonitorPoint.getName()+";";
        for (Object key:updateMap.keySet()) {
            if (key.toString().equals("name")){
            if (key.toString().equals("name")&&updateMap.get(key)!=null){
                content = content+"站点名称:"+oldMonitorPoint.getName()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("longitude")){
            if (key.toString().equals("longitude")&&updateMap.get(key)!=null){
                content = content+"经度:"+oldMonitorPoint.getLongitude()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("latitude")){
            if (key.toString().equals("latitude")&&updateMap.get(key)!=null){
                content = content+"纬度:"+oldMonitorPoint.getLatitude()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("province_code")){
            if (key.toString().equals("province_code")&&updateMap.get(key)!=null){
                content = content+"省份编码:"+oldMonitorPoint.getProvinceCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("city_code")){
            if (key.toString().equals("city_code")&&updateMap.get(key)!=null){
                content = content+"地级市编码:"+oldMonitorPoint.getCityCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("area_code")){
            if (key.toString().equals("area_code")&&updateMap.get(key)!=null){
                content = content+"县/区/县级市:"+oldMonitorPoint.getAreaCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("address")){
            if (key.toString().equals("address")&&updateMap.get(key)!=null){
                content = content+"地址:"+oldMonitorPoint.getAddress()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("organization_id")){
            if (key.toString().equals("organization_id")&&updateMap.get(key)!=null){
                content = content+"组织id:"+oldMonitorPoint.getOrganizationId()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("desc")){
            if (key.toString().equals("desc")&&updateMap.get(key)!=null){
                content = content+"描述:"+oldMonitorPoint.getDesc()+"->"+updateMap.get(key)+";";
            }
        }
@@ -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);
        }
@@ -299,6 +347,17 @@
        return resultMap;
    }

    @Override
    public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer organizationId) {
        QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
        MonitorPoint monitorPoint = new MonitorPoint();
        monitorPoint.setOrganizationId(organizationId);
        monitorPoint.setIsDelete(Constants.NOT_DELETE);
        monitorPointQueryWrapper.setEntity(monitorPoint);
        List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(monitorPointQueryWrapper);
        return monitorPoints;
    }

    /**
     * @Description: 获取地区名
     * @Param: [areaArr, menu]menuMap：key为menuid，value为menu