zbj//1.将台账数据导入终端相关表接口改动

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java

@@ -53,6 +53,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -1898,7 +1901,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 if (Objects.isNull(temp)) {
                     temp = assembleLine(substationName, LineBaseEnum.SUB_LEVEL.getCode(), pids.get(LineBaseEnum.GD_LEVEL.getCode()), pids);
                     //处理电压等级字典表
-                    DictData substationScale = dicDataFeignClient.getDicDataByName(terminalBaseExcel.getSubStationScale()).getData();
+                    DictData substationScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubStationScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
                     if (Objects.isNull(substationScale)) {
                         terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级不存在"));
                         continue;
@@ -2001,7 +2004,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         }
                     }
                     //处理电压等级字典表
-                    DictData subvScale = dicDataFeignClient.getDicDataByName(terminalBaseExcel.getSubvScale()).getData();
+                    DictData subvScale = dicDataFeignClient.getDicDataByNameAndType(terminalBaseExcel.getSubvScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
                     if (Objects.isNull(subvScale)) {
                         terminalBaseExcelMsgs.add(assembleBaseMsg(terminalBaseExcel, "字典电压等级：" + terminalBaseExcel.getSubStationScale() + "不存在"));
                         continue;

pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java

@@ -31,6 +31,9 @@ public interface DicDataFeignClient {
     @GetMapping("/getDicDataByName")
     HttpResult<DictData> getDicDataByName(@RequestParam("dicName") String dicName);
 
+    @GetMapping("/getDicDataByNameAndType")
+    HttpResult<DictData> getDicDataByNameAndType(@RequestParam("dicName") String dicName ,@RequestParam("typeName") String typeName);
+
     @GetMapping("/getDicDataByCode")
     HttpResult<DictData> getDicDataByCode(@RequestParam("code") String code);
 

pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java

@@ -55,6 +55,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory<DicDat
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<DictData> getDicDataByNameAndType(String dicName, String typeName) {
+                log.error("{}异常，降级处理，异常为：{}","根据字典名称获取字典数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<DictData> getDicDataByCode(String code) {
                 log.error("{}异常，降级处理，异常为：{}","根据字典code获取字典数据",cause.toString());

pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java

@@ -17,6 +17,7 @@ import com.njcn.system.pojo.vo.DictDataVO;
 import com.njcn.system.service.IDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -162,6 +163,19 @@ public class DictDataController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getDicDataByNameAndType")
+    @ApiOperation("根据字典名称查询字典数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dicName", value = "查询参数", required = true),
+            @ApiImplicitParam(name = "typeName", value = "查询参数", required = true)
+    })
+    public HttpResult<DictData> getDicDataByNameAndType(@RequestParam("dicName") String dicName,@RequestParam("typeName") String typeName) {
+        String methodDescribe = getMethodDescribe("getDicDataByNameAndType");
+        DictData result = dictDataService.getDicDataByNameAndType(dicName,typeName);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/getDicDataByCode")
     @ApiOperation("根据字典code查询字典数据")

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java

@@ -22,6 +22,7 @@ public interface DictDataMapper extends BaseMapper<DictData> {
 
     /**
      * 分页查询字典数据
+     *
      * @param page         分页数据
      * @param queryWrapper 查询条件
      * @return 字典数据
@@ -36,7 +37,10 @@ public interface DictDataMapper extends BaseMapper<DictData> {
 
     DictData getDicDataByName(@Param("dicName") String dicName);
 
+    DictData getDicDataByNameAndType(@Param("dicName") String dicName, @Param("typeName") String typeName);
+
     DictData getDicDataByCode(@Param("code") String code);
+
     /**
      * 根据字典类型名称&数据名称获取字典数据
      *

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml

@@ -32,6 +32,16 @@
         order by sys_dict_data.sort
     </select>
 
+    <select id="getDicDataByNameAndType" resultType="DictData">
+        SELECT sys_dict_data.*
+        FROM sys_dict_data sys_dict_data
+                 LEFT JOIN sys_dict_type sdt ON sdt.Id = sys_dict_data.Type_Id
+        WHERE sys_dict_data.name = #{dicName}
+          and sys_dict_data.state = 1
+          and sdt.`Name`= #{typeName}
+        order by sys_dict_data.sort
+    </select>
+
     <!-- 根据字典名称查询字典数据-->
     <select id="getDicDataByCode" resultType="DictData">
         SELECT sys_dict_data.*

pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java

@@ -83,6 +83,13 @@ public interface IDictDataService extends IService<DictData> {
      */
     DictData getDicDataByName(String dicName);
 
+    /**
+     *
+     * @param dicName 字典名称,类型名称
+     * @return 根据字典名称查询字典数据
+     */
+    DictData getDicDataByNameAndType(String dicName,String typeName);
+
     /**
      *
      * @param code 字典code

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java

@@ -144,6 +144,11 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
         return this.baseMapper.getDicDataByName(dicName);
     }
 
+    @Override
+    public DictData getDicDataByNameAndType(String dicName,String typeName) {
+        return this.baseMapper.getDicDataByNameAndType(dicName,typeName);
+    }
+
     @Override
     public DictData getDicDataByCode(String code) {
         return this.baseMapper.getDicDataByCode(code);