菜单增删改查修改

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<PageData<OperMenuDTO>> page(@RequestParam Map<String, Object> params){
 		PageData<OperMenuDTO> page = operMenuService.page(params);
@@ -45,6 +50,10 @@ public class OperMenuController {
 	@GetMapping("{id}")
 	public Result<OperMenuDTO> get(@PathVariable("id") String id){
 		OperMenuDTO data = operMenuService.get(id);
+
+		//菜单资源列表
+		List<MenuResourceDTO> resourceList = operResourceService.getMenuResourceList(id);
+
 		return new Result<OperMenuDTO>().ok(data);
 	}
 

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperResourceService.java

@@ -101,4 +101,10 @@ public interface OperResourceService extends BaseService<OperResourceEntity> {
      * @param resourceList   资源列表
      */
     void saveMenuResource(String menuId, String menuName, List<MenuResourceDTO> resourceList);
+
+    /**
+     * 获取菜单资源列表
+     * @param menuId  菜单ID
+     */
+    List<MenuResourceDTO> getMenuResourceList(String menuId);
 }

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<OperMenuDao, OperMenuEn
 
     @Override
     public OperMenuDTO get(String id) {
-        OperMenuEntity entity = baseDao.selectById(id);
+        OperMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage());
+
         return ConvertUtils.sourceToTarget(entity, OperMenuDTO.class);
     }
 

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java

@@ -133,4 +133,11 @@ public class OperResourceServiceImpl extends BaseServiceImpl<OperResourceDao, Op
         }
     }
 
+    @Override
+    public List<MenuResourceDTO> getMenuResourceList(String menuId) {
+        List<OperResourceEntity> entityList = baseDao.getMenuResourceList(menuId+"");
+
+        return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class);
+    }
+
 }

epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperResourceDao.xml

@@ -8,7 +8,7 @@
     </delete>
 
     <select id="getMenuResourceList" resultType="com.epmet.entity.OperResourceEntity">
-        select resource_url, resource_method from oper_resource where resource_code = #{value} order by create_date asc
+        select resource_url, resource_method from oper_resource where resource_code = #{value} order by created_time asc
     </select>
 
     <select id="getResourceList" resultType="com.epmet.entity.OperResourceEntity">