commit

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityAddController.java

@@ -43,7 +43,7 @@ public class FamilyActivityAddController {
     @Ok("json:full")
     @ApiOperation("亲子活动新增/修改")
     @SaCheckPermission("family.manage.activity")
-    @SLog(type = "family", tag = "新增/修改活动", msg = "新增/修改活动")
+	@SLog(tag = "亲子活动-活动管理", msg = "新增/修改活动")
     public Result doHandle(FamilyActivity activity) {
         if (StrUtil.isBlank(activity.getId())) {
             familyActivityManageService.add(activity, null);

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityController.java

@@ -69,7 +69,7 @@ public class FamilyActivityController {
     @At
     @ApiOperation("活动删除")
     @SaCheckPermission("family.manage.activity")
-    @SLog(type = "family", tag = "删除活动", msg = "删除活动")
+	@SLog(tag = "亲子活动-活动管理", msg = "删除活动")
     public Result onDelete(String id) {
         Trans.exec(() -> {
             familyActivityManageService.delete(id);

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyTypeController.java

@@ -90,7 +90,7 @@ public class FamilyTypeController {
     @At
     @ApiOperation("活动类型新增")
     @SaCheckPermission("family.manage.type")
-    @SLog(type = "family", tag = "活动类型新增", msg = "活动类型新增")
+	@SLog(tag = "亲子活动-活动类型管理", msg = "活动类型新增")
     public Result doAdd(@Param("data") String data) throws Exception {
         FamilyType type = Json.fromJson(FamilyType.class, data);
         int count = dao.count(FamilyType.class, Cnd.where("code", "=", type.getCode()));
@@ -106,7 +106,7 @@ public class FamilyTypeController {
     @At
     @ApiOperation("活动类型修改")
     @SaCheckPermission("family.manage.type")
-    @SLog(type = "family", tag = "活动类型修改", msg = "活动类型修改")
+	@SLog(tag = "亲子活动-活动类型管理", msg = "活动类型修改")
     public Result doEdit(FamilyType type) {
         int count = dao.count(FamilyType.class, Cnd.where("code", "=", type.getCode()).and("id", "!=", type.getId()));
         if (count > 0) {
@@ -121,7 +121,7 @@ public class FamilyTypeController {
     @At
     @ApiOperation("活动类型删除")
     @SaCheckPermission("family.manage.type")
-    @SLog(type = "family", tag = "活动类型删除", msg = "活动类型删除")
+	@SLog(tag = "亲子活动-活动类型管理", msg = "活动类型删除")
     public Object doDelete(@Param(value = "id") String id) {
         dao.clear(FamilyType.class, Cnd.where("id", "=", id));
         dao.clear(FamilyMobileSignColumn.class, Cnd.where("typeId", "=", id));

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserAdjustController.java

@@ -123,7 +123,7 @@ public class FamilyUserAdjustController {
     @At
     @ApiOperation("人员调整")
     @SaCheckPermission("family.manage.activity.adjust")
-    @SLog(type = "family", tag = "人员调整", msg = "人员调整")
+	@SLog(tag = "亲子活动-人员调整", msg = "人员调整")
     public Result adjust(String activityId, String oldCourseId, String newCourseId, String userId) {
 
         Cnd oldCnd = Cnd.where("activityId", "=", activityId)
@@ -162,7 +162,7 @@ public class FamilyUserAdjustController {
     @At
     @ApiOperation("删除报名人员")
     @SaCheckPermission("family.manage.activity.adjust")
-    @SLog(type = "family", tag = "删除报名人员", msg = "删除报名人员")
+	@SLog(tag = "亲子活动-人员调整", msg = "删除报名人员")
     public Result deleteSignUser(String activityId, String courseId, String userId) {
 
         //删除

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserBlackListManageController.java

@@ -88,7 +88,7 @@ public class FamilyUserBlackListManageController {
     @At
     @ApiOperation("报名人员处理")
     @SaCheckPermission("family.user.activity")
-    @SLog(type = "family", tag = "报名人员处理", msg = "报名人员处理")
+	@SLog(tag = "亲子活动-人员调整", msg = "报名人员处理")
     public Result doHandleUser(@Param("userId") String userId) {
         familyBlackListService.doHandleUser(userId);
         return Result.success();
@@ -134,7 +134,7 @@ public class FamilyUserBlackListManageController {
     @At
     @ApiOperation("补充人员")
     @SaCheckPermission("family.user.activity")
-    @SLog(type = "family", tag = "补充人员", msg = "补充人员")
+	@SLog(tag = "亲子活动-人员管理", msg = "补充人员")
     public Result reserveSingUp(String[] ids, String courseId) {
         //先查询这个课程有多少个未签到的人员
         Sql sql = Sqls.create("""

src/main/java/com/budwk/app/zhgh/activity/family/controller/mobile/MFamilyActivityController.java

@@ -140,7 +140,7 @@ public class MFamilyActivityController {
     @At
     @ApiOperation("活动报名")
     @SaCheckPermission("h5.family.sign")
-    @SLog(type = "family", tag = "活动报名", msg = "活动报名")
+	@SLog(tag = "亲子活动-活动报名", msg = "活动报名")
     public Result doSignUp(FamilyUser familyUser) {
         try {
             lock.lock();
@@ -179,7 +179,7 @@ public class MFamilyActivityController {
     @At
     @ApiOperation("取消报名")
     @SaCheckPermission("h5.family.sign")
-    @SLog(type = "family", tag = "取消报名", msg = "取消报名")
+	@SLog(tag = "亲子活动-活动报名", msg = "取消报名")
     public Result cancelSignUp(@Param("activityId") String activityId, @Param("courseId") String courseId) {
         String userId = SecurityUtil.getUserId();
         //取消分两种情况
@@ -222,7 +222,7 @@ public class MFamilyActivityController {
     @At
     @ApiOperation("签到")
     @SaCheckPermission("h5.family.sign")
-    @SLog(type = "family", tag = "签到", msg = "签到")
+	@SLog(tag = "亲子活动-活动报名", msg = "活动签到")
     public Result doQd(@Param("id") String id, @Param("courseId") String courseId, @Param("point") Double[] points) {
         FamilyCourse course = dao.fetch(FamilyCourse.class, courseId);
         List<Double> coursePoints = course.getCourseLocationCoordinates();
@@ -351,7 +351,7 @@ public class MFamilyActivityController {
     @At
     @ApiOperation("二维码签到")
     @SaCheckPermission("h5.family.sign")
-    @SLog(type = "family", tag = "二维码签到", msg = "二维码签到")
+	@SLog(tag = "亲子活动-活动报名", msg = "二维码签到")
     public Result codeSign(String id, String codeCourseId, String clickCourseId) {
         if(StrUtil.isBlank(codeCourseId) || StrUtil.isBlank(clickCourseId)) {
             return Result.error("签到失败，没有获取到扫描信息");

src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java

@@ -112,7 +112,7 @@ public class YearPlanController {
 	@At
 	@ApiOperation("新增/修改年度计划")
 	@SaCheckPermission("planSummary.yearPlan.manage")
-	@SLog(type = "yearPlan", tag = "新增/修改年度计划", msg = "新增/修改年度计划")
+	@SLog(tag = "年度计划总结-年度计划管理", msg = "新增/修改年度计划")
 	public Object onSubmit(YearPlan yearPlan) {
 		yearPlanService.insertOrUpdate(yearPlan);
 		return Result.success();
@@ -121,7 +121,7 @@ public class YearPlanController {
 	@At
 	@ApiOperation("删除年度计划")
 	@SaCheckPermission("planSummary.yearPlan.manage")
-	@SLog(type = "yearPlan", tag = "删除年度计划", msg = "删除年度计划")
+	@SLog(tag = "年度计划总结-年度计划管理", msg = "删除年度计划")
 	public Object onDelete(String id) {
 		yearPlanService.delete(id);
 		return Result.success();

src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearSummaryController.java

@@ -110,7 +110,7 @@ public class YearSummaryController {
 	@At
 	@ApiOperation("新增/修改年度总结")
 	@SaCheckPermission("planSummary.yearSummary.manage")
-	@SLog(type = "yearSummary", tag = "新增/修改年度总结", msg = "新增/修改年度总结")
+	@SLog(tag = "年度计划总结-年度总结管理", msg = "新增/修改年度总结")
 	public Object onSubmit(YearSummary yearSummary) {
 		View_user user = dao.fetch(View_user.class, Cnd.where(View_user::getId, "=", SecurityUtil.getUserId()));
 		yearSummary.setUserId(SecurityUtil.getUserId());
@@ -128,7 +128,7 @@ public class YearSummaryController {
 	@At
 	@ApiOperation("删除年度总结")
 	@SaCheckPermission("planSummary.yearSummary.manage")
-	@SLog(type = "yearSummary", tag = "删除年度总结", msg = "删除年度总结")
+	@SLog(tag = "年度计划总结-年度总结管理", msg = "删除年度总结")
 	public Object onDelete(String id) {
 		yearSummaryService.delete(id);
 		return Result.success();

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpActivityAddController.java

@@ -45,7 +45,7 @@ public class TrainSignUpActivityAddController {
     @Ok("json:full")
     @ApiOperation("品牌活动新增/修改")
     @SaCheckPermission("trainSingUp.manage.activity")
-    @SLog(type = "trainSignUp", tag = "新增/修改活动", msg = "新增/修改活动")
+	@SLog(tag = "品牌活动-活动管理", msg = "新增/修改活动")
     public Result doHandle(TrainSignUpActivity activity) {
         if (StrUtil.isBlank(activity.getId())) {
             trainSignUpActivityManageService.add(activity, null);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpActivityController.java

@@ -69,7 +69,7 @@ public class TrainSignUpActivityController {
     @At
     @ApiOperation("活动删除")
     @SaCheckPermission("trainSingUp.manage.activity")
-    @SLog(type = "trainSignUp", tag = "删除活动", msg = "删除活动")
+	@SLog(tag = "品牌活动-活动管理", msg = "删除活动")
     public Result onDelete(String id) {
         Trans.exec(() -> {
             trainSignUpActivityManageService.delete(id);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpTypeController.java

@@ -90,7 +90,7 @@ public class TrainSignUpTypeController {
     @At
     @ApiOperation("活动类型新增")
     @SaCheckPermission("trainSingUp.manage.type")
-    @SLog(type = "trainSignUp", tag = "活动类型新增", msg = "活动类型新增")
+	@SLog(tag = "品牌活动-类型管理", msg = "活动类型新增")
     public Result doAdd(@Param("data") String data) throws Exception {
         TrainSignUpType type = Json.fromJson(TrainSignUpType.class, data);
         int count = dao.count(TrainSignUpType.class, Cnd.where("code", "=", type.getCode()));
@@ -106,7 +106,7 @@ public class TrainSignUpTypeController {
     @At
     @ApiOperation("活动类型修改")
     @SaCheckPermission("trainSingUp.manage.type")
-    @SLog(type = "trainSignUp", tag = "活动类型修改", msg = "活动类型修改")
+	@SLog(tag = "品牌活动-类型管理", msg = "活动类型修改")
     public Result doEdit(TrainSignUpType type) {
         int count = dao.count(TrainSignUpType.class, Cnd.where("code", "=", type.getCode()).and("id", "!=", type.getId()));
         if (count > 0) {
@@ -121,7 +121,7 @@ public class TrainSignUpTypeController {
     @At
     @ApiOperation("活动类型删除")
     @SaCheckPermission("trainSingUp.manage.type")
-    @SLog(type = "trainSignUp", tag = "活动类型删除", msg = "活动类型删除")
+	@SLog(tag = "品牌活动-类型管理", msg = "活动类型删除")
     public Object doDelete(@Param(value = "id") String id) {
         dao.clear(TrainSignUpType.class, Cnd.where("id", "=", id));
         dao.clear(TrainMobileSignColumn.class, Cnd.where("typeId", "=", id));

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java

@@ -125,7 +125,7 @@ public class TrainSignUpUserAdjustController {
     @At
     @ApiOperation("人员调整")
     @SaCheckPermission("trainSingUp.manage.activity.adjust")
-    @SLog(type = "trainSingUp", tag = "人员调整", msg = "人员调整")
+	@SLog(tag = "品牌活动-人员调整", msg = "人员调整")
     public Result adjust(String activityId, String oldCourseId, String newCourseId, String userId) {
 
         Cnd oldCnd = Cnd.where("activityId", "=", activityId)
@@ -164,7 +164,7 @@ public class TrainSignUpUserAdjustController {
     @At
     @ApiOperation("删除报名人员")
     @SaCheckPermission("trainSingUp.manage.activity.adjust")
-    @SLog(type = "trainSingUp", tag = "删除报名人员", msg = "删除报名人员")
+	@SLog(tag = "品牌活动-人员调整", msg = "删除报名人员")
     public Result deleteSignUser(String activityId, String courseId, String userId) {
 
         //删除

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserBlackListManageController.java

@@ -86,7 +86,7 @@ public class TrainSignUpUserBlackListManageController {
     @At
     @ApiOperation("报名人员处理")
     @SaCheckPermission("trainSingUp.user.activity")
-    @SLog(type = "trainSingUp", tag = "报名人员处理", msg = "报名人员处理")
+	@SLog(tag = "品牌活动-人员管理", msg = "报名人员处理")
     public Result doHandleUser(@Param("userId") String userId) {
         trainSignUpBlackListService.doHandleUser(userId);
         return Result.success();
@@ -132,7 +132,7 @@ public class TrainSignUpUserBlackListManageController {
     @At
     @ApiOperation("补充人员")
     @SaCheckPermission("trainSingUp.user.activity")
-    @SLog(type = "trainSingUp", tag = "补充人员", msg = "补充人员")
+	@SLog(tag = "品牌活动-人员管理", msg = "补充人员")
     public Result reserveSingUp(String[] ids, String courseId) {
         //先查询这个课程有多少个未签到的人员
         Sql sql = Sqls.create("""

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/mobile/MTrainSignUpActivityController.java

@@ -145,6 +145,7 @@ public class MTrainSignUpActivityController {
     @At
     @ApiOperation("活动报名")
     @SaCheckPermission("h5.trainSignUp.sign")
+	@SLog(tag = "品牌活动-活动报名", msg = "活动报名")
     public Result doSignUp(TrainSignUpUser trainSignUpUser) {
         try {
             lock.lock();
@@ -184,6 +185,7 @@ public class MTrainSignUpActivityController {
     @At
     @ApiOperation("取消报名")
     @SaCheckPermission("h5.trainSignUp.sign")
+	@SLog(tag = "品牌活动-活动报名", msg = "取消报名")
     public Result cancelSignUp(@Param("activityId") String activityId, @Param("courseId") String courseId) {
         String userId = SecurityUtil.getUserId();
         //取消分两种情况
@@ -226,7 +228,7 @@ public class MTrainSignUpActivityController {
     @At
     @ApiOperation("签到")
     @SaCheckPermission("h5.trainSignUp.sign")
-    @SLog(type = "family", tag = "签到", msg = "签到")
+	@SLog(tag = "品牌活动-活动报名", msg = "签到")
     public Result doQd(@Param("id") String id, @Param("courseId") String courseId, @Param("point") Double[] points) {
         TrainSignUpCourse course = dao.fetch(TrainSignUpCourse.class, courseId);
         List<Double> coursePoints = course.getCourseLocationCoordinates();
@@ -355,7 +357,7 @@ public class MTrainSignUpActivityController {
     @At
     @ApiOperation("二维码签到")
     @SaCheckPermission("h5.trainSignUp.sign")
-    @SLog(type = "family", tag = "二维码签到", msg = "二维码签到")
+	@SLog(tag = "品牌活动-活动报名", msg = "二维码签到")
     public Result codeSign(String id, String codeCourseId, String clickCourseId) {
         if(StrUtil.isBlank(codeCourseId) || StrUtil.isBlank(clickCourseId)) {
             return Result.error("签到失败，没有获取到扫描信息");