|
@@ -20,6 +20,7 @@ import com.goafanti.activity.service.ActivityService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
|
|
|
+import com.goafanti.common.enums.ActivityCacheKey;
|
|
|
import com.goafanti.common.enums.ActivityFields;
|
|
import com.goafanti.common.enums.ActivityFields;
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
import com.goafanti.common.model.Activity;
|
|
import com.goafanti.common.model.Activity;
|
|
@@ -33,9 +34,9 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
@RequestMapping(value = "/api/admin/activity")
|
|
@RequestMapping(value = "/api/admin/activity")
|
|
|
public class AdminActivityApiController extends BaseApiController {
|
|
public class AdminActivityApiController extends BaseApiController {
|
|
|
@Resource
|
|
@Resource
|
|
|
- private ActivityService activityService;
|
|
|
|
|
|
|
+ private ActivityService activityService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- JDBCIdGenerator idGenerator;
|
|
|
|
|
|
|
+ JDBCIdGenerator idGenerator;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 活动列表
|
|
* 活动列表
|
|
@@ -91,27 +92,27 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
ActivityFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
ActivityFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (StringUtils.isBlank(ia.getId())) {
|
|
if (StringUtils.isBlank(ia.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
res = disposeInputActivity(res, ia, startTimeFormattedDate);
|
|
res = disposeInputActivity(res, ia, startTimeFormattedDate);
|
|
|
if (!res.getError().isEmpty()) {
|
|
if (!res.getError().isEmpty()) {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
activityService.update((Activity) res.getData(), startTimeFormattedDate, endTimeFormattedDate,
|
|
activityService.update((Activity) res.getData(), startTimeFormattedDate, endTimeFormattedDate,
|
|
|
enrollDeadlineFormattedDate, Long.parseLong(ia.getId()));
|
|
enrollDeadlineFormattedDate, Long.parseLong(ia.getId()));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 详情
|
|
* 详情
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/detail", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/detail", method = RequestMethod.GET)
|
|
|
- public Result detail(Long id){
|
|
|
|
|
|
|
+ public Result detail(Long id) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (null == id) {
|
|
if (null == id) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动Id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动Id"));
|
|
@@ -120,7 +121,7 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
res.setData(activityService.findActivityDetail(id));
|
|
res.setData(activityService.findActivityDetail(id));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除
|
|
* 删除
|
|
|
*/
|
|
*/
|
|
@@ -134,7 +135,7 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 活动图片上传
|
|
* 活动图片上传
|
|
|
*/
|
|
*/
|
|
@@ -153,6 +154,24 @@ public class AdminActivityApiController extends BaseApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 清除缓存
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value = "/cleanCache", method = RequestMethod.POST)
|
|
|
|
|
+ public Result cleanCache(String cacheKey) {
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ if (StringUtils.isBlank(cacheKey)) {
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "缓存标记"));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (ActivityCacheKey.ACTIVITY_PORTAL_LIST_CACHE_KEY.getCode().equals(cacheKey)) {
|
|
|
|
|
+ activityService.cleanActivityPortalList(); // 清除门户端科技活动列表缓存
|
|
|
|
|
+ } else {
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "缓存标记"));
|
|
|
|
|
+ }
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private Result disposeInputActivity(Result res, InputActivity ia, String startTimeFormattedDate) {
|
|
private Result disposeInputActivity(Result res, InputActivity ia, String startTimeFormattedDate) {
|
|
|
if (StringUtils.isBlank(ia.getName())) {
|
|
if (StringUtils.isBlank(ia.getName())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "标题"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "标题"));
|