Parcourir la source

添加默认集团编码

zhangqiankun il y a 3 ans
Parent
commit
bb31aaddc9

+ 19 - 0
src/main/java/com/persagy/calendar/controller/WorkCalendarLabelController.java

@@ -3,6 +3,7 @@ package com.persagy.calendar.controller;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +39,9 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/v2.0/calendarLabel", method = RequestMethod.POST)
 public class WorkCalendarLabelController {
 	
+	@Value("${integrated.calendar.group-code:BR}")
+	private String defaultGroupCode;
+	
 	@Autowired
 	private WorkCalendarLabelHandler workCalendarLabelHandler;
 	
@@ -47,6 +51,9 @@ public class WorkCalendarLabelController {
     @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryCalendarLabelList")
     public ResponseResult queryCalendarLabelList(@RequestBody @Validated WorkCalendarLabelQueryVO queryVO) {
+    	if (StringUtil.isBlank(queryVO.getGroupCode())) {
+			queryVO.setGroupCode(defaultGroupCode);
+		}
 		List<WorkCalendarLabel> dateList = this.workCalendarLabelHandler.queryCalendarLabelList(queryVO);
 		if (CollectionUtil.isEmpty(dateList)) {
 			return ResponseUtil.successResult(Lists.newArrayList(), 0L);
@@ -63,6 +70,10 @@ public class WorkCalendarLabelController {
     @ApiOperation(value = "查询标签的有效期")
     @RequestMapping(value = "queryCalendarLabelValid")
     public ResponseResult queryCalendarLabelValid(@RequestBody @Validated WorkCalendarLabelQueryVO queryVO) {
+    	if (StringUtil.isBlank(queryVO.getGroupCode())) {
+			queryVO.setGroupCode(defaultGroupCode);
+		}
+    	
     	if (StringUtil.isBlank(queryVO.getDictType())) {
     		return ResponseUtil.errorResult(ResponseCode.A0400.getCode(), "标签类型,不可为空");
 		}
@@ -81,6 +92,10 @@ public class WorkCalendarLabelController {
 	@ApiOperation(value = "创建或更新日期标签属性")
     @RequestMapping(value = "updateLabelInfo")
 	public ResponseResult updateLabelInfo(@RequestBody @Validated WorkCalendarLabelUpdateVO updateVO) {
+		if (StringUtil.isBlank(updateVO.getGroupCode())) {
+			updateVO.setGroupCode(defaultGroupCode);
+		}
+		
 		ResponseResult validity = WorkCalendarLabelHandler.checkDataValidity(updateVO);
 		if (validity != null) {
 			return validity;
@@ -97,6 +112,10 @@ public class WorkCalendarLabelController {
 	@ApiOperation(value = "更新日期标签属性集")
     @RequestMapping(value = "updateCalendarDateAttribute")
 	public ResponseResult updateCalendarDateAttribute(@RequestBody @Validated WorkLabelBatchUpdateVO updateVO) {
+		if (StringUtil.isBlank(updateVO.getGroupCode())) {
+			updateVO.setGroupCode(defaultGroupCode);
+		}
+		
 		List<WorkCalendarLabelUpdateVO> labels = updateVO.getLabels();
 		List<WorkCalendarMoreDateCreateVO> times = updateVO.getTimes();
 		if (CollectionUtil.isNotEmpty(labels) || CollectionUtil.isNotEmpty(times)) {

+ 21 - 1
src/main/java/com/persagy/calendar/controller/WorkCalendarRuleController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,7 +46,10 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping(value = "/v2.0/workCalendarRule", method = RequestMethod.POST)
 public class WorkCalendarRuleController {
-    
+
+	@Value("${integrated.calendar.group-code:BR}")
+	private String defaultGroupCode;
+	
 	@Autowired
     private IWorkCalendarService workCalendarService;
     
@@ -64,6 +68,10 @@ public class WorkCalendarRuleController {
     @ApiOperation(value = "普通列表查询")
     @RequestMapping(value = "queryWorkCalendarRuleList")
     public ResponseResult queryWorkCalendarRuleList(@RequestBody @Validated WorkCalendarRuleQueryVO queryVO) {
+    	if (StringUtil.isBlank(queryVO.getGroupCode())) {
+			queryVO.setGroupCode(defaultGroupCode);
+		}
+    	
     	int dictTypeLevel = this.workCalendarDictService.getDictTypeLevel(queryVO.getGroupCode(), queryVO.getDictType());
     	
     	QueryWrapper<WorkCalendarRule> queryWrapper = new WorkCalendarRule.Builder().createQueryWrapper().groupCodeEq(queryVO.getGroupCode())
@@ -80,6 +88,10 @@ public class WorkCalendarRuleController {
 	@ApiOperation(value = "保存")
 	@RequestMapping(value = "createWorkCalendarRule")
     public ResponseResult createWorkCalendarRule(@RequestBody @Validated CustomCalendarVO<WorkCalendarRuleCreateVO> createVO) {
+		if (StringUtil.isBlank(createVO.getGroupCode())) {
+			createVO.setGroupCode(defaultGroupCode);
+		}
+		
 		this.workCalendarRuleHandler.batchCreateCalednarRule(createVO);
         return ResponseUtil.successResult("保存成功");
     }
@@ -90,6 +102,10 @@ public class WorkCalendarRuleController {
 	@ApiOperation(value = "更新")
 	@RequestMapping(value = "updateWorkCalendarRule")
     public ResponseResult updateWorkCalendarRule(@RequestBody @Validated CustomCalendarVO<WorkCalendarRuleUpdateVO> updateVO) {
+		if (StringUtil.isBlank(updateVO.getGroupCode())) {
+			updateVO.setGroupCode(defaultGroupCode);
+		}
+		
 		this.workCalendarRuleHandler.batchUpdateCalednarRule(updateVO);
         return ResponseUtil.successResult("更新成功");
     }
@@ -100,6 +116,10 @@ public class WorkCalendarRuleController {
     @ApiOperation(value = "删除")
     @RequestMapping(value = "deleteWorkCalendarRule")
     public ResponseResult deleteWorkCalendarRule(@RequestBody @Validated WorkCalendarRuleDeleteVO deleteVO) {
+    	if (StringUtil.isBlank(deleteVO.getGroupCode())) {
+			deleteVO.setGroupCode(defaultGroupCode);
+		}
+    	
     	// 规则ID和工作历ID必须存在其一
     	String ruleId = deleteVO.getId();
     	String calendarId = deleteVO.getCalendarId();

+ 1 - 1
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarLabelQueryVO.java

@@ -25,7 +25,7 @@ public class WorkCalendarLabelQueryVO {
 	@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@NotBlank(message = "集团编码不可为空")
+	//@NotBlank(message = "集团编码不可为空")
 	@ApiModelProperty(value = "集团编码")
 	private String groupCode;