app菜单管理修改

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java

@@ -113,6 +113,16 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
      */
     private String menuCode;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 子模板ID
+     */
+    private String templateId;
+
     @NotBlank(message = "{sysmenu.name.require}", groups = DefaultGroup.class)
     private String name;
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java

@@ -30,6 +30,8 @@ import com.elink.esua.epdc.service.AppMenuTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -52,6 +54,12 @@ public class AppMenuTemplateController {
         return new Result<PageData<AppMenuTemplateDTO>>().ok(page);
     }
 
+    @GetMapping("list")
+    public Result<List<AppMenuTemplateDTO>> list(){
+        List<AppMenuTemplateDTO> list = appMenuTemplateService.list(new HashMap<>());
+        return new Result<List<AppMenuTemplateDTO>>().ok(list);
+    }
+
     @GetMapping("{id}")
     public Result<AppMenuTemplateDTO> get(@PathVariable("id") String id){
         AppMenuTemplateDTO data = appMenuTemplateService.get(id);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java

@@ -45,4 +45,11 @@ public interface AppMenuDao extends BaseDao<AppMenuEntity> {
      * @date 2019/11/19 13:43
      */
     List<AppMenuDTO> selectListAppMenu(@Param("type") Integer type, @Param("language") String language);
+
+    /**
+     * 获取菜单详细信息
+     * @param id
+     * @return
+     */
+    AppMenuDTO selectByIdDIY(@Param("id") String id, @Param("language") String language);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java

@@ -94,4 +94,14 @@ public class AppMenuEntity extends BaseEntity {
      */
     private String menuCode;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 子模板ID
+     */
+    private String templateId;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java

@@ -87,8 +87,8 @@ public class AppMenuServiceImpl extends BaseServiceImpl<AppMenuDao, AppMenuEntit
 
     @Override
     public AppMenuDTO get(String id) {
-        AppMenuEntity entity = baseDao.selectById(id);
+        AppMenuDTO dto = baseDao.selectByIdDIY(id,HttpContextUtils.getLanguage());
-        return ConvertUtils.sourceToTarget(entity, AppMenuDTO.class);
+        return dto;
     }
 
     @Override

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml

@@ -15,4 +15,15 @@
             ORDER BY m.sort ASC
     </select>
 
+    <select id="selectByIdDIY" resultType="com.elink.esua.epdc.dto.AppMenuDTO">
+        SELECT
+          m.*,
+          l.field_value AS `NAME`
+        FROM
+          sys_app_menu m
+        LEFT JOIN sys_language l ON m.id = l.table_id AND l.table_name = 'sys_app_menu' AND l.field_name = 'name' AND l.LANGUAGE = #{language}
+        WHERE m.del_flag = 0
+        AND m.id = #{id}
+    </select>
+
 </mapper>