增加代理人。代理集团。

yijia-admin/src/main/java/com/yijia/web/controller/system/SysAgentController.java

@@ -0,0 +1,143 @@
+package com.yijia.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.yijia.common.core.domain.entity.SysUser;
+import com.yijia.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.system.domain.SysAgent;
+import com.yijia.system.service.ISysAgentService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 代理机构Controller
+ *
+ * @author yijia
+ * @date 2021-07-01
+ */
+@RestController
+@RequestMapping("/system/agent")
+public class SysAgentController extends BaseController
+{
+    @Autowired
+    private ISysAgentService sysAgentService;
+    @Autowired
+    private ISysUserService sysUserService;
+    /**
+     * 查询代理机构列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SysAgent sysAgent)
+    {
+        startPage();
+        List<SysAgent> list = sysAgentService.selectSysAgentList(sysAgent);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出代理机构列表
+     */
+    @Log(title = "代理机构", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysAgent sysAgent)
+    {
+        List<SysAgent> list = sysAgentService.selectSysAgentList(sysAgent);
+        ExcelUtil<SysAgent> util = new ExcelUtil<SysAgent>(SysAgent.class);
+        return util.exportExcel(list, "agent");
+    }
+
+    /**
+     * 获取代理机构详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(sysAgentService.selectSysAgentById(id));
+    }
+
+    /**
+     * 新增代理机构
+     */
+    @Log(title = "代理机构", businessType = BusinessType.INSERT)
+    @PostMapping("/addSysAgent")
+    public AjaxResult addSysAgent(@RequestBody SysAgent sysAgent)
+    {
+        List<Integer> sysAgentlist =new ArrayList<>();
+        try {
+            if(sysAgent!=null && sysAgent.getFlag()!=null && sysAgent.getFlag().equals("1")){
+                if(sysAgent.getList()!=null &&sysAgent.getList().size()>0 && sysAgent.getUserId()!=null){
+                    SysUser user = sysUserService.selectUserById(sysAgent.getUserId());
+                    if(user.getAgentFlag()!=null &&user.getAgentFlag().equals("1")){
+                        for(String group : sysAgent.getList()){
+                            SysAgent agent = new SysAgent();
+                            agent.setGroupId(Long.valueOf(group));
+                            agent.setUserId(sysAgent.getUserId());
+                            sysAgentService.insertSysAgent(agent);
+                        }
+                    }
+                }
+            }else if(sysAgent!=null && sysAgent.getFlag()!=null && sysAgent.getFlag().equals("0")){
+                if(sysAgent.getList()!=null &&sysAgent.getList().size()>0 && sysAgent.getUserId()!=null){
+                    for(String group : sysAgent.getList()){
+                        SysAgent agent = new SysAgent();
+                        agent.setGroupId(Long.valueOf(group));
+                        agent.setUserId(sysAgent.getUserId());
+                        SysAgent sysAgent1 =  sysAgentService.selectSysAgent(agent);
+                        if (sysAgent1!=null) {
+                             sysAgentService.deleteSysAgentById(sysAgent1.getId().intValue());
+                        }
+                    }
+                }
+            }
+           sysAgentlist = sysAgentService.sysAgentlist(sysAgent);
+        }catch (Exception e){
+            System.out.println("------------------------------------"+e.getLocalizedMessage()+"");
+            e.printStackTrace();
+        }
+        return AjaxResult.success(sysAgentlist);
+    }
+
+    /**
+     * 查询代理已存在的
+     */
+    @GetMapping("/sysAgentlist")
+    public AjaxResult sysAgentlist(SysAgent sysAgent)
+    {
+        return  AjaxResult.success(sysAgentService.sysAgentlist(sysAgent));
+    }
+
+
+    /**
+     * 修改代理机构
+     */
+    @Log(title = "代理机构", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysAgent sysAgent)
+    {
+        return toAjax(sysAgentService.updateSysAgent(sysAgent));
+    }
+
+    /**
+     * 删除代理机构
+     */
+    @Log(title = "代理机构", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(sysAgentService.deleteSysAgentByIds(ids));
+    }
+}

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

@@ -6,6 +6,9 @@ import java.util.List;
 
 import com.yijia.common.core.domain.TreeSelect;
 import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.bean.BeanUtils;
+import com.yijia.station.domain.DeptInfoDemo;
+import com.yijia.station.domain.SysDeptDemo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -144,6 +147,64 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(list);
     }
     /**
+     * 查询所有的集团
+     *
+     */
+    @GetMapping("/groupList")
+    public AjaxResult groupList(SysDept dept)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        List<SysDept> depts =new ArrayList<>();
+        if(currentUser.getUser().getDept().getJiBie() !=null && currentUser.getUser().getDept().getJiBie()== 0 && currentUser.getUser().getAgentFlag().equals("1")){
+            SysDept sysDept =new SysDept();
+            sysDept.setUserId(currentUser.getUser().getUserId());
+            //查询代理人所有的集团
+            depts = deptService.selectGroupAgentList(sysDept);
+        }else {
+            SysDept sysDept =new SysDept();
+            sysDept.setParentId(currentUser.getUser().getDeptId());
+            depts = deptService.searchDeptList(sysDept);
+        }
+        return AjaxResult.success(depts);
+    }
+    /**
+     * 根据集团查询油站信息
+     *
+     */
+    @GetMapping("/searchDeptList")
+    public AjaxResult searchDeptList(SysDept dept)
+    {
+        List<SysDept> depts = new ArrayList<>();
+        if(dept!=null&& dept.getDeptId()!=null ){
+            SysDept sysDept =new SysDept();
+            sysDept.setParentId(dept.getDeptId());
+            depts = deptService.searchDeptList(sysDept);
+        }else{
+            logger.info("请输入集团信息");
+        }
+        return AjaxResult.success(depts);
+    }
+
+    /****
+     * 查询分配代理管理
+     */
+    @GetMapping("/selectSysAgentList")
+    public AjaxResult selectSysAgentList(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectSysAgentList(dept);
+        List<DeptInfoDemo> deptList=new ArrayList<>();
+        if(depts!=null && depts.size()>0){
+            for(SysDept sysDept :depts){
+                DeptInfoDemo deptDemo =new DeptInfoDemo();
+                deptDemo.setDeptId(sysDept.getDeptId());
+                deptDemo.setDeptName(sysDept.getDeptName());
+                deptList.add(deptDemo);
+            }
+        }
+        return AjaxResult.success(deptList);
+    }
+
+    /**
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")

yijia-admin/src/main/java/com/yijia/web/controller/system/SysUserController.java

@@ -2,8 +2,12 @@ package com.yijia.web.controller.system;
 
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.yijia.system.domain.SysAgent;
+import com.yijia.system.service.ISysAgentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,7 +38,7 @@ import com.yijia.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author yijia
  */
 @RestController
@@ -52,6 +56,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private ISysAgentService sysAgentService;
 
     /**
      * 获取用户列表
@@ -169,7 +175,15 @@ public class SysUserController extends BaseController
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
     {
-        return toAjax(userService.deleteUserByIds(userIds));
+       int  i = userService.deleteUserByIds(userIds);
+       if(userIds!=null &&userIds.length>0){
+           for(Long id :userIds){
+               SysAgent sysAgent =new SysAgent();
+               sysAgent.setUserId(id);
+               i= sysAgentService.deleteSysAgent(sysAgent);
+           }
+       }
+        return toAjax(i);
     }
 
     /**
@@ -198,4 +212,32 @@ public class SysUserController extends BaseController
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));
     }
+
+    /**
+     * 代理开启修改
+     */
+    @Log(title = "修改用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeAgentFlag")
+    @Transactional
+    public AjaxResult changeAgentFlag(@RequestBody SysUser user)
+    {
+        int i=0;
+        try {
+            user.setUpdateBy(SecurityUtils.getUsername());
+            if(user.getAgentFlag()!=null && user.getAgentFlag().equals("0")&& user.getUserId()!=null ){
+                i= userService.updateUserAgentFlag(user);
+                SysAgent sysAgent =new SysAgent();
+                sysAgent.setUserId(user.getUserId());
+                sysAgentService.deleteSysAgent(sysAgent);
+            }else if(user.getAgentFlag()!=null && user.getAgentFlag().equals("1")){
+                i= userService.updateUserAgentFlag(user);
+            }
+        }catch (Exception e){
+            System.out.println("代理开启权限"+e.getLocalizedMessage()+"");
+            e.printStackTrace();
+        }
+
+        return toAjax(i);
+    }
+
 }