排查第一页枚举添加

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -1151,8 +1151,14 @@ public class HighDangerController {
     }
 
     @GetMapping("/getRoadTypes")
-    public ServerResponse<?> getRoadType() {
-        List<EnumRoadType> roadTypes = highDangerService.getRoadTypes();
+    public ServerResponse<?> getRoadType(@RequestParam Integer enumType) {
+        List<EnumRoadType> roadTypes = highDangerService.getRoadTypes(enumType);
+        return ServerResponse.ok(roadTypes);
+    }
+
+    @GetMapping("/getEnumValues")
+    public ServerResponse<?> getEnumValues(@RequestParam Integer enumType) {
+        List<EnumRoadType> roadTypes = highDangerService.getEnumValues(enumType);
         return ServerResponse.ok(roadTypes);
     }
 

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java

@@ -101,7 +101,9 @@ public interface HighDangerMapper{
 
     void updateSectionCommunity(@Param("businessId") String businessId,@Param("xqcode") String xqcode,@Param("jdcode") String jdcode);
 
-    List<EnumRoadType> getRoadTypes();
+    List<EnumRoadType> getRoadTypes(Integer enumType);
+
+    List<EnumRoadType> getEnumValues(Integer enumType);
 
     SectionVO getSectionByCode(String sectionCode);
 

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java

@@ -6,6 +6,7 @@ import com.hisense.hiatmp.model.common.HighDangerRoad;
 import com.hisense.hiatmp.model.common.ThtDangerItems;
 import com.hisense.hiatmp.model.dmr.Point;
 import com.hisense.hiatmp.server_api.utils.CoordinateConverter;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -35,7 +36,9 @@ public interface HighDangerService {
 
     void insertDangerRoad(HighDangerRoad highDangerRoad);
 
-    List<EnumRoadType> getRoadTypes();
+    List<EnumRoadType> getRoadTypes(Integer enumType);
+
+    List<EnumRoadType> getEnumValues(Integer enumType);
 
     // 随机生成12位数字
     String random12();

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
@@ -348,9 +349,15 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
     }
 
     @Override
-    public List<EnumRoadType> getRoadTypes() {
+    public List<EnumRoadType> getRoadTypes(Integer enumType) {
         // 获取道路类型
-        return highDangerMapper.getRoadTypes();
+        return highDangerMapper.getRoadTypes(enumType);
+    }
+
+    @Override
+    public List<EnumRoadType> getEnumValues(Integer enumType) {
+        // 获取道路类型
+        return highDangerMapper.getEnumValues(enumType);
     }
 
     public  String random12(){

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -664,7 +664,15 @@
     <select id="getRoadTypes" resultType="com.hisense.hiatmp.model.common.EnumRoadType">
         select *
         from bis_enum_type
-        where enumtype_id = '303'
+        where enumtype_id = #{enumType}
+        order by dispindex,enum_name
+    </select>
+
+    <select id="getEnumValues" resultType="com.hisense.hiatmp.model.common.EnumRoadType">
+        select *
+        from enum_type
+        where enumtypeid = #{enumType}
+        order by dispindex,enumname
     </select>
 
     <select id="getSectionByCode" resultType="com.hisense.hiatmp.model.common.SectionVO">