From 2296cae1a5658ed4e6868928c26cc599838d5544 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Mon, 23 Mar 2020 13:54:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/Constant.java | 4 ++ .../epmet/commons/tools/utils/TreeUtils.java | 29 ++++++++ .../epmet/controller/OperMenuController.java | 37 ++++++++-- .../java/com/epmet/redis/OperMenuRedis.java | 5 +- .../com/epmet/redis/OperResourceRedis.java | 5 +- .../epmet/service/OperLanguageService.java | 10 +++ .../com/epmet/service/OperMenuService.java | 26 ++++++- .../epmet/service/OperResourceService.java | 9 +++ .../epmet/service/OperRoleMenuService.java | 6 ++ .../service/impl/OperLanguageServiceImpl.java | 17 +++++ .../service/impl/OperMenuServiceImpl.java | 72 ++++++++++++++++++- .../service/impl/OperResourceServiceImpl.java | 32 +++++++++ .../service/impl/OperRoleMenuServiceImpl.java | 5 ++ .../service/impl/OperRoleServiceImpl.java | 4 +- 14 files changed, 248 insertions(+), 13 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java index 38a6c0d33a..e62ed4b7ce 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java @@ -35,6 +35,10 @@ public interface Constant { * 菜单根节点标识 */ Long MENU_ROOT = 0L; + /** + * 菜单根节点标识 + */ + String OPER_MENU_ROOT = "0"; /** * 部门根节点标识 */ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java index b78c8317ef..4272d9cfc6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeUtils.java @@ -40,6 +40,23 @@ public class TreeUtils { return treeList; } + /** + * 根据pid，构建树节点 + */ + public static List buildTree(List treeNodes, String pid) { + //pid不能为空 + AssertUtils.isNull(pid, "pid"); + + List treeList = new ArrayList<>(); + for(T treeNode : treeNodes) { + if (pid.equals(treeNode.getPid())) { + treeList.add(findChildren(treeNodes, treeNode)); + } + } + + return treeList; + } + /** * 查找子节点 */ @@ -52,6 +69,18 @@ public class TreeUtils { return rootNode; } + /** + * 查找子节点 + */ + private static T findChildren(List treeNodes, T rootNode) { + for(T treeNode : treeNodes) { + if(rootNode.getId().equals(treeNode.getPid())) { + rootNode.getChildren().add(findChildren(treeNodes, treeNode)); + } + } + return rootNode; + } + /** * 构建树节点 */ diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index b8af4cade1..8f4a61e1c5 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; @@ -48,18 +49,18 @@ public class OperMenuController { } @PostMapping - public Result save(@RequestBody OperMenuDTO dto){ + public Result save(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operMenuService.save(dto); + operMenuService.save(dto,tokenDto); return new Result(); } @PutMapping - public Result update(@RequestBody OperMenuDTO dto){ + public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operMenuService.update(dto); + operMenuService.update(dto,tokenDto); return new Result(); } @@ -71,12 +72,40 @@ public class OperMenuController { return new Result(); } + @DeleteMapping("{id}") + public Result delete(@PathVariable("id") String id, @LoginUser TokenDto tokenDto){ + //效验数据 + AssertUtils.isNull(id, "id"); + + //判断是否有子菜单或按钮 + List list = operMenuService.getListPid(id); + if(list.size() > 0){ + return new Result().error(ErrorCode.SUB_MENU_EXIST); + } + + operMenuService.delete(id, tokenDto); + + return new Result(); + } + @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = operMenuService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, OperMenuExcel.class); } + /** + * 获取菜单列表 + * @param type 类型 + * @return Result> + */ + @GetMapping("list") + public Result> list(Integer type){ + List list = operMenuService.getMenuList(type); + + return new Result>().ok(list); + } + /** * 导航 * @param tokenDto token diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java index d86846c7d8..f1b568f33a 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java @@ -38,8 +38,9 @@ public class OperMenuRedis { @Autowired private RedisUtils redisUtils; - public void delete(Object[] ids) { - + public void delete(String userId, String app, String client) { + redisUtils.deleteByPattern(RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage())); + redisUtils.delete(RedisKeys.getUserPermissionsKey(userId, app, client)); } public void set(){ diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java index 4c79c26170..68ea39a15e 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java @@ -17,6 +17,7 @@ package com.epmet.redis; +import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,8 +33,10 @@ public class OperResourceRedis { @Autowired private RedisUtils redisUtils; - public void delete(Object[] ids) { + public void delete() { + String key = RedisKeys.getSysResourceKey(); + redisUtils.delete(key); } public void set(){ diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperLanguageService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperLanguageService.java index 366c48bd0b..0f0ad555bc 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperLanguageService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperLanguageService.java @@ -92,4 +92,14 @@ public interface OperLanguageService extends BaseService { * @date 2020-03-18 */ void delete(String[] ids); + + /** + * 保存或更新 + * @param tableName 表名 + * @param tableId 表主键 + * @param fieldName 字段名 + * @param fieldValue 字段值 + * @param language 语言 + */ + void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java index efa9eebb4d..9025ce4dd5 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java @@ -75,7 +75,7 @@ public interface OperMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperMenuDTO dto); + void save(OperMenuDTO dto, TokenDto tokenDto); /** * 默认更新 @@ -85,7 +85,7 @@ public interface OperMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperMenuDTO dto); + void update(OperMenuDTO dto, TokenDto tokenDto); /** * 批量删除 @@ -97,6 +97,15 @@ public interface OperMenuService extends BaseService { */ void delete(String[] ids); + /** + * 删除 + * + * @param id id + * @author generator + * @date 2020-03-18 + */ + void delete(String id, TokenDto tokenDto); + /** * 用户菜单列表 * @@ -106,6 +115,13 @@ public interface OperMenuService extends BaseService { */ List getUserMenuList(TokenDto tokenDto, Integer type); + /** + * 菜单列表 + * + * @param type 菜单类型 + */ + List getMenuList(Integer type); + /** * 用户菜单导航 * @param tokenDto 用户信息 @@ -119,4 +135,10 @@ public interface OperMenuService extends BaseService { * @return java.util.Set */ Set getUserPermissions(TokenDto tokenDto); + + /** + * 根据父菜单，查询子菜单 + * @param pid 父菜单ID + */ + List getListPid(String pid); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java index 1433da0ac6..815250f1d4 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.OperResourceDTO; +import com.epmet.dto.result.MenuResourceDTO; import com.epmet.entity.OperResourceEntity; import java.util.List; @@ -92,4 +93,12 @@ public interface OperResourceService extends BaseService { * @date 2020-03-18 */ void delete(String[] ids); + + /** + * 保存菜单资源 + * @param menuId 菜单ID + * @param menuName 菜单名称 + * @param resourceList 资源列表 + */ + void saveMenuResource(String menuId, String menuName, List resourceList); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java index 50d3e452ac..84cfe6d996 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java @@ -116,4 +116,10 @@ public interface OperRoleMenuService extends BaseService { * @param roleIds */ void deleteByRoleIds(String[] roleIds); + + /** + * 根据菜单id，删除角色菜单关系 + * @param menuId 菜单id + */ + void deleteByMenuId(String menuId); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java index 3ff21c04c1..ee486aa224 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java @@ -101,4 +101,21 @@ public class OperLanguageServiceImpl extends BaseServiceImpl page(Map params) { @@ -91,16 +104,39 @@ public class OperMenuServiceImpl extends BaseServiceImpl getUserMenuList(TokenDto tokenDto, Integer type) { List menuList; @@ -128,6 +176,15 @@ public class OperMenuServiceImpl extends BaseServiceImpl getMenuList(Integer type) { + List menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); + + List dtoList = ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class); + + return TreeUtils.buildTree(dtoList, Constant.OPER_MENU_ROOT); + } + @Override public List getUserMenuNavList(TokenDto tokenDto) { List menuList = operMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); @@ -171,4 +228,15 @@ public class OperMenuServiceImpl extends BaseServiceImpl getListPid(String pid) { + List menuList = baseDao.getListPid(pid); + + return ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class); + } + + private void saveLanguage(String tableId, String fieldName, String fieldValue){ + operLanguageService.saveOrUpdate("oper_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); + } + } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java index 89abe6aae8..70f2965c7f 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java @@ -17,15 +17,19 @@ package com.epmet.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.enums.ResourceAuthEnum; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.OperResourceDao; import com.epmet.dto.OperResourceDTO; +import com.epmet.dto.result.MenuResourceDTO; import com.epmet.entity.OperResourceEntity; +import com.epmet.enums.MenuFlagEnum; import com.epmet.redis.OperResourceRedis; import com.epmet.service.OperResourceService; import org.apache.commons.lang3.StringUtils; @@ -101,4 +105,32 @@ public class OperResourceServiceImpl extends BaseServiceImpl resourceList) { + //先删除菜单资源关系 + baseDao.deleteByCode(menuId+""); + + //删除缓存 + operResourceRedis.delete(); + + //菜单没有一个资源的情况 + if(CollUtil.isEmpty(resourceList)){ + return ; + } + + //保存菜单资源关系 + for(MenuResourceDTO dto : resourceList){ + OperResourceEntity entity = new OperResourceEntity(); + entity.setResourceCode(menuId+""); + entity.setResourceName(menuName); + entity.setResourceUrl(dto.getResourceUrl()); + entity.setResourceMethod(dto.getResourceMethod()); + entity.setAuthLevel(ResourceAuthEnum.PERMISSIONS_AUTH.value()); + entity.setMenuFlag(MenuFlagEnum.YES.value()); + + //保存 + insert(entity); + } + } + } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java index d179b6245e..0897d62367 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java @@ -142,4 +142,9 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - + String name = (String)params.get(FieldConstant.NAME_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); return wrapper; } From fcb5b8ba6b16e191df2e72b8737dc83eb1e97d6c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 23 Mar 2020 14:15:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC?= =?UTF-8?q?=E8=A7=88=E8=8E=B7=E5=8F=96=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?sql=E8=AF=AD=E5=8F=A5=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerHomeDetailDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml index f8c959f45a..c5695e7ee8 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml @@ -84,5 +84,6 @@ ) a INNER JOIN customer_home_detail b ON a.id = b.HOME_ID AND b.DEL_FLAG = '0' LEFT JOIN home_component c ON b.COMPONENT_ID = c.id AND c.DEL_FLAG = '0' + ORDER BY b.REGION DESC,b.DISPLAY_ORDER ASC \ No newline at end of file From e25b2207f54585e8fad428d829d4339aa9c14396 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Mon, 23 Mar 2020 14:53:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/OperMenuController.java | 9 +++++++++ .../main/java/com/epmet/service/OperResourceService.java | 6 ++++++ .../java/com/epmet/service/impl/OperMenuServiceImpl.java | 3 ++- .../com/epmet/service/impl/OperResourceServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/OperResourceDao.xml | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index 8f4a61e1c5..80f82dff81 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -12,8 +12,10 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.OperMenuDTO; +import com.epmet.dto.result.MenuResourceDTO; import com.epmet.excel.OperMenuExcel; import com.epmet.service.OperMenuService; +import com.epmet.service.OperResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,6 +38,9 @@ public class OperMenuController { @Autowired private OperMenuService operMenuService; + @Autowired + private OperResourceService operResourceService; + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = operMenuService.page(params); @@ -45,6 +50,10 @@ public class OperMenuController { @GetMapping("{id}") public Result get(@PathVariable("id") String id){ OperMenuDTO data = operMenuService.get(id); + + //菜单资源列表 + List resourceList = operResourceService.getMenuResourceList(id); + return new Result().ok(data); } diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java index 815250f1d4..560e097c0b 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java @@ -101,4 +101,10 @@ public interface OperResourceService extends BaseService { * @param resourceList 资源列表 */ void saveMenuResource(String menuId, String menuName, List resourceList); + + /** + * 获取菜单资源列表 + * @param menuId 菜单ID + */ + List getMenuResourceList(String menuId); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java index de2b612c8f..da2786ecaf 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java @@ -98,7 +98,8 @@ public class OperMenuServiceImpl extends BaseServiceImpl getMenuResourceList(String menuId) { + List entityList = baseDao.getMenuResourceList(menuId+""); + + return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml index 3cf44a3346..94c839c252 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml @@ -8,7 +8,7 @@ + SELECT + f.id, + f.FUNCTION_NAME AS functionName + FROM + FUNCTION f + WHERE + f.DEL_FLAG = '0' + AND f.SHOPPING_STATUS = '1' + + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml index 10bfc66952..a9e006b145 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/HomeComponentDao.xml @@ -102,4 +102,29 @@ ORDER BY CONVERT ( hc.COMPONENT_NAME USING gbk ) ASC + + + From 11a9c209c4dac899e63a26274f79a4855d35fe5c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 24 Mar 2020 12:40:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81Review=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerGridController.java | 4 +- .../java/com/epmet/dao/CustomerGridDao.java | 2 +- .../epmet/service/CustomerGridService.java | 4 +- .../service/impl/CustomerGridServiceImpl.java | 6 +- .../main/resources/mapper/CustomerGridDao.xml | 2 +- .../constant/StrangerResiGuideConstant.java | 25 +++++ .../StrangerResiGuideController.java | 4 +- .../com/epmet/feign/EpmetUserFeignClient.java | 4 +- .../EpmetUserFeignClientFallBack.java | 4 +- .../service/StrangerAccessRecordService.java | 7 +- .../impl/StrangerAccessRecordServiceImpl.java | 94 ++++++++++--------- .../epmet/constant/GridVisitedConstant.java | 29 ++++++ .../controller/GridVisitedController.java | 21 +++-- .../java/com/epmet/dao/GridVisitedDao.java | 2 +- .../com/epmet/feign/GovOrgFeignClient.java | 14 +-- .../fallback/GovOrgFeignClientFallBack.java | 8 +- .../com/epmet/service/GridLatestService.java | 2 +- .../com/epmet/service/GridVisitedService.java | 18 +--- .../service/impl/GridLatestServiceImpl.java | 40 ++++---- .../service/impl/GridVisitedServiceImpl.java | 83 +++++++++------- .../main/resources/mapper/GridVisitedDao.xml | 2 +- 21 files changed, 222 insertions(+), 153 deletions(-) create mode 100644 epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index fec741f5e4..34e26e1be7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -102,8 +102,8 @@ public class CustomerGridController { * @throws Exception */ @PostMapping("getcustomergridbygridid") - public Result getCustomerGridByGridId(@RequestBody CustomerGridFormDTO formDTO) { - return customerGridService.getCustomerGridByGridId(formDTO); + public Result getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO) { + return customerGridService.getCustomerGridByGridId(customerGridFormDTO); } /** * @Description 陌生人导览模块调用 根据陌生揽客传入的地区码进行分页查询显示 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 41951995ff..143810f40b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -68,5 +68,5 @@ public interface CustomerGridDao extends BaseDao { **/ List selectRestGridWithoutGivenAreaCode(Map paramsMap); - CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO formDTO); + CustomerGridDTO selectCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index ceb317d455..0840522faa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -108,9 +108,9 @@ public interface CustomerGridService extends BaseService { Result> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO); /** 根据网格Id查询用户数据 - * @param formDTO + * @param customerGridFormDTO * @return * @date 2020-03-17 */ - Result getCustomerGridByGridId(CustomerGridFormDTO formDTO); + Result getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index d94eb029cf..94774d1030 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -147,8 +147,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getCustomerGridByGridId(CustomerGridFormDTO formDTO) { - return new Result().ok(baseDao.getCustomerGridByGridId(formDTO)); - } + public Result getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) { + return new Result().ok(baseDao.selectCustomerGridByGridId(customerGridFormDTO)); +} } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 6350399a83..207420bbaa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -38,7 +38,7 @@ customer_id, CONVERT ( grid_name USING gbk ) ASC - SELECT vi.id, From 73e7898bb79bef0a9d2dfa387779ae5306dbdb37 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 24 Mar 2020 12:50:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/StrangerAccessRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index 15d79aed99..5c58c1c071 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -205,9 +205,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getGridHome(TokenDto tokenDTO, StrangerFormDTO strangerFormDTO) { //1.先判断参数 //居民端 所以参数必须是居民端的参数 否则就是参数错误s - /*if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) { + if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) { return new Result().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION); - }*/ + } //token里边有所属端 userId这些参数 前台传递customerID和gridId //2:调用epmet-user服务查询数据 新建网格记录数据 VisitedFormDTO visitedFormDTO = new VisitedFormDTO();