From 1ecd90ae55b14bfd0416954433598125fba9afd0 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 30 Jul 2022 17:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E5=8F=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=91=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=B8=BA=E5=89=8D=E5=8F=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=88=A0=E9=99=A4=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/userauth/win/SysEveWinMation.java | 18 ++ .../eve/controller/SysEveMenuController.java | 22 -- .../eve/controller/SysEveWinController.java | 87 ++----- .../com/skyeye/eve/dao/SysEveMenuDao.java | 4 - .../java/com/skyeye/eve/dao/SysEveWinDao.java | 43 +--- .../skyeye/eve/service/SysEveMenuService.java | 4 - .../skyeye/eve/service/SysEveWinService.java | 13 +- .../service/impl/SysEveMenuServiceImpl.java | 35 +-- .../service/impl/SysEveWinServiceImpl.java | 206 +++++----------- .../mapper/userauth/SysEveMenuMapper.xml | 28 --- .../mapper/userauth/SysEveUserMapper.xml | 8 +- .../mapper/userauth/SysEveWinMapper.xml | 229 ++---------------- .../resources/reqmapping/mapping/userauth.xml | 57 ----- 13 files changed, 135 insertions(+), 619 deletions(-) diff --git a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/win/SysEveWinMation.java b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/win/SysEveWinMation.java index 5f681bf0..336d2bda 100644 --- a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/win/SysEveWinMation.java +++ b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/win/SysEveWinMation.java @@ -4,8 +4,11 @@ package com.skyeye.eve.entity.userauth.win; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; +import com.skyeye.annotation.api.ApiModelProperty; import com.skyeye.common.entity.CommonOperatorUserInfo; import lombok.Data; @@ -24,6 +27,21 @@ import java.io.Serializable; @ApiModel("服务管理实体类") public class SysEveWinMation extends CommonOperatorUserInfo implements Serializable { + @TableId("id") + @ApiModelProperty(value = "主键id。为空时新增，不为空时编辑") + private String id; + + @TableField("sys_name") + @ApiModelProperty(value = "服务名称", required = "required") + private String sysName; + + @TableField("content") + @ApiModelProperty(value = "描述") + private String content; + + @TableField("sys_url") + @ApiModelProperty(value = "服务地址") + private String sysUrl; } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveMenuController.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveMenuController.java index f350cc1f..d66bd335 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveMenuController.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveMenuController.java @@ -102,17 +102,6 @@ public class SysEveMenuController { sysEveMenuService.deleteSysMenuMationById(inputObject, outputObject); } - /** - * 异步加载树查看商户拥有的系统 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveMenuController/queryTreeSysMenuMationBySimpleLevel") - public void queryTreeSysMenuMationBySimpleLevel(InputObject inputObject, OutputObject outputObject) { - sysEveMenuService.queryTreeSysMenuMationBySimpleLevel(inputObject, outputObject); - } - /** * 获取菜单级别列表 * @@ -146,17 +135,6 @@ public class SysEveMenuController { sysEveMenuService.editSysEveMenuSortLowerById(inputObject, outputObject); } - /** - * 获取该系统商户拥有的系统 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveMenuController/querySysWinMationListBySysId") - public void querySysWinMationListBySysId(InputObject inputObject, OutputObject outputObject) { - sysEveMenuService.querySysWinMationListBySysId(inputObject, outputObject); - } - /** * 系统菜单详情 * diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveWinController.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveWinController.java index bf97da86..440e31ed 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveWinController.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveWinController.java @@ -4,24 +4,29 @@ package com.skyeye.eve.controller; +import com.skyeye.annotation.api.Api; +import com.skyeye.annotation.api.ApiImplicitParam; +import com.skyeye.annotation.api.ApiImplicitParams; +import com.skyeye.annotation.api.ApiOperation; +import com.skyeye.common.entity.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; +import com.skyeye.eve.entity.userauth.win.SysEveWinMation; import com.skyeye.eve.service.SysEveWinService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * * @ClassName: SysEveWinController * @Description: 服务管理控制层 * @author: skyeye云系列--卫志强 * @date: 2022/7/30 0:10 - * * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @RestController +@Api(value = "前台服务管理", tags = "前台服务管理", modelName = "基础模块") public class SysEveWinController { @Autowired @@ -33,17 +38,21 @@ public class SysEveWinController { * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ + @ApiOperation(id = "sysevewin001", value = "获取服务信息列表", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/SysEveWinController/queryWinMationList") public void queryWinMationList(InputObject inputObject, OutputObject outputObject) { sysEveWinService.queryWinMationList(inputObject, outputObject); } /** - * 新增服务信息 + * 新增/编辑服务信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ + @ApiOperation(id = "writeSysEveWinMation", value = "新增/编辑服务信息", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = SysEveWinMation.class) @RequestMapping("/post/SysEveWinController/insertWinMation") public void insertWinMation(InputObject inputObject, OutputObject outputObject) { sysEveWinService.insertWinMation(inputObject, outputObject); @@ -55,86 +64,40 @@ public class SysEveWinController { * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ + @ApiOperation(id = "sysevewin003", value = "编辑服务信息时进行回显", method = "GET", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) @RequestMapping("/post/SysEveWinController/queryWinMationToEditById") public void queryWinMationToEditById(InputObject inputObject, OutputObject outputObject) { sysEveWinService.queryWinMationToEditById(inputObject, outputObject); } - /** - * 编辑服务信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveWinController/editWinMationById") - public void editWinMationById(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.editWinMationById(inputObject, outputObject); - } - /** * 删除服务信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ + @ApiOperation(id = "sysevewin005", value = "删除桌面信息", method = "DELETE", allUse = "1") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) @RequestMapping("/post/SysEveWinController/deleteWinMationById") public void deleteWinMationById(InputObject inputObject, OutputObject outputObject) { sysEveWinService.deleteWinMationById(inputObject, outputObject); } /** - * 进行商户服务授权 + * 获取所有的服务信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @RequestMapping("/post/SysEveWinController/editAuthorizationById") - public void editAuthorizationById(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.editAuthorizationById(inputObject, outputObject); - } - - /** - * 进行商户服务取消授权 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveWinController/editCancleAuthorizationById") - public void editCancleAuthorizationById(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.editCancleAuthorizationById(inputObject, outputObject); - } - - /** - * 获取应用商店 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveWinController/queryWinMationListToShow") - public void queryWinMationListToShow(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.queryWinMationListToShow(inputObject, outputObject); - } - - /** - * 服务重要的同步操作 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveWinController/insertWinMationImportantSynchronization") - public void insertWinMationImportantSynchronization(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.insertWinMationImportantSynchronization(inputObject, outputObject); - } - - /** - * 服务重要的同步操作获取数据 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEveWinController/queryWinMationImportantSynchronizationData") - public void queryWinMationImportantSynchronizationData(InputObject inputObject, OutputObject outputObject) { - sysEveWinService.queryWinMationImportantSynchronizationData(inputObject, outputObject); + @ApiOperation(id = "querySysEveWinList", value = "获取所有的服务信息", method = "GET", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "id", name = "id", value = "主键id", required = "required")}) + @RequestMapping("/post/SysEveWinController/querySysEveWinList") + public void querySysEveWinList(InputObject inputObject, OutputObject outputObject) { + sysEveWinService.querySysEveWinList(inputObject, outputObject); } } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveMenuDao.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveMenuDao.java index fdd00f88..d14e8b32 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveMenuDao.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveMenuDao.java @@ -31,8 +31,6 @@ public interface SysEveMenuDao { int deleteSysMenuMationById(Map map); - List> queryTreeSysMenuMationBySimpleLevel(Map map); - Map queryUseThisMenuRoleById(Map map); List> querySysMenuLevelList(Map map); @@ -49,8 +47,6 @@ public interface SysEveMenuDao { int editSysEveMenuSortLowerById(Map map); - List> querySysWinMationListBySysId(Map map); - Map querySysEveMenuBySysId(Map map); } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveWinDao.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveWinDao.java index 5c925f39..87ceaea6 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveWinDao.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveWinDao.java @@ -4,51 +4,26 @@ package com.skyeye.eve.dao; +import com.skyeye.common.entity.CommonPageInfo; +import com.skyeye.eve.entity.userauth.win.SysEveWinMation; +import org.apache.ibatis.annotations.Param; + import java.util.List; import java.util.Map; /** * @ClassName: SysEveWinDao - * @Description: 系统信息管理数据层 + * @Description: 服务信息管理数据层 * @author: skyeye云系列--卫志强 * @date: 2021/8/7 23:26 * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ -public interface SysEveWinDao { +public interface SysEveWinDao extends SkyeyeBaseMapper { - List> queryWinMationList(Map map); + List> queryWinMationList(CommonPageInfo commonPageInfo); - Map queryWinMationByNameOrUrl(Map map); - - int insertWinMation(Map map); - - Map queryWinMationToEditById(Map map); - - Map queryWinMationByNameOrUrlAndId(Map map); - - int editWinMationById(Map map); - - int deleteWinMationById(Map map); - - Map queryChildMationById(Map map); - - Map querySysEveWinNum(Map map); - - int insertAuthorizationById(Map map); - - int editCancleAuthorizationById(Map map); - - List> queryWinMationListToShow(Map map); - - Map queryWinMationSynchronizationById(Map map); - - List> queryWinMationImportantSynchronizationData(Map map); - - int insertWinMationImportantSynchronization(List> rows); - - List> queryWinMationSynchronizationByWinId(Map map); - - List> queryWinMationImportantSynchronizationPointData(Map map); + Map queryChildMationById(@Param("id")String id); + List> querySysEveWinList(); } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveMenuService.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveMenuService.java index dff7cce4..5b02804d 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveMenuService.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveMenuService.java @@ -21,16 +21,12 @@ public interface SysEveMenuService { void deleteSysMenuMationById(InputObject inputObject, OutputObject outputObject); - void queryTreeSysMenuMationBySimpleLevel(InputObject inputObject, OutputObject outputObject); - void querySysMenuLevelList(InputObject inputObject, OutputObject outputObject); void editSysEveMenuSortTopById(InputObject inputObject, OutputObject outputObject); void editSysEveMenuSortLowerById(InputObject inputObject, OutputObject outputObject); - void querySysWinMationListBySysId(InputObject inputObject, OutputObject outputObject); - void querySysEveMenuBySysId(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveWinService.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveWinService.java index 8e8b70d2..2bbd3a0a 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveWinService.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveWinService.java @@ -15,18 +15,7 @@ public interface SysEveWinService { void queryWinMationToEditById(InputObject inputObject, OutputObject outputObject); - void editWinMationById(InputObject inputObject, OutputObject outputObject); - void deleteWinMationById(InputObject inputObject, OutputObject outputObject); - void editAuthorizationById(InputObject inputObject, OutputObject outputObject); - - void editCancleAuthorizationById(InputObject inputObject, OutputObject outputObject); - - void queryWinMationListToShow(InputObject inputObject, OutputObject outputObject); - - void insertWinMationImportantSynchronization(InputObject inputObject, OutputObject outputObject); - - void queryWinMationImportantSynchronizationData(InputObject inputObject, OutputObject outputObject); - + void querySysEveWinList(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveMenuServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveMenuServiceImpl.java index 0cedd67d..ed81af17 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveMenuServiceImpl.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveMenuServiceImpl.java @@ -179,22 +179,6 @@ public class SysEveMenuServiceImpl implements SysEveMenuService { } } - /** - * 异步加载树查看商户拥有的系统 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryTreeSysMenuMationBySimpleLevel(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - List> beans = sysEveMenuDao.queryTreeSysMenuMationBySimpleLevel(map); - if (!beans.isEmpty()) { - outputObject.setBeans(beans); - outputObject.settotal(beans.size()); - } - } - /** * 获取菜单级别列表 * @@ -249,7 +233,8 @@ public class SysEveMenuServiceImpl implements SysEveMenuService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void editSysEveMenuSortLowerById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - Map topBean = sysEveMenuDao.querySysEveMenuISLowerByThisId(map);//根据同一级排序获取这条数据的下一条数据 + // 根据同一级排序获取这条数据的下一条数据 + Map topBean = sysEveMenuDao.querySysEveMenuISLowerByThisId(map); if (topBean == null) { outputObject.setreturnMessage("已经是最靠后菜单，无法移动。"); } else { @@ -262,22 +247,6 @@ public class SysEveMenuServiceImpl implements SysEveMenuService { } } - /** - * 获取该系统商户拥有的系统 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void querySysWinMationListBySysId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - List> beans = sysEveMenuDao.querySysWinMationListBySysId(map); - if (!beans.isEmpty()) { - outputObject.setBeans(beans); - outputObject.settotal(beans.size()); - } - } - /** * 系统菜单详情 * diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveWinServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveWinServiceImpl.java index 3c53720c..5050a211 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveWinServiceImpl.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveWinServiceImpl.java @@ -4,26 +4,27 @@ package com.skyeye.eve.service.impl; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.skyeye.common.object.GetUserToken; +import com.skyeye.common.constans.CommonConstants; +import com.skyeye.common.entity.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.common.object.PutObject; import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; -import com.skyeye.common.util.HttpClient; -import com.skyeye.eve.dao.SysEveMenuAuthPointDao; +import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.eve.dao.SysEveWinDao; -import com.skyeye.eve.entity.userauth.menu.SysMenuAuthPointMation; +import com.skyeye.eve.entity.userauth.win.SysEveWinMation; +import com.skyeye.eve.service.IAuthUserService; import com.skyeye.eve.service.SysEveWinService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,11 +39,13 @@ import java.util.Map; @Service public class SysEveWinServiceImpl implements SysEveWinService { + private static final Logger LOGGER = LoggerFactory.getLogger(SysEveWinServiceImpl.class); + @Autowired private SysEveWinDao sysEveWinDao; @Autowired - private SysEveMenuAuthPointDao sysEveMenuAuthPointDao; + private IAuthUserService iAuthUserService; /** * 获取服务信息列表 @@ -52,15 +55,17 @@ public class SysEveWinServiceImpl implements SysEveWinService { */ @Override public void queryWinMationList(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysEveWinDao.queryWinMationList(map); + CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class); + Page pages = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit()); + List> beans = sysEveWinDao.queryWinMationList(commonPageInfo); + iAuthUserService.setNameByIdList(beans, "createId", "createName"); + iAuthUserService.setNameByIdList(beans, "lastUpdateId", "lastUpdateName"); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } /** - * 新增服务信息 + * 新增/编辑服务信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 @@ -68,13 +73,29 @@ public class SysEveWinServiceImpl implements SysEveWinService { @Override @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void insertWinMation(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map bean = sysEveWinDao.queryWinMationByNameOrUrl(map); - if (bean != null && !bean.isEmpty()) { - outputObject.setreturnMessage("存在相同的服务或服务地址，请更换"); + SysEveWinMation sysEveWinMation = inputObject.getParams(SysEveWinMation.class); + // 1.根据条件进行校验 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.getDeclaredFieldsInfo2(SysEveWinMation.class, "sysName"), sysEveWinMation.getSysName()); + if (StringUtils.isNotEmpty(sysEveWinMation.getId())) { + queryWrapper.ne(CommonConstants.ID, sysEveWinMation.getId()); + } + SysEveWinMation checkSysEveWin = sysEveWinDao.selectOne(queryWrapper); + + if (ObjectUtils.isEmpty(checkSysEveWin)) { + String userId = inputObject.getLogParams().get("id").toString(); + // 2.新增/编辑数据 + if (StringUtils.isNotEmpty(sysEveWinMation.getId())) { + LOGGER.info("update sys win data, id is {}", sysEveWinMation.getId()); + DataCommonUtil.setCommonLastUpdateDataByGenericity(sysEveWinMation, userId); + sysEveWinDao.updateById(sysEveWinMation); + } else { + DataCommonUtil.setCommonDataByGenericity(sysEveWinMation, userId); + LOGGER.info("insert sys win data, id is {}", sysEveWinMation.getId()); + sysEveWinDao.insert(sysEveWinMation); + } } else { - DataCommonUtil.setCommonData(map, inputObject.getLogParams().get("id").toString()); - sysEveWinDao.insertWinMation(map); + outputObject.setreturnMessage("该服务已存在，请更换."); } } @@ -87,26 +108,10 @@ public class SysEveWinServiceImpl implements SysEveWinService { @Override public void queryWinMationToEditById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - Map bean = sysEveWinDao.queryWinMationToEditById(map); - outputObject.setBean(bean); - } - - /** - * 编辑服务信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editWinMationById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map bean = sysEveWinDao.queryWinMationByNameOrUrlAndId(map); - if (bean != null && !bean.isEmpty()) { - outputObject.setreturnMessage("存在相同的服务或服务地址，请更换"); - } else { - sysEveWinDao.editWinMationById(map); - } + String id = map.get("id").toString(); + SysEveWinMation sysEveWinMation = sysEveWinDao.selectById(id); + outputObject.setBean(sysEveWinMation); + outputObject.settotal(1); } /** @@ -119,129 +124,26 @@ public class SysEveWinServiceImpl implements SysEveWinService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void deleteWinMationById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - Map bean = sysEveWinDao.queryChildMationById(map); - if (Integer.parseInt(bean.get("menuNum").toString()) > 0 || Integer.parseInt(bean.get("useNum").toString()) > 0) { - outputObject.setreturnMessage("该服务存在功能菜单或者使用商户，请先进行菜单或商户操作。"); + String id = map.get("id").toString(); + Map bean = sysEveWinDao.queryChildMationById(id); + if (Integer.parseInt(bean.get("menuNum").toString()) > 0) { + outputObject.setreturnMessage("该服务存在功能菜单，请先进行菜单移除操作。"); } else { - sysEveWinDao.deleteWinMationById(map); + sysEveWinDao.deleteById(id); } } /** - * 进行商户服务授权 + * 获取所有的服务信息 * * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editAuthorizationById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map bean = sysEveWinDao.querySysEveWinNum(map); - if (bean != null && !bean.isEmpty()) { - map.put("winNumId", bean.get("id")); - DataCommonUtil.setCommonData(map, inputObject.getLogParams().get("id").toString()); - sysEveWinDao.insertAuthorizationById(map); - } else { - outputObject.setreturnMessage("暂无可授权的商户。"); - } - } - - /** - * 进行商户服务取消授权 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editCancleAuthorizationById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - sysEveWinDao.editCancleAuthorizationById(map); - } - - /** - * 获取应用商店 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryWinMationListToShow(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysEveWinDao.queryWinMationListToShow(map); + public void querySysEveWinList(InputObject inputObject, OutputObject outputObject) { + List> beans = sysEveWinDao.querySysEveWinList(); outputObject.setBeans(beans); - outputObject.settotal(pages.getTotal()); - } - - /** - * 服务重要的同步操作 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void insertWinMationImportantSynchronization(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - // 判断是否有权限 - Map bean = sysEveWinDao.queryWinMationSynchronizationById(map); - if (bean == null) { - outputObject.setreturnMessage("您不具备该服务的同步权限。"); - } else { - List> hasRows = sysEveWinDao.queryWinMationSynchronizationByWinId(map); - if (hasRows.isEmpty()) { - String url = map.get("url") + "/sysimportantsynchronization002?loginPCIp=" + PutObject.getRequest().getHeader("loginPCIp") - + "&userToken=" + GetUserToken.getUserToken(PutObject.getRequest()) + "&winid=" + map.get("id"); - String str = HttpClient.doGet(url); - JSONObject json = JSONUtil.toBean(str, null); - if ("0".equals(json.get("returnCode").toString())) { - Map user = inputObject.getLogParams(); - JSONObject jo = JSONUtil.toBean(json.get("bean").toString(), null); - // 处理菜单 - List> beans = JSONUtil.toList(jo.get("menuBeans").toString(), null); - for (Map row : beans) { - row.put("sysWinId", map.get("id")); - row.put("createId", user.get("id")); - row.put("createTime", DateUtil.getTimeAndToString()); - if (!"--".equals(row.get("menuUrl").toString())) { - // 一级菜单 - row.put("menuUrl", map.get("url").toString() + "/" + row.get("menuUrl").toString().replace("../../", "")); - } - } - sysEveWinDao.insertWinMationImportantSynchronization(beans); - // 处理权限点 - List points = JSONUtil.toList(jo.get("pointBeans").toString(), SysMenuAuthPointMation.class); - sysEveMenuAuthPointDao.insertBatch(points); - } else { - outputObject.setreturnMessage(json.get("returnMessage").toString()); - } - } else { - outputObject.setreturnMessage("服务菜单只能同步一次哦。"); - } - } - } - - /** - * 服务重要的同步操作获取数据 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryWinMationImportantSynchronizationData(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - List> menuBeans = sysEveWinDao.queryWinMationImportantSynchronizationData(map); - List> pointBeans = sysEveWinDao.queryWinMationImportantSynchronizationPointData(map); - if (!menuBeans.isEmpty() || !pointBeans.isEmpty()) { - Map bean = new HashMap<>(); - bean.put("menuBeans", menuBeans); - bean.put("pointBeans", pointBeans); - outputObject.setBean(bean); - } else { - outputObject.setreturnMessage("暂无可以同步的数据"); - } + outputObject.settotal(beans.size()); } } diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml index 4e6ad82f..ee20d7be 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml @@ -185,21 +185,6 @@ id = #{id} - - - SELECT - a.id, - a.sys_name `name` - FROM - sys_eve_win a, - sys_eve_win_super_power b, - sys_eve_win_num c - WHERE - c.id = b.win_num_id - AND b.win_id = a.id - - diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveWinMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveWinMapper.xml index ac4a6d6b..961a8682 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveWinMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveWinMapper.xml @@ -2,232 +2,51 @@ - SELECT a.id, a.sys_name sysName, a.sys_url sysUrl, - a.sys_desc sysDesc, - a.sys_pic sysPic, + a.content, + a.create_id createId, CONVERT(a.create_time, char) createTime, - COUNT(c.id) menuNum, - (SELECT COUNT(1) FROM sys_eve_win_super_power d WHERE d.win_id = a.id) useNum + a.last_update_id lastUpdateId, + CONVERT(a.last_update_time, char) lastUpdateTime, + COUNT(c.id) menuNum FROM sys_eve_win a LEFT JOIN sys_eve_menu c ON a.id = c.sys_win_id - WHERE 1 = 1 - - AND a.sys_name LIKE '%${sysName}%' + + + ${sqlExtract} + + AND a.sys_name LIKE '%${keyword}%' + + GROUP BY a.id ORDER BY a.create_time DESC - SELECT - a.id, - a.sys_name sysName, - a.sys_url sysUrl, - a.sys_desc sysDesc, - CONVERT(a.create_time, char) createTime - FROM - sys_eve_win a - WHERE a.sys_name = #{sysName} - OR a.sys_url = #{sysUrl} - - - - INSERT into sys_eve_win - (id, sys_name, sys_desc, sys_url, sys_pic, first_type, second_type, create_id, create_time) - VALUES - (#{id}, #{sysName}, #{sysDesc}, #{sysUrl}, #{sysPic}, #{sysFirstType}, #{sysSecondType}, #{createId}, #{createTime}) - - - - - - - - UPDATE sys_eve_win - - - sys_name = #{sysName}, - - - sys_url = #{sysUrl}, - - - sys_pic = #{sysPic}, - - - first_type = #{sysFirstType}, - - - second_type = #{sysSecondType}, - - sys_desc = #{sysDesc}, - - WHERE id = #{id} - - - - - - DELETE - FROM - sys_eve_win - WHERE - id = #{id} - - - - - - INSERT into sys_eve_win_super_power - (id, win_id, win_num_id, create_id, create_time) - VALUES - (#{id}, #{winId}, #{winNumId}, #{createId}, #{createTime}) - - - - DELETE - FROM - sys_eve_win_super_power - WHERE - win_id = #{winId} - - - SELECT a.id, - a.sys_name sysName, - a.sys_url sysUrl, - a.sys_pic sysPic, - b.id powerId + a.sys_name `name`, + '0' pId, + false isParent, + '/assets/images/syswinlogo.png' icon FROM sys_eve_win a - LEFT JOIN sys_eve_win_super_power b ON a.id = b.win_id - WHERE 1 = 1 - - AND a.first_type = #{firstType} - - - AND INSTR(CONCAT(',', #{secondType}, ','), CONCAT(',', a.second_type, ',')) - - - - - - - - - - INSERT into sys_eve_menu - (id, menu_name, menu_name_en, menu_icon_type, menu_icon_pic, menu_icon, menu_url, menu_type, menu_sys_type, menu_parent_id, menu_level, open_type, order_num, menu_icon_bg, menu_icon_color, sys_win_id, is_share, creater, create_time) - VALUES - - (#{item.id}, #{item.menuName}, #{item.menuNameEn}, #{item.menuIconType}, #{item.menuIconPic}, #{item.menuIcon}, #{item.menuUrl}, #{item.menuType}, #{item.menuSysType}, #{item.parentId}, #{item.menuLevel}, #{item.openType}, #{item.orderNum}, #{item.menuIconBg}, #{item.menuIconColor}, #{item.sysWinId}, #{item.isShare}, #{item.createId}, #{item.createTime}) - - - - - + \ No newline at end of file diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml b/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml index c0a7de93..6aa5cb05 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml @@ -257,8 +257,6 @@ - - @@ -293,8 +291,6 @@ - - @@ -400,59 +396,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -