修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -196,7 +196,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
@@ -218,7 +218,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
@@ -299,14 +299,14 @@ public class DataDictionaryController extends BaseController {
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null);
+					null,null);
 		} else {
 			list = iDataDictionaryService.list(queryWrapper);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null);
+					null,null);
 		}
 		// 创建根节点
 		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
@@ -367,7 +367,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -32,4 +32,8 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
 	public List<DataDictionary>  getFireTeamTypeTree(String bizOrgCode);
 	
 	public List<DataDictionary> getwaterResourceTypeTree(String bizOrgCode);
+
+	public List<DataDictionary> getFirefightersJobTitle(String type);
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -48,4 +48,10 @@ public class DataDictionary extends BaseEntity {
     @TableField(exist = false)
     private int count;
 
+    @ApiModelProperty(value = "树code")
+    @TableField(exist = false)
+    private String  treeCode;
+
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java

@@ -76,7 +76,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
             // 数据字典生成树方法 原先通过getCode做主键  现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code  by kongfm 2021-09-08
             // 数据字典还原 by kongfm 2021-09-09
             List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                    , "getParent", null);
+                    , "getParent", null,null);
             redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
             return menus;
         }
@@ -129,8 +129,9 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
     public List<Menu> getFireTeamTypeTree(String bizOrgCode) throws Exception {
     	// Menu root = new Menu(null, "消防队伍类型", null, null,0);
     	List<DataDictionary> list=	dataDictionaryMapper.getFireTeamTypeTree(bizOrgCode);
+
     	List<Menu> menus = TreeParser.getTreeContainsCount(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-				"getParent", "getCount");
+				"getParent", "getCount","getTreeCode");
     	// root.setChildren(menus);
         for (Menu m:menus
         ) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/Menu.java

@@ -16,7 +16,8 @@ public class Menu {
 	    public Long parentId;
 	    public Boolean isRoot;
 	    public List<Menu> children;
-	    public int num;	    
+	    public String  treeCode;
+	    public int num;
 		public int getNum() {
 			return num;
 		}
@@ -28,9 +29,16 @@ public class Menu {
 			this.id = id;
 			this.name = name;
 			this.parentId = parentId2;	
-			this.num = num;		
+			this.num = num;
 		}
-		
+	public Menu(Long id, String name, Long parentId2,int num,String  treeCode) {
+		super();
+		this.id = id;
+		this.name = name;
+		this.parentId = parentId2;
+		this.num = num;
+		this.treeCode = treeCode;
+	}
 		public Menu(Long id, String name, Long parentId, List<Menu> children,int num) {
 			super();
 			this.id = id;

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -60,7 +60,7 @@ GROUP BY
 	
 	<select id="getFireTeamTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 	SELECT
-		cdd.*, case when fire.count is null then 0 else fire.count end as count
+		cdd.*,getParentListCode(cdd.sequence_nbr) treeCode,  case when fire.count is null then 0 else fire.count end as count
 	FROM
 		cb_data_dictionary cdd
 	LEFT JOIN (
@@ -78,6 +78,19 @@ GROUP BY
 	WHERE
 	cdd.type = 'XFJGLX'
 	</select>
+
+	<select id ="getFirefightersJobTitle" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+		SELECT
+			*,getParentListCode(sequence_nbr) treeCode
+		FROM
+			cb_data_dictionary cbb
+
+		WHERE
+			cbb.type = #{type}
+	</select>
+
+
+
 	<select id="getwaterResourceTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 	SELECT
 	cdd.*, case when fire.count is null then 0 else fire.count end as count

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

@@ -203,7 +203,7 @@ public class FireExpertsController extends BaseController {
         	i.setName(i.getName()+" ("+i.getCount()+")");
         });
         List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                , "getParent",null);
+                , "getParent",null,null);
         Menu menu = new Menu(-1L, "专家领域", -1L, menus,0);
         List<Menu> menuList = new ArrayList<>();
         menuList.add(menu);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -180,13 +180,13 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     public List<Menu> getTeamTree(Map<String, Object> columnMap) throws Exception {
         Collection<FireTeam> list = this.listByMap(columnMap);
         return TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
-                null);
+                null,null);
     }
 
     public List<Menu> getTeamTreeLikeCode(QueryWrapper<FireTeam> columnMap) throws Exception {
         Collection<FireTeam> list = this.list(columnMap);
         return TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
-                null);
+                null,null);
     }
     /**
      * 获取机场单位-队伍树
@@ -476,7 +476,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         queryWrapper.eq(FireTeam::getIsDelete, false);
 
         return TreeParser.getTree(null, this.baseMapper.selectList(queryWrapper), FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
-                null);
+                null,null);
     }
 
     /**
@@ -504,7 +504,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
             return null;
         }
         return TreeParser.getTree(parentFireTeam.getSequenceNbr(), this.baseMapper.selectList(queryWrapper), FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
-                null);
+                null,null);
         // TODO Auto-generated method stub
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,7 +46,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	DataDictionaryServiceImpl iDataDictionaryService;
 	@Autowired
 	FirefightersContactsServiceImpl firefightersContactsService;
-
+	@Autowired
+	DataDictionaryMapper dataDictionaryMapper;
 	@Override
 	public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
 		return firefightersMapper.getFirefighters(pageNum, pageSize, par);
@@ -119,12 +121,14 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	@Override
 	public List<Menu> getFirefightersJobTitleCount(String bizOrgCode) throws Exception {
 
-		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("type", "GWMC");
-		queryWrapper.orderByAsc("sort_num");
-		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+//		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.eq("type", "GWMC");
+//		queryWrapper.orderByAsc("sort_num");
+//		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+		Collection<DataDictionary> list =dataDictionaryMapper.getFirefightersJobTitle("GWMC");
+
 		List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-				"getParent", firefightersMapper.getFirefightersJobTitleCount(bizOrgCode));
+				"getParent", firefightersMapper.getFirefightersJobTitleCount(bizOrgCode),"getTreeCode");
 		for (Menu m:menus
 			 ) {
 			if( null != m.children) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -295,7 +295,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		List<Menu> menuList = new ArrayList<Menu>();
 		try {
 			List<Menu>	menus = TreeParser.getTree(null, resultList, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
 			// 挂在主节点
 			menuList.add(menu);

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2770,5 +2770,28 @@
             END#
         </sql>
     </changeSet>
+
+    <changeSet author="tw" id="20220217-1"  runAlways="true">
+        <comment>`getParentListCode`</comment>
+        <sql endDelimiter="#">
+            DROP FUNCTION IF EXISTS `getParentListCode`#
+            CREATE DEFINER=`root`@`%` FUNCTION `getParentListCode`(rootId varchar(100)) RETURNS varchar(2000) CHARSET latin1
+            BEGIN
+            DECLARE i varchar(2000) default '';
+            DECLARE j varchar(1000) default rootId;
+
+            WHILE rootId is not null  do
+            SET i =(SELECT parent FROM cb_data_dictionary WHERE sequence_nbr = rootId);
+            IF i is not null THEN
+            SET j = concat(i, ',', j);
+            SET rootId = i;
+            ELSE
+            SET rootId = i;
+            END IF;
+            END WHILE;
+            return j;
+            END#
+        </sql>
+    </changeSet>
 </databaseChangeLog>