补充新更新

This commit is contained in:
2022-06-22 09:14:52 +08:00
parent 59da3376c1
commit 6870c2ccc3
323 changed files with 18518 additions and 441 deletions

View File

@@ -49,6 +49,9 @@ public interface AreaFeignClient {
@PostMapping("/areaPro")
HttpResult<Area> areaPro(@RequestParam("id")String id , @RequestParam("type")Integer type);
@PostMapping("/areaDeptPro")
HttpResult<Area> areaDeptPro(@RequestParam("id")String id);
/**

View File

@@ -61,6 +61,12 @@ public class AreaFeignClientFallbackFactory implements FallbackFactory<AreaFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Area> areaDeptPro(String id) {
log.error("{}异常,降级处理,异常为:{}","根据部门id查询省份信息",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Area> selectAreaByName(String name) {
log.error("{}异常,降级处理,异常为:{}","根据行政区域名称查询详细",cause.toString());

View File

@@ -257,5 +257,18 @@ public class AreaController extends BaseController {
Area result = areaService.selectAreaByName(name);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 根据部门id获取省份
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/areaDeptPro")
@ApiOperation("根据区域id获取省份")
@ApiImplicitParam(name = "id", value = "部门id", required = false)
public HttpResult<Area> areaDeptPro(@RequestParam(required = false) @ApiParam("id") String id) {
String methodDescribe = getMethodDescribe("areaDeptTree");
Area result = areaService.areaDeptPro(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

View File

@@ -64,8 +64,15 @@ public interface AreaMapper extends BaseMapper<Area> {
/**
* 查询所有区域
* @return
* @return 结果
*/
List<AreaTreeVO> getAreaAll();
/**
* 根据部门id获取区域详情
* @param id 部门id
* @return 结果
*/
Area areaDeptProDetail(@Param("id")String id);
}

View File

@@ -71,4 +71,19 @@
SELECT sys_area.*
FROM sys_area sys_area
</select>
<select id="areaDeptProDetail" resultType="Area">
SELECT
*
FROM
sys_area
WHERE
id = (
SELECT
area
FROM
sys_dept
WHERE
id = #{id})
</select>
</mapper>

View File

@@ -94,6 +94,8 @@ public interface IAreaService extends IService<Area> {
*/
Area areaPro(String id, Integer type);
Area areaDeptPro(String id);
List<AreaTreeVO> getDeptIdAreaTree();
/**

View File

@@ -213,6 +213,13 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
area = areaPro(id, type);
}
return area;
}
@Override
public Area areaDeptPro(String id) {
Area areaDetail = this.baseMapper.areaDeptProDetail(id);
Area area = areaPro(areaDetail.getId(),areaDetail.getType());
return area;
}
@Override