Forráskód Böngészése

修改注解代码逻辑

songyh 3 éve
szülő
commit
6ea394ee24

+ 5 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/mapper/CoreMapper.java

@@ -6,6 +6,7 @@ import org.jeecg.common.system.entity.SysDepart;
 import org.jeecg.common.system.entity.SysDict;
 import org.jeecg.common.system.entity.SysPermissionDataRule;
 import org.jeecg.common.system.entity.SysUser;
+import org.jeecg.common.system.vo.DictModel;
 
 import java.util.List;
 
@@ -29,5 +30,9 @@ public interface CoreMapper extends BaseMapper<SysDict> {
 
 	List<String> queryDataRuleIds(@Param("username") String username,@Param("permissionId") String permissionId);
 
+	List<DictModel> queryDictItemsByCode(@Param("code")String code);
+
 	List<SysPermissionDataRule> selectSysPermissionDataRuleList(@Param("idList") List<String> idList, @Param("status") int status);
+
+	List<DictModel> queryTableDictItemsByCode(@Param("table")String dicTable, @Param("text")String dicText, @Param("code")String dicCode);
 }

+ 8 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/mapper/xml/CoreMapper.xml

@@ -48,4 +48,12 @@
 			#{item}
 		</foreach>
 	</select>
+    <select id="queryDictItemsByCode" resultType="org.jeecg.common.system.vo.DictModel">
+		select s.item_value as "value",s.item_text as "text" from sys_dict_item s
+		where dict_id = (select id from sys_dict where dict_code = #{code})
+		order by s.sort_order asc
+	</select>
+	<select id="queryTableDictItemsByCode" resultType="org.jeecg.common.system.vo.DictModel">
+		select ${text} as "text",${code} as "value" from ${table}
+	</select>
 </mapper>

+ 5 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/service/ICoreService.java

@@ -3,6 +3,7 @@ package org.jeecg.common.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.system.entity.SysDict;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
@@ -31,4 +32,8 @@ public interface ICoreService extends IService<SysDict> {
 
     @Cacheable(cacheNames= CacheConstant.SYS_USERS_CACHE, key="#username")
     LoginUser getUserByName(String username);
+
+    List<DictModel> queryDictItemsByCode(String dicCode);
+
+    List<DictModel> queryTableDictItemsByCode(String dicTable, String dicText, String dicCode);
 }

+ 11 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/service/impl/CoreServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.common.system.entity.*;
 import org.jeecg.common.system.mapper.CoreMapper;
 import org.jeecg.common.system.mapper.CorePermissionMapper;
 import org.jeecg.common.system.service.ICoreService;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
@@ -207,4 +208,14 @@ public class CoreServiceImpl extends ServiceImpl<CoreMapper, SysDict> implements
 		BeanUtils.copyProperties(sysUser, loginUser);
 		return loginUser;
 	}
+
+	@Override
+	public List<DictModel> queryDictItemsByCode(String dicCode) {
+		return coreMapper.queryDictItemsByCode(dicCode);
+	}
+
+	@Override
+	public List<DictModel> queryTableDictItemsByCode(String dicTable, String dicText, String dicCode) {
+		return coreMapper.queryTableDictItemsByCode(dicTable,dicText,dicCode);
+	}
 }

+ 6 - 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java

@@ -2,9 +2,11 @@ package org.jeecg.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.system.service.ICoreService;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.dict.service.AutoPoiDictServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -25,9 +27,8 @@ import java.util.List;
 @Slf4j
 @Service
 public class AutoPoiDictConfig implements AutoPoiDictServiceI {
-	@Lazy
-	@Resource
-	private CommonAPI commonAPI;
+	@Autowired
+	private ICoreService coreService;
 
 	/**
 	 * 通过字典查询easypoi,所需字典文本
@@ -42,11 +43,11 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI {
 		List<DictModel> dictList = null;
 		// step.1 如果没有字典表则使用系统字典表
 		if (oConvertUtils.isEmpty(dicTable)) {
-			dictList = commonAPI.queryDictItemsByCode(dicCode);
+			dictList = coreService.queryDictItemsByCode(dicCode);
 		} else {
 			try {
 				dicText = oConvertUtils.getString(dicText, dicCode);
-				dictList = commonAPI.queryTableDictItemsByCode(dicTable, dicText, dicCode);
+				dictList = coreService.queryTableDictItemsByCode(dicTable, dicText, dicCode);
 			} catch (Exception e) {
 				log.error(e.getMessage(),e);
 			}