Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
zhangbaojian
2023-04-26 13:57:44 +08:00
parent 26bc511536
commit 3b8774d7e4
8 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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);

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

@@ -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());

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

@@ -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查询字典数据")

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

@@ -22,21 +22,25 @@ public interface DictDataMapper extends BaseMapper<DictData> {
/**
* 分页查询字典数据
*
* @param page 分页数据
* @param queryWrapper 查询条件
* @return 字典数据
*/
Page<DictDataVO> page(@Param("page")Page<DictDataVO> page, @Param("ew")QueryWrapper<DictDataVO> queryWrapper);
Page<DictDataVO> page(@Param("page") Page<DictDataVO> page, @Param("ew") QueryWrapper<DictDataVO> queryWrapper);
/**
* @param dictypeName 字典类型名称
* @return 根据字典类型名称查询字典数据
*/
List<DictData> getDicDataByTypeName(@Param("dictypeName")String dictypeName);
List<DictData> getDicDataByTypeName(@Param("dictypeName") String dictypeName);
DictData getDicDataByName(@Param("dicName")String dicName);
DictData getDicDataByName(@Param("dicName") String dicName);
DictData getDicDataByNameAndType(@Param("dicName") String dicName, @Param("typeName") String typeName);
DictData getDicDataByCode(@Param("code") String code);
DictData getDicDataByCode(@Param("code")String code);
/**
* 根据字典类型名称&数据名称获取字典数据
*
@@ -44,12 +48,12 @@ public interface DictDataMapper extends BaseMapper<DictData> {
* @param dicDataName 字典数据名称
* @return 字典数据
*/
DictData getDicDataByNameAndTypeName(@Param("dicTypeName")String dicTypeName, @Param("dicDataName")String dicDataName);
DictData getDicDataByNameAndTypeName(@Param("dicTypeName") String dicTypeName, @Param("dicDataName") String dicDataName);
/**
* @param dictTypeCode 字典类型名称
* @return 根据字典类型名称查询字典数据
*/
List<DictData> getDicDataByTypeCode(@Param("dictTypeCode")String dictTypeCode);
List<DictData> getDicDataByTypeCode(@Param("dictTypeCode") String dictTypeCode);
}

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

@@ -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.*

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

@@ -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

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

@@ -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);