Prechádzať zdrojové kódy

1、修改common文件

zhoux 2 rokov pred
rodič
commit
86fca51e5a

+ 1 - 27
src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -117,20 +117,6 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取产品品牌
-     * @author : 夏常明
-     * @date : 2023/1/10 13:53
-     */
-    @ApiOperation(
-            value = "获取产品品牌",
-            notes = "获取产品品牌"
-    )
-    @PostMapping("get_brand")
-    public ResponseResultVO<List<Map<String, Object>>> getBrand(@RequestBody Map<String, Object> param) {
-        return commonService.getBrand(param);
-    }
-
-    /**
      * @desc : 获取角色
      * @author : 姜宁
      * @date : 2023/1/29 14:26
@@ -193,19 +179,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getSettingKind(@RequestBody Map<String, Object> param) {
         return commonService.getSettingKind(param);
     }
-
-    /**
-     * @desc : 获取组织部门
-     * @author : 姜宁
-     * @date : 2023/2/1 14:12
-     */
-    @ApiOperation(value = "获取组织部门分页查询", notes = "获取组织部门分页查询")
-    @PostMapping({"get_organization_by_page"})
-    public ResponseResultVO<PageList<Map<String, Object>>> getOrganizationByPage(@RequestBody Map<String, Object> param) {
-        return commonService.getOrganizationByPage(param);
-    }
-
-
+    
     /**
      * @desc : 获取数据字典
      * @author : 姜宁

+ 6 - 27
src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -70,19 +70,12 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     Long getOrgCountByPage(Map param);
 
-    /**
-     * @desc : 获取产品品牌
-     * @author : 夏常明
-     * @date : 2023/1/10 13:57
-     */
-    List<Map<String, Object>> getBrand(Map param);
-
-    /**
-     * @desc : 获取用户菜单
-     * @author : 周兴
-     * @date : 2023/1/9 14:20
-     */
-    List<Map<String, Object>> getMenuByUser(@Param("appCode") String appCode, @Param("userId") Integer userId);
+//    /**
+//     * @desc : 获取用户菜单
+//     * @author : 周兴
+//     * @date : 2023/1/9 14:20
+//     */
+//    List<Map<String, Object>> getMenuByUser(@Param("appCode") String appCode, @Param("userId") Integer userId);
 
     /**
      * @desc : 获取角色
@@ -126,20 +119,6 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     List<Map<String, Object>> getSettingKind(Map param);
 
-    /**
-     * @desc : 获取组织部门
-     * @author : 姜宁
-     * @date : 2023/2/1 14:10
-     */
-    List<Map<String, Object>> getOrganizationByPage(Map param);
-
-    /**
-     * @desc : 获取组织部门(数量)
-     * @author : 姜宁
-     * @date : 2023/2/1 14:11
-     */
-    Long getOrganizationCountByPage(Map param);
-
 
     /**
      * @desc : 获取数据字典

+ 9 - 0
src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -280,6 +280,15 @@
         order by dd.display_no
     </select>
 
+    <!-- 获取数据字典项目 -->
+    <select id="getDictionaryItemData" resultType="java.util.Map">
+        SELECT stdi.dict_code                                         AS "dictCode",
+               sys.f_get_name_i18n_lang(stdi.dict_name_i18n, 'zh_CN') AS "dictName"
+        FROM sys.t_dictionary_item stdi
+        WHERE stdi.flg_valid
+          AND stdi.level_no NOT IN ('1')
+    </select>
+
     <!-- 获取数据类型 -->
     <select id="getValueKind" resultType="java.util.Map">
         select tvk.kind_code AS "kindCode",

+ 0 - 27
src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -194,17 +194,6 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取商品品牌
-     * @author : 夏常明
-     * @date : 2023/1/10 14:24
-     */
-    public ResponseResultVO<List<Map<String, Object>>> getBrand(Map<String, Object> param) {
-        // 获取系统基础数据
-        List<Map<String, Object>> list = commonMapper.getBrand(param);
-        return ResponseResultUtil.success(list);
-    }
-
-    /**
      * @desc : 获取角色
      * @author : 姜宁
      * @date : 2023/1/29 14:28
@@ -290,22 +279,6 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc : 获取组织部门
-     * @author : 姜宁
-     * @date : 2023/2/1 14:09
-     */
-    public ResponseResultVO<PageList<Map<String, Object>>> getOrganizationByPage(Map<String, Object> param) {
-        // 校验分页参数
-        if (param.get("pageSize") == null || param.get("currentPage") == null) {
-            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
-        }
-        // 分页参数赋值
-        param = this.getLimit(param);
-        return super.mergeListWithCount(param, commonMapper.getOrganizationByPage(param),
-                commonMapper.getOrganizationCountByPage(param));
-    }
-
-    /**
      * @desc : 获取数据字典
      * @author : 姜宁
      * @date : 2023/2/7 14:47