1. 组织架构

electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.system.domain.EtAreaDept;
+import com.ruoyi.system.mapper.EtAreaDeptMapper;
+import com.ruoyi.system.mapper.EtOperatingAreaMapper;
 import com.ruoyi.system.service.IEtOperatingAreaService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +29,8 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 
+import javax.annotation.Resource;
+
 /**
  * 运营商信息
  *
@@ -39,6 +46,12 @@ public class SysDeptController extends BaseController
     @Autowired
     private IEtOperatingAreaService etOperatingAreaService;
 
+    @Resource
+    private EtAreaDeptMapper etAreaDeptMapper;
+
+    @Resource
+    private EtOperatingAreaMapper etOperatingAreaMapper;
+
 
     /**
      * 获取运营商列表
@@ -89,6 +102,16 @@ public class SysDeptController extends BaseController
         {
             return error("新增运营商'" + dept.getDeptName() + "'失败，运营商名称已存在");
         }
+        Long[] areaIds = dept.getAreaIds();
+        if (ObjectUtil.isNotNull(areaIds))
+        {
+            for (Long areaId:areaIds) {
+                List<EtAreaDept> areaId1 = etAreaDeptMapper.selectList(new QueryWrapper<EtAreaDept>().eq("area_id", areaId));
+                if (ObjectUtil.isNotEmpty(areaId1)){
+                    return error("运营区'" + etOperatingAreaMapper.selectById(areaId1.get(0)).getAreaName() + "'已经被绑定");
+                }
+            }
+        }
         dept.setCreateBy(getUsername());
         return toAjax(deptService.insertDept(dept));
     }
@@ -115,6 +138,16 @@ public class SysDeptController extends BaseController
         {
             return error("该运营商包含未停用的子运营商！");
         }
+        Long[] areaIds = dept.getAreaIds();
+        if (ObjectUtil.isNotNull(areaIds))
+        {
+            for (Long areaId:areaIds) {
+                List<EtAreaDept> areaId1 = etAreaDeptMapper.selectList(new QueryWrapper<EtAreaDept>().eq("area_id", areaId));
+                if (ObjectUtil.isNotEmpty(areaId1)){
+                    return error("运营区'" + etOperatingAreaMapper.selectById(areaId1.get(0)).getAreaName() + "'已经被绑定");
+                }
+            }
+        }
         dept.setUpdateBy(getUsername());
         return toAjax(deptService.updateDept(dept));
     }

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java

@@ -1285,6 +1285,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
     public List<AsDevice> allVehicleByArea(Long areaId) {
         QueryWrapper<AsDevice> wrapper = new QueryWrapper<>();
         wrapper.eq("area_id",areaId);
+        wrapper.eq("status","1");
         List<AsDevice> asDevices = asDeviceMapper.selectList(wrapper);
         return asDevices;
     }

electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -1,21 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.EtAreaDept;
-import com.ruoyi.system.domain.EtAreaRule;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.*;
-import com.ruoyi.system.service.IEtOperatingAreaService;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.TreeSelect;
@@ -24,13 +8,25 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.domain.EtAreaDept;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDeptService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 部门管理 服务实现

electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.AsUser;
@@ -13,10 +14,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.system.domain.EtOperatingArea;
+import com.ruoyi.system.domain.*;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysUserPost;
-import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.*;
 import com.wechat.pay.java.service.profitsharing.model.AddReceiverResponse;
@@ -78,6 +76,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private IAsUserService asUserService;
 
+    @Resource
+    private EtAreaDeptMapper etAreaDeptMapper;
+
 
     /**
      * 根据条件分页查询用户列表
@@ -317,6 +318,8 @@ public class SysUserServiceImpl implements ISysUserService
         }else{
             throw new ServiceException("未查询到APP用户,请登录小程序");
         }
+        //根据运营区id查询运营商id， 运营商与运营区是一对多关系
+        setOperatorId(user);
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
@@ -326,6 +329,20 @@ public class SysUserServiceImpl implements ISysUserService
         return rows;
     }
 
+    /**
+     * 根据运营区id查询运营商id
+     * @param user
+     */
+    private void setOperatorId(SysUser user) {
+        Long areaId = user.getAreaId();
+        if(ObjectUtil.isNotNull(areaId)){
+            List<EtAreaDept> areaId1 = etAreaDeptMapper.selectList(new QueryWrapper<EtAreaDept>().eq("area_id", areaId));
+            if(ObjectUtil.isNotEmpty(areaId1)){
+                user.setDeptId(areaId1.get(0).getDeptId());
+            }
+        }
+    }
+
     private void setDividendItem(SysUser user) {
         List<String> ids = user.getDividendItemIds();
         if(ObjectUtils.isNotEmpty(ids)){
@@ -385,6 +402,8 @@ public class SysUserServiceImpl implements ISysUserService
         }else{
             throw new ServiceException("未查询到APP用户,请登录小程序");
         }
+        //根据运营区id查询运营商id， 运营商与运营区是一对多关系
+        setOperatorId(user);
         return userMapper.updateUser(user);
     }