From bc05a89ae694ec9934524f945cac9c915f67c017 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 28 Dec 2023 11:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=BA=BF=E4=B8=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiXgfDepartmentController.java | 30 + .../controller/api/ApiXgfUserController.java | 56 ++ .../zcloud/controller/api/dto/XgfUserDto.java | 4 + .../corpsystem/CorpMenuController.java | 231 ++++++ .../corpsystem/CorpRoleController.java | 447 +++++++++++ .../corpsystem/CorpUsersController.java | 725 ++++++++++++++++++ .../controller/xgf/TrainUsersController.java | 230 ++++++ .../xgf/TrainingBatchController.java | 203 +++++ .../controller/xgf/XgfUserController.java | 98 +++ .../datasource/corpsystem/CorpMenuMapper.java | 62 ++ .../datasource/corpsystem/CorpRoleMapper.java | 110 +++ .../corpsystem/CorpUsersMapper.java | 130 ++++ .../datasource/system/CorpPathMapper.java | 13 + .../datasource/xgf/FlowDetailMapper.java | 16 + .../mapper/datasource/xgf/FlowMapper.java | 16 + .../datasource/xgf/TrainUsersMapper.java | 129 ++++ .../datasource/xgf/TrainingBatchMapper.java | 82 ++ .../datasource/xgf/XgfUserDetailsMapper.java | 58 ++ .../mapper/datasource/xgf/XgfUserMapper.java | 73 ++ .../service/system/CorpPathService.java | 25 + .../system/corpsystem/CorpMenuService.java | 75 ++ .../system/corpsystem/CorpRoleService.java | 94 +++ .../system/corpsystem/CorpUsersService.java | 133 ++++ .../corpsystem/impl/CorpMenuServiceImpl.java | 126 +++ .../corpsystem/impl/CorpRoleServiceImpl.java | 136 ++++ .../corpsystem/impl/CorpUsersServiceImpl.java | 177 +++++ .../system/impl/CorpPathServiceImpl.java | 60 ++ .../zcloud/service/xgf/TrainUsersService.java | 100 +++ .../service/xgf/TrainingBatchService.java | 95 +++ .../zcloud/service/xgf/XgfUserService.java | 27 + .../xgf/impl/TrainUsersServiceImpl.java | 207 +++++ .../xgf/impl/TrainingBatchServiceImpl.java | 416 ++++++++++ .../service/xgf/impl/XgfUserServiceImpl.java | 199 +++++ .../datasource/corpsystem/CorpMenuMapper.xml | 146 ++++ .../datasource/corpsystem/CorpRoleMapper.xml | 199 +++++ .../datasource/corpsystem/CorpUsersMapper.xml | 549 +++++++++++++ .../datasource/system/CorpPathMapper.xml | 54 ++ .../datasource/xgf/FlowDetailMapper.xml | 132 ++++ .../mybatis/datasource/xgf/FlowMapper.xml | 91 +++ .../datasource/xgf/TrainUsersMapper.xml | 493 ++++++++++++ .../datasource/xgf/TrainingBatchMapper.xml | 388 ++++++++++ .../datasource/xgf/XgfUserDetailsMapper.xml | 337 ++++++++ .../mybatis/datasource/xgf/XgfUserMapper.xml | 312 ++++++++ 更新.md | 1 + 44 files changed, 7285 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/api/ApiXgfDepartmentController.java create mode 100644 src/main/java/com/zcloud/controller/api/ApiXgfUserController.java create mode 100644 src/main/java/com/zcloud/controller/api/dto/XgfUserDto.java create mode 100644 src/main/java/com/zcloud/controller/corpsystem/CorpMenuController.java create mode 100644 src/main/java/com/zcloud/controller/corpsystem/CorpRoleController.java create mode 100644 src/main/java/com/zcloud/controller/corpsystem/CorpUsersController.java create mode 100644 src/main/java/com/zcloud/controller/xgf/TrainUsersController.java create mode 100644 src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java create mode 100644 src/main/java/com/zcloud/controller/xgf/XgfUserController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpMenuMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpRoleMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpUsersMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/TrainUsersMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserDetailsMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java create mode 100644 src/main/java/com/zcloud/service/system/CorpPathService.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/CorpMenuService.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/CorpRoleService.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/CorpUsersService.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/impl/CorpMenuServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/impl/CorpRoleServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/system/corpsystem/impl/CorpUsersServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/xgf/TrainUsersService.java create mode 100644 src/main/java/com/zcloud/service/xgf/TrainingBatchService.java create mode 100644 src/main/java/com/zcloud/service/xgf/XgfUserService.java create mode 100644 src/main/java/com/zcloud/service/xgf/impl/TrainUsersServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml create mode 100644 src/main/resources/mybatis/datasource/corpsystem/CorpRoleMapper.xml create mode 100644 src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml create mode 100644 src/main/resources/mybatis/datasource/system/CorpPathMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/FlowMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml create mode 100644 src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml create mode 100644 更新.md diff --git a/src/main/java/com/zcloud/controller/api/ApiXgfDepartmentController.java b/src/main/java/com/zcloud/controller/api/ApiXgfDepartmentController.java new file mode 100644 index 00000000..7778e34d --- /dev/null +++ b/src/main/java/com/zcloud/controller/api/ApiXgfDepartmentController.java @@ -0,0 +1,30 @@ +package com.zcloud.controller.api; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CorpInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/openApi/preventCorp") +public class ApiXgfDepartmentController extends BaseController { + + @Resource + private CorpInfoService corpInfoService; + + /** + * 获取所有公司 + */ + @RequestMapping(value = "/getAllPreventionCorp") + @ResponseBody + private PageData getAllPreventionCorp() throws Exception { + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", corpInfoService.listAll(new PageData())); + return response; + } +} diff --git a/src/main/java/com/zcloud/controller/api/ApiXgfUserController.java b/src/main/java/com/zcloud/controller/api/ApiXgfUserController.java new file mode 100644 index 00000000..539d0b03 --- /dev/null +++ b/src/main/java/com/zcloud/controller/api/ApiXgfUserController.java @@ -0,0 +1,56 @@ +package com.zcloud.controller.api; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.service.xgf.XgfUserService; +import com.zcloud.util.Warden; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/openApi/xfgUser") +public class ApiXgfUserController extends BaseController { + + @Resource + private XgfUserService xgfUserService; + + @RequestMapping(value = "/synchronizationUserInfo") + @ResponseBody + public Object synchronizationUserInfo() throws Exception { + try { + PageData request = this.getPageData(); + xgfUserService.init(request); + Map response = new HashMap(); + response.put("result", "success"); + return response; + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException("系统异常"); + } + } + + @RequestMapping(value = "/approvalApplication") + @ResponseBody + public Object approvalApplication() throws Exception { + Map response = new HashMap(); + try { + PageData request = this.getPageData(); + xgfUserService.approvalApplication(request); + response.put("result", "success"); + response.put("code","0"); + return response; + } catch (Exception e) { + e.printStackTrace(); + response.put("result", "error"); + response.put("code","9999"); + response.put("msg", e.getMessage()); + return response; + } + } +} diff --git a/src/main/java/com/zcloud/controller/api/dto/XgfUserDto.java b/src/main/java/com/zcloud/controller/api/dto/XgfUserDto.java new file mode 100644 index 00000000..60948602 --- /dev/null +++ b/src/main/java/com/zcloud/controller/api/dto/XgfUserDto.java @@ -0,0 +1,4 @@ +package com.zcloud.controller.api.dto; + +public class XgfUserDto { +} diff --git a/src/main/java/com/zcloud/controller/corpsystem/CorpMenuController.java b/src/main/java/com/zcloud/controller/corpsystem/CorpMenuController.java new file mode 100644 index 00000000..093831c0 --- /dev/null +++ b/src/main/java/com/zcloud/controller/corpsystem/CorpMenuController.java @@ -0,0 +1,231 @@ +package com.zcloud.controller.corpsystem; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Menu; +import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.corpsystem.CorpMenuService; +import com.zcloud.util.Const; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.RightsHelper; +import com.zcloud.util.Tools; +import net.sf.json.JSONArray; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：菜单管理处理类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Controller +@RequestMapping("/corpMenu") +public class CorpMenuController extends BaseController { + + @Autowired + private CorpMenuService corpMenuService; + @Autowired + private FHlogService FHLOG; + + /** + * 菜单列表ztree(菜单管理) + * @return + */ + @RequestMapping(value="/listAllMenu") + @ResponseBody + public Object listAllMenu()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + JSONArray arr = JSONArray.fromObject(corpMenuService.listAllMenu("0")); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("MENU_NAME", "name").replaceAll("subMenu", "nodes").replaceAll("hasMenu", "checked").replaceAll("MENU_URL", "url"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } + + /** + * 菜单列表 + * @return + */ + @RequestMapping(value="/list") + @ResponseBody + public Object list(String MENU_ID)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + MENU_ID = Tools.isEmpty(MENU_ID)?"0":MENU_ID; + List menuList = corpMenuService.listSubMenuByParentId(MENU_ID); + map.put("pd", corpMenuService.getMenuById(pd)); //传入父菜单所有信息 + map.put("MSG", null == pd.get("MSG")?"'list'":pd.get("MSG").toString()); //MSG=change 则为编辑或删除后跳转过来的 + map.put("menuList", menuList); + map.put("result", errInfo); + return map; + } + + /** + * 请求新增菜单页面 + * @return + */ + @RequestMapping(value="/toAdd") + @ResponseBody + public Object toAdd()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String MENU_ID = (null == pd.get("MENU_ID") || "".equals(pd.get("MENU_ID").toString()))?"0":pd.get("MENU_ID").toString();//接收传过来的上级菜单ID,如果上级为顶级就取值“0” + pd.put("MENU_ID",MENU_ID); + map.put("pds", corpMenuService.getMenuById(pd)); //传入父菜单所有信息 + map.put("result", errInfo); + return map; + } + + /** + * 新增菜单 + * @param menu + * @return + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add(Menu menu)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + menu.setMENU_ID(String.valueOf(Integer.parseInt(corpMenuService.findMaxId(pd).get("MID").toString())+1)); + menu.setMENU_ICON(""); //默认无菜单图标 + corpMenuService.addMenu(menu); //新增菜单 + FHLOG.save(Jurisdiction.getUsername(), "新增菜单:"+menu.getMENU_NAME()); //记录日志 + map.put("result", errInfo); + return map; + } + + /** + * 请求编辑菜单页面 + * @param + * @return + */ + @RequestMapping(value="/toEdit") + @ResponseBody + public Object toEdit(String MENU_ID)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = corpMenuService.getMenuById(pd); //读取此ID的菜单数据 + map.put("pd", pd); + pd.put("MENU_ID",pd.get("PARENT_ID").toString()); //用作读取父菜单信息 + map.put("pds", corpMenuService.getMenuById(pd)); //传入父菜单所有信息 + map.put("result", errInfo); + return map; + } + + /** + * 保存编辑 + * @param + * @return + */ + @RequestMapping(value="/edit") + @ResponseBody + public Object edit(Menu menu)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + corpMenuService.edit(menu); + FHLOG.save(Jurisdiction.getUsername(), "修改菜单:"+menu.getMENU_NAME()); //记录日志 + map.put("result", errInfo); + return map; + } + + /** + * 删除菜单 + * @param MENU_ID + * @param out + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete(@RequestParam String MENU_ID)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + if(corpMenuService.listSubMenuByParentId(MENU_ID).size() > 0){//判断是否有子菜单，是：不允许删除 + errInfo = "error"; + }else{ + corpMenuService.deleteMenuById(MENU_ID); + errInfo = "success"; + FHLOG.save(Jurisdiction.getUsername(), "删除的菜单ID为:"+MENU_ID); //记录日志 + } + map.put("result", errInfo); + return map; + } + + /** + * 保存菜单图标 + * @param + * @return + */ + @RequestMapping(value="/editicon") + @ResponseBody + public Object editicon()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + corpMenuService.editicon(pd); + map.put("result", errInfo); + return map; + } + + /** + * 显示菜单列表ztree(拓展左侧四级菜单) + * @return + */ + @RequestMapping(value="/otherlistMenu") + @ResponseBody + public Object otherlistMenu(String MENU_ID)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("MENU_ID", MENU_ID); + String MENU_URL = corpMenuService.getMenuById(pd).getString("MENU_URL"); + if("#".equals(MENU_URL.trim()) || "".equals(MENU_URL.trim()) || null == MENU_URL){ + MENU_URL = "../index/default.html"; + } + String roleRights = Jurisdiction.getSession().getAttribute(Jurisdiction.getUsername() + Const.SESSION_ROLE_RIGHTS).toString(); //获取本角色菜单权限 + List athmenuList = corpMenuService.listAllMenuQx(MENU_ID); //获取某菜单下所有子菜单 + athmenuList = this.readMenu(athmenuList, roleRights); //根据权限分配菜单 + JSONArray arr = JSONArray.fromObject(athmenuList); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("MENU_NAME", "name").replaceAll("subMenu", "nodes").replaceAll("hasMenu", "checked").replaceAll("MENU_URL", "url").replaceAll("#", ""); + map.put("zTreeNodes", json); + map.put("MENU_URL",MENU_URL); //本ID菜单链接 + map.put("result", errInfo); + return map; + } + + /**根据角色权限获取本权限的菜单列表(递归处理) + * @param menuList：传入的总菜单 + * @param roleRights：加密的权限字符串 + * @return + */ + public List readMenu(List menuList,String roleRights){ + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + // 横排一级组 + String corpId = Jurisdiction.getCORPINFO_ID(); + pd.put("CORPINFO_ID", corpId); + PageData corp = corpInfoService.findById(pd); + PageData fpd = new PageData(); + fpd.put("CORPINFO_ID",corp.getString("ROLE_NAME")); + fpd.put("ROLE_ID",corp.getString("ROLE_NAME")); + pd.put("ROLE_ID",corp.getString("ROLE_NAME")); + Role roleList = corpRoleService.getRoleById(corp.getString("ROLE_NAME")); //列出组(页面横向排列的一级组) + List roleList_z = corpRoleService.listAllRolesByPId(fpd); //列出此组下架角色 + pd = corpRoleService.findById(pd); //取得点击的角色组(横排的) + map.put("pd", pd); + map.put("roleList", Collections.singletonList(roleList)); + map.put("roleList_z", roleList_z); + map.put("result", errInfo); + return map; + } + + /**保存新增角色 + * @return + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String parent_id = pd.getString("PARENT_ID"); //父类角色id + pd.put("ROLE_ID", parent_id); + if("0".equals(parent_id)){ + pd.put("RIGHTS", ""); //菜单权限 + }else{ + String rights = corpRoleService.findById(pd).getString("RIGHTS"); + pd.put("RIGHTS", (null == rights)?"":rights); //组菜单权限 + } + String RNUMBER = "R"+DateUtil.getDays()+Tools.getRandomNum(); + pd.put("RNUMBER", RNUMBER); //编码 + pd.put("ROLE_ID", this.get32UUID()); //主键 + pd.put("ADD_QX", "0"); //初始新增权限为否 + pd.put("DEL_QX", "0"); //删除权限 + pd.put("EDIT_QX", "0"); //修改权限 + pd.put("CHA_QX", "0"); //查看权限 + if ("".equals(pd.getString("LEVEL"))) { + pd.put("LEVEL",0); + } + corpRoleService.add(pd); + FHLOG.save(Jurisdiction.getUsername(), "新增角色"+pd.getString("ROLE_NAME")); //记录日志 + map.put("result", errInfo); + return map; + } + + /**请求编辑 + * @return + * @throws Exception + */ + @RequestMapping(value="/toEdit") + @ResponseBody + public Object toEdit()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = corpRoleService.findById(pd); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**保存修改 + * @return + * @throws Exception + */ + @RequestMapping(value="/edit") + @ResponseBody + public Object edit()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + corpRoleService.edit(pd); + FHLOG.save(Jurisdiction.getUsername(), "修改角色"+pd.getString("ROLE_NAME")); //记录日志 + map.put("result", errInfo); + return map; + } + + /**删除角色 + * @param ROLE_ID + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object deleteRole(@RequestParam String ROLE_ID)throws Exception{ + Map map = new HashMap(); + PageData pd = new PageData(); + String errInfo = "success"; + pd.put("ROLE_ID", ROLE_ID); + List roleList_z = corpRoleService.listAllRolesByPId(pd); //列出此角色的所有下级 + if("fhadminzhuche".equals(ROLE_ID)|| roleList_z.size() > 0){ +// errInfo = "false"; //下级有数据时or注册用户角色，删除失败 + errInfo = "fail"; + map.put("result", "errInfo"); + map.put("msg", "此组下有角色，不能删除！"); + return map; + }else{ + List userlist = corpUsersService.listAllUserByRoldId(pd); //此角色下的用户 + if(userlist.size() > 0){ //此角色已被使用就不能删除 + errInfo = "false2"; + }else{ + corpRoleService.deleteRoleById(ROLE_ID); //执行删除 + errInfo = "success"; + FHLOG.save(Jurisdiction.getUsername(), "删除角色ID为:"+ROLE_ID); //记录日志 + } + } + map.put("result", errInfo); + return map; + } + + /** + * 显示菜单列表ztree(菜单授权菜单) + * @return + */ + @RequestMapping(value="/menuqx") + @ResponseBody + public Object listAllMenu(String ROLE_ID)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + Role role = corpRoleService.getRoleById(ROLE_ID); //根据角色ID获取角色对象 + String roleRights = role.getRIGHTS(); //取出本角色菜单权限 + List menuList = corpMenuService.listAllMenuQx("0"); //获取所有菜单 + menuList = this.readMenu(menuList, roleRights); //根据角色权限处理菜单权限状态(递归处理) + JSONArray arr = JSONArray.fromObject(menuList); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("MENU_NAME", "name").replaceAll("subMenu", "nodes").replaceAll("hasMenu", "checked"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + } + + /**根据角色权限处理权限状态(递归处理) + * @param menuList：传入的总菜单 + * @param roleRights：加密的权限字符串 + * @return + */ + public List readMenu(List menuList,String roleRights){ + for(int i=0;i map = new HashMap(); + PageData pd = new PageData(); + if(null != menuIds && !"".equals(menuIds.trim())){ + BigInteger rights = RightsHelper.sumRights(Tools.str2StrArray(menuIds));//用菜单ID做权处理 + Role role = corpRoleService.getRoleById(ROLE_ID); //通过id获取角色对象 + role.setRIGHTS(rights.toString()); + corpRoleService.updateRoleRights(role); //更新当前角色菜单权限 + pd.put("rights",rights.toString()); + }else{ + Role role = new Role(); + role.setRIGHTS(""); + role.setROLE_ID(ROLE_ID); + corpRoleService.updateRoleRights(role); //更新当前角色菜单权限(没有任何勾选) + pd.put("rights",""); + } + pd.put("ROLE_ID", ROLE_ID); + if(!"1".equals(ROLE_ID)){ //当修改admin权限时,不修改其它角色权限 + corpRoleService.setAllRights(pd); //更新此角色所有子角色的菜单权限 + } + map.put("result", "success"); + FHLOG.save(Jurisdiction.getUsername(), "给角色ID："+ROLE_ID+" 授权了菜单权限操作"); //记录日志 + return map; + } + + /**请求角色按钮授权页面(增删改查) + * @param ROLE_ID： 角色ID + * @param msg： 区分增删改查 + * @return + * @throws Exception + */ + @RequestMapping(value="/b4Button") + @ResponseBody + public Object b4Button(@RequestParam String ROLE_ID,@RequestParam String msg)throws Exception{ + Map map = new HashMap(); + List menuList = corpMenuService.listAllMenuQx("0"); //获取所有菜单 + Role role = corpRoleService.getRoleById(ROLE_ID); //根据角色ID获取角色对象 + String roleRights = ""; + if("add_qx".equals(msg)){ + roleRights = role.getADD_QX(); //新增权限 + }else if("del_qx".equals(msg)){ + roleRights = role.getDEL_QX(); //删除权限 + }else if("edit_qx".equals(msg)){ + roleRights = role.getEDIT_QX(); //修改权限 + }else if("cha_qx".equals(msg)){ + roleRights = role.getCHA_QX(); //查看权限 + } + menuList = this.readMenu(menuList, roleRights); //根据角色权限处理菜单权限状态(递归处理) + JSONArray arr = JSONArray.fromObject(menuList); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id").replaceAll("PARENT_ID", "pId").replaceAll("MENU_NAME", "name").replaceAll("subMenu", "nodes").replaceAll("hasMenu", "checked"); + map.put("zTreeNodes", json); + map.put("result", "success"); + return map; + } + + /** + * 保存角色按钮权限 + * @param ROLE_ID + * @param menuIds + * @param msg + * @throws Exception + */ + @RequestMapping(value="/saveB4Button") + @ResponseBody + public Object saveB4Button(@RequestParam String ROLE_ID,@RequestParam String menuIds,@RequestParam String msg)throws Exception{ + Map map = new HashMap(); + PageData pd = new PageData(); + pd = this.getPageData(); + if(null != menuIds && !"".equals(menuIds.trim())){ + BigInteger rights = RightsHelper.sumRights(Tools.str2StrArray(menuIds)); + pd.put("value",rights.toString()); + }else{ + pd.put("value",""); + } + pd.put("ROLE_ID", ROLE_ID); + corpRoleService.saveB4Button(msg,pd); + map.put("result", "success"); + FHLOG.save(Jurisdiction.getUsername(), "给角色ID："+ROLE_ID+" 授权了增删改查按钮权限操作"); //记录日志 + return map; + } + + /** 选择角色(弹窗选择用) + * @param + * @return + * @throws Exception + */ + @RequestMapping(value="/roleListWindow") + @ResponseBody + public Object roleListWindow(Page page)throws Exception{ + Map map = new HashMap(); + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List roleList = corpRoleService.roleListWindow(page); //列出所有角色 + map.put("roleList", roleList); + map.put("page", page); + map.put("result", "success"); + return map; + } + + /**根据名称查询角色 + * @param ROLE_ID + * @return + * @throws Exception + */ + @RequestMapping(value="/findByName") + @ResponseBody + public Object findByName()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); +// pd = corpRoleService.findByName(pd);/// + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + @RequestMapping(value="/b4ButtonV2") + @ResponseBody + public Object b4ButtonV2(@RequestParam String ROLE_ID,@RequestParam String msg)throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + String pid =pd.getString("PARENT_ID"); + Map map = new HashMap(); + String errInfo = "success"; + Role role = corpRoleService.getRoleById(ROLE_ID); //根据角色ID获取角色对象 + String roleRights = ""; + if("add_qx".equals(msg)){ + roleRights = role.getADD_QX(); //新增权限 + }else if("del_qx".equals(msg)){ + roleRights = role.getDEL_QX(); //删除权限 + }else if("edit_qx".equals(msg)){ + roleRights = role.getEDIT_QX(); //修改权限 + }else if("cha_qx".equals(msg)){ + roleRights = role.getCHA_QX(); //查看权限 + } + List menuListAll = corpMenuService.listSubMenuAll(); + Map> menuAllMap = new HashMap<>(); + for (int i=0;i menuListValue = new ArrayList<>(); + Menu menu = menuListAll.get(i); + if(menuAllMap.containsKey(menu.getPARENT_ID())){ + menuListValue = menuAllMap.get(menu.getPARENT_ID()); + } + menuListValue.add(menu); + menuAllMap.put(menu.getPARENT_ID(),menuListValue); + } + List menuList = this.listAllMenuDigui("0",menuAllMap,roleRights); //获取所有菜单 + menuList = this.readMenu(menuList, roleRights); //根据角色权限处理菜单权限状态(递归处理) + JSONArray arr = JSONArray.fromObject(menuList); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id") + .replaceAll("PARENT_ID", "pId") + .replaceAll("MENU_NAME", "name") + .replaceAll("subMenu", "nodes") + .replaceAll("hasMenu", "checked"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + + } + /** + * 显示菜单列表ztree(菜单授权菜单) + * @return + */ + @RequestMapping(value="/listAllMenuV2") + @ResponseBody + public Object listAllMenuByParentID(String ROLE_ID)throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + String pid =pd.getString("PARENT_ID"); + Map map = new HashMap(); + String errInfo = "success"; + Role role = corpRoleService.getRoleById(ROLE_ID); //根据角色ID获取角色对象 + String roleRights = role.getRIGHTS(); //取出本角色菜单权限 + List menuListAll = corpMenuService.listSubMenuAll(); + Map> menuAllMap = new HashMap<>(); + for (int i=0;i menuListValue = new ArrayList<>(); + Menu menu = menuListAll.get(i); + if(menuAllMap.containsKey(menu.getPARENT_ID())){ + menuListValue = menuAllMap.get(menu.getPARENT_ID()); + } + menuListValue.add(menu); + menuAllMap.put(menu.getPARENT_ID(),menuListValue); + } + List menuList = this.listAllMenuDigui("0",menuAllMap,roleRights); //获取所有菜单 + menuList = this.readMenu(menuList, roleRights); //根据角色权限处理菜单权限状态(递归处理) + JSONArray arr = JSONArray.fromObject(menuList); + String json = arr.toString(); + json = json.replaceAll("MENU_ID", "id") + .replaceAll("PARENT_ID", "pId") + .replaceAll("MENU_NAME", "name") + .replaceAll("subMenu", "nodes") + .replaceAll("hasMenu", "checked"); + map.put("zTreeNodes", json); + map.put("result", errInfo); + return map; + + } + + /** + * + * @param MENU_ID + * @param menuAllList key pid val Pid 下面的list + * @return + * @throws Exception + */ + public List listAllMenuDigui(String MENU_ID,Map> menuAllList,String roleRights) throws Exception { + List menuList = this.listSubMenuByParentId(MENU_ID,menuAllList); //更具pid 获取数据 + for(Menu menu : menuList){ + menu.setMENU_URL("menu_edit.html?MENU_ID="+menu.getMENU_ID()); + menu.setSubMenu(this.listAllMenuDigui(menu.getMENU_ID(),menuAllList,roleRights)); + menu.setTarget("treeFrame"); + menu.setHasMenu(RightsHelper.testRights(roleRights, menu.getMENU_ID())); + } + return menuList; + } + public List listSubMenuByParentId (String MENU_ID,Map> menuAllList){ //更具pid 获取数据 + List menuList = new ArrayList<>(); + if(menuAllList.containsKey(MENU_ID)){ + menuList = menuAllList.get(MENU_ID); + } + return menuList; + } +} diff --git a/src/main/java/com/zcloud/controller/corpsystem/CorpUsersController.java b/src/main/java/com/zcloud/controller/corpsystem/CorpUsersController.java new file mode 100644 index 00000000..4653f46c --- /dev/null +++ b/src/main/java/com/zcloud/controller/corpsystem/CorpUsersController.java @@ -0,0 +1,725 @@ +package com.zcloud.controller.corpsystem; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; +import com.zcloud.entity.system.Role; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.system.FHlogService; +import com.zcloud.service.system.RoleService; +import com.zcloud.service.system.UeditorService; +import com.zcloud.service.system.corpsystem.CorpUsersService; +import com.zcloud.util.*; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.*; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.crypto.hash.SimpleHash; +import org.apache.shiro.session.Session; +import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：系统用户处理类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Controller +@RequestMapping("/corpUser") +public class CorpUsersController extends BaseController { + + @Autowired + private CorpUsersService corpUsersService; + @Autowired + private RoleService roleService; + @Autowired + private UeditorService ueditorService; + @Autowired + private FHlogService FHLOG; + @Autowired + private DepartmentService departmentService; + + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listAll") + @ResponseBody + public Object listAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List userList = corpUsersService.listAllUser(pd); //列出Post列表 + map.put("userList", userList); + map.put("result", errInfo); + return map; + } + + + + + + + + + /**用户列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping("/list") + @ResponseBody + public Object listUsers(Page page)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + /*检索条件*/ + String ROLE_ID = pd.getString("ROLE_ID"); //角色ID + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String STRARTTIME = pd.getString("STRARTTIME"); //开始时间 + String ENDTIME = pd.getString("ENDTIME"); //结束时间 + if(Tools.notEmpty(STRARTTIME))pd.put("STRARTTIME", STRARTTIME+" 00:00:00"); + if(Tools.notEmpty(ENDTIME))pd.put("ENDTIME", ENDTIME+" 00:00:00"); + if(!"admin".equals(Jurisdiction.getUsername())) { + Session session = Jurisdiction.getSession(); + PageData dept = (PageData)session.getAttribute(Const.SESSION_DEPT); + if(Tools.isEmpty(pd.get("PROVINCE")) && Tools.isEmpty(pd.get("CITY")) && Tools.isEmpty(pd.get("COUNTRY")) && Tools.isEmpty(pd.get("VILLAGE")) ){ + if (!"000000".equals(dept.getString("PROVINCE"))){ + pd.put("PROVINCE", dept.get("PROVINCE")); + } + pd.put("CITY", dept.get("CITY")); + pd.put("COUNTRY", dept.get("COUNTRY")); + pd.put("VILLAGE", dept.get("VILLAGE")); + } + } + page.setPd(pd); + List userList = corpUsersService.userlistPage(page); //列出用户列表 + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + + map.put("userList", userList); + map.put("roleList", roleList); + map.put("ROLE_ID", ROLE_ID); + map.put("page", page); + map.put("pd", pd); + + map.put("result", errInfo); + return map; + } + + /**去新增用户页面 + * @return + * @throws Exception + */ + @RequestMapping(value="/goAddUser") + @ResponseBody + public Object goAddUser()throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + map.put("roleList", roleList); + map.put("result", errInfo); + return map; + } + + /**去修改用户页面(从系统用户页面修改) + * @return + * @throws Exception + */ + @RequestMapping(value="/goEditUser") + @ResponseBody + public Object goEditUser() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if("1".equals(pd.getString("USER_ID"))){return null;} //不能修改admin用户 + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + List departmentList=departmentService.listAllDepartment("c14c41b8058b421ba6b988c2c3bd3139"); + pd = corpUsersService.findById(pd); //根据ID读取 + String ROLE_IDS = pd.getString("ROLE_IDS"); //副职角色ID + if(Tools.notEmpty(ROLE_IDS)){ + String arryROLE_ID[] = ROLE_IDS.split(","); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + pd.put("USERNAME", Jurisdiction.getUsername()); + pd = corpUsersService.findByUsername(pd); //根据用户名读取 + map.put("pd", pd); + map.put("roleList", roleList); + map.put("result", errInfo); + return map; + } + + /** + * 修改用户(系统用户列表修改) + */ + @RequestMapping(value="/editUser") + @ResponseBody + public Object editUser() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + FHLOG.save(Jurisdiction.getUsername(), "从系统用户中修改"+pd.getString("USERNAME")+"的资料"); //记录日志 + if(!Jurisdiction.getUsername().equals(pd.getString("USERNAME"))){ //如果当前登录用户修改用户资料提交的用户名非本人 + if("admin".equals(pd.getString("USERNAME")) && !"admin".equals(Jurisdiction.getUsername())){return null;} //非admin用户不能修改admin + }else{ //如果当前登录用户修改用户资料提交的用户名是本人，则不能修改本人的角色ID + PageData upd = new PageData(); + upd = corpUsersService.findByUsername(pd); + pd.put("ROLE_ID", upd.getString("ROLE_ID")); //对角色ID还原本人角色ID + pd.put("ROLE_IDS", Tools.notEmpty(upd.getString("ROLE_IDS"))?upd.get("ROLE_IDS"):""); //对角色ID还原本人副职角色ID + } + if(pd.getString("PASSWORD") != null && !"".equals(pd.getString("PASSWORD"))){ + pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); + } + corpUsersService.editUser(pd); //执行修改 + map.put("result", errInfo); + return map; + } + + /** + * 修改用户(系统用户列表修改) + */ + @RequestMapping(value="/editUserFuns") + @ResponseBody + public Object editUserFuns() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + FHLOG.save(Jurisdiction.getUsername(), "从系统用户中修改"+pd.getString("USERNAME")+"的小程序菜单权限"); //记录日志 + corpUsersService.editUserFuns(pd); //执行修改 + map.put("result", errInfo); + return map; + } + + /** + * 修改用户(个人资料修改) + */ + @RequestMapping(value="/editUserOwn") + @ResponseBody + public Object editUserOwn() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(!Jurisdiction.getUsername().equals(pd.getString("USERNAME"))){ //如果当前登录用户修改用户资料提交的用户名非本人 + FHLOG.save(Jurisdiction.getUsername(), "恶意修改用户资料："+pd.getString("USERNAME")); + return null;//不能修改非本人的资料 + }else{ //如果当前登录用户修改用户资料提交的用户名是本人，则不能修改本人的角色ID + PageData upd = new PageData(); + upd = corpUsersService.findByUsername(pd); + pd.put("USER_ID", upd.getString("USER_ID")); //对ID还原本人ID，防止串改 + pd.put("ROLE_ID", upd.getString("ROLE_ID")); //对角色ID还原本人角色ID + pd.put("ROLE_IDS", Tools.notEmpty(upd.getString("ROLE_IDS"))?upd.get("ROLE_IDS"):""); //对角色ID还原本人副职角色ID + } + if(pd.getString("PASSWORD") != null && !"".equals(pd.getString("PASSWORD"))){ + pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); + } + corpUsersService.editUser(pd); //执行修改 + FHLOG.save(Jurisdiction.getUsername(), "从个人资料中修改"+pd.getString("USERNAME")+"的资料"); //记录日志 + map.put("result", errInfo); + return map; + } + + /** + * 修改用户密码() + */ + @RequestMapping(value="/editUserPwd") + @ResponseBody + public Object editUserPwd() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String userName = Jurisdiction.getUsername(); + String userOldPwd = pd.getString("password"); + UsernamePasswordToken token = new UsernamePasswordToken(userName, new SimpleHash("SHA-1", userName, userOldPwd).toString()); + + Subject subject = SecurityUtils.getSubject(); + try { + subject.login(token); //这一步在调用login(token)方法时,它会走到MyRealm.doGetAuthenticationInfo()方法中 + }catch(UnknownAccountException uae){ + errInfo = "usererror"; + }catch(IncorrectCredentialsException ice){ + errInfo = "usererror"; + }catch(LockedAccountException lae){ + errInfo = "usererror"; + }catch(ExcessiveAttemptsException eae){ + errInfo = "usererror4"; + }catch (DisabledAccountException sae){ + errInfo = "usererror"; + }catch(AuthenticationException ae){ + errInfo = "usererror"; + } + + if("success".equals(errInfo)) { + if(subject.isAuthenticated()){ //密码验证成功 + String newPwd =new SimpleHash("SHA-1",userName, pd.getString("newpwd")).toString();//加密新密码 + PageData updateUserPd = new PageData(); + updateUserPd.put("USER_ID", Jurisdiction.getUSER_ID()); + updateUserPd.put("PASSWORD", newPwd); + corpUsersService.editPassword(updateUserPd); + FHLOG.save(userName, "从app修改密码中修改"+userName+"的密码"); //记录日志 + }else { + token.clear(); + errInfo = "usererror"; + } + }else { + errInfo="error"; + map.put("result", errInfo); + map.put("msg", "用户密码错误"); + return map; + } + /** + * 1.验证原始密码是否正确 + * 2.密码加密 + * 3.修改数据库 + * 4.增加日志 + */ + map.put("result", errInfo); + return map; + } + + /** + * @param page + * @throws Exception + */ + @RequestMapping(value="/resetPwd") + @ResponseBody + public Object resetPwd (Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pageData = corpUsersService.findById(pd); + //corpInfo + String pwd = new SimpleHash("SHA-1", pageData.getString("USERNAME"), "Aa@123456789").toString(); + PageData updateUser = new PageData(); + updateUser.put("PASSWORD", pwd); + updateUser.put("USER_ID", pageData.getString("USER_ID")); + corpUsersService.editPassword(updateUser); + + map.put("result", errInfo); + return map; + } + + /**判断用户名是否存在 + * @return + */ + @RequestMapping(value="/hasUser") + @ResponseBody + public Object hasUser() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(corpUsersService.findByUsername(pd) != null){ + errInfo = "fail"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**判断邮箱是否存在 + * @return + */ + @RequestMapping(value="/hasEmail") + @ResponseBody + public Object hasEmail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(corpUsersService.findByEmail(pd) != null){ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**判断编码是否存在 + * @return + */ + @RequestMapping(value="/hasNumber") + @ResponseBody + public Object hasNumber() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(corpUsersService.findByNumbe(pd) != null){ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**保存用户 + * @return + * @throws Exception + */ + @RequestMapping(value="/saveUser") + @ResponseBody + public Object saveUser() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("USER_ID", this.get32UUID()); //ID 主键 + pd.put("LAST_LOGIN", ""); //最后登录时间 + pd.put("IP", ""); //IP + pd.put("STATUS", "0"); //状态 + pd.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,"); //用户默认皮肤 + String userPwd = Tools.isEmpty(pd.get("PASSWORD"))?"Aa@123456789" : pd.getString("PASSWORD"); + pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), userPwd).toString()); //密码加密 + String[] userRole = pd.getString("roleIDs").split(";"); //处理多角色的用户 + pd.put("ROLE_ID",userRole[0]); + pd.put("PASSWORD",pd.getString("userPASSWORD")); + if(userRole.length>1){ + String ROLE_IDS =pd.getString("roleIDs").replaceAll(";",",").replaceAll(userRole[0]+',' ,""); + pd.put("ROLE_IDS",ROLE_IDS); + } + if(null == corpUsersService.findByUsername(pd)){ //判断用户名是否存在 + corpUsersService.saveUser(pd); //执行保存 + }else{ + map.put("result","failed"); + } + FHLOG.save(Jurisdiction.getUsername(), "新增用户："+pd.getString("USERNAME")); //记录日志 + map.put("result", errInfo); //返回结果 + return map; + } + + /**删除用户 + * @return + */ + @RequestMapping(value="/deleteUser") + @ResponseBody + public Object deleteUser() throws Exception{ + Map map = new HashMap(); + PageData pd = new PageData(); + String errInfo = "success"; + pd = this.getPageData(); + FHLOG.save(Jurisdiction.getUsername(), "删除用户ID："+pd.getString("USER_ID")); //记录日志 + corpUsersService.deleteUser(pd); //删除用户 + ueditorService.delete(pd); //删除副文本关联数据 + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 批量删除 + * @throws Exception + */ + @RequestMapping(value="/deleteAllUser") + @ResponseBody + public Object deleteAllUser() throws Exception{ + PageData pd = new PageData(); + Map map = new HashMap(); + pd = this.getPageData(); + String USER_IDS = pd.getString("USER_IDS"); + String errInfo = "success"; + if(Tools.notEmpty(USER_IDS)){ + String ArrayUSER_IDS[] = USER_IDS.split(","); + FHLOG.save(Jurisdiction.getUsername(), "批量删除用户"); //记录日志 + corpUsersService.deleteAllUser(ArrayUSER_IDS); //删除用户 + ueditorService.deleteAll(ArrayUSER_IDS); //删除副文本关联数据 + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**导出用户信息到EXCEL + * @return + * @throws Exception + */ + @RequestMapping(value="/excel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + try{ + + /*检索条件*/ + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String STRARTTIME = pd.getString("STRARTTIME"); //开始时间 + String ENDTIME = pd.getString("ENDTIME"); //结束时间 + if(Tools.notEmpty(STRARTTIME))pd.put("STRARTTIME", STRARTTIME+" 00:00:00"); + if(Tools.notEmpty(ENDTIME))pd.put("ENDTIME", ENDTIME+" 00:00:00"); + + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("用户名"); //1 + titles.add("编号"); //2 + titles.add("姓名"); //3 + titles.add("职位"); //4 + titles.add("手机"); //5 + titles.add("邮箱"); //6 + titles.add("最近登录"); //7 + titles.add("上次登录IP"); //8 + dataMap.put("titles", titles); + List userList = corpUsersService.listAllUser(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + if (null != file && !file.isEmpty()) { + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"xls".equals(suffixName)) { + map.put("result", "fail"); + map.put("exception", "上传文件格式不正确"); + return map; + } + String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE; //文件上传路径 + String fileName = FileUpload.fileUp(file, filePath, "userexcel"); //执行上传 + List listPd = (List)ObjectExcelRead.readExcel(filePath, fileName, 2, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第3行开始；0:从第A列开始；0:第0个sheet + pd.put("LAST_LOGIN", ""); //最后登录时间 + pd.put("IP", ""); //IP + pd.put("STATUS", "0"); //状态 + pd.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,"); //默认皮肤 + pd.put("ROLE_ID", "fhadminzhuche"); //默认角色注册用户 + pd.put("ROLE_IDS", ""); //副职角色 + /** + * var0 :编号 + * var1 :姓名 + * var2 :手机 + * var3 :邮箱 + * var4 :备注 + */ + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if("admin".equals(pd.getString("USERNAME"))){return null;} //不能查看admin用户 + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + map.put("fx", "user"); + pd = corpUsersService.findByUsername(pd); //根据ID读取 + String ROLE_IDS = pd.getString("ROLE_IDS"); //副职角色ID + if(Tools.notEmpty(ROLE_IDS)){ + String arryROLE_ID[] = ROLE_IDS.split(","); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String USERNAME = pd.getString("USERNAME"); + if("admin".equals(USERNAME)){return null;} //不能查看admin用户 + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + pd = corpUsersService.findByUsername(pd); //根据ID读取 + map.put("msg", "1"); + if(null == pd){ + PageData rpd = new PageData(); + rpd.put("RNUMBER", USERNAME); //用户名查不到数据时就把数据当作角色的编码去查询角色表 + rpd = roleService.getRoleByRnumber(rpd); + map.put("rpd", rpd); + map.put("msg", "2"); + } + map.put("pd", pd); + map.put("roleList", roleList); + map.put("result", errInfo); + return map; + } + + /**显示用户列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/listUsersForWindow") + @ResponseBody + public Object listUsersForWindow(Page page)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + String STRARTTIME = pd.getString("STRARTTIME"); //开始时间 + String ENDTIME = pd.getString("ENDTIME"); //结束时间 + if(Tools.notEmpty(STRARTTIME))pd.put("STRARTTIME", STRARTTIME+" 00:00:00"); + if(Tools.notEmpty(ENDTIME))pd.put("ENDTIME", ENDTIME+" 00:00:00"); + page.setPd(pd); + List userList = corpUsersService.listUsersBystaff(page); //列出用户列表(弹窗选择用) + pd.put("ROLE_ID", "1"); + List roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 + map.put("userList", userList); + map.put("roleList", roleList); + map.put("page", page); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /**修改用户状态 STATUS + * @return + */ + @RequestMapping(value="/updateUserStatus") + @ResponseBody + public Object updateUserStatus() throws Exception{ + Map map = new HashMap(); + PageData pd = new PageData(); + String errInfo = "success"; + pd = this.getPageData(); + pd.put("STATUS",pd.getString("status")); + corpUsersService.updateUserStatus(pd); + FHLOG.save(Jurisdiction.getUsername(), "修改用户状态ID："+pd.getString("USER_ID")); //记录日志 + map.put("result", errInfo); //返回结果 + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java b/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java new file mode 100644 index 00000000..450e6f57 --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/TrainUsersController.java @@ -0,0 +1,230 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.xgf.TrainUsersService; +import com.zcloud.util.ObjectExcelView; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：原来: 现在入场告知培训 + * 作者：luoxiaobao + * 时间：2023-09-27 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/trainusers") +public class TrainUsersController extends BaseController { + + @Autowired + private TrainUsersService trainusersService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("trainusers:add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("TRAINUSERS_ID", this.get32UUID()); //主键 + pd.put("STEP_STATUS", "0"); + trainusersService.save(pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("trainusers:del") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainusersService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("trainusers:edit") + @ResponseBody + public Object edit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainusersService.edit(pd); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("trainusers:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainusersService.list(page); //列出TrainUsers列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("trainusers:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = trainusersService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @RequiresPermissions("trainusers:del") + @ResponseBody + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + trainusersService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + @RequiresPermissions("toExcel") + public ModelAndView exportExcel() throws Exception{ + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("备注1"); //1 + titles.add("培训批次"); //2 + titles.add("用户ID"); //3 + titles.add("培训开始时间"); //4 + titles.add("培训结束时间"); //5 + titles.add("培训状态0未培训1培训中2培训通过-1培训未通过"); //6 + titles.add("培训企业"); //7 + titles.add("流动类型"); //8 + titles.add("安全监督部"); //9 + titles.add("主管部门"); //10 + titles.add("主管部门审批状态"); //11 + titles.add("主管部门审批意见"); //12 + titles.add("管理部门审批状态"); //13 + titles.add("管理部门审批意见"); //14 + dataMap.put("titles", titles); + List varOList = trainusersService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainusersService.approveUser(pd); + map.put("result", errInfo); + return map; + } + @RequestMapping(value = "/getUserinfoList") + @ResponseBody + public Object getUserinfoList() throws Exception { + Map map = new HashMap<>(); + PageData pd = new PageData(); + pd = this.getPageData(); + List list = trainusersService.findinfoByCondition(pd); + map.put("list", list); + map.put("result", "success"); + return map; + } + +} diff --git a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java new file mode 100644 index 00000000..feb476ac --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java @@ -0,0 +1,203 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.xgf.TrainingBatchService; +import com.zcloud.service.xgf.XgfUserService; +import com.zcloud.util.*; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.*; + +/** + * 说明：培训批次管理 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/trainingbatch") +public class TrainingBatchController extends BaseController { + + @Autowired + private TrainingBatchService trainingbatchService; + + @Autowired + private XgfUserService xgfUserService; + + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @RequiresPermissions("trainingbatch:add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainingbatchService.save(pd); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * + */ + @RequestMapping(value = "/delete") + @RequiresPermissions("trainingbatch:del") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainingbatchService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @RequiresPermissions("trainingbatch:edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + trainingbatchService.edit(pd); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @RequiresPermissions("trainingbatch:list") + @ResponseBody + public Object list(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainingbatchService.list(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/userList") + @RequiresPermissions("trainingbatch:list") + @ResponseBody + public Object userList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = xgfUserService.flowlistPage(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/batchUserList") + @RequiresPermissions("trainingbatch:list") + @ResponseBody + public Object batchUserList(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainingbatchService.batchUserlistPage(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @RequiresPermissions("trainingbatch:edit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = trainingbatchService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @RequiresPermissions("trainingbatch:del") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + trainingbatchService.deleteAll(ArrayDATA_IDS); + } + map.put("result", "success"); //返回结果 + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java new file mode 100644 index 00000000..3929e092 --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -0,0 +1,98 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.xgf.TrainingBatchService; +import com.zcloud.service.xgf.XgfUserService; +import com.zcloud.util.HttpClientService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/xgf/user") +public class XgfUserController extends BaseController { + + @Resource + private XgfUserService xgfUserService; + + @Value("${preventionxgf.api.url}") + private String url; + + @Resource + private TrainingBatchService trainingBatchService; + + + @RequestMapping(value = "/list") + @ResponseBody + public Object list(Page page) throws Exception { + PageData request = this.getPageData(); + page.setPd(request); + xgfUserService.list(page); + PageData response = new PageData(); + response.put("result", "success"); + response.put("page", page); + response.put("data", request); + return response; + } + + @RequestMapping(value = "/approve") + @ResponseBody + public Object approve() throws Exception { + PageData request = this.getPageData(); + xgfUserService.approve(request); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } + + @RequestMapping(value = "/regulatoryUserList") + @ResponseBody + public Object regulatoryUserList() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } + + @RequestMapping(value = "/getInfo") + @ResponseBody + public Object getInfo() throws Exception { + PageData request = this.getPageData(); + PageData condition = new PageData(); + /*组织人员信息*/ + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData entity = xgfUserService.findInfo(condition); + /*组织人员图片信息*/ + condition.put("USER_ID", entity.getString("XGF_USER_ID")); + condition.put("CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + Map result = HttpClientService.doPost(url + "/openApi/user/getInfoPicture", condition); + if (result == null || !"succeed".equals(result.get("result"))) throw new RuntimeException("请求失败"); + /*组织员工培训信息*/ + condition.clear(); + condition.put("USER_ID", entity.getString("XGF_USER_ID")); + List recordList = xgfUserService.findRecordList(condition); + /*培训申请记录*/ + condition.clear(); + condition.put("USER_ID", entity.getString("XGF_USER_ID")); + List trainList = trainingBatchService.findByUserId(condition); + + PageData response = new PageData(); + response.put("result", "success"); + response.put("info", entity); + response.put("img", result); + response.put("trainRecordList", recordList); + response.put("applyList", trainList); + response.put("data", request); + return response; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpMenuMapper.java b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpMenuMapper.java new file mode 100644 index 00000000..7afb951d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpMenuMapper.java @@ -0,0 +1,62 @@ +package com.zcloud.mapper.datasource.corpsystem; + +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Menu; + +import java.util.List; + +/** + * 说明：菜单Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpMenuMapper { + + /**新增菜单 + * @param menu + */ + void addMenu(Menu menu); + + /**保存修改菜单 + * @param menu + */ + void edit(Menu menu); + + /** + * 通过菜单ID获取数据 + * @param pd + * @return + */ + PageData getMenuById(PageData pd); + + /**获取最大的菜单ID + * @param pd + * @return + */ + PageData findMaxId(PageData pd); + + /**通过ID获取其子一级菜单 + * @param parentId + * @return + */ + List listSubMenuByParentId(String parentId); + + /**获取所有菜单并填充每个菜单的子菜单列表(菜单管理) + * @param MENU_ID + * @return + */ + List listAllMenu(String MENU_ID); + + /**删除菜单 + * @param MENU_ID + */ + void deleteMenuById(String MENU_ID); + + /**保存菜单图标 + * @param pd + * @return + */ + void editicon(PageData pd); + + List listSubMenuAll(String MENU_ID); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpRoleMapper.java b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpRoleMapper.java new file mode 100644 index 00000000..fe3585ae --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpRoleMapper.java @@ -0,0 +1,110 @@ +package com.zcloud.mapper.datasource.corpsystem; + + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Role; + +import java.util.List; + +/** + * 说明：角色Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpRoleMapper { + + /**通过角色ID获取数据 + * @param pd + * @return + */ + PageData findById(PageData pd); + + /**通过id查找(返回角色对象) + * @param roleId + * @return + */ + Role getRoleById(String ROLE_ID); + + /**通过角色编码查找 + * @param pd + * @return + */ + PageData getRoleByRnumber(PageData pd); + + /**通过组ID获取组下级角色列表 + * @param pd + * @return + */ + List listAllRolesByPId(PageData pd); + + /**添加 + * @param pd + */ + void add(PageData pd); + + /**保存修改 + * @param pd + */ + void edit(PageData pd); + + /**删除角色 + * @param ROLE_ID + * @throws Exception + */ + void deleteRoleById(String ROLE_ID); + + /**给当前角色附加菜单权限 + * @param role + * @throws Exception + */ + void updateRoleRights(Role role); + + /**给全部子角色加菜单权限 + * @param pd + * @throws Exception + */ + void setAllRights(PageData pd); + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + void addQx(PageData pd); + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + void delQx(PageData pd); + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + void editQx(PageData pd); + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + void chaQx(PageData pd); + + /**通过角色ID数组获取角色列表 + * @param arryROLE_ID + * @throws Exception + */ + List listAllRolesByArryROLE_ID(String[] arryROLE_ID); + + /**角色列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + List roleWindowlistPage(Page page); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpUsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpUsersMapper.java new file mode 100644 index 00000000..3c0bb8d1 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/corpsystem/CorpUsersMapper.java @@ -0,0 +1,130 @@ +package com.zcloud.mapper.datasource.corpsystem; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.User; + +import java.util.List; + +/** + * 说明：用户Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpUsersMapper { + + /**通过用户获取数据 + * @param pd + * @return + */ + PageData findByUsername(PageData pd); + + /**用户列表 + * @param page + * @return + */ + List userlistPage(Page page); + + /**通过用户ID获取用户信息和角色信息 + * @param USER_ID + * @return + */ + User getUserAndRoleById(String USER_ID); + + /**通过邮箱获取数据 + * @param pd + * @return + * @throws Exception + */ + PageData findByEmail(PageData pd); + + /**通过编码获取数据 + * @param pd + * @return + * @throws Exception + */ + PageData findByNumbe(PageData pd); + + /**列出某角色下的所有用户 + * @param pd + * @return + * @throws Exception + */ + List listAllUserByRoldId(PageData pd); + + /**用户列表(全部) + * @param pd + * @return + * @throws Exception + */ + List listAllUser(PageData pd); + + /**用户列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + List userBystafflistPage(Page page); + + /**通过用户ID获取数据 + * @param pd + * @return + * @throws Exception + */ + PageData findById(PageData pd); + + /**通过分公司ID获取数据 + * @param pd + * @return + * @throws Exception + */ + PageData findByCorpId(PageData pd); + + /**保存用户IP + * @param pd + */ + void saveIP(PageData pd); + + /**保存用户 + * @param pd + * @throws Exception + */ + void saveUser(PageData pd); + void editPassword(PageData pd); + + /**保存用户系统皮肤 + * @param pd + * @throws Exception + */ + void saveSkin(PageData pd); + + /**修改用户 + * @param pd + * @throws Exception + */ + void editUser(PageData pd); + + /**删除用户 + * @param pd + * @throws Exception + */ + void deleteUser(PageData pd); + + /**批量删除用户 + * @param pd + * @throws Exception + */ + void deleteAllUser(String[] USER_IDS); + + /**修改用户小程序权限 + * @param pd + * @throws Exception + */ + void editUserFuns(PageData pd); + Integer hasUserName (PageData pd); + + List listUserAndDept (PageData pd); + void updateUserStatus (PageData pd); + + void unLockUser(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java new file mode 100644 index 00000000..cba8a7f9 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/system/CorpPathMapper.java @@ -0,0 +1,13 @@ +package com.zcloud.mapper.datasource.system; + +import com.zcloud.entity.PageData; + +/** + * 企业图片地址、后端地址访问表 + */ +public interface CorpPathMapper { + + PageData getCorpPathByCorpId(PageData pd); + + PageData getCorpPathByPersonInfo(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java new file mode 100644 index 00000000..37ab6211 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowDetailMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.PageData; + +public interface FlowDetailMapper { + + void save(PageData flow); + + void delete(PageData flow); + + void edit(PageData flow); + + PageData findById(PageData flow); + + PageData selectOne(PageData condition); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java new file mode 100644 index 00000000..160baf67 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/FlowMapper.java @@ -0,0 +1,16 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.PageData; + +public interface FlowMapper { + + void save(PageData flow); + + void delete(PageData flow); + + void edit(PageData flow); + + PageData findById(PageData flow); + + PageData findByCondition(PageData condition); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/TrainUsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainUsersMapper.java new file mode 100644 index 00000000..bafeb394 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainUsersMapper.java @@ -0,0 +1,129 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：培训学员 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +public interface TrainUsersMapper{ + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**固定服务人员培训管理列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + void updateStatusByFlowTrain(PageData pd); + + List unflowlistPage(Page page); + + void updateStatus(PageData pd); + + /** + * 固定服务人员培训管理培训申请记录 + * @param page + * @return + */ + List trainApplicationRecordList(Page page); + + /** + * 固定服务人员培训管理查看 + * @param pd + * @return + */ + PageData trainView(PageData pd); + + + + + /** + * 安全监督部 审核 + * @param pd + * @return + */ + Integer approveSupervision(PageData pd); + /** + * 主管部门 审核 + * @param pd + * @return + */ + Integer approveManager(PageData pd); + /** + * 安全监督部 审核 + * @param pd + * @return + */ + Integer approveTerritoriality(PageData pd); + + /** + * 根据培训批次id 获取 这次培训中审批完成的次数 + * @param pd + * @return + */ + List getApproveCountByGbatchId(PageData pd ); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData getPdById(PageData pd); + + + /** + * 查询和这个批次完成评审的 数量 和 传过来的对比 + */ + Integer getCountByWanchengPingshen(PageData pd); + + void graduation(PageData condition); + void graduationstudent(PageData condition); + + + + void updateDate(PageData condition); + + List findinfoByCondition(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java new file mode 100644 index 00000000..76fdf346 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java @@ -0,0 +1,82 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：培训批次管理 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +public interface TrainingBatchMapper{ + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + void audit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 获取编号 + * @param pd + * @return + */ + PageData getCode(PageData pd); + + List batchUserlistPage(Page page); + + List passUserlistPage(Page page); + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findAndTimeById(PageData pd); + + void graduation(PageData condition); + + List findByUserId(PageData condition); + + List oldlistPage(Page page); +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserDetailsMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserDetailsMapper.java new file mode 100644 index 00000000..9ac6f5d0 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserDetailsMapper.java @@ -0,0 +1,58 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface XgfUserDetailsMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**批量删除 + * @param pd + * @throws Exception + */ + void deleteAll(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List listPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**列表(根据多选ID查询数据) + * @param pd + * @throws Exception + */ + public List listByIds(PageData pd); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java new file mode 100644 index 00000000..63d2150e --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -0,0 +1,73 @@ +package com.zcloud.mapper.datasource.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface XgfUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**批量删除 + * @param pd + * @throws Exception + */ + void deleteAll(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List listPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**列表(根据多选ID查询数据) + * @param pd + * @throws Exception + */ + public List listByIds(PageData pd); + + void updateStatusByUnflowTrain(PageData pd); + + void bantchUpdateStatus(int STATUS, String[] arrayDATA_ids); + + void updateStatusByFlowTrain(PageData pd); + + void graduation(PageData condition); + + void graduationstudent(PageData condition); + + List flowlistPage(Page page); + + PageData getInfoById(PageData condition); + + List findRecordList(PageData condition); +} diff --git a/src/main/java/com/zcloud/service/system/CorpPathService.java b/src/main/java/com/zcloud/service/system/CorpPathService.java new file mode 100644 index 00000000..11abaa48 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/CorpPathService.java @@ -0,0 +1,25 @@ +package com.zcloud.service.system; + +import com.zcloud.entity.PageData; + +/** + * 企业图片地址、后端地址访问表 + */ +public interface CorpPathService { + + /** + * 根据企业id获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + PageData getCorpPathByCorpId(PageData pd) throws Exception; + + /** + * 根据人员信息获取对应企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + PageData getCorpPathByPersonInfo(PageData pd) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/CorpMenuService.java b/src/main/java/com/zcloud/service/system/corpsystem/CorpMenuService.java new file mode 100644 index 00000000..931731b8 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/CorpMenuService.java @@ -0,0 +1,75 @@ +package com.zcloud.service.system.corpsystem; + +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Menu; + +import java.util.List; + +/** + * 说明：菜单服务接口 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpMenuService { + + /**新增菜单 + * @param menu + * @throws Exception + */ + public void addMenu(Menu menu) throws Exception; + + /**保存修改菜单 + * @param menu + * @throws Exception + */ + public void edit(Menu menu) throws Exception; + + /**获取最大的菜单ID + * @param pd + * @return + * @throws Exception + */ + public PageData findMaxId(PageData pd) throws Exception; + + /**获取所有菜单并填充每个菜单的子菜单列表(系统菜单列表) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllMenuQx(String MENU_ID) throws Exception; + + /**通过ID获取其子一级菜单 + * @param parentId + * @return + * @throws Exception + */ + public List listSubMenuByParentId(String parentId)throws Exception; + + /**获取所有菜单并填充每个菜单的子菜单列表(菜单管理)( + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllMenu(String MENU_ID) throws Exception; + + /**获取所有菜单并填充每个菜单的子菜单列表(系统菜单列表) + * @param pd + * @return + * @throws Exception + */ + public PageData getMenuById(PageData pd) throws Exception; + + /**删除菜单 + * @param MENU_ID + * @throws Exception + */ + public void deleteMenuById(String MENU_ID) throws Exception; + + /**保存菜单图标 + * @param pd + * @throws Exception + */ + public void editicon(PageData pd) throws Exception; + public List listSubMenuAll()throws Exception; + +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/CorpRoleService.java b/src/main/java/com/zcloud/service/system/corpsystem/CorpRoleService.java new file mode 100644 index 00000000..753d1458 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/CorpRoleService.java @@ -0,0 +1,94 @@ +package com.zcloud.service.system.corpsystem; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Role; + +import java.util.List; + +/** + * 说明：角色服务接口 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpRoleService { + + /**通过角色ID获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过id查找(返回角色对象) + * @param roleId + * @return + * @throws Exception + */ + public Role getRoleById(String ROLE_ID) throws Exception; + + /**通过组ID获取组下级角色列表 + * @param pd + * @return + * @throws Exception + */ + public List listAllRolesByPId(PageData pd) throws Exception; + + /**通过角色编码查找 + * @param pd + * @return + * @throws Exception + */ + public PageData getRoleByRnumber(PageData pd) throws Exception; + + /**添加 + * @param pd + * @throws Exception + */ + public void add(PageData pd) throws Exception; + + /**保存修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception; + + /**删除角色 + * @param ROLE_ID + * @throws Exception + */ + public void deleteRoleById(String ROLE_ID) throws Exception; + + /**给当前角色附加菜单权限 + * @param role + * @throws Exception + */ + public void updateRoleRights(Role role) throws Exception; + + /**给全部子角色加菜单权限 + * @param pd + * @throws Exception + */ + public void setAllRights(PageData pd) throws Exception; + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + public void saveB4Button(String msg,PageData pd) throws Exception; + + /**通过角色ID数组获取角色列表 + * @param arryROLE_ID + * @throws Exception + */ + public List getRoleByArryROLE_ID(String[] arryROLE_ID)throws Exception; + + /**角色列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + public List roleListWindow(Page page)throws Exception; + +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/CorpUsersService.java b/src/main/java/com/zcloud/service/system/corpsystem/CorpUsersService.java new file mode 100644 index 00000000..90e57b56 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/CorpUsersService.java @@ -0,0 +1,133 @@ +package com.zcloud.service.system.corpsystem; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.User; + +import java.util.List; + +/** + * 说明：用户服务接口 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface CorpUsersService { + + /**通过用户名获取用户信息 + * @param pd + * @return + * @throws Exception + */ + public PageData findByUsername(PageData pd)throws Exception; + + /**通过用户ID获取用户信息 + * @param pd + * @return + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**用户列表 + * @param page + * @return + * @throws Exception + */ + public List userlistPage(Page page)throws Exception; + + /**通过用户ID获取用户信息和角色信息 + * @param USER_ID + * @return + * @throws Exception + */ + public User getUserAndRoleById(String USER_ID) throws Exception; + + /**保存用户IP + * @param pd + * @throws Exception + */ + public void saveIP(PageData pd)throws Exception; + + /**通过邮箱获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findByEmail(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findByNumbe(PageData pd) throws Exception; + + /**列出某角色下的所有用户 + * @param pd + * @return + * @throws Exception + */ + public List listAllUserByRoldId(PageData pd) throws Exception; + + /**用户列表(全部) + * @param pd + * @return + * @throws Exception + */ + public List listAllUser(PageData pd)throws Exception; + + /**用户列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + public List listUsersBystaff(Page page)throws Exception; + + /**保存用户 + * @param pd + * @throws Exception + */ + public void saveUser(PageData pd)throws Exception; + + /**保存用户系统皮肤 + * @param pd + * @throws Exception + */ + public void saveSkin(PageData pd)throws Exception; + + /**修改用户 + * @param pd + * @throws Exception + */ + public void editUser(PageData pd)throws Exception; + public void editPassword(PageData pd)throws Exception; + + /**删除用户 + * @param pd + * @throws Exception + */ + public void deleteUser(PageData pd)throws Exception; + + /**批量删除用户 + * @param pd + * @throws Exception + */ + public void deleteAllUser(String[] USER_IDS)throws Exception; + + /**修改用户小程序权限 + * @param pd + * @throws Exception + */ + public void editUserFuns(PageData pd); + + public Integer hasUserName(PageData pd)throws Exception; + + public List listUserAndDept (PageData pd) throws Exception; + + /*** + * 修改用户状态 + * @param pd + * @return + * @throws Exception + */ + public void updateUserStatus (PageData pd) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpMenuServiceImpl.java b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpMenuServiceImpl.java new file mode 100644 index 00000000..8b09cca3 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpMenuServiceImpl.java @@ -0,0 +1,126 @@ +package com.zcloud.service.system.corpsystem.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Menu; +import com.zcloud.mapper.datasource.corpsystem.CorpMenuMapper; +import com.zcloud.service.system.corpsystem.CorpMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：菜单服务接口实现类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Service +@Transactional //开启事物 +public class CorpMenuServiceImpl implements CorpMenuService { + + @Autowired + private CorpMenuMapper corpMenuMapper; + + /**新增菜单 + * @param menu + * @throws Exception + */ + @CacheEvict(value="menucache", allEntries=true) + public void addMenu(Menu menu) throws Exception{ + corpMenuMapper.addMenu(menu); + } + + /**保存修改菜单 + * @param menu + * @throws Exception + */ + @CacheEvict(value="menucache", allEntries=true) + public void edit(Menu menu) throws Exception{ + corpMenuMapper.edit(menu); + } + + /** + * 通过菜单ID获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData getMenuById(PageData pd) throws Exception { + return corpMenuMapper.getMenuById(pd); + } + + /**获取最大的菜单ID + * @param pd + * @return + * @throws Exception + */ + public PageData findMaxId(PageData pd) throws Exception{ + return corpMenuMapper.findMaxId(pd); + } + + /** + * 通过ID获取其子一级菜单 + * @param parentId + * @return + * @throws Exception + */ + @Cacheable(key="'menu-'+#parentId",value="menucache") + public List listSubMenuByParentId(String parentId) throws Exception { + return corpMenuMapper.listSubMenuByParentId(parentId); + } + + /** + * 获取所有菜单并填充每个菜单的子菜单列表(菜单管理)(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllMenu(String MENU_ID) throws Exception { + List menuList = this.listSubMenuByParentId(MENU_ID); + for(Menu menu : menuList){ + menu.setMENU_URL("menu_edit.html?MENU_ID="+menu.getMENU_ID()); + menu.setSubMenu(this.listAllMenu(menu.getMENU_ID())); + menu.setTarget("treeFrame"); + } + return menuList; + } + + /** + * 获取所有菜单并填充每个菜单的子菜单列表(系统菜单列表)(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllMenuQx(String MENU_ID) throws Exception { + List menuList = this.listSubMenuByParentId(MENU_ID); + for(Menu menu : menuList){ + menu.setSubMenu(this.listAllMenuQx(menu.getMENU_ID())); + menu.setTarget("treeFrame"); + } + return menuList; + } + + /**删除菜单 + * @param MENU_ID + * @throws Exception + */ + @CacheEvict(value="menucache", allEntries=true) + public void deleteMenuById(String MENU_ID) throws Exception{ + corpMenuMapper.deleteMenuById(MENU_ID); + } + + /**保存菜单图标 + * @param pd + * @throws Exception + */ + @CacheEvict(value="menucache", allEntries=true) + public void editicon(PageData pd) throws Exception{ + corpMenuMapper.editicon(pd); + } + public List listSubMenuAll()throws Exception{ + return corpMenuMapper.listSubMenuAll(""); + } +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpRoleServiceImpl.java b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpRoleServiceImpl.java new file mode 100644 index 00000000..1f4442cc --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpRoleServiceImpl.java @@ -0,0 +1,136 @@ +package com.zcloud.service.system.corpsystem.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Role; +import com.zcloud.mapper.datasource.corpsystem.CorpRoleMapper; +import com.zcloud.service.system.corpsystem.CorpRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：角色服务接口实现类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Service +@Transactional //开启事物 +public class CorpRoleServiceImpl implements CorpRoleService { + + @Autowired + private CorpRoleMapper corpRoleMapper; + + /**通过角色ID获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return corpRoleMapper.findById(pd); + } + + /**通过id查找(返回角色对象) + * @param roleId + * @return + * @throws Exception + */ + public Role getRoleById(String ROLE_ID) throws Exception{ + return corpRoleMapper.getRoleById(ROLE_ID); + } + + /**通过角色编码查找 + * @param pd + * @return + * @throws Exception + */ + public PageData getRoleByRnumber(PageData pd) throws Exception{ + return corpRoleMapper.getRoleByRnumber(pd); + } + + /**通过组ID获取组下级角色列表 + * @param pd + * @return + * @throws Exception + */ + public List listAllRolesByPId(PageData pd) throws Exception { + return corpRoleMapper.listAllRolesByPId(pd); + } + + /**添加 + * @param pd + * @throws Exception + */ + public void add(PageData pd) throws Exception{ + corpRoleMapper.add( pd); + } + + /**保存修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception{ + corpRoleMapper.edit( pd); + } + + /**删除角色 + * @param ROLE_ID + * @throws Exception + */ + public void deleteRoleById(String ROLE_ID) throws Exception{ + corpRoleMapper.deleteRoleById(ROLE_ID); + } + + /**给当前角色附加菜单权限 + * @param role + * @throws Exception + */ + public void updateRoleRights(Role role) throws Exception{ + corpRoleMapper.updateRoleRights(role); + } + + /**给全部子角色加菜单权限 + * @param pd + * @throws Exception + */ + public void setAllRights(PageData pd) throws Exception{ + corpRoleMapper.setAllRights(pd); + } + + /**权限(增删改查) + * @param msg 区分增删改查 + * @param pd + * @throws Exception + */ + public void saveB4Button(String msg,PageData pd) throws Exception{ + if("add_qx".equals(msg)){ + corpRoleMapper.addQx(pd); + }else if("del_qx".equals(msg)){ + corpRoleMapper.delQx(pd); + }else if("edit_qx".equals(msg)){ + corpRoleMapper.editQx(pd); + }else if("cha_qx".equals(msg)){ + corpRoleMapper.chaQx(pd); + } + } + + /**通过角色ID数组获取角色列表 + * @param arryROLE_ID + * @throws Exception + */ + public List getRoleByArryROLE_ID(String[] arryROLE_ID)throws Exception{ + return corpRoleMapper.listAllRolesByArryROLE_ID(arryROLE_ID); + } + + /**角色列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + public List roleListWindow(Page page)throws Exception{ + return corpRoleMapper.roleWindowlistPage(page); + } + +} diff --git a/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpUsersServiceImpl.java b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpUsersServiceImpl.java new file mode 100644 index 00000000..ccc6e72a --- /dev/null +++ b/src/main/java/com/zcloud/service/system/corpsystem/impl/CorpUsersServiceImpl.java @@ -0,0 +1,177 @@ +package com.zcloud.service.system.corpsystem.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.User; +import com.zcloud.mapper.datasource.corpsystem.CorpUsersMapper; +import com.zcloud.service.system.corpsystem.CorpUsersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：用户服务接口实现类 + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +@Service +@Transactional //开启事物 +public class CorpUsersServiceImpl implements CorpUsersService { + + @Autowired + private CorpUsersMapper corpUsersMapper; + + /**通过用户名获取用户信息 + * @param pd + * @return + * @throws Exception + */ + public PageData findByUsername(PageData pd) throws Exception { + return corpUsersMapper.findByUsername(pd); + } + + /**通过用户ID获取用户信息 + * @param pd + * @return + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return corpUsersMapper.findById(pd); + } + + /**用户列表 + * @param page + * @return + * @throws Exception + */ + public List userlistPage(Page page) throws Exception { + return corpUsersMapper.userlistPage(page); + } + + /**通过用户ID获取用户信息和角色信息 + * @param USER_ID + * @return + * @throws Exception + */ + public User getUserAndRoleById(String USER_ID) throws Exception { + return corpUsersMapper.getUserAndRoleById(USER_ID); + } + + /**保存用户IP + * @param pd + * @throws Exception + */ + public void saveIP(PageData pd) throws Exception { + corpUsersMapper.saveIP(pd); + } + + /**通过邮箱获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findByEmail(PageData pd) throws Exception { + return corpUsersMapper.findByEmail(pd); + } + + /**通过编码获取数据 + * @param pd + * @return + * @throws Exception + */ + public PageData findByNumbe(PageData pd) throws Exception { + return corpUsersMapper.findByNumbe(pd); + } + + /**列出某角色下的所有用户 + * @param pd + * @return + * @throws Exception + */ + public List listAllUserByRoldId(PageData pd) throws Exception{ + return corpUsersMapper.listAllUserByRoldId(pd); + } + + /**用户列表(全部) + * @param pd + * @return + * @throws Exception + */ + public List listAllUser(PageData pd)throws Exception{ + return corpUsersMapper.listAllUser(pd); + } + + /**用户列表(弹窗选择用) + * @param page + * @return + * @throws Exception + */ + public List listUsersBystaff(Page page)throws Exception{ + return corpUsersMapper.userBystafflistPage(page); + } + + /**保存用户 + * @param pd + * @throws Exception + */ + public void saveUser(PageData pd)throws Exception { + corpUsersMapper.saveUser(pd); + } + + /**保存用户系统皮肤 + * @param pd + * @throws Exception + */ + public void saveSkin(PageData pd)throws Exception{ + corpUsersMapper.saveSkin(pd); + } + + /**修改用户 + * @param pd + * @throws Exception + */ + public void editUser(PageData pd)throws Exception{ + corpUsersMapper.editUser(pd); + } + public void editPassword(PageData pd)throws Exception{ + corpUsersMapper.editPassword(pd); + } + + /**删除用户 + * @param pd + * @throws Exception + */ + public void deleteUser(PageData pd)throws Exception{ + corpUsersMapper.deleteUser(pd); + } + + /**批量删除用户 + * @param pd + * @throws Exception + */ + public void deleteAllUser(String[] USER_IDS)throws Exception{ + corpUsersMapper.deleteAllUser(USER_IDS); + } + + /**修改用户小程序权限 + * @param pd + * @throws Exception + */ + public void editUserFuns(PageData pd) { + corpUsersMapper.editUserFuns(pd); + } + + @Override + public Integer hasUserName(PageData pd) throws Exception { + return corpUsersMapper.hasUserName(pd); + } + + public List listUserAndDept (PageData pd) throws Exception{ + return corpUsersMapper.listUserAndDept(pd); + } + public void updateUserStatus (PageData pd) throws Exception{ + corpUsersMapper.updateUserStatus(pd); + } +} diff --git a/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java new file mode 100644 index 00000000..10c7e473 --- /dev/null +++ b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java @@ -0,0 +1,60 @@ +package com.zcloud.service.system.impl; + +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.system.CorpPathMapper; +import com.zcloud.service.system.CorpPathService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * 企业图片地址、后端地址访问表 + */ +@Service +public class CorpPathServiceImpl implements CorpPathService { + @Autowired + private CorpPathMapper corpPathMapper; + + @Value("${corp.default.pic-path}") + private String defaultPicPath; + + @Value("${corp.default.back-end-path}") + private String defaultBackEndPath; + + /** + * 根据企业id获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + @Override + public PageData getCorpPathByCorpId(PageData pd) throws Exception { + PageData data = corpPathMapper.getCorpPathByCorpId(pd); + if (Tools.isEmpty(data)) { + PageData result = new PageData(); + result.put("PIC_PATH",defaultPicPath); + result.put("BACK_END_PATH", defaultBackEndPath); + return result; + } + return data; + } + + /** + * 根据人员信息获取企业图片、后端路径访问地址 + * @param pd + * @return + * @throws Exception + */ + @Override + public PageData getCorpPathByPersonInfo(PageData pd) throws Exception { + PageData data = corpPathMapper.getCorpPathByPersonInfo(pd); + if ("1".equals(pd.getString("USER_ID")) || Tools.isEmpty(data)) { + PageData result = new PageData(); + result.put("PIC_PATH",defaultPicPath); + result.put("BACK_END_PATH", defaultBackEndPath); + return result; + } + return data; + } +} diff --git a/src/main/java/com/zcloud/service/xgf/TrainUsersService.java b/src/main/java/com/zcloud/service/xgf/TrainUsersService.java new file mode 100644 index 00000000..bba08ab6 --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/TrainUsersService.java @@ -0,0 +1,100 @@ +package com.zcloud.service.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** +import java.util.List; + +/** + * 说明：培训学员 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +public interface TrainUsersService{ + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**固定服务人员培训管理列表 + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 固定服务人员培训管理查看 + * @param pd + * @return + */ + public PageData trainView(PageData pd) throws Exception; + + /** + * 培训申请记录 + * @param pd + * @return + */ + public List trainApplicationRecordList(Page page); + + + /**固定人员列表 + * @param page + * @throws Exception + */ + public List unflowlist(Page page)throws Exception; + + /**审核 + * @param pd + * @throws Exception + */ + public void audit(PageData pd)throws Exception; + + + /**新增 + * @param pd + * @throws Exception + */ + public void approveUser(PageData pd)throws Exception; + List findinfoByCondition(PageData condition) throws Exception; + + void endApproval(PageData pd) throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java b/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java new file mode 100644 index 00000000..5dff54a4 --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java @@ -0,0 +1,95 @@ +package com.zcloud.service.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：培训批次管理 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +public interface TrainingBatchService{ + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + public void unflowTrain(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**审核 + * @param pd + * @throws Exception + */ + void audit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 获取编号 + * @param pd + * @return + */ + public PageData getCode(PageData pd) throws Exception; + + /**批次内人员列表 + * @param page + * @throws Exception + */ + public List batchUserlistPage(Page page)throws Exception; + + List passUserlistPage(Page page) throws Exception; + + void graduation(PageData condition); + + void openClass(PageData condition); + + void openStudentClass(PageData condition); + + void updateClassMessage(PageData condition); + + void saveFlow(PageData request) throws Exception; + + List findByUserId(PageData condition) throws Exception; + + List oldBatchList(Page page) throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java new file mode 100644 index 00000000..3397027c --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -0,0 +1,27 @@ +package com.zcloud.service.xgf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface XgfUserService { + + void save(PageData pd) throws Exception; + + void saveDetail(PageData pd) throws Exception; + + List list(Page page) throws Exception; + + void init(PageData request) throws Exception; + + void approvalApplication(PageData request) throws Exception; + + List flowlistPage(Page page)throws Exception; + + void approve(PageData request) throws Exception; + + PageData findInfo(PageData condition); + + List findRecordList(PageData condition) throws Exception; +} diff --git a/src/main/java/com/zcloud/service/xgf/impl/TrainUsersServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/TrainUsersServiceImpl.java new file mode 100644 index 00000000..5f5cb66d --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/impl/TrainUsersServiceImpl.java @@ -0,0 +1,207 @@ +package com.zcloud.service.xgf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.system.UsersMapper; +import com.zcloud.mapper.datasource.xgf.*; +import com.zcloud.service.xgf.TrainUsersService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Tools; +import com.zcloud.util.Warden; +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.Date; +import java.util.List; + +/** + * 说明：培训学员 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class TrainUsersServiceImpl implements TrainUsersService { + + @Resource + private TrainUsersMapper trainusersMapper; + + @Resource + private TrainingBatchMapper trainingBatchMapper; + @Resource + private XgfUserMapper xgfUserMapper; + + @Resource + private FlowDetailMapper flowDetailMapper; + + @Resource + private FlowMapper flowMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + trainusersMapper.save(pd); + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + trainusersMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + trainusersMapper.edit(pd); + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return trainusersMapper.datalistPage(page); + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return trainusersMapper.listAll(pd); + } + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return trainusersMapper.findById(pd); + } + + /** + * 批量删除 + * + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS) throws Exception { + trainusersMapper.deleteAll(ArrayDATA_IDS); + } + + /** + * 固定服务人员培训管理查看 + * + * @param pd + * @return + * @throws Exception + */ + @Override + public PageData trainView(PageData pd) throws Exception { + return trainusersMapper.trainView(pd); + } + + @Override + public List trainApplicationRecordList(Page page) { + return trainusersMapper.trainApplicationRecordList(page); + } + + + public List unflowlist(Page page) throws Exception { + return trainusersMapper.unflowlistPage(page); + } + + public void audit(PageData pd) throws Exception { + if (Integer.parseInt(pd.getString("AUDIT_STATUS")) == -1) { + + } else if (Integer.parseInt(pd.getString("AUDIT_STATUS")) == 1) { + pd.put("STATUS", 2); + pd.put("END_DATE", DateUtil.date2Str(new Date())); + xgfUserMapper.updateStatusByUnflowTrain(pd); + trainusersMapper.updateStatus(pd); + } + } + + @Override + public void approveUser(PageData pd) throws Exception { + PageData condition = new PageData(); + condition.put("TRAIN_USERS_ID", pd.get("TRAIN_USERS_ID")); + PageData userEntity = trainusersMapper.findById(condition); + switch (userEntity.getString("STEP_STATUS")){ + case "0": + userEntity.put("TERRITORIALITY_STATE", pd.getString("IS_STATE")); + userEntity.put("TERRITORIALITY_OPINION", pd.getString("OPINION")); + userEntity.put("TERRITORIALITY_TIME", DateUtil.getTime()); + break; + case "1": + userEntity.put("MANAGER_STATE", pd.getString("IS_STATE")); + userEntity.put("MANAGER_OPINION", pd.getString("OPINION")); + userEntity.put("MANAGER_TIME", DateUtil.getTime()); + break; + case "3": + userEntity.put("SUPERVISION_STATE", pd.getString("IS_STATE")); + userEntity.put("SUPERVISION_OPINION", pd.getString("OPINION")); + userEntity.put("SUPERVISION_TIME", DateUtil.getTime()); + break; + } + if ("0".equals(pd.getString("IS_STATE"))) { + userEntity.put("STEP_STATUS", '-' + userEntity.getString("STEP_STATUS")); + userEntity.put("RESULT_STATUS","3"); + } else { + int stepNumber = Integer.parseInt(userEntity.getString("STEP_STATUS")) + 1; + if (stepNumber == 3){ + userEntity.put("RESULT_STATUS","2"); + } + userEntity.put("STEP_STATUS", Integer.toString(stepNumber)); + } + trainusersMapper.edit(userEntity); + } + + @Override + public List findinfoByCondition(PageData condition) throws Exception { + return trainusersMapper.findinfoByCondition(condition); + } + + @Override + public void endApproval(PageData pd) throws Exception { + PageData condition = new PageData(); + condition.put("TRAINING_BATCH_ID",pd.getString("TRAINING_BATCH_ID")); + PageData entity = trainingBatchMapper.findById(condition); + int stepNumber = Integer.parseInt(entity.getString("STEP_STATUS")); + switch (stepNumber){ + case 0: + entity.put("TERRITORIALITY_TIME",DateUtil.getTime()); + break; + case 1: + entity.put("MANAGER_TIME",DateUtil.getTime()); + break; + case 2: + entity.put("SUPERVISION_TIME",DateUtil.getTime()); + break; + } + entity.put("STEP_STATUS",++stepNumber); + trainingBatchMapper.edit(entity); + } +} + diff --git a/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java new file mode 100644 index 00000000..773f317e --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java @@ -0,0 +1,416 @@ +package com.zcloud.service.xgf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.system.DepartmentMapper; +import com.zcloud.mapper.datasource.system.UsersMapper; +import com.zcloud.mapper.datasource.xgf.*; +import com.zcloud.service.xgf.TrainingBatchService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.DecimalFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 说明：培训批次管理 + * 作者：luoxiaobao + * 时间：2023-05-08 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class TrainingBatchServiceImpl implements TrainingBatchService { + + @Resource + private TrainingBatchMapper trainingbatchMapper; + + @Resource + private TrainUsersMapper trainUsersMapper; + + @Resource + private XgfUserMapper xgfUserMapper; + + @Resource + private FlowMapper flowMapper; + + @Resource + private FlowDetailMapper flowDetailMapper; + + @Resource + private UsersMapper usersMapper; + + @Resource + private DepartmentMapper departmentMapper; + + /** + * 新增 + * + * @param pd + * @throws Exception + */ + public void save(PageData pd) throws Exception { + /* 保存主题信息 */ + String batch_id = UuidUtil.get32UUID(); + String train_area = pd.getString("TRAIN_AREA"); + pd.put("TRAINING_BATCH_ID", batch_id); //主键 + pd.put("CREATOR", Jurisdiction.getUsername()); //添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + pd.put("ISDELETE", 0); //是否删除 1-是 0-否 + + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft = new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + pd.put("CREATDATE", year + "-" + month); + PageData cpd = trainingbatchMapper.getCode(pd); //根据ID读取 + String code = year + "-" + month + "-" + dft.format((Integer.parseInt(cpd.get("code").toString()) + 1)); + pd.put("BATCH_NAME", code); + /*翻译*/ + PageData condition = new PageData(); + condition.put("USER_ID", pd.get("SUPERVISION_USER_ID")); + PageData supUser = usersMapper.getUserInfo(condition); + pd.put("SUPERVISION_USER_NAME", supUser.get("NAME")); + + condition.clear(); + condition.put("DEPARTMENT_ID", pd.get("SUPERVISION")); + PageData supDepartment = departmentMapper.getInfo(condition); + pd.put("SUPERVISION_DEPARTMENT_NAME", supDepartment.get("NAME")); + + condition.clear(); + condition.put("USER_ID", pd.get("MANAGER_USER_ID")); + PageData manUser = usersMapper.getUserInfo(condition); + pd.put("MANAGER_USER_NAME", manUser.get("NAME")); + + condition.clear(); + condition.put("DEPARTMENT_ID", pd.get("MANAGER")); + PageData manDepartment = departmentMapper.getInfo(condition); + pd.put("MANAGER_DEPARTMENT_NAME", manDepartment.get("NAME")); + + // 2023-12-21 相关方功能限制，暂时移除集团单位审批节点 created by sparrow + if (StringUtils.isNotEmpty(pd.getString("TERRITORIALITY_USER_ID"))) { + condition.clear(); + condition.put("USER_ID", pd.get("TERRITORIALITY_USER_ID")); + PageData terUser = usersMapper.getUserInfo(condition); + pd.put("TERRITORIALITY_USER_NAME", terUser == null ? "" : terUser.get("NAME")); + + condition.clear(); + condition.put("DEPARTMENT_ID", pd.get("TERRITORIALITY")); + PageData terDepartment = departmentMapper.getInfo(condition); + pd.put("TERRITORIALITY_DEPARTMENT_NAME", terDepartment == null ? "" : terDepartment.get("NAME")); + } + + pd.put("IS_DELETE", "0"); + pd.put("STEP_STATUS", "1"); + trainingbatchMapper.save(pd); + + String arrayDATA_ids[] = pd.getString("users").split(","); + Arrays.asList(arrayDATA_ids).forEach(id -> { + PageData user = new PageData(); + user.put("TRAIN_USERS_ID", UuidUtil.get32UUID()); + user.put("TRAINING_BATCH_ID", batch_id); + user.put("USER_ID", id); + user.put("TRAIN_AREA", train_area); + user.put("STATUS", 0); + user.put("SUPERVISION_STATE", 9); + user.put("MANAGER_STATE", 9); + user.put("TERRITORIALITY_STATE", 9); + user.put("STEP_STATUS", "1"); + user.put("BELONG_TO_CORP", pd.get("BELONG_TO_CORP")); + user.put("BELONG_TO_CORP_NAME", pd.get("BELONG_TO_CORP_NAME")); + user.put("IS_DELETE", "0"); + user.put("RESULT_STATUS", "1"); + trainUsersMapper.save(user); + condition.clear(); + condition.put("XGF_USER_ID", id); + PageData userEntity = xgfUserMapper.findById(condition); + userEntity.put("STATUS", "3"); + userEntity.put("STUDY_STATUS", "9"); + xgfUserMapper.edit(userEntity); + }); + + /* 保存审批流程信息 */ + PageData flow = new PageData(); + flow.put("FLOW_ID", Warden.get32UUID()); + flow.put("TYPE", "0"); + flow.put("CREATOR", Jurisdiction.getUSER_ID()); + flow.put("CREATOR_NAME", Jurisdiction.getName()); + flow.put("CREATOR_TIME", DateUtil.getTime()); + flow.put("VALID_FLAG", "1"); + flow.put("FOREIGN_KEY", pd.getString("TRAINING_BATCH_ID")); + flow.put("ISDELETE", "0"); + flowMapper.save(flow); + /* 保存审批流程明细信息 */ + PageData flowDetail = new PageData(); + flowDetail.put("FLOW_DETAIL_ID", Warden.get32UUID()); + flowDetail.put("FLOW_ID", flow.getString("FLOW_ID")); + flowDetail.put("STEP_FLAG", "1"); + flowDetail.put("SORT", 0); + flowDetail.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + flowDetail.put("APPROVER_NAME", Jurisdiction.getName()); + flowDetail.put("APPROVER_TIME", DateUtil.getTime()); + flowDetail.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + // TODO 未完成 + flowDetail.put("APPROVER_CORPINFO_NAME", ""); + flowDetail.put("PASS_FLAG", "1"); + flowDetail.put("END_FLAG", "0"); + flowDetail.put("ISDELETE", "0"); + flowDetail.put("PARENT_ID", "0"); + flowDetailMapper.save(flowDetail); + } + + /** + * 固定人员培训 + * + * @param pd + * @throws Exception + */ + public void unflowTrain(PageData pd) throws Exception { + PageData trainBatch = new PageData(); + String batch_id = UuidUtil.get32UUID(); + trainBatch.put("TRAINING_BATCH_ID", batch_id); //主键 + trainBatch.put("CREATOR", pd.getString("TRAIN_CORP_LEADER_NAME")); //添加人 + trainBatch.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + trainBatch.put("OPERATOR", pd.getString("TRAIN_CORP_LEADER_NAME")); //修改人 + trainBatch.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + trainBatch.put("ISDELETE", 0); //是否删除 1-是 0-否 + trainBatch.put("TYPE", 1); + trainBatch.put("USER_COUNT", pd.getString("USER_COUNT")); + trainBatch.put("AUDIT_STATUS", 0); + trainBatch.put("TRAIN_CORP_DEPT", pd.getString("TRAIN_CORP_DEPT")); + trainBatch.put("TRAIN_CORP_LEADER", pd.getString("TRAIN_CORP_LEADER")); + + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft = new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + trainBatch.put("CREATDATE", year + "-" + month); + PageData cpd = trainingbatchMapper.getCode(trainBatch); //根据ID读取 + String code = year + "-" + month + "-" + dft.format((Integer.parseInt(cpd.get("code").toString()) + 1)); + trainBatch.put("BATCH_NAME", code); + + trainingbatchMapper.save(trainBatch); + trainBatch.put("AUDIT_STATUS", "2"); + this.audit(trainBatch); + + String arrayDATA_IDS[] = pd.getString("users").split(","); + Arrays.asList(arrayDATA_IDS).forEach(id -> { + PageData user = new PageData(); + user.put("TRAIN_USERS_ID", UuidUtil.get32UUID()); + user.put("TRAINING_BATCH_ID", batch_id); + user.put("USER_ID", id); + user.put("TRAIN_CORPINFO_ID", pd.getString("FIRST_PARTY_ID")); + user.put("STATUS", 1); + user.put("START_DATE", DateUtil.date2Str(new Date())); + user.put("SUPERVISION_STATE", 9); + user.put("MANAGER_STATE", 9); + user.put("TERRITORIALITY_STATE", 9); + user.put("STEP_STATUS", "0"); + trainUsersMapper.save(user); + }); + xgfUserMapper.bantchUpdateStatus(1, arrayDATA_IDS); + + } + + /** + * 删除 + * + * @param pd + * @throws Exception + */ + public void delete(PageData pd) throws Exception { + trainingbatchMapper.delete(pd); + } + + /** + * 修改 + * + * @param pd + * @throws Exception + */ + public void edit(PageData pd) throws Exception { + trainingbatchMapper.edit(pd); + } + + public void audit(PageData pd) throws Exception { + if (Integer.parseInt(pd.getString("AUDIT_STATUS")) == -1) { + pd.put("STATUS", 0); + pd.put("ENTRUST_TIME", DateUtil.date2Str(new Date())); + xgfUserMapper.updateStatusByFlowTrain(pd); + trainingbatchMapper.audit(pd); + } else if (Integer.parseInt(pd.getString("AUDIT_STATUS")) == 2) { + pd.put("STATUS", 1); + pd.put("START_DATE", DateUtil.date2Str(new Date())); + pd.put("AUDIT_TIME", DateUtil.date2Str(new Date())); + xgfUserMapper.updateStatusByFlowTrain(pd); + trainUsersMapper.updateStatusByFlowTrain(pd); + trainingbatchMapper.audit(pd); + } else if (Integer.parseInt(pd.getString("AUDIT_STATUS")) == 3) { + pd.put("STATUS", 2); + pd.put("END_DATE", DateUtil.date2Str(new Date())); + pd.put("VERIFY_TIME", DateUtil.date2Str(new Date())); + xgfUserMapper.updateStatusByFlowTrain(pd); + trainUsersMapper.updateStatusByFlowTrain(pd); + trainingbatchMapper.audit(pd); + } else { + pd.put("ENTRUST_TIME", DateUtil.date2Str(new Date())); + trainingbatchMapper.audit(pd); + } + } + + /** + * 列表 + * + * @param page + * @throws Exception + */ + public List list(Page page) throws Exception { + return trainingbatchMapper.datalistPage(page); + } + + /** + * 列表(全部) + * + * @param pd + * @throws Exception + */ + public List listAll(PageData pd) throws Exception { + return trainingbatchMapper.listAll(pd); + } + + /** + * 通过id获取数据 + * + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd) throws Exception { + return trainingbatchMapper.findById(pd); + } + + /** + * 批量删除 + * + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS) throws Exception { + trainingbatchMapper.deleteAll(ArrayDATA_IDS); + } + + /** + * 获取编号 + * + * @param pd + * @return + */ + @Override + public PageData getCode(PageData pd) throws Exception { + return trainingbatchMapper.getCode(pd); + } + + public List batchUserlistPage(Page page) throws Exception { + return trainingbatchMapper.batchUserlistPage(page); + } + + @Override + public List passUserlistPage(Page page) throws Exception { + return trainingbatchMapper.passUserlistPage(page); + } + + @Override + public void graduation(PageData condition) { + trainingbatchMapper.graduation(condition); + xgfUserMapper.graduation(condition); + } + + @Override + public void openClass(PageData info) { + List list = Warden.getList(info.getString("list")); + PageData condition = new PageData(); + condition.put("STATUS", info.getString("userStatus")); + condition.put("list", list.stream().filter(n -> "1".equals(n.getString("STATUS"))).map(n -> n.getString("USER_ID")).collect(Collectors.toList())); + xgfUserMapper.graduation(condition); + + condition.clear(); + condition.put("STATUS", info.getString("detailsStatus")); + condition.put("list", list.stream().filter(n -> "1".equals(n.getString("STATUS"))).map(n -> n.getString("TRAIN_USERS_ID")).collect(Collectors.toList())); + trainUsersMapper.graduation(condition); + + } + + @Override + public void openStudentClass(PageData info) { +// List list = Warden.getList(info.getString("list")); + PageData condition = new PageData(); + condition.put("STATUS", info.getString("userStatus")); + condition.put("USER_ID", info.getString("USER_ID")); + xgfUserMapper.graduationstudent(condition); + + condition.clear(); + condition.put("STATUS", info.getString("detailsStatus")); + condition.put("TRAIN_USERS_ID", info.getString("TRAIN_USERS_ID")); + trainUsersMapper.graduationstudent(condition); + + } + + @Override + public void updateClassMessage(PageData info) { + List list = Warden.getList(info.getString("list")); + PageData condition = new PageData(); + condition.put("list", list.stream().map(n -> n.getString("TRAIN_USERS_ID")).collect(Collectors.toList())); + if (StringUtils.isNotEmpty(info.getString("START_DATE"))) { + condition.put("START_DATE", DateUtil.getTime()); + } + if (StringUtils.isNotEmpty(info.getString("END_DATE"))) { + condition.put("END_DATE", DateUtil.getTime()); + } + trainUsersMapper.updateDate(condition); + } + + @Override + public void saveFlow(PageData request) throws Exception { + /* 保存审批流程明细信息 */ + PageData condition = new PageData(); + condition.put("FLOW_ID", request.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); + PageData flow = flowDetailMapper.selectOne(condition); + flow.put("STEP_FLAG", "0"); + flowDetailMapper.edit(flow); + PageData next_flow = new PageData(); + next_flow.put("FLOW_DETAIL_ID", Warden.get32UUID()); + next_flow.put("FLOW_ID", flow.getString("FLOW_ID")); + next_flow.put("STEP_FLAG", "1"); + next_flow.put("SORT", (Integer) flow.get("SORT") + 1); + next_flow.put("APPROVER_ID", request.get("APPROVER_ID")); + next_flow.put("APPROVER_NAME", request.get("APPROVER_NAME")); + next_flow.put("APPROVER_TIME", DateUtil.getTime()); + next_flow.put("APPROVER_CORPINFO_ID", request.get("APPROVER_CORPINFO_ID")); + next_flow.put("APPROVER_CORPINFO_NAME", request.get("APPROVER_CORPINFO_NAME")); + next_flow.put("PASS_FLAG", "1"); + next_flow.put("END_FLAG", "0"); + next_flow.put("ISDELETE", "0"); + next_flow.put("PARENT_ID", flow.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(next_flow); + } + + @Override + public List findByUserId(PageData condition) throws Exception { + return trainingbatchMapper.findByUserId(condition); + } + + @Override + public List oldBatchList(Page page) throws Exception { + return trainingbatchMapper.oldlistPage(page); + } +} + diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java new file mode 100644 index 00000000..169722b4 --- /dev/null +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -0,0 +1,199 @@ +package com.zcloud.service.xgf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.xgf.TrainUsersMapper; +import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; +import com.zcloud.mapper.datasource.xgf.XgfUserMapper; +import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.system.DepartmentService; +import com.zcloud.service.xgf.XgfUserService; +import com.zcloud.util.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class XgfUserServiceImpl implements XgfUserService { + + @Resource + private XgfUserMapper xgfUserMapper; + + @Resource + private XgfUserDetailsMapper xgfUserDetailsMapper; + + @Resource + private TrainUsersMapper trainUsersMapper; + + @Resource + private DepartmentService departmentService; + + @Value("${preventionxgf.api.url}") + private String prevention_xgf_url; + + @Override + public void save(PageData pd) throws Exception { + xgfUserMapper.save(pd); + } + + @Override + public void saveDetail(PageData pd) throws Exception { + xgfUserDetailsMapper.save(pd); + } + + @Override + public List list(Page page) throws Exception { + return xgfUserDetailsMapper.listPage(page); + } + + @Override + @Transactional + public void init(PageData request) throws Exception { + List list = Warden.getList(request.getString("infoList")); + PageData condition = new PageData(); + for (PageData x : list) { + if (StringUtils.isNotBlank(x.getString("USER_ID"))) { + condition.put("XGF_USER_ID", x.getString("USER_ID")); + PageData entity = xgfUserMapper.findById(condition); + if (entity == null || entity.size() <= 0) { + x.put("XGF_USER_ID", x.get("USER_ID")); + x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); + x.put("XGF_USER_NAME", x.get("NAME")); + x.put("VALID_FLAG", "1"); + x.put("STATUS", "2"); + x.put("CREATED_TIME", DateUtil.getTime()); + x.put("OPERATOR_TIME", DateUtil.getTime()); + x.put("IS_DELETE", "0"); + x.put("CREATE_TIME", DateUtil.getTime()); + /* 监管部门 */ + condition.clear(); + condition.put("DEPARTMENT_ID", x.get("MANAGER_DEPARTMENT_ID")); + PageData regDepartmentEntity = departmentService.getCorpDepartment(condition); + if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) { + x.put("MANAGER_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + } + + /* 主管部门 */ + condition.clear(); + condition.put("DEPARTMENT_ID", x.get("MAIN_DEPARTMENT_ID")); + regDepartmentEntity = departmentService.getCorpDepartment(condition); + x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + if (regDepartmentEntity.size() > 0) { + x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + } + xgfUserMapper.save(x); + xgfUserDetailsMapper.save(x); + } else { + x.put("XGF_USER_ID", x.get("USER_ID")); + x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); + x.put("IS_DELETE", "0"); + x.put("CREATE_TIME", DateUtil.getTime()); + x.put("OPERATOR_TIME", DateUtil.getTime()); + /* 监管部门 */ + condition.clear(); + condition.put("DEPARTMENT_ID", x.get("MANAGER_DEPARTMENT_ID")); + PageData regDepartmentEntity = departmentService.getCorpDepartment(condition); + if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) { + x.put("MANAGER_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + } + /* 主管部门 */ + condition.clear(); + condition.put("DEPARTMENT_ID", x.get("MAIN_DEPARTMENT_ID")); + regDepartmentEntity = departmentService.getCorpDepartment(condition); + x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + if (regDepartmentEntity.size() > 0) { + x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); + } + x.put("IS_DELETE", "0"); + x.put("VALID_FLAG", "1"); + x.put("STATUS", "2"); + if ("2".equals(x.getString("STUDY_STATUS"))) { + x.put("STUDY_STATUS", "2"); + }else { + x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); + } + x.put("STUDY_STATUS",entity.getString("STUDY_STATUS")); + + xgfUserMapper.edit(x); + xgfUserDetailsMapper.edit(x); + } + } + } + } + + @Override + public void approvalApplication(PageData request) throws Exception { + + + List list = Arrays.asList(request.getString("xgf_user_ids").split(",")); + + PageData condition = new PageData(); + condition.put("XGF_USER_IDS", list); + List entities = xgfUserMapper.listByIds(condition); + /* 校验所有数据是否都是正常状态 */ + if (entities.stream().anyMatch(n -> !"2".equals(n.getString("STATUS")))) { + String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map( n -> n.getString("NAME")).collect(Collectors.joining(",")); + throw new RuntimeException("用户[" + name + "]在系统流程中无法被打回"); + } + + for (PageData x : entities) { + x.put("VALID_FLAG", "0"); + x.put("STATUS", "1"); + xgfUserMapper.edit(x); + } + } + + @Override + public List flowlistPage(Page page) throws Exception { + return xgfUserMapper.flowlistPage(page); + } + + @Override + @Transactional + public void approve(PageData request) throws Exception { + List _list = Warden.getList(request.getString("list")); + if (_list == null || _list.size() == 0) { + throw new RuntimeException("请求数据异常"); + } + List list = _list.stream().map(x -> x.getString("XGF_USER_ID")).collect(Collectors.toList()); + PageData condition = new PageData(); + for (String x : list) { + condition.put("XGF_USER_ID", x); + PageData entity = xgfUserMapper.findById(condition); + if (entity == null || entity.size() == 0) { + throw new RuntimeException("未找到该用户"); + } + if ("1".equals(request.getString("STATUS"))) { + entity.put("STATUS", "0"); + } else { + entity.put("STATUS", "2"); + entity.put("VALID_FLAG", "1"); + } + xgfUserMapper.edit(entity); + + entity.put("USER_ID", condition.get("XGF_USER_ID")); + entity.put("STATUS", request.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", entity); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + } + } + + @Override + public PageData findInfo(PageData condition) { + return xgfUserMapper.getInfoById(condition); + } + + @Override + public List findRecordList(PageData condition) throws Exception { + return xgfUserMapper.findRecordList(condition); + } +} diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml new file mode 100644 index 00000000..24f3cd6b --- /dev/null +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpMenuMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SYS_MENU + + + + + MENU_ID, + MENU_NAME, + MENU_URL, + PARENT_ID, + MENU_ICON, + SHIRO_KEY, + MENU_ORDER, + MENU_STATE, + MENU_TYPE, + COMPONENT, + SHOW_MODEL + + + + + #{MENU_ID}, + #{MENU_NAME}, + #{MENU_URL}, + #{PARENT_ID}, + #{MENU_ICON}, + #{SHIRO_KEY}, + #{MENU_ORDER}, + #{MENU_STATE}, + #{MENU_TYPE}, + #{COMPONENT}, + #{SHOW_MODEL} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + MENU_NAME =#{MENU_NAME}, + MENU_URL =#{MENU_URL} , + MENU_ORDER=#{MENU_ORDER}, + MENU_STATE=#{MENU_STATE}, + SHIRO_KEY=#{SHIRO_KEY}, + MENU_TYPE =#{MENU_TYPE}, + COMPONENT=#{COMPONENT}, + SHOW_MODEL=#{SHOW_MODEL} + where + MENU_ID=#{MENU_ID} + + + + + + + + + + + + + + delete from + + where MENU_ID=#{MENU_ID} + + + + + update + + set + MENU_ICON=#{MENU_ICON} + where + MENU_ID=#{MENU_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpRoleMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpRoleMapper.xml new file mode 100644 index 00000000..00d9bf33 --- /dev/null +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpRoleMapper.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + SYS_ROLE + + + + + ROLE_ID, + ROLE_NAME, + RIGHTS, + PARENT_ID, + ADD_QX, + DEL_QX, + EDIT_QX, + CHA_QX, + DEPT_TYPE, + RNUMBER, + LEVEL, + PRIMARYNUM + + + + + #{ROLE_ID}, + #{ROLE_NAME}, + #{RIGHTS}, + #{PARENT_ID}, + #{ADD_QX}, + #{DEL_QX}, + #{EDIT_QX}, + #{CHA_QX}, + #{DEPT_TYPE}, + #{RNUMBER}, + #{LEVEL}, + #{PRIMARYNUM} + + + + + + + + + + + + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set ROLE_NAME = #{ROLE_NAME}, + DEPT_TYPE = #{DEPT_TYPE}, + PRIMARYNUM = #{PRIMARYNUM}, + LEVEL = #{LEVEL} + where ROLE_ID = #{ROLE_ID} + + + + + delete from + + where ROLE_ID=#{ROLE_ID} + + + + + update + + set RIGHTS=#{RIGHTS} + where ROLE_ID=#{ROLE_ID} + + + + + update + + set RIGHTS=#{rights} + where PARENT_ID=#{ROLE_ID} + + + + + update + + set ADD_QX=#{value} + where ROLE_ID=#{ROLE_ID} + + + + + update + + set DEL_QX=#{value} + where ROLE_ID=#{ROLE_ID} + + + + + update + + set EDIT_QX=#{value} + where ROLE_ID=#{ROLE_ID} + + + + + update + + set CHA_QX=#{value} + where ROLE_ID=#{ROLE_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml new file mode 100644 index 00000000..63d5f9de --- /dev/null +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml @@ -0,0 +1,549 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SYS_USER + + + + + SYS_ROLE + + + + + USER_ID, + USERNAME, + PASSWORD, + NAME, + ROLE_ID, + LAST_LOGIN, + IP, + STATUS, + BZ, + SKIN, + EMAIL, + NUMBER, + PHONE, + ROLE_IDS, + FUN_IDS, + TYPE, + LEVEL, + PROVINCE, + CITY, + COUNTRY, + VILLAGE, + SEX, + SORT, + JOB_LEVEL, + JOB + + + + + #{USER_ID}, + #{USERNAME}, + #{PASSWORD}, + #{NAME}, + #{ROLE_ID}, + #{LAST_LOGIN}, + #{IP}, + #{STATUS}, + #{BZ}, + #{SKIN}, + #{EMAIL}, + #{NUMBER}, + #{PHONE}, + #{ROLE_IDS}, + #{DEPARTMENT_ID}, + #{FUN_IDS}, + #{TYPE}, + #{LEVEL}, + #{PROVINCE}, + #{CITY}, + #{COUNTRY}, + #{VILLAGE}, + #{SEX}, + #{SORT}, + #{JOB_LEVEL}, + #{JOB} + + + + + + + + + + + + + + + + + + + + + + + insert into ( + + ) values ( + + ) + + + + + update + + set NAME = #{NAME}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + ROLE_ID = #{ROLE_ID}, + ROLE_IDS = #{ROLE_IDS}, + BZ = #{BZ}, + EMAIL = #{EMAIL}, + NUMBER = #{NUMBER}, + PHONE = #{PHONE}, + LEVEL=#{LEVEL}, + TYPE=#{TYPE}, + PROVINCE=#{PROVINCE}, + CITY=#{CITY}, + COUNTRY=#{COUNTRY}, + VILLAGE=#{VILLAGE} + + ,PASSWORD = #{PASSWORD} + + where + USER_ID = #{USER_ID} + + + update + + set PASSWORD = #{PASSWORD} + where + USER_ID = #{USER_ID} + + + + + + + + + + + + + + update + + set + IP = #{IP}, + LAST_LOGIN = #{LAST_LOGIN} + where + USERNAME = #{USERNAME} + + + + + update + + set + SKIN = #{SKIN} + where USERNAME = #{USERNAME} + + + + + delete from + + where + USER_ID = #{USER_ID} + and + USER_ID != '1' + + + + + delete from + + where + USER_ID in + + #{item} + + and + USER_ID != '1' + + + + + + + + update + + set FUN_IDS = #{FUN_IDS} + where + USER_ID = #{USER_ID} + + + + + + update + + set + STATUS = #{STATUS} + where USER_ID = #{USER_ID} + + + + + update + + set + STATUS = #{STATUS}, + ERROR_COUNT = #{ERROR_COUNT} + where USER_ID = #{USER_ID} + + diff --git a/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml new file mode 100644 index 00000000..53274656 --- /dev/null +++ b/src/main/resources/mybatis/datasource/system/CorpPathMapper.xml @@ -0,0 +1,54 @@ + + + + + + + SYS_CORP_PATH + + + + + CORP_PATH_ID, + CORPINFO_ID, + PIC_PATH, + BACK_END_PATH, + USER_IDENTITY + + + + + f.CORP_PATH_ID, + f.CORPINFO_ID, + f.PIC_PATH, + f.BACK_END_PATH + + + + + #{CORP_PATH_ID}, + #{CORPINFO_ID}, + #{PIC_PATH}, + #{BACK_END_PATH} + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml new file mode 100644 index 00000000..4a663f1e --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -0,0 +1,132 @@ + + + + + + + BUS_FLOW_DETAIL + + + + + SYS_DICTIONARIES + + + + + f.FLOW_DETAIL_ID, + f.FLOW_ID, + f.STEP_FLAG, + F.STEP_NAME, + f.APPROVER_ID, + f.APPROVER_NAME, + f.APPROVER_OPINION, + f.APPROVER_CORPINFO_ID, + f.APPROVER_CORPINFO_NAME, + f.APPROVER_TIME, + f.PASS_FLAG, + f.END_FLAG, + f.ISDELETE, + f.PARENT_ID, + f.FOREIGN_KEY + + + + + FLOW_DETAIL_ID, + FLOW_ID, + STEP_FLAG, + STEP_NAME, + APPROVER_ID, + APPROVER_NAME, + APPROVER_OPINION, + APPROVER_CORPINFO_ID, + APPROVER_CORPINFO_NAME, + APPROVER_TIME, + PASS_FLAG, + END_FLAG, + ISDELETE, + PARENT_ID, + FOREIGN_KEY + + + + + #{FLOW_DETAIL_ID}, + #{FLOW_ID}, + #{STEP_FLAG}, + #{STEP_NAME}, + #{APPROVER_ID}, + #{APPROVER_NAME}, + #{APPROVER_OPINION}, + #{APPROVER_CORPINFO_ID}, + #{APPROVER_CORPINFO_NAME}, + #{APPROVER_TIME}, + #{PASS_FLAG}, + #{END_FLAG}, + #{ISDELETE}, + #{PARENT_ID}, + #{FOREIGN_KEY} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} + + + + + update BUS_FLOW_DETAIL + set FLOW_ID = #{FLOW_ID}, + STEP_FLAG = #{STEP_FLAG}, + APPROVER_ID = #{APPROVER_ID}, + APPROVER_NAME = #{APPROVER_NAME}, + APPROVER_OPINION = #{APPROVER_OPINION}, + APPROVER_CORPINFO_NAME = #{APPROVER_CORPINFO_NAME}, + APPROVER_TIME = #{APPROVER_TIME}, + PASS_FLAG = #{PASS_FLAG}, + END_FLAG = #{END_FLAG}, + ISDELETE = #{ISDELETE}, + PARENT_ID = #{PARENT_ID}, + FOREIGN_ID = #{FOREIGN_ID}, + STEP_NAME = #{STEP_NAME}, + where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml new file mode 100644 index 00000000..978c5797 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -0,0 +1,91 @@ + + + + + + + BUS_FLOW + + + + + SYS_DICTIONARIES + + + + + f.FLOW_ID, + f.TYPE, + f.CREATOR, + f.CREATOR_NAME, + f.CREATOR_TIME, + f.VALID_FLAG, + f.FOREIGN_KEY + + + + + FLOW_ID, + TYPE, + CREATOR, + CREATOR_NAME, + CREATOR_TIME, + VALID_FLAG, + FOREIGN_KEY + + + + + #{FLOW_ID}, + #{TYPE}, + #{CREATOR}, + #{CREATOR_NAME}, + #{CREATOR_TIME}, + #{VALID_FLAG}, + #{FOREIGN_KEY} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + FLOW_ID = #{FLOW_ID} + + + + + update BUS_FLOW set + TYPE = #{TYPE}, + CREATOR = #{CREATOR}, + CREATOR_NAME = #{CREATOR_NAME}, + CREATOR_TIME = #{CREATOR_TIME}, + VALID_FLAG = #{VALID_FLAG}, + FOREIGN_KEY = FOREIGN_KEY + where + FLOW_ID = #{FLOW_ID} + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml b/src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml new file mode 100644 index 00000000..0c20cab8 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml @@ -0,0 +1,493 @@ + + + + + + + xgf_train_users + + + + + SYS_DICTIONARIES + + + + + f.TRAINING_BATCH_ID, + f.USER_ID, + f.START_DATE, + f.END_DATE, + f.STATUS, + f.TRAIN_CORPINFO_ID, + f.TRAIN_AREA, + f.SUPERVISION_STATE, + f.SUPERVISION_OPINION, + f.SUPERVISION_TIME, + f.MANAGER_STATE, + f.MANAGER_OPINION, + f.MANAGER_TIME, + f.TERRITORIALITY_STATE, + f.TERRITORIALITY_OPINION, + f.TERRITORIALITY_TIME, + f.TRAIN_USERS_ID, + f.STEP_STATUS, + f.BELONG_TO_CORP + f.BELONG_TO_CORP_NAME, + f.IS_DELETE, + f.RESULT_STATUS + + + + + TRAINING_BATCH_ID, + USER_ID, + START_DATE, + END_DATE, + STATUS, + TRAIN_CORPINFO_ID, + TRAIN_AREA, + SUPERVISION_STATE, + SUPERVISION_OPINION, + SUPERVISION_TIME, + MANAGER_STATE, + MANAGER_OPINION, + MANAGER_TIME, + TERRITORIALITY_STATE, + TERRITORIALITY_OPINION, + TERRITORIALITY_TIME, + TRAIN_USERS_ID, + STEP_STATUS, + BELONG_TO_CORP, + BELONG_TO_CORP_NAME, + IS_DELETE, + RESULT_STATUS + + + + + #{TRAINING_BATCH_ID}, + #{USER_ID}, + #{START_DATE}, + #{END_DATE}, + #{STATUS}, + #{TRAIN_CORPINFO_ID}, + #{TRAIN_AREA}, + #{SUPERVISION_STATE}, + #{SUPERVISION_OPINION}, + #{SUPERVISION_TINE}, + #{MANAGER_STATE}, + #{MANAGER_OPINION}, + #{MANAGER_TIME}, + #{TERRITORIALITY_STATE}, + #{TERRITORIALITY_OPINION}, + #{TERRITORIALITY_TIME}, + #{TRAIN_USERS_ID}, + #{STEP_STATUS}, + #{BELONG_TO_CORP}, + #{BELONG_TO_CORP_NAME}, + #{IS_DELETE}, + #{RESULT_STATUS} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + + + update + + set + TRAINING_BATCH_ID= #{TRAINING_BATCH_ID}, + USER_ID = #{USER_ID}, + START_DATE = #{START_DATE}, + END_DATE = #{END_DATE}, + STATUS = #{STATUS}, + TRAIN_CORPINFO_ID = #{TRAIN_CORPINFO_ID}, + TRAIN_AREA = #{TRAIN_AREA}, + SUPERVISION_STATE = #{SUPERVISION_STATE}, + SUPERVISION_OPINION = #{SUPERVISION_OPINION}, + SUPERVISION_TIME = #{SUPERVISION_TINE}, + MANAGER_STATE = #{MANAGER_STATE}, + MANAGER_OPINION = #{MANAGER_OPINION}, + MANAGER_TIME = #{MANAGER_TIME}, + TERRITORIALITY_STATE = #{TERRITORIALITY_STATE}, + TERRITORIALITY_OPINION = #{TERRITORIALITY_OPINION}, + TERRITORIALITY_TIME = #{TERRITORIALITY_TIME}, + STEP_STATUS = #{STEP_STATUS}, + BELONG_TO_CORP = #{BELONG_TO_CORP}, + BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME}, + IS_DELETE = #{IS_DELETE}, + RESULT_STATUS = #{RESULT_STATUS} + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + TRAIN_USERS_ID in + + #{item} + + + + + + update + + set STATUS = #{STATUS}, + + START_DATE = #{START_DATE}, + + + END_DATE = #{END_DATE}, + + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + where + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + + + + + + + + + + update + set STATUS = #{STATUS}, + + START_DATE = #{START_DATE}, + + + END_DATE = #{END_DATE}, + + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + + + + + + update + set + SUPERVISION_STATE = #{SUPERVISION_STATE}, + + STATUS = #{STATUS}, + + SUPERVISION_OPINION = #{SUPERVISION_OPINION}, + SUPERVISION_TIME= #{SUPERVISION_TIME}, + STEP_STATUS = #{STEP_STATUS} + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + update + set + MANAGER_STATE= #{MANAGER_STATE}, + + STATUS = #{STATUS}, + + MANAGER_OPINION = #{MANAGER_OPINION}, + MANAGER_TIME = #{MANAGER_TIME}, + STEP_STATUS = #{STEP_STATUS} + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + update + set + TERRITORIALITY_STATE = #{TERRITORIALITY_STATE}, + + STATUS = #{STATUS}, + + TERRITORIALITY_OPINION = #{TERRITORIALITY_OPINION}, + TERRITORIALITY_TIME = #{TERRITORIALITY_TIME}, + STEP_STATUS = #{STEP_STATUS} + where + TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + update bus_trainusers a set a.STATUS = #{STATUS} where a.TRAIN_USERS_ID in + + #{item} + ; + + + + update bus_trainusers a set a.STATUS = #{STATUS} where a.TRAIN_USERS_ID = #{TRAIN_USERS_ID} + + + update bus_trainusers a set + + a.START_DATE = #{START_DATE} + + + a.END_DATE = #{END_DATE} + + where a.TRAIN_USERS_ID in + + #{item} + ; + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml new file mode 100644 index 00000000..c6175178 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml @@ -0,0 +1,388 @@ + + + + + + + xgf_training_batch + + + + + SYS_DICTIONARIES + + + + + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.BATCH_NAME, + f.CORPINFO_ID, + f.USER_COUNT, + f.TRAIN_CORP_DEPT, + f.TRAIN_CORP_LEADER, + f.DESCR, + f.TRAIN_AREA, + f.MANAGER, + f.MANAGER_DEPARTMENT_NAME, + f.MANAGER_USER_ID, + f.MANAGER_USER_NAME, + f.MANAGER_TIME, + f.AUDIT_STATUS, + f.TRAINING_BATCH_ID, + f.SUPERVISION, + f.SUPERVISION_DEPARTMENT_NAME, + f.SUPERVISION_USER_ID, + f.SUPERVISION_USER_NAME, + f.SUPERVISION_TIME, + f.TERRITORIALITY, + f.TERRITORIALITY_DEPARTMENT_NAME, + f.TERRITORIALITY_USER_ID, + f.TERRITORIALITY_USER_NAME, + f.TERRITORIALITY_TIME, + f.BELONG_TO_CORP, + f.BELONG_TO_CORP_NAME, + f.IS_DELETE, + f.STEP_STATUS + + + + + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + BATCH_NAME, + CORPINFO_ID, + USER_COUNT, + TRAIN_CORP_DEPT, + TRAIN_CORP_LEADER, + DESCR, + TRAIN_AREA, + MANAGER, + MANAGER_DEPARTMENT_NAME, + MANAGER_USER_ID, + MANAGER_USER_NAME, + MANAGER_TIME, + AUDIT_STATUS, + TRAINING_BATCH_ID, + SUPERVISION, + SUPERVISION_DEPARTMENT_NAME, + SUPERVISION_USER_ID, + SUPERVISION_USER_NAME, + SUPERVISION_TIME, + TERRITORIALITY, + TERRITORIALITY_DEPARTMENT_NAME, + TERRITORIALITY_USER_ID, + TERRITORIALITY_USER_NAME, + TERRITORIALITY_TIME, + BELONG_TO_CORP, + BELONG_TO_CORP_NAME, + IS_DELETE, + STEP_STATUS + + + + + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{BATCH_NAME}, + #{CORPINFO_ID}, + #{USER_COUNT}, + #{TRAIN_CORP_DEPT}, + #{TRAIN_CORP_LEADER}, + #{DESCR}, + #{TRAIN_AREA}, + #{MANAGER}, + #{MANAGER_DEPARTMENT_NAME}, + #{MANAGER_USER_ID}, + #{MANAGER_USER_NAME}, + #{MANAGER_TIME}, + #{AUDIT_STATUS}, + #{TRAINING_BATCH_ID}, + #{SUPERVISION}, + #{SUPERVISION_DEPARTMENT_NAME}, + #{SUPERVISION_USER_ID}, + #{SUPERVISION_USER_NAME}, + #{SUPERVISION_TIME}, + #{TERRITORIALITY}, + #{TERRITORIALITY_DEPARTMENT_NAME}, + #{TERRITORIALITY_USER_ID}, + #{TERRITORIALITY_USER_NAME}, + #{TERRITORIALITY_TIME}, + #{BELONG_TO_CORP}, + #{BELONG_TO_CORP_NAME}, + #{IS_DELETE}, + #{STEP_STATUS} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + + + + + update + + set + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE}, + BATCH_NAME = #{BATCH_NAME}, + CORPINFO_ID = #{CORPINFO_ID}, + USER_COUNT = #{USER_COUNT}, + TRAIN_CORP_DEPT = #{TRAIN_CORP_DEPT}, + TRAIN_CORP_LEADER = #{TRAIN_CORP_LEADER}, + DESCR = #{DESCR}, + TRAIN_AREA = #{TRAIN_AREA}, + MANAGER = #{MANAGER}, + MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME}, + MANAGER_USER_ID = #{MANAGER_USER_ID}, + MANAGER_USER_NAME = #{MANAGER_USER_NAME}, + MANAGER_TIME = #{MANAGER_TIME}, + AUDIT_STATUS = #{AUDIT_STATUS}, + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID}, + SUPERVISION = #{SUPERVISION}, + SUPERVISION_DEPARTMENT_NAME = #{SUPERVISION_DEPARTMENT_NAME}, + SUPERVISION_USER_ID = #{SUPERVISION_USER_ID}, + SUPERVISION_USER_NAME = #{SUPERVISION_USER_NAME}, + SUPERVISION_TIME = #{SUPERVISION_TIME}, + TERRITORIALITY = #{TERRITORIALITY}, + TERRITORIALITY_DEPARTMENT_NAME = #{TERRITORIALITY_DEPARTMENT_NAME}, + TERRITORIALITY_USER_ID = #{TERRITORIALITY_USER_ID}, + TERRITORIALITY_USER_NAME = #{TERRITORIALITY_USER_NAME}, + TERRITORIALITY_TIME = #{TERRITORIALITY_TIME}, + BELONG_TO_CORP = #{BELONG_TO_CORP}, + BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME}, + IS_DELETE = #{IS_DELETE}, + STEP_STATUS = #{STEP_STATUS} + where + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + + + + + update + + set + AUDIT_STATUS = #{AUDIT_STATUS}, + + TRAIN_CORP_DEPT = #{TRAIN_CORP_DEPT}, + + + TRAIN_CORP_LEADER = #{TRAIN_CORP_LEADER}, + + + ENTRUST_TIME = #{ENTRUST_TIME}, + + + AUDIT_TIME = #{AUDIT_TIME}, + + + VERIFY_TIME = #{VERIFY_TIME}, + + + AUDIT_DESCR = #{AUDIT_DESCR}, + + + CORP_AUDIT_DESCR = #{CORP_AUDIT_DESCR}, + + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + where + TRAINING_BATCH_ID = #{TRAINING_BATCH_ID} + + + update xgf_train_users a set a.STATUS = '2' where a.USER_ID in + + #{item} + ; + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + TRAINING_BATCH_ID in + + #{item} + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml new file mode 100644 index 00000000..0c1343c9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -0,0 +1,337 @@ + + + + + + + XGF_USER_DETAILS + + + + + f.XGF_USER_DETAILS_ID, + f.XGF_USER_ID, + f.XGF_USER_NAME, + f.BELONG_TO_CORP, + f.BELONG_TO_CORP_NAME, + f.PHONE, + f.CREATE_TIME, + f.DEPART_STATE, + f.IS_DELETE, + f.AGE, + f.HKLOCAL, + f.ADDRESS, + f.DEGREE_OF_EDUCATION, + f.DEGREE_OF_EDUCATION_NAME, + f.CORP_START_DATE, + f.POST_ID, + f.POST_NAME, + f.WORK_SIGN, + f.JOINED_DATE, + f.WORK_DATE, + f.PHOTO, + f.DATE_OF_BIRTH, + f.ISPAY, + f.ISPAY_NUMBER, + f.IS_SAFETY_TELL, + f.IS_SAFETY_TIME, + f.IS_INJURIES_PAY, + f.IS_SIGN_LABOR, + f.SEX, + f.ENTRY_DATE, + f.PERSON_WORK_TYPE, + f.PERSON_WORK_TYPE_NAME, + f.NATIONALITY, + f.NATIONALITY_NAME, + f.POLITICAL_TIME, + f.POLITICAL_STATUS, + f.POLITICAL_STATUS_NAME, + f.IS_INJURIES_PAY_TIME, + f.IS_LEVEL_THREE, + f.IS_BODY_ADAPT, + f.IS_SPECIAL_JOB, + f.CORPINFO_ID, + f.MANAGER_DEPARTMENT_ID, + f.MANAGER_DEPARTMENT_NAME, + f.COMPETENT_DEPARTMENT_ID, + f.COMPETENT_DEPARTMENT_NAME, + f.MAIN_DEPARTMENT_ID, + f.MAIN_DEPARTMENT_NAME, + f.CARD_ID, + f.DEPARTMENT_ID, + f.DEPARTMENT_NAME, + f.IS_BF, + f.IS_SOCIAL, + f.SOCIAL_NUMBER, + f.zzName + + + + + XGF_USER_DETAILS_ID, + XGF_USER_ID, + XGF_USER_NAME, + BELONG_TO_CORP, + BELONG_TO_CORP_NAME, + PHONE, + CREATE_TIME, + DEPART_STATE, + IS_DELETE, + AGE, + HKLOCAL, + ADDRESS, + DEGREE_OF_EDUCATION, + DEGREE_OF_EDUCATION_NAME, + CORP_START_DATE, + POST_ID, + POST_NAME, + WORK_SIGN, + JOINED_DATE, + WORK_DATE, + PHOTO, + DATE_OF_BIRTH, + ISPAY, + ISPAY_NUMBER, + IS_SAFETY_TELL, + IS_SAFETY_TIME, + IS_INJURIES_PAY, + IS_SIGN_LABOR, + SEX, + ENTRY_DATE, + PERSON_WORK_TYPE, + PERSON_WORK_TYPE_NAME, + NATIONALITY, + NATIONALITY_NAME, + POLITICAL_TIME, + POLITICAL_STATUS, + POLITICAL_STATUS_NAME, + IS_INJURIES_PAY_TIME, + IS_LEVEL_THREE, + IS_BODY_ADAPT, + IS_SPECIAL_JOB, + CORPINFO_ID, + MANAGER_DEPARTMENT_ID, + MANAGER_DEPARTMENT_NAME, + COMPETENT_DEPARTMENT_ID, + COMPETENT_DEPARTMENT_NAME, + MAIN_DEPARTMENT_ID, + MAIN_DEPARTMENT_NAME, + CARD_ID, + DEPARTMENT_ID, + DEPARTMENT_NAME, + IS_BF, + IS_SOCIAL, + SOCIAL_NUMBER, + zzName + + + + + #{XGF_USER_DETAILS_ID}, + #{XGF_USER_ID}, + #{XGF_USER_NAME}, + #{BELONG_TO_CORP}, + #{BELONG_TO_CORP_NAME}, + #{PHONE}, + #{CREATE_TIME}, + #{DEPART_STATE}, + #{IS_DELETE}, + #{AGE}, + #{HKLOCAL}, + #{ADDRESS}, + #{DEGREE_OF_EDUCATION}, + #{DEGREE_OF_EDUCATION_NAME}, + #{CORP_START_DATE}, + #{POST_ID}, + #{POST_NAME}, + #{WORK_SIGN}, + #{JOINED_DATE}, + #{WORK_DATE}, + #{PHOTO}, + #{DATE_OF_BIRTH}, + #{ISPAY}, + #{ISPAY_NUMBER}, + #{IS_SAFETY_TELL}, + #{IS_SAFETY_TIME}, + #{IS_INJURIES_PAY}, + #{IS_SIGN_LABOR}, + #{SEX}, + #{ENTRY_DATE}, + #{PERSON_WORK_TYPE}, + #{PERSON_WORK_TYPE_NAME}, + #{NATIONALITY}, + #{NATIONALITY_NAME}, + #{POLITICAL_TIME}, + #{POLITICAL_STATUS}, + #{POLITICAL_STATUS_NAME}, + #{IS_INJURIES_PAY_TIME}, + #{IS_LEVEL_THREE}, + #{IS_BODY_ADAPT}, + #{IS_SPECIAL_JOB}, + #{CORPINFO_ID}, + #{MANAGER_DEPARTMENT_ID}, + #{MANAGER_DEPARTMENT_NAME}, + #{COMPETENT_DEPARTMENT_ID}, + #{COMPETENT_DEPARTMENT_NAME}, + #{MAIN_DEPARTMENT_ID}, + #{MAIN_DEPARTMENT_NAME}, + #{CARD_ID}, + #{DEPARTMENT_ID}, + #{DEPARTMENT_NAME}, + #{IS_BF}, + #{IS_SOCIAL}, + #{SOCIAL_NUMBER}, + #{zzName} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + IS_DELETE = '1' + where + XGF_USER_ID = #{XGF_USER_ID} + + + + + update + + set + XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID}, + XGF_USER_ID = #{XGF_USER_ID}, + XGF_USER_NAME = #{XGF_USER_NAME}, + BELONG_TO_CORP = #{BELONG_TO_CORP}, + BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME}, + PHONE = #{PHONE}, + CREATE_TIME = #{CREATE_TIME}, + DEPART_STATE = #{DEPART_STATE}, + IS_DELETE = #{IS_DELETE}, + AGE = #{AGE}, + HKLOCAL = #{HKLOCAL}, + ADDRESS = #{ADDRESS}, + DEGREE_OF_EDUCATION = #{DEGREE_OF_EDUCATION}, + DEGREE_OF_EDUCATION_NAME = #{DEGREE_OF_EDUCATION_NAME}, + CORP_START_DATE = #{CORP_START_DATE}, + POST_ID = #{POST_ID}, + POST_NAME = #{POST_NAME}, + WORK_SIGN = #{WORK_SIGN}, + JOINED_DATE = #{JOINED_DATE}, + WORK_DATE = #{WORK_DATE}, + PHOTO = #{PHOTO}, + DATE_OF_BIRTH = #{DATE_OF_BIRTH}, + ISPAY = #{ISPAY}, + ISPAY_NUMBER = #{ISPAY_NUMBER}, + IS_SAFETY_TELL = #{IS_SAFETY_TELL}, + IS_SAFETY_TIME = #{IS_SAFETY_TIME}, + IS_INJURIES_PAY = #{IS_INJURIES_PAY}, + IS_SIGN_LABOR = #{IS_SIGN_LABOR}, + SEX = #{SEX}, + ENTRY_DATE = #{ENTRY_DATE}, + PERSON_WORK_TYPE = #{PERSON_WORK_TYPE}, + PERSON_WORK_TYPE_NAME = #{PERSON_WORK_TYPE_NAME}, + NATIONALITY = #{NATIONALITY}, + NATIONALITY_NAME = #{NATIONALITY_NAME}, + POLITICAL_TIME = #{POLITICAL_TIME}, + POLITICAL_STATUS = #{POLITICAL_STATUS}, + POLITICAL_STATUS_NAME = #{POLITICAL_STATUS_NAME}, + IS_INJURIES_PAY_TIME = #{IS_INJURIES_PAY_TIME}, + IS_LEVEL_THREE = #{IS_LEVEL_THREE}, + IS_BODY_ADAPT = #{IS_BODY_ADAPT}, + IS_SPECIAL_JOB = #{IS_SPECIAL_JOB}, + CORPINFO_ID = #{CORPINFO_ID}, + MANAGER_DEPARTMENT_ID = #{MANAGER_DEPARTMENT_ID}, + MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME}, + COMPETENT_DEPARTMENT_ID = #{COMPETENT_DEPARTMENT_ID}, + COMPETENT_DEPARTMENT_NAME = #{COMPETENT_DEPARTMENT_NAME}, + MAIN_DEPARTMENT_ID = #{MAIN_DEPARTMENT_ID}, + MAIN_DEPARTMENT_NAME = #{MAIN_DEPARTMENT_NAME}, + CARD_ID = #{CARD_ID}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + DEPARTMENT_NAME = #{DEPARTMENT_NAME}, + IS_BF = #{IS_BF}, + IS_SOCIAL = #{IS_SOCIAL}, + SOCIAL_NUMBER = #{SOCIAL_NUMBER}, + zzName = #{zzName} + where + XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} + + + + + + + + + + + + + + update + + set + IS_DELETE = '1', + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + XFG_USER_DETAILS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml new file mode 100644 index 00000000..ddbff968 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -0,0 +1,312 @@ + + + + + + + XGF_USER + + + + + f.XGF_USER_ID, + f.USERNAME, + f.NAME, + f.VALID_FLAG, + f.BELONG_TO_CORP, + f.BELONG_TO_CORP_NAME, + f.IS_DELETE, + f.CREATE_TIME, + f.CORPINFO_ID, + f.STATUS, + f.OPERATOR_TIME, + f.ISFLOW, + f.STUDY_STATUS + + + + + XGF_USER_ID, + USERNAME, + NAME, + VALID_FLAG, + BELONG_TO_CORP, + BELONG_TO_CORP_NAME, + IS_DELETE, + CREATE_TIME, + CORPINFO_ID, + STATUS, + OPERATOR_TIME, + ISFLOW, + STUDY_STATUS + + + + + #{XGF_USER_ID}, + #{USERNAME}, + #{NAME}, + #{VALID_FLAG}, + #{BELONG_TO_CORP}, + #{BELONG_TO_CORP_NAME}, + #{IS_DELETE}, + #{CREATE_TIME}, + #{CORPINFO_ID}, + #{STATUS}, + #{OPERATOR_TIME}, + #{ISFLOW}, + #{STUDY_STATUS} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + IS_DELETE = '1' + where + XGF_USER_ID = #{XGF_USER_ID} + + + + + update + + set + USERNAME = #{USERNAME}, + NAME = #{NAME}, + VALID_FLAG = #{VALID_FLAG}, + BELONG_TO_CORP = #{BELONG_TO_CORP}, + BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME}, + IS_DELETE = #{IS_DELETE}, + CREATE_TIME = #{CREATE_TIME}, + CORPINFO_ID = #{CORPINFO_ID}, + STATUS = #{STATUS}, + OPERATOR_TIME = #{OPERATOR_TIME}, + ISFLOW = #{ISFLOW}, + STUDY_STATUS = #{STUDY_STATUS} + where + XGF_USER_ID = #{XGF_USER_ID} + + + + update + + set STATUS = #{STATUS} + where + XGF_USER_ID in (select USER_ID from xgf_train_users bu where bu.TRAINUSERS_ID = #{TRAINUSERS_ID}) + + + update + + set STUDY_STATUS = #{STATUS} + where + XGF_USER_ID in + + #{item} + + + + update + + set STATUS = #{STATUS} + where + XGF_USER_ID in (select USER_ID from xgf_train_users bu where bu.TRAININGBATCH_ID = #{TRAININGBATCH_ID}) + + + update xgf_train_users a set a.STATUS = #{STATUS} where a.TRAINUSERS_ID in + + #{item} + ; + + + update xgf_train_users a set a.STATUS = #{STATUS} where a.TRAINUSERS_ID = #{TRAINUSERS_ID} + + + + + + + + + + + + + + update + + set + IS_DELETE = '1', + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + SPECIALEQUIPMENT_ID in + + #{item} + + + + + + + + + + diff --git a/更新.md b/更新.md new file mode 100644 index 00000000..f6c918f8 --- /dev/null +++ b/更新.md @@ -0,0 +1 @@ +升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程 \ No newline at end of file