Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 */
 @Api(tags="咨询信息")
 @RestController
-@RequestMapping("/h5Api/nuBizAdvisoryInfo")
+@RequestMapping("/admin/h5Api/nuBizAdvisoryInfo")
 @Slf4j
 public class H5ApiAdvisoryInfoController extends JeecgController<NuBizAdvisoryInfo, INuBizAdvisoryInfoService> {
    @Autowired

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/NuBizAdvisoryInfoController.java

@@ -47,12 +47,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags="咨询信息")
 @RestController
-@RequestMapping("/NuBizAdvisoryInfo/nuBizAdvisoryInfo")
+@RequestMapping("/admin/NuBizAdvisoryInfo/nuBizAdvisoryInfo")
 @Slf4j
 public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryInfo, INuBizAdvisoryInfoService> {
 	@Autowired
 	private INuBizAdvisoryInfoService nuBizAdvisoryInfoService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -79,7 +79,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
 		IPage<NuBizAdvisoryInfo> pageList = nuBizAdvisoryInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -93,7 +93,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
 		nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
 		return Result.OK(nuBizAdvisoryInfo);
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -108,7 +108,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
 		nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -123,7 +123,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
 		nuBizAdvisoryInfoService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -138,7 +138,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
 		this.nuBizAdvisoryInfoService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/appversionconfig/controller/AppVersionConfigController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
  */
 @Api(tags="app版本记录")
 @RestController
-@RequestMapping("/appVersionConfig/appVersionConfig")
+@RequestMapping("/admin/appVersionConfig/appVersionConfig")
 @Slf4j
 public class AppVersionConfigController extends JeecgController<AppVersionConfig, IAppVersionConfigService> {
 	@Autowired

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/mediaasyncerrorlog/controller/MediaAsyncErrorLogController.java

@@ -47,12 +47,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags="资源同步错误日志")
 @RestController
-@RequestMapping("/mediaasyncerrorlog/mediaAsyncErrorLog")
+@RequestMapping("/admin/mediaasyncerrorlog/mediaAsyncErrorLog")
 @Slf4j
 public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErrorLog, IMediaAsyncErrorLogService> {
 	@Autowired
 	private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -74,7 +74,7 @@ public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErro
 		IPage<MediaAsyncErrorLog> pageList = mediaAsyncErrorLogService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -89,7 +89,7 @@ public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErro
 		mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -104,7 +104,7 @@ public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErro
 		mediaAsyncErrorLogService.updateById(mediaAsyncErrorLog);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -119,7 +119,7 @@ public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErro
 		mediaAsyncErrorLogService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -134,7 +134,7 @@ public class MediaAsyncErrorLogController extends JeecgController<MediaAsyncErro
 		this.mediaAsyncErrorLogService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/mediamanage/controller/MediaManageController.java

@@ -50,7 +50,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags = "媒体资源管理")
 @RestController
-@RequestMapping("/mediamanage/mediaManage")
+@RequestMapping("/admin/mediamanage/mediaManage")
 @Slf4j
 public class MediaManageController extends JeecgController<MediaManage, IMediaManageService> {
 

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java

@@ -43,7 +43,7 @@ import java.util.Map;
  */
 @Api(tags = "护理单元")
 @RestController
-@RequestMapping("/nuBaseInfo/nuBaseInfo")
+@RequestMapping("/admin/nuBaseInfo/nuBaseInfo")
 @Slf4j
 public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInfoService> {
     @Autowired

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java

@@ -47,12 +47,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags="员工咨询信息")
 @RestController
-@RequestMapping("/nuEmployeesAdvisoryInfo/nuEmployeesAdvisoryInfo")
+@RequestMapping("/admin/nuEmployeesAdvisoryInfo/nuEmployeesAdvisoryInfo")
 @Slf4j
 public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmployeesAdvisoryInfo, INuEmployeesAdvisoryInfoService> {
 	@Autowired
 	private INuEmployeesAdvisoryInfoService nuEmployeesAdvisoryInfoService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -74,7 +74,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 		IPage<NuEmployeesAdvisoryInfo> pageList = nuEmployeesAdvisoryInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -88,7 +88,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 		nuEmployeesAdvisoryInfoService.save(nuEmployeesAdvisoryInfo);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +102,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 		nuEmployeesAdvisoryInfoService.updateById(nuEmployeesAdvisoryInfo);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +117,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 		nuEmployeesAdvisoryInfoService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +132,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 		this.nuEmployeesAdvisoryInfoService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java

@@ -48,7 +48,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags = "机构加盟申请信息表")
 @RestController
-@RequestMapping("/orgapplyinfo/orgApplyInfo")
+@RequestMapping("/admin/orgapplyinfo/orgApplyInfo")
 @Slf4j
 public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgApplyInfoService> {
     @Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @Api(tags="体型标签")
 @RestController
-@RequestMapping("/directiveTag/bodyTag")
+@RequestMapping("/services/directiveTag/bodyTag")
 @Slf4j
 public class DirectiveBodyTagController extends JeecgController<DirectiveBodyTag, IDirectiveBodyTagService> {
 	@Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @Api(tags="情绪标签")
 @RestController
-@RequestMapping("/directiveTag/emotionTag")
+@RequestMapping("/services/directiveTag/emotionTag")
 @Slf4j
 public class DirectiveEmotionTagController extends JeecgController<DirectiveEmotionTag, IDirectiveEmotionTagService> {
 	@Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @Api(tags="服务类别")
 @RestController
-@RequestMapping("/serviceCategory/configServiceCategory")
+@RequestMapping("/services/serviceCategory/configServiceCategory")
 @Slf4j
 public class ConfigServiceCategoryController extends JeecgController<ConfigServiceCategory, IConfigServiceCategoryService> {
 	@Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "服务指令")
 @RestController
-@RequestMapping("/serviceDirective/configServiceDirective")
+@RequestMapping("/services/serviceDirective/configServiceDirective")
 @Slf4j
 public class ConfigServiceDirectiveController extends JeecgController<ConfigServiceDirective, IConfigServiceDirectiveService> {
     @Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @Api(tags = "服务类型")
 @RestController
-@RequestMapping("/ServiceType/configServiceType")
+@RequestMapping("/services/ServiceType/configServiceType")
 @Slf4j
 public class ConfigServiceTypeController extends JeecgController<ConfigServiceType, IConfigServiceTypeService> {
     @Autowired