修改gis问题类型及数量接口

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/InspectionFileServiceImpl.java

@@ -96,8 +96,20 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
      */
     @Override
     public JsonResult getQuestionList() {
-        //String tenantId = ShiroUtils.getTenantId();
-        String tenantId = "0";
+        //获取当前登录人租户id
+        //String username = SecurityUserUtils.username();
+        String username = "admin";
+        User user = userMapper.selectOne(new LambdaQueryWrapper<User>()
+                .eq(User::getMark, 1)
+                .eq(User::getUsername, username));
+        if(ObjectUtil.isNull(user)){
+            return null;
+        }
+        if(StringUtils.isEmpty(user.getTenantId())){
+            return JsonResult.error(ListByDeptUserTypeEnum.TENANT_ID_IS_NULL.getCode(),ListByDeptUserTypeEnum.TENANT_ID_IS_NULL.getMsg());
+        }
+        //租户id
+        String tenantId = user.getTenantId();
         //查询区域范范围问题
         List<InspectionFile> inspectionFileLists = new ArrayList<>();
         List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
@@ -131,6 +143,8 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 if (StringUtils.isNotEmpty(x.getQuestionId())) {
                     QuestionType questionType = questionTypeMapper.selectById(x.getQuestionId());
                     if (null != questionType) {
+                        vo.setCode(questionType.getCode());
+                        vo.setContent(questionType.getContent());
                         vo.setType(questionType.getName());
                     }
                 }
@@ -167,9 +181,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         ListByDeptUserTypeVo vo1 = new ListByDeptUserTypeVo();
         ListByDeptUserTypeVo vo2 = new ListByDeptUserTypeVo();
         //问题数量
-        Long pitGrooveNum = 0l;
-        Long ponDingNum = 0l;
-        Long crackNum = 0l;
+        Integer pitGrooveNum = 0;
+        Integer ponDingNum = 0;
+        Integer crackNum = 0;
         //若角色为超级管理员，查看状态为已生成工单和和问题已处理
         if(UserTypeEnum.SUPER_ADMIN.getCode()==user.getType()){
             //直接查问题列表

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/InspectionFileVo.java

@@ -32,8 +32,18 @@ public class InspectionFileVo {
     private String longitude;
 
     /**
-     * 问题类型:1坑槽，2积水，3裂缝
+     * 问题类型:类型名称：1横向裂缝，3网状裂纹，4坑槽，5块状裂纹，6积水
      */
     private Integer type;
 
+    /**
+     * 问题编号
+     */
+    private String code;
+
+    /**
+     * 巡检内容
+     */
+    private String content;
+
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/ListByDeptUserTypeVo.java

@@ -17,5 +17,5 @@ public class ListByDeptUserTypeVo {
     /**
      * 问题数量
      */
-    private Long num;
+    private Integer num;
 }