~liusuyi/ruoyi-api.git

上一版本: 7f719930 | 补丁 | 提交 | 忽略空白

Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 7e49fc48065211df6bbb6b6f43fa747cdfbf4727

Merge remote-tracking branch 'origin/master'

已修改9个文件

	ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java	65 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java

@@ -61,7 +61,16 @@
        List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);

        return getDataTable(list);

    }



    /**

     * 查询相机设备列表（不校验权限）

     */

    @GetMapping("/list/noPerm")

    @ApiOperation("查询相机设备列表")

    public TableDataInfo listNoPerm(ArdCameras ardCamera) {

        startPage();

        List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);

        return getDataTable(list);

    }

    /**

     * 导出相机设备列表

     */


 ard-work/src/main/java/com/ruoyi/device/external/controller/ArdEquipExternalController.java

@@ -50,7 +50,17 @@
        List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
        return getDataTable(list);
    }

    /**
     * 查询external列表(不校验权限)
     */
    @ApiOperation(value = "查询外联设备管理列表")
    @GetMapping("/list/noPerm")
    public TableDataInfo listNoPerm(ArdEquipExternal ardEquipExternal)
    {
        startPage();
        List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
        return getDataTable(list);
    }
    /**
     * 导出external列表
     */

 ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java

@@ -56,7 +56,17 @@
        List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
        return getDataTable(list);
    }

    /**
     * 查询radar列表（不校验权限）
     */
    @GetMapping("/list/noPerm")
    @ApiOperation(value = "查询雷达管理列表")
    public TableDataInfo listNoPerm(ArdEquipRadar ardEquipRadar)
    {
        startPage();
        List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
        return getDataTable(list);
    }
    /**
     * 导出radar列表
     */

 ard-work/src/main/java/com/ruoyi/device/tower/controller/ArdTowersController.java

@@ -51,7 +51,17 @@
        List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
        return getDataTable(list);
    }

    /**
     * 查询塔管理列表(不校验权限)
     */
    @GetMapping("/list/noPerm")
    @ApiOperation(value = "查询塔管理列表(不校验权限)")
    public TableDataInfo listNoPerm(ArdTowers ardTowers)
    {
        startPage();
        List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
        return getDataTable(list);
    }
    /**
     * 导出塔管理列表
     */

 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java

@@ -47,6 +47,13 @@
        return getDataTable(list);
    }

    //不校验权限
    @GetMapping("/listByStartTime/noPerm")
    public TableDataInfo listByStartTimeNoPerm(ArdVideoInspectRecord ardVideoInspectRecord) {
        startPage();
        List<HashMap> list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
        return getDataTable(list);
    }
    @PreAuthorize("@ss.hasPermi('inspect:record:list')")
    @GetMapping("/getFileCountByStartMonth")
    public List getFileCountByStartMonth(@RequestParam("startMonth") String startMonth) {

 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java

@@ -46,7 +46,15 @@
        List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
        return getDataTable(list);
    }

    /**
     * 查询视频巡检任务列表（不校验权限）
     */
    @GetMapping("/list/noPerm")
    public TableDataInfo listNoPerm(ArdVideoInspectTask ardVideoInspectTask) {
        startPage();
        List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
        return getDataTable(list);
    }
    /**
     * 导出视频巡检任务列表
     */

 ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java

@@ -55,7 +55,15 @@
        List<Vtdu> list = vtduService.selectVtduList(vtdu);

        return getDataTable(list);

    }



    /**

     * 查询流媒体管理列表（不校验权限）

     */

    @GetMapping("/list/noPerm")

    public TableDataInfo listNoPerm(Vtdu vtdu) {

        startPage();

        List<Vtdu> list = vtduService.selectVtduList(vtdu);

        return getDataTable(list);

    }

    /**

     * 导出流媒体管理列表

     */

@@ -101,7 +109,38 @@
        }

        return success(vtdu);

    }



    /**

     * 获取流媒体管理详细信息（不校验权限）

     */

    @GetMapping(value = "/{name}/noPerm")

    public AjaxResult getInfoNoPerm(@PathVariable("name") String name) {

        Vtdu vtdu = vtduService.selectVtduByName(name);

        if (vtdu != null) {

            String cameraId = name.split("_")[0];

            Integer chanNo = Integer.valueOf(name.split("_")[1]);

            CameraCmd cmd = new CameraCmd(cameraId, chanNo);

            Map<String, Object> videoCompressionCfg = cameraSdkService.getVideoCompressionCfg(cmd);

            String videoEncType = (String) videoCompressionCfg.get("videoEncType");

            if (videoEncType != null) {

                if (!videoEncType.equals("标准h264")) {

                    vtdu.setIsCode("1");

                } else {

                    vtdu.setIsCode("0");

                }

            }

            else

            {

                vtdu.setIsCode("0");

            }

            //流媒体不存在新增，存在更新

            if (!mediaService.checkNameExist(name)) {

                mediaService.addPath(name, vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());

            } else {

                vtduService.updateVtdu(vtdu);

            }

        }

        return success(vtdu);

    }

    /**

     * 新增流媒体管理

     */


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -28,14 +28,13 @@

/**
 * 参数配置 信息操作处理
 * 
 *
 * @author ruoyi
 */
@Api(tags = "参数配置")
@RestController
@RequestMapping("/system/config")
public class SysConfigController extends BaseController
{
public class SysConfigController extends BaseController {
    @Autowired
    private ISysConfigService configService;

@@ -44,8 +43,17 @@
     */
    @PreAuthorize("@ss.hasPermi('system:config:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysConfig config)
    {
    public TableDataInfo list(SysConfig config) {
        startPage();
        List<SysConfig> list = configService.selectConfigList(config);
        return getDataTable(list);
    }

    /**
     * 获取参数配置列表(不验证权限)
     */
    @GetMapping("/list/noPerm")
    public TableDataInfo listNoPerm(SysConfig config) {
        startPage();
        List<SysConfig> list = configService.selectConfigList(config);
        return getDataTable(list);
@@ -53,8 +61,16 @@

    @PreAuthorize("@ss.hasPermi('system:config:list')")
    @GetMapping("/lists")
    public AjaxResult lists(SysConfig config)
    {
    public AjaxResult lists(SysConfig config) {
        List<SysConfig> list = configService.selectConfigList(config);
        return toAjaxList(list);
    }

    /**
     * 获取参数配置列表不分页(不验证权限)
     */
    @GetMapping("/lists/noPerm")
    public AjaxResult listsNoPerm(SysConfig config) {
        List<SysConfig> list = configService.selectConfigList(config);
        return toAjaxList(list);
    }
@@ -62,8 +78,7 @@
    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:config:export')")
    @PostMapping("/export")
    public void export(HttpServletResponse response, SysConfig config)
    {
    public void export(HttpServletResponse response, SysConfig config) {
        List<SysConfig> list = configService.selectConfigList(config);
        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
        util.exportExcel(response, list, "参数数据");
@@ -74,8 +89,15 @@
     */
    @PreAuthorize("@ss.hasPermi('system:config:query')")
    @GetMapping(value = "/{configId}")
    public AjaxResult getInfo(@PathVariable Long configId)
    {
    public AjaxResult getInfo(@PathVariable Long configId) {
        return success(configService.selectConfigById(configId));
    }

    /**
     * 根据参数编号获取详细信息(不校验权限)
     */
    @GetMapping(value = "/{configId}/noPerm")
    public AjaxResult getInfoNoPerm(@PathVariable Long configId) {
        return success(configService.selectConfigById(configId));
    }

@@ -84,8 +106,7 @@
     */
    @ApiOperation("根据参数键名查询参数值")
    @GetMapping(value = "/configKey/{configKey}")
    public AjaxResult getConfigKey(@PathVariable String configKey)
    {
    public AjaxResult getConfigKey(@PathVariable String configKey) {
        return success(configService.selectConfigByKey(configKey));
    }

@@ -95,10 +116,8 @@
    @PreAuthorize("@ss.hasPermi('system:config:add')")
    @Log(title = "参数管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@Validated @RequestBody SysConfig config)
    {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
        {
    public AjaxResult add(@Validated @RequestBody SysConfig config) {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        config.setCreateBy(getUsername());
@@ -111,10 +130,8 @@
    @PreAuthorize("@ss.hasPermi('system:config:edit')")
    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@Validated @RequestBody SysConfig config)
    {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
        {
    public AjaxResult edit(@Validated @RequestBody SysConfig config) {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        config.setUpdateBy(getUsername());
@@ -127,8 +144,7 @@
    @PreAuthorize("@ss.hasPermi('system:config:remove')")
    @Log(title = "参数管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{configIds}")
    public AjaxResult remove(@PathVariable Long[] configIds)
    {
    public AjaxResult remove(@PathVariable Long[] configIds) {
        configService.deleteConfigByIds(configIds);
        return success();
    }
@@ -139,8 +155,7 @@
    @PreAuthorize("@ss.hasPermi('system:config:remove')")
    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
    @DeleteMapping("/refreshCache")
    public AjaxResult refreshCache()
    {
    public AjaxResult refreshCache() {
        configService.resetConfigCache();
        return success();
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -238,7 +238,13 @@
    public AjaxResult deptTree(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));
    }

    /**
     * 获取部门树列表
     */
    @GetMapping("/deptTree/noPerm")
    public AjaxResult deptTreeNoPerm(SysDept dept) {
        return success(deptService.selectDeptTreeList(dept));
    }
    /**
     * 修改密码
     */

			@@ -61,7 +61,16 @@
			List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
			return getDataTable(list);
			}

			/**
			* 查询相机设备列表（不校验权限）
			*/
			@GetMapping("/list/noPerm")
			@ApiOperation("查询相机设备列表")
			public TableDataInfo listNoPerm(ArdCameras ardCamera) {
			startPage();
			List<ArdCameras> list = ardCamerasService.selectArdCamerasList(ardCamera);
			return getDataTable(list);
			}
			/**
			* 导出相机设备列表
			*/

			@@ -50,7 +50,17 @@
			List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
			return getDataTable(list);
			}

			/**
			* 查询external列表(不校验权限)
			*/
			@ApiOperation(value = "查询外联设备管理列表")
			@GetMapping("/list/noPerm")
			public TableDataInfo listNoPerm(ArdEquipExternal ardEquipExternal)
			{
			startPage();
			List<ArdEquipExternal> list = ardEquipExternalService.selectArdEquipExternalList(ardEquipExternal);
			return getDataTable(list);
			}
			/**
			* 导出external列表
			*/

			@@ -56,7 +56,17 @@
			List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
			return getDataTable(list);
			}

			/**
			* 查询radar列表（不校验权限）
			*/
			@GetMapping("/list/noPerm")
			@ApiOperation(value = "查询雷达管理列表")
			public TableDataInfo listNoPerm(ArdEquipRadar ardEquipRadar)
			{
			startPage();
			List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar);
			return getDataTable(list);
			}
			/**
			* 导出radar列表
			*/

			@@ -51,7 +51,17 @@
			List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
			return getDataTable(list);
			}

			/**
			* 查询塔管理列表(不校验权限)
			*/
			@GetMapping("/list/noPerm")
			@ApiOperation(value = "查询塔管理列表(不校验权限)")
			public TableDataInfo listNoPerm(ArdTowers ardTowers)
			{
			startPage();
			List<ArdTowers> list = ardTowersService.selectArdTowersList(ardTowers);
			return getDataTable(list);
			}
			/**
			* 导出塔管理列表
			*/

			@@ -47,6 +47,13 @@
			return getDataTable(list);
			}

			//不校验权限
			@GetMapping("/listByStartTime/noPerm")
			public TableDataInfo listByStartTimeNoPerm(ArdVideoInspectRecord ardVideoInspectRecord) {
			startPage();
			List<HashMap> list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
			return getDataTable(list);
			}
			@PreAuthorize("@ss.hasPermi('inspect:record:list')")
			@GetMapping("/getFileCountByStartMonth")
			public List getFileCountByStartMonth(@RequestParam("startMonth") String startMonth) {

			@@ -46,7 +46,15 @@
			List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
			return getDataTable(list);
			}

			/**
			* 查询视频巡检任务列表（不校验权限）
			*/
			@GetMapping("/list/noPerm")
			public TableDataInfo listNoPerm(ArdVideoInspectTask ardVideoInspectTask) {
			startPage();
			List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
			return getDataTable(list);
			}
			/**
			* 导出视频巡检任务列表
			*/

			@@ -55,7 +55,15 @@
			List<Vtdu> list = vtduService.selectVtduList(vtdu);
			return getDataTable(list);
			}

			/**
			* 查询流媒体管理列表（不校验权限）
			*/
			@GetMapping("/list/noPerm")
			public TableDataInfo listNoPerm(Vtdu vtdu) {
			startPage();
			List<Vtdu> list = vtduService.selectVtduList(vtdu);
			return getDataTable(list);
			}
			/**
			* 导出流媒体管理列表
			*/
			@@ -101,7 +109,38 @@
			}
			return success(vtdu);
			}

			/**
			* 获取流媒体管理详细信息（不校验权限）
			*/
			@GetMapping(value = "/{name}/noPerm")
			public AjaxResult getInfoNoPerm(@PathVariable("name") String name) {
			Vtdu vtdu = vtduService.selectVtduByName(name);
			if (vtdu != null) {
			String cameraId = name.split("_")[0];
			Integer chanNo = Integer.valueOf(name.split("_")[1]);
			CameraCmd cmd = new CameraCmd(cameraId, chanNo);
			Map<String, Object> videoCompressionCfg = cameraSdkService.getVideoCompressionCfg(cmd);
			String videoEncType = (String) videoCompressionCfg.get("videoEncType");
			if (videoEncType != null) {
			if (!videoEncType.equals("标准h264")) {
			vtdu.setIsCode("1");
			} else {
			vtdu.setIsCode("0");
			}
			}
			else
			{
			vtdu.setIsCode("0");
			}
			//流媒体不存在新增，存在更新
			if (!mediaService.checkNameExist(name)) {
			mediaService.addPath(name, vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
			} else {
			vtduService.updateVtdu(vtdu);
			}
			}
			return success(vtdu);
			}
			/**
			* 新增流媒体管理
			*/

			@@ -28,14 +28,13 @@

			/**
			* 参数配置信息操作处理
			*
			*
			* @author ruoyi
			*/
			@Api(tags = "参数配置")
			@RestController
			@RequestMapping("/system/config")
			public class SysConfigController extends BaseController
			{
			public class SysConfigController extends BaseController {
			@Autowired
			private ISysConfigService configService;

			@@ -44,8 +43,17 @@
			*/
			@PreAuthorize("@ss.hasPermi('system:config:list')")
			@GetMapping("/list")
			public TableDataInfo list(SysConfig config)
			{
			public TableDataInfo list(SysConfig config) {
			startPage();
			List<SysConfig> list = configService.selectConfigList(config);
			return getDataTable(list);
			}

			/**
			* 获取参数配置列表(不验证权限)
			*/
			@GetMapping("/list/noPerm")
			public TableDataInfo listNoPerm(SysConfig config) {
			startPage();
			List<SysConfig> list = configService.selectConfigList(config);
			return getDataTable(list);
			@@ -53,8 +61,16 @@

			@PreAuthorize("@ss.hasPermi('system:config:list')")
			@GetMapping("/lists")
			public AjaxResult lists(SysConfig config)
			{
			public AjaxResult lists(SysConfig config) {
			List<SysConfig> list = configService.selectConfigList(config);
			return toAjaxList(list);
			}

			/**
			* 获取参数配置列表不分页(不验证权限)
			*/
			@GetMapping("/lists/noPerm")
			public AjaxResult listsNoPerm(SysConfig config) {
			List<SysConfig> list = configService.selectConfigList(config);
			return toAjaxList(list);
			}
			@@ -62,8 +78,7 @@
			@Log(title = "参数管理", businessType = BusinessType.EXPORT)
			@PreAuthorize("@ss.hasPermi('system:config:export')")
			@PostMapping("/export")
			public void export(HttpServletResponse response, SysConfig config)
			{
			public void export(HttpServletResponse response, SysConfig config) {
			List<SysConfig> list = configService.selectConfigList(config);
			ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
			util.exportExcel(response, list, "参数数据");
			@@ -74,8 +89,15 @@
			*/
			@PreAuthorize("@ss.hasPermi('system:config:query')")
			@GetMapping(value = "/{configId}")
			public AjaxResult getInfo(@PathVariable Long configId)
			{
			public AjaxResult getInfo(@PathVariable Long configId) {
			return success(configService.selectConfigById(configId));
			}

			/**
			* 根据参数编号获取详细信息(不校验权限)
			*/
			@GetMapping(value = "/{configId}/noPerm")
			public AjaxResult getInfoNoPerm(@PathVariable Long configId) {
			return success(configService.selectConfigById(configId));
			}

			@@ -84,8 +106,7 @@
			*/
			@ApiOperation("根据参数键名查询参数值")
			@GetMapping(value = "/configKey/{configKey}")
			public AjaxResult getConfigKey(@PathVariable String configKey)
			{
			public AjaxResult getConfigKey(@PathVariable String configKey) {
			return success(configService.selectConfigByKey(configKey));
			}

			@@ -95,10 +116,8 @@
			@PreAuthorize("@ss.hasPermi('system:config:add')")
			@Log(title = "参数管理", businessType = BusinessType.INSERT)
			@PostMapping
			public AjaxResult add(@Validated @RequestBody SysConfig config)
			{
			if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
			{
			public AjaxResult add(@Validated @RequestBody SysConfig config) {
			if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
			return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
			}
			config.setCreateBy(getUsername());
			@@ -111,10 +130,8 @@
			@PreAuthorize("@ss.hasPermi('system:config:edit')")
			@Log(title = "参数管理", businessType = BusinessType.UPDATE)
			@PutMapping
			public AjaxResult edit(@Validated @RequestBody SysConfig config)
			{
			if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
			{
			public AjaxResult edit(@Validated @RequestBody SysConfig config) {
			if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
			return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
			}
			config.setUpdateBy(getUsername());
			@@ -127,8 +144,7 @@
			@PreAuthorize("@ss.hasPermi('system:config:remove')")
			@Log(title = "参数管理", businessType = BusinessType.DELETE)
			@DeleteMapping("/{configIds}")
			public AjaxResult remove(@PathVariable Long[] configIds)
			{
			public AjaxResult remove(@PathVariable Long[] configIds) {
			configService.deleteConfigByIds(configIds);
			return success();
			}
			@@ -139,8 +155,7 @@
			@PreAuthorize("@ss.hasPermi('system:config:remove')")
			@Log(title = "参数管理", businessType = BusinessType.CLEAN)
			@DeleteMapping("/refreshCache")
			public AjaxResult refreshCache()
			{
			public AjaxResult refreshCache() {
			configService.resetConfigCache();
			return success();
			}

			@@ -238,7 +238,13 @@
			public AjaxResult deptTree(SysDept dept) {
			return success(deptService.selectDeptTreeList(dept));
			}

			/**
			* 获取部门树列表
			*/
			@GetMapping("/deptTree/noPerm")
			public AjaxResult deptTreeNoPerm(SysDept dept) {
			return success(deptService.selectDeptTreeList(dept));
			}
			/**
			* 修改密码
			*/