监控调阅 处理调阅过程中项目被停用的情况

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteDictDataService.java

@@ -27,4 +27,13 @@ public interface RemoteDictDataService
      */
     @GetMapping(value = "/dict/data/bytype/{dictType}")
      public List<SysDictData> selectDictByeType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     *  查询指定类型的字典值 包括被删除的 被禁用的
+     * @param dictType
+     * @param source
+     * @return
+     */
+    @GetMapping(value = "/dict/data/fromDB/{dictType}")
+    public List<SysDictData> selectAllDictByeTypeFormDB(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDictDataFallbackFactory.java

@@ -28,6 +28,11 @@ public class RemoteDictDataFallbackFactory implements FallbackFactory<RemoteDict
             public List<SysDictData> selectDictByeType(String dictType, String source) {
                 return new ArrayList<>();
             }
+
+            @Override
+            public List<SysDictData> selectAllDictByeTypeFormDB(String dictType, String source) {
+                return null;
+            }
         };
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -1596,15 +1596,13 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         accessPdf.setOrgName(accessPdfVO.getOrgName());
 
         List<AccessDataVo> accessDataVos = baseMapper.selectPointByTask(accessPdfVO.getTaskId());
-        List<SysDictData> sysDictData = dictDataService.selectDictByeType(DictConstants.CORE_REGISTRATION_PROJECT, SecurityConstants.INNER);
+        List<SysDictData> sysDictData = dictDataService.selectAllDictByeTypeFormDB(DictConstants.CORE_REGISTRATION_PROJECT, SecurityConstants.INNER);
         for (AccessDataVo vo : accessDataVos) {
             vo.setProject(DictUtils.getDictLabel(DictConstants.CORE_REGISTRATION_PROJECT, Integer.parseInt(vo.getProject())));
             if (ObjectUtil.isEmpty(vo.getProject())){
                 sysDictData.stream().filter(d->d.getDictValue().equals(vo.getProject())).findFirst().ifPresent(d->vo.setProject(d.getDictLabel()));
             }
         }
-        //处理没有项目的数据，或者说项目被停用的数据
-        accessDataVos.removeIf(d->ObjectUtil.isEmpty(d.getProject()));
         accessPdf.setDataVos(accessDataVos);
         accessPdf.setSignImg(getFileRealPath(accessDataVos.get(0).getSignImg(), prefixPath, staticsPath));
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> remoteOrgService.selectOrgById(accessPdfVO.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDictDataController.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -84,6 +83,12 @@ public class SysDictDataController extends BaseController {
         return data;
     }
 
+    @ApiOperation(value = "根据字典类型查询字典数据信息")
+    @GetMapping(value = "/fromDB/{dictType}")
+    public List<SysDictData> selectAllDictByeTypeFormDB(@PathVariable String dictType) {
+        return dictTypeService.selectAllDictByeTypeFormDB(dictType);
+    }
+
     /**
      * 新增字典类型
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysDictTypeMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysDictType;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -84,4 +85,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType>
      * @return 结果
      */
      SysDictType checkDictTypeUnique(String dictType);
+
+    List<SysDictData> selectAllDictByeTypeFormDB(@Param("dictType") String dictType);
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysDictTypeService.java

@@ -104,4 +104,6 @@ public interface ISysDictTypeService extends IService<SysDictType>
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictType dictType);
+
+    List<SysDictData> selectAllDictByeTypeFormDB(String dictType);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,7 +1,6 @@
 package com.xunmei.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.UserConstants;
@@ -11,7 +10,6 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysDictType;
-import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.mapper.SysDictDataMapper;
 import com.xunmei.system.mapper.SysDictTypeMapper;
 import com.xunmei.system.service.ISysDictTypeService;
@@ -240,4 +238,10 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
         }
         return UserConstants.UNIQUE;
     }
+
+    @Override
+    public List<SysDictData> selectAllDictByeTypeFormDB(String dictType) {
+
+        return baseMapper.selectAllDictByeTypeFormDB(dictType);
+    }
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -101,5 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-</mapper> 
+
+	<select id="selectAllDictByeTypeFormDB" resultType="com.xunmei.system.api.domain.SysDictData">
+		select *
+		from sys_dict_data
+		where dict_type = #{dictType}
+    </select>
+</mapper>