1、修改常用功能

src/main/java/com/dk/oauth/controller/CompanyController.java

@@ -28,6 +28,7 @@ public class CompanyController {
     @Autowired
     private ICompanyService companyService;
 
+
     /**
      * @desc   : 通过ID查询
      * @author : admin
@@ -123,4 +124,15 @@ public class CompanyController {
     public ResponseResultVO<?> saveMenuFrequency(@RequestBody MenuFrequency menuFrequency) {
         return companyService.saveMenuFrequency(menuFrequency);
     }
+
+    /**
+     * @desc   : 获取常用功能
+     * @author : 周兴
+     * @date   : 2024/6/14 14:55
+     */
+    @ApiOperation( value = "获取常用功能", notes = "获取常用功能" )
+    @PostMapping(value = "/get_comMenu")
+    public ResponseResultVO<?> getComMenu(@PathVariable String gradeCode) {
+        return companyService.getComMenu(gradeCode);
+    }
 }

src/main/java/com/dk/oauth/entity/ComMenuResponse.java

@@ -1,139 +0,0 @@
-package com.dk.oauth.entity;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import com.dk.common.infrastructure.handler.UuidTypeHandler;
-import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- *  常用功能
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ExportTitle("常用功能")
-@TableName(value = "t_mst_com_menu", autoResultMap = true)
-@ApiModel(value="实体类：常用功能", description="表名：t_mst_com_menu")
-public class ComMenuResponse extends PageInfo<ComMenuResponse> implements Serializable {
-
-    /*
-     * 数据库字段
-     */
-
-    /**
-     * 功能菜单
-     */
-    @ApiModelProperty(value = "功能菜单")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String menuUuid;
-
-
-    /**
-     * 企业版本
-     */
-    @Excel(name = "企业版本")
-    @ApiModelProperty(value = "企业版本")
-    private String gradeCode;
-
-
-
-    /**
-     * 应用代码
-     */
-    @Excel(name = "应用代码")
-    @ApiModelProperty(value = "应用代码")
-    private String appCode;
-
-
-    /**
-     * 显示顺序 (【1 ～ 46655】)
-     */
-    @Excel(name = "显示顺序 (【1 ～ 46655】)")
-    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
-    private Integer displayNo;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-    private String menuName;
-
-    private String objectCode;
-
-    private String objectPath;
-
-    private String objectIcon;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
-    private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/dk/oauth/mapper/ComMenuMapper.java

@@ -2,8 +2,6 @@ package com.dk.oauth.mapper;
 
 import com.dk.common.mapper.BaseMapper;
 import com.dk.oauth.entity.ComMenu;
-import com.dk.oauth.entity.ComMenuResponse;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,13 +10,13 @@ import java.util.List;
 *  常用功能 Mapper
 */
 @Repository
-public interface ComMenuMapper extends BaseMapper<ComMenuResponse> {
+public interface ComMenuMapper extends BaseMapper<ComMenu> {
     /**
      * @desc   : 根据条件进行查询
      * @author : 周兴
      * @date   : 2024/3/29 10:42
      */
-    List<ComMenuResponse> selectByCond(ComMenu comMenuQuery);
+    List<ComMenu> selectByCond(ComMenu comMenuQuery);
 
 
 }

src/main/java/com/dk/oauth/service/ICompanyService.java

@@ -34,4 +34,6 @@ public interface ICompanyService  extends IService<Company> {
     ResponseResultVO getCompanyMaxStaffNum(Integer id);
 
     ResponseResultVO updateCompanyCurStaffNum(Map<String,Object> map);
+
+    ResponseResultVO getComMenu(String gradeCode);
 }

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -397,13 +397,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         map.put("goodsCategorys",listGoodsCategorys);
         // 常用功能
-        List<ComMenuResponse> comMenuResponses = comMenuMapper.selectByCond(new ComMenu().setGradeCode(company.getGradeCode()));
+        List<ComMenu> comMenus = comMenuMapper.selectByCond(new ComMenu().setGradeCode(company.getGradeCode()));
         List<Map<String, Object>> listComMenu = new ArrayList<>();
-        for (int i = 0; i < comMenuResponses.size(); i++) {
+        for (int i = 0; i < comMenus.size(); i++) {
             m = new HashMap<>();
-            m.put("menuUuid",comMenuResponses.get(i).getMenuUuid());
-            m.put("appCode",comMenuResponses.get(i).getAppCode());
-            m.put("displayNo",comMenuResponses.get(i).getDisplayNo());
+            m.put("menuUuid",comMenus.get(i).getMenuUuid());
+            m.put("appCode",comMenus.get(i).getAppCode());
+            m.put("displayNo",comMenus.get(i).getDisplayNo());
             listComMenu.add(m);
         }
         map.put("listComMenu",listComMenu);
@@ -493,4 +493,15 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         companyMapper.saveMenuFrequency(menuFrequency);
         return ResponseResultUtil.success();
     }
+
+    /**
+     * @desc : 获取常用功能
+     * @author : 周兴
+     * @date : 2024/6/14 9:39
+     */
+    @Override
+    public ResponseResultVO getComMenu(String gradeCode){
+        List<ComMenu> comMenus = comMenuMapper.selectByCond(new ComMenu().setGradeCode(gradeCode));
+        return ResponseResultUtil.success(comMenus);
+    }
 }

src/main/resources/mapper/ComMenuMapper.xml

@@ -9,12 +9,8 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.oauth.entity.ComMenuResponse">
+    <resultMap id="BaseResultMap" type="com.dk.oauth.entity.ComMenu">
         <id column="menu_uuid" property="menuUuid" typeHandler="UuidTypeHandler"/>
-        <result column="menu_name" property="menuName"/>
-        <result column="object_code" property="objectCode"/>
-        <result column="object_path" property="objectPath"/>
-        <result column="object_icon" property="objectIcon"/>
         <result column="grade_code" property="gradeCode"/>
         <result column="app_code" property="appCode"/>
         <result column="display_no" property="displayNo"/>