소스 검색

剔除swagger依赖

zhangqiankun 3 년 전
부모
커밋
9fcdeffd12
53개의 변경된 파일197개의 추가작업 그리고 401개의 파일을 삭제
  1. 7 2
      pom.xml
  2. 0 7
      src/main/java/com/persagy/calendar/client/model/BaseModel.java
  3. 12 8
      src/main/java/com/persagy/calendar/controller/CommonController.java
  4. 0 18
      src/main/java/com/persagy/calendar/controller/OldWorkCalendarController.java
  5. 2 9
      src/main/java/com/persagy/calendar/controller/RwdObjectController.java
  6. 0 9
      src/main/java/com/persagy/calendar/controller/WorkCalendarController.java
  7. 0 15
      src/main/java/com/persagy/calendar/controller/WorkCalendarDateController.java
  8. 0 9
      src/main/java/com/persagy/calendar/controller/WorkCalendarLabelController.java
  9. 0 7
      src/main/java/com/persagy/calendar/controller/WorkCalendarRuleController.java
  10. 0 5
      src/main/java/com/persagy/calendar/controller/WorkTimeEngineController.java
  11. 2 3
      src/main/java/com/persagy/calendar/pojo/old/DataRangeVO.java
  12. 4 7
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalCreateVO.java
  13. 3 6
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalDeleteVO.java
  14. 5 8
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalsByTag.java
  15. 2 5
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalsVO.java
  16. 4 7
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarQueryVO.java
  17. 6 9
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleCreateVO.java
  18. 4 7
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleDeleteVO.java
  19. 1 4
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleVO.java
  20. 2 5
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarSetIntervalVO.java
  21. 2 5
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagQueryVO.java
  22. 3 6
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagVO.java
  23. 2 5
      src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagsVO.java
  24. 2 5
      src/main/java/com/persagy/calendar/pojo/old/OldWorkCalendarVO.java
  25. 1 2
      src/main/java/com/persagy/calendar/pojo/vo/BaseQueryVO.java
  26. 1 4
      src/main/java/com/persagy/calendar/pojo/vo/BaseUpdateVO.java
  27. 3 4
      src/main/java/com/persagy/calendar/pojo/vo/BaseVO.java
  28. 2 5
      src/main/java/com/persagy/calendar/pojo/vo/CalculateExtraDateVO.java
  29. 2 5
      src/main/java/com/persagy/calendar/pojo/vo/CustomCalendarVO.java
  30. 2 5
      src/main/java/com/persagy/calendar/pojo/vo/DictCodeCreate.java
  31. 3 6
      src/main/java/com/persagy/calendar/pojo/vo/DictCreateVO.java
  32. 6 9
      src/main/java/com/persagy/calendar/pojo/vo/DictQueryVO.java
  33. 8 11
      src/main/java/com/persagy/calendar/pojo/vo/RwdObjectQueryVO.java
  34. 5 8
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateCreateVO.java
  35. 5 8
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateDeleteVO.java
  36. 12 15
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateQueryVO.java
  37. 6 9
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateUpdateVO.java
  38. 11 14
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarLabelQueryVO.java
  39. 9 12
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarLabelUpdateVO.java
  40. 8 11
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarMoreDateCreateVO.java
  41. 6 9
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarObjectUpdateVO.java
  42. 6 9
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarQueryVO.java
  43. 8 11
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleCreateVO.java
  44. 1 4
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleDeleteVO.java
  45. 4 7
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleQueryVO.java
  46. 9 12
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleUpdateVO.java
  47. 5 8
      src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarUpdateVO.java
  48. 3 6
      src/main/java/com/persagy/calendar/pojo/vo/WorkLabelBatchUpdateVO.java
  49. 0 7
      src/main/java/com/persagy/dye/controller/DyeBasicController.java
  50. 0 7
      src/main/java/com/persagy/dye/controller/DyeRuleCustomController.java
  51. 0 7
      src/main/java/com/persagy/dye/controller/DyeRuleDefaultController.java
  52. 0 5
      src/main/java/com/persagy/dye/controller/DyeSdkController.java
  53. 8 10
      src/main/java/com/persagy/dye/pojo/vo/DyeScaleplateVO.java

+ 7 - 2
pom.xml

@@ -66,15 +66,20 @@
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-ribbon-spring-boot-starter</artifactId>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-swagger-spring-boot-starter</artifactId>
-		</dependency>
+		</dependency> -->
 		<!-- <dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-redis-spring-boot-starter</artifactId>
 		</dependency> -->
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
+		
 		<!-- web -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

+ 0 - 7
src/main/java/com/persagy/calendar/client/model/BaseModel.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.client.model;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -17,23 +15,18 @@ import lombok.ToString;
  */
 @Getter
 @Setter
-@ApiModel
 @ToString
 public class BaseModel {
 	
 	@NotBlank(message = "userId不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
 	@NotBlank(message = "groupCode不可为空")
-	@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	@NotBlank(message = "项目ID不可为空")
-	@ApiModelProperty(value = "项目ID")
 	private String projectId;
 	
-	@ApiModelProperty(value = "应用ID")
 	private String appId;
 	
 }

+ 12 - 8
src/main/java/com/persagy/calendar/controller/CommonController.java

@@ -41,8 +41,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 通用接口
@@ -51,7 +49,6 @@ import io.swagger.annotations.ApiOperation;
  * @author zhangqiankun
  * @date 2020-10-03 13:54:22
  */
-@Api(tags = "通用接口")
 @RestController
 @RequestMapping(value = "/v2.0/common", method = RequestMethod.POST)
 public class CommonController {
@@ -77,7 +74,6 @@ public class CommonController {
      * 手动解析规则信息
      * 非自定义已存在的作息时间信息被更新,不存在的被插入,自定义的不动
      */
-    @ApiOperation(value = "立即解析规则信息")
     @RequestMapping(value = "handleParseCalendarRule")
     public ResponseResult handleParseCalendarRule(@RequestBody @Validated WorkCalendarDateQueryVO queryVO) {
     	if ("Pj1111111111".equalsIgnoreCase(queryVO.getProjectId())) {
@@ -116,7 +112,6 @@ public class CommonController {
 	/**
      * 字典值查询
      */
-    @ApiOperation(value = "字典查询")
     @RequestMapping(value = "dictQuery")
     public ResponseResult dictQuery(@RequestBody @Validated DictQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -144,7 +139,6 @@ public class CommonController {
 		return ResponseUtil.successResult(dictTypeCode);
     }
     
-    @ApiOperation(value = "字典值创建")
     @RequestMapping(value = "dictCreate")
     public ResponseResult dictCreate(@RequestBody @Validated DictCreateVO<DictCodeCreate> createVO) {
     	if (StringUtil.isBlank(createVO.getGroupCode())) {
@@ -169,7 +163,12 @@ public class CommonController {
     	return result ? ResponseUtil.successResult("创建成功") : ResponseUtil.successResult("创建失败");
     }
     
-    @ApiOperation(value = "项目字典数据初始化")
+    /**
+     * 项目字典数据初始化
+     * 
+     * @param queryVO
+     * @return
+     */
     @RequestMapping(value = "initProjectDict")
     public ResponseResult initProjectDict(@RequestBody DictQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -182,7 +181,12 @@ public class CommonController {
     	return StringUtil.isBlank(result) ? ResponseUtil.successResult("初始化成功") : ResponseUtil.errorResult(result);
     }
     
-    @ApiOperation(value = "数据转换")
+    /**
+     * 数据转换
+     * 
+     * @param queryVO
+     * @return
+     */
     @RequestMapping(value = "switchData")
     public ResponseResult switchData(@RequestBody DictQueryVO queryVO) {
     	// 获取该集团下所有的工作历类型

+ 0 - 18
src/main/java/com/persagy/calendar/controller/OldWorkCalendarController.java

@@ -32,8 +32,6 @@ import com.persagy.common.constant.HistoryConstant;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * @version 
@@ -43,7 +41,6 @@ import io.swagger.annotations.ApiOperation;
  * @since 2020年10月3日:	下午2:41:21
  */
 
-@Api(tags = "老版工作历服务接口")
 @RestController
 @RequestMapping(value = "/data-platform-3/calendar", method = RequestMethod.POST)
 public class OldWorkCalendarController {
@@ -63,7 +60,6 @@ public class OldWorkCalendarController {
     /**
      * 创建工作历,name groupId联合唯一
      */
-    @ApiOperation(value = "创建工作历")
 	@RequestMapping(value = "create")
 	public ResponseOldResult create(@RequestBody @Validated OldWorkCalendarVO oldWorkCalendar) {
 		// 判断是否唯一
@@ -85,7 +81,6 @@ public class OldWorkCalendarController {
 	/**
      * 创建一套与已有工作历内容一样的工作历,name groupId联合唯一
      */
-	@ApiOperation(value = "从模板创建工作历")
 	@RequestMapping(value = "create_from")
 	public ResponseOldResult create_from(@RequestBody @Validated OldWorkCalendarVO oldWorkCalendar) {
 		String from_id = oldWorkCalendar.getFrom_id();
@@ -115,7 +110,6 @@ public class OldWorkCalendarController {
     /**
      * 修改工作历,name groupId联合唯一
      */
-	@ApiOperation(value = "更新工作历")
 	@RequestMapping(value = "update")
 	public ResponseOldResult update(@RequestBody @Validated OldWorkCalendarVO oldWorkCalendar) {
 		String id = oldWorkCalendar.getId();
@@ -142,7 +136,6 @@ public class OldWorkCalendarController {
 	/**
      * 删除工作历,级联删除规则
      */
-	@ApiOperation(value = "删除工作历")
 	@RequestMapping(value = "delete")
 	public ResponseOldResult delete(@RequestBody Map<String, String> requestMap) {
 		String id = requestMap.get("id");
@@ -157,7 +150,6 @@ public class OldWorkCalendarController {
      * 查询工作历,默认只查老的工作历信息
      * 无需参数
      */
-	@ApiOperation(value = "查询工作历")
 	@RequestMapping(value = "query")
 	public ResponseOldResult query(@RequestBody Map<String, String> map) {
 		// 默认只查正常的
@@ -171,7 +163,6 @@ public class OldWorkCalendarController {
 	/**
      * 创建规则
      */
-	@ApiOperation(value = "创建规则")
 	@RequestMapping(value = "create_rules")
 	public ResponseOldResult createRules(@RequestBody @Validated OldCalendarRuleVO<OldCalendarRuleCreateVO> requestData) {
 		boolean result = this.oldWorkCalendarDateService.createOldCalendarRule(requestData);
@@ -182,7 +173,6 @@ public class OldWorkCalendarController {
 	/**
      * 删除规则
      */
-	@ApiOperation(value = "删除规则")
 	@RequestMapping(value = "del_rules")
 	public ResponseOldResult delRules(@RequestBody @Validated OldCalendarRuleVO<OldCalendarRuleDeleteVO> requestData) {
 		boolean result = this.oldWorkCalendarDateService.deleteOldCalendarRule(requestData);
@@ -193,7 +183,6 @@ public class OldWorkCalendarController {
 	/**
      * 更新规则
      */
-	@ApiOperation(value = "更新规则")
 	@RequestMapping(value = "update_rule")
 	public ResponseOldResult updateRule(@RequestBody @Validated OldCalendarRuleCreateVO requestData) {
 		// 判断工作历信息是否存在
@@ -211,7 +200,6 @@ public class OldWorkCalendarController {
      * 查询规则
      * id 必填 tag选填
      */
-	@ApiOperation(value = "查询规则")
 	@RequestMapping(value = "query_rules")
 	public ResponseOldResult queryRules(@RequestBody @Validated Map<String, String> requestData) {
 		String id = requestData.get("id");
@@ -225,7 +213,6 @@ public class OldWorkCalendarController {
 	/**
      * 设置作息日期
      */
-	@ApiOperation(value = "设置作息日期")
 	@RequestMapping(value = "set_tags")
 	public ResponseOldResult setTags(@RequestBody @Validated OldCalendarTagsVO requestData) {
 		// 判断工作历信息是否存在
@@ -241,7 +228,6 @@ public class OldWorkCalendarController {
 	/**
      * 删除作息日期
      */
-	@ApiOperation(value = "删除作息日期")
 	@RequestMapping(value = "unset_tags")
 	public ResponseOldResult unsetTags(@RequestBody @Validated OldCalendarTagsVO requestData) {
 		// 判断工作历信息是否存在
@@ -258,7 +244,6 @@ public class OldWorkCalendarController {
 	/**
      * 设置作息时间段
      */
-	@ApiOperation(value = "设置作息时间段")
 	@RequestMapping(value = "set_intervals")
 	public ResponseOldResult setIntervals(@RequestBody @Validated OldCalendarIntervalsVO<OldCalendarIntervalCreateVO> requestData) {
 		// 判断工作历信息是否存在
@@ -275,7 +260,6 @@ public class OldWorkCalendarController {
 	/**
      * 删除作息时间段
      */
-	@ApiOperation(value = "删除作息时间段")
 	@RequestMapping(value = "unset_intervals")
 	public ResponseOldResult unsetIntervals(@RequestBody @Validated OldCalendarIntervalsVO<OldCalendarIntervalDeleteVO> requestData) {
 		// 判断工作历信息是否存在
@@ -292,7 +276,6 @@ public class OldWorkCalendarController {
 	/**
      * 根据tag设置作息时段
      */
-	@ApiOperation(value = "根据tag设置作息时段")
 	@RequestMapping(value = "set_intervals_by_tag")
 	public ResponseOldResult setIntervalsByTag(@RequestBody @Validated OldCalendarIntervalsByTag requestData) {
 		// 判断工作历信息是否存在
@@ -311,7 +294,6 @@ public class OldWorkCalendarController {
 	 * @param requestData
 	 * @return
 	 */
-	@ApiOperation(value = "查询工作历详情")
 	@RequestMapping(value = "query_details")
 	public ResponseOldResult queryDetails(@RequestBody @Validated OldCalendarQueryVO requestData) {
 		// 判断工作历信息是否存在

+ 2 - 9
src/main/java/com/persagy/calendar/controller/RwdObjectController.java

@@ -36,18 +36,16 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
+ * 物理世界对象管理
+ * 
  * @version 
- * @description 
  * @company persagy
  * @author zhangqiankun
  * @since 2021年3月2日:	下午3:16:15
  */
 @RestController
-@Api(tags = "物理世界对象管理")
 @RequestMapping(value = "/v2.0/rwdObject", method = RequestMethod.POST)
 public class RwdObjectController {
 	
@@ -65,7 +63,6 @@ public class RwdObjectController {
 	 * @param queryVO
 	 * @return
 	 */
-	@ApiOperation(value = "物理世界对象列表查询")
     @RequestMapping(value = "queryRwdObjects")
 	public ResponseResult queryRwdObjects(@RequestBody @Validated RwdObjectQueryVO queryVO) {
 		BaseModel baseModel = new BaseModel();
@@ -80,7 +77,6 @@ public class RwdObjectController {
 	 * @param queryVO
 	 * @return
 	 */
-	@ApiOperation(value = "查询工作历对象列表")
     @RequestMapping(value = "queryCalendarObjectList")
     public ResponseResult queryCalendarObjectList(@RequestBody @Validated WorkCalendarQueryVO queryVO) {
 		QueryWrapper<WorkCalendarObject> queryWrapper = null;
@@ -141,7 +137,6 @@ public class RwdObjectController {
 	/**
 	 * 添加对象工作历
 	 */
-	@ApiOperation(value = "添加对象工作历")
 	@RequestMapping(value = "addCalendarObject")
 	public ResponseResult addCalendarObject(@RequestBody @Validated WorkCalendarObjectUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getCalendarId())) {
@@ -164,7 +159,6 @@ public class RwdObjectController {
 	/**
 	 * 删除加对象工作历
 	 */
-	@ApiOperation(value = "删除加对象工作历")
 	@RequestMapping(value = "deleteCalendarObject")
 	public ResponseResult deleteCalendarObject(@RequestBody @Validated WorkCalendarObjectUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getObjId()) && CollectionUtil.isEmpty(updateVO.getObjIds())) {
@@ -187,7 +181,6 @@ public class RwdObjectController {
     /**
      * 对象变更所属工作历
      */
-    @ApiOperation(value = "对象变更所属工作历")
     @RequestMapping(value = "changeCalendarObject")
     public ResponseResult changeCalendarObject(@RequestBody @Validated WorkCalendarObjectUpdateVO updateVO) {
     	if (StringUtil.isBlank(updateVO.getCalendarId())) {

+ 0 - 9
src/main/java/com/persagy/calendar/controller/WorkCalendarController.java

@@ -31,8 +31,6 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 工作历主表
@@ -43,7 +41,6 @@ import io.swagger.annotations.ApiOperation;
  * @date 2020-10-02 11:33:00
  */
 
-@Api(tags = "工作历类型")
 @RestController
 @RequestMapping(value = "/v2.0/workCalendar", method = RequestMethod.POST)
 public class WorkCalendarController {
@@ -63,7 +60,6 @@ public class WorkCalendarController {
     /**
      * 列表查询
      */
-    @ApiOperation(value = "普通列表查询")
     @RequestMapping(value = "queryWorkCalendarList")
     public ResponseResult queryWorkCalendarList(@RequestBody @Validated WorkCalendarQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -92,7 +88,6 @@ public class WorkCalendarController {
     /**
 	 * 根据原有的工作历ID创建新的工作历信息和规则信息
 	 */
-    @ApiOperation(value = "根据原有的工作历创建")
     @RequestMapping(value = "createWorkCalendarFromId")
     public ResponseResult createWorkCalendarFromId(@RequestBody @Validated WorkCalendarUpdateVO updateVO) {
     	if (StringUtil.isBlank(updateVO.getGroupCode())) {
@@ -126,7 +121,6 @@ public class WorkCalendarController {
     /**
      * 判断projectId和name是否联合唯一
      */
-	@ApiOperation(value = "工作历类型名称重复性校验")
 	@RequestMapping(value = "validCalendarName")
     public ResponseResult validCalendarName(@RequestBody @Validated WorkCalendarUpdateVO updateVO) {
 		// 判断projectId和name是否联合唯一
@@ -137,7 +131,6 @@ public class WorkCalendarController {
     /**
      * 新增
      */
-	@ApiOperation(value = "新增")
 	@RequestMapping(value = "createWorkCalendar")
     public ResponseResult createWorkCalendar(@RequestBody @Validated WorkCalendarUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getGroupCode())) {
@@ -161,7 +154,6 @@ public class WorkCalendarController {
     /**
      * 更新
      */
-	@ApiOperation(value = "更新")
 	@RequestMapping(value = "updateWorkCalendar")
     public ResponseResult updateWorkCalendar(@RequestBody @Validated WorkCalendarUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getGroupCode())) {
@@ -193,7 +185,6 @@ public class WorkCalendarController {
     /**
      * 逻辑删除,且级联删除
      */
-    @ApiOperation(value = "删除")
     @RequestMapping(value = "deleteWorkCalendar")
     public ResponseResult deleteWorkCalendar(@RequestBody @Validated BaseUpdateVO baseUpdateVO) {
     	if (StringUtil.isBlank(baseUpdateVO.getGroupCode())) {

+ 0 - 15
src/main/java/com/persagy/calendar/controller/WorkCalendarDateController.java

@@ -34,8 +34,6 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 工作历作息时间表
@@ -45,7 +43,6 @@ import io.swagger.annotations.ApiOperation;
  * @author zhangqiankun
  * @date 2020-10-03 13:54:22
  */
-@Api(tags = "工作历作息时间")
 @RestController
 @RequestMapping(value = "/v2.0/workCalendarDate", method = RequestMethod.POST)
 public class WorkCalendarDateController {
@@ -71,13 +68,8 @@ public class WorkCalendarDateController {
     /**
      * 列表查询,这里可不需要集团编码
      */
-    @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryWorkCalendarDateList")
     public ResponseResult queryWorkCalendarDateList(@RequestBody @Validated WorkCalendarDateQueryVO queryVO) {
-    	/*if (StringUtil.isBlank(queryVO.getProjectId())) {
-			return ResponseUtil.errorResult("项目ID不可为空");
-		}*/
-    	
     	if (StringUtil.isNotBlank(queryVO.getObjId())) {
     		QueryWrapper<WorkCalendarObject> queryWrapper = new WorkCalendarObject.Builder().createQueryWrapper()
     				.projectIdEq(queryVO.getProjectId()).objectIdEq(queryVO.getObjId()).builderQueryWrapper();
@@ -99,7 +91,6 @@ public class WorkCalendarDateController {
      * 
      * 自定义作息时间,一定是属于工作历级别的,这一点不允许修改,不然规则解析需要推翻重来,改动很大
      */
-	@ApiOperation(value = "添加自定义作息时间")
 	@RequestMapping(value = "createCustomCalendarDate")
     public ResponseResult createCustomCalendarDate(@RequestBody @Validated CustomCalendarVO<WorkCalendarDateCreateVO> createVO) {
 		if (StringUtil.isBlank(createVO.getGroupCode())) {
@@ -115,12 +106,8 @@ public class WorkCalendarDateController {
      * 
      * 自定义作息时间,一定是属于工作历级别的,这一点不允许修改,不然规则解析需要推翻重来,改动很大
      */
-	@ApiOperation(value = "多时间段添加工作历作息时间信息")
 	@RequestMapping(value = "createCustomCalendarMoreDate")
     public ResponseResult createCustomCalendarMoreDate(@RequestBody @Validated WorkCalendarMoreDateCreateVO createVO) {
-		/*if (BooleanUtil.isFalse(createVO.getIsDelete()) && CollectionUtil.isEmpty(createVO.getTimetable())) {
-			return ResponseUtil.errorResult(ResponseCode.A0400.getCode(), "作息时间点集合timetable,不可为空");
-		}*/
 		if (StringUtil.isBlank(createVO.getGroupCode())) {
 			createVO.setGroupCode(defaultGroupCode);
 		}
@@ -148,7 +135,6 @@ public class WorkCalendarDateController {
      * 
      * 自定义作息时间,一定是属于工作历级别的,这一点不允许修改,不然规则解析需要推翻重来,改动很大
      */
-	@ApiOperation(value = "更新自定义作息时间")
 	@RequestMapping(value = "updateCustomCalendarDate")
     public ResponseResult updateCustomCalendarDate(@RequestBody @Validated CustomCalendarVO<WorkCalendarDateUpdateVO> updateVO) {
 		this.workCalendarDateHandler.batchUpdateCalendarDate(updateVO);
@@ -158,7 +144,6 @@ public class WorkCalendarDateController {
     /**
      * 物理删除自定义作息时间,自定义的时间需大于当日
      */
-	@ApiOperation(value = "物理删除自定义作息时间")
 	@RequestMapping(value = "deleteCustomCalendarDate")
     public ResponseResult deleteCustomCalendarDate(@RequestBody @Validated WorkCalendarDateDeleteVO deleteVO) {
 		if (StringUtil.isBlank(deleteVO.getGroupCode())) {

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

@@ -26,18 +26,14 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * @version 
- * @description 
  * @company persagy
  * @author zhangqiankun
  * @since 2021年3月3日:	下午5:48:32
  */
 @RestController
-@Api(tags = "标签管理")
 @RequestMapping(value = "/v2.0/calendarLabel", method = RequestMethod.POST)
 public class WorkCalendarLabelController {
 	
@@ -50,7 +46,6 @@ public class WorkCalendarLabelController {
 	/**
      * 根据时间段-自动计算出此年内不在此时间段内的日期
      */
-    @ApiOperation(value = "自动计算")
     @RequestMapping(value = "calculateExtraDate")
     public ResponseResult calculateExtraDate(@RequestBody @Validated CalculateExtraDateVO dateVO) {
     	List<String> extraDate = DateUtil.calculateExtraDate(dateVO.getLabelDates());
@@ -60,7 +55,6 @@ public class WorkCalendarLabelController {
 	/**
      * 日期标签属性列表查询
      */
-    @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryCalendarLabelList")
     public ResponseResult queryCalendarLabelList(@RequestBody @Validated WorkCalendarLabelQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -79,7 +73,6 @@ public class WorkCalendarLabelController {
 	 * @param queryVO 
 	 * @return
 	 */
-    @ApiOperation(value = "查询标签的有效期")
     @RequestMapping(value = "queryCalendarLabelValid")
     public ResponseResult queryCalendarLabelValid(@RequestBody @Validated WorkCalendarLabelQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -104,7 +97,6 @@ public class WorkCalendarLabelController {
 	 * @param updateVO
 	 * @return
 	 */
-	@ApiOperation(value = "创建或更新日期标签属性")
     @RequestMapping(value = "updateLabelInfo")
 	public ResponseResult updateLabelInfo(@RequestBody @Validated WorkCalendarLabelUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getGroupCode())) {
@@ -124,7 +116,6 @@ public class WorkCalendarLabelController {
 	 * @param updateVO
 	 * @return
 	 */
-	@ApiOperation(value = "更新日期标签属性集")
     @RequestMapping(value = "updateCalendarDateAttribute")
 	public ResponseResult updateCalendarDateAttribute(@RequestBody @Validated WorkLabelBatchUpdateVO updateVO) {
 		if (StringUtil.isBlank(updateVO.getGroupCode())) {

+ 0 - 7
src/main/java/com/persagy/calendar/controller/WorkCalendarRuleController.java

@@ -30,8 +30,6 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 工作历规则表
@@ -42,7 +40,6 @@ import io.swagger.annotations.ApiOperation;
  * @date 2020-10-02 18:26:14
  */
 
-@Api(tags = "工作历规则")
 @RestController
 @RequestMapping(value = "/v2.0/workCalendarRule", method = RequestMethod.POST)
 public class WorkCalendarRuleController {
@@ -65,7 +62,6 @@ public class WorkCalendarRuleController {
     /**
      * 普通列表查询
      */
-    @ApiOperation(value = "普通列表查询")
     @RequestMapping(value = "queryWorkCalendarRuleList")
     public ResponseResult queryWorkCalendarRuleList(@RequestBody @Validated WorkCalendarRuleQueryVO queryVO) {
     	if (StringUtil.isBlank(queryVO.getGroupCode())) {
@@ -85,7 +81,6 @@ public class WorkCalendarRuleController {
     /**
      * 新增
      */
-	@ApiOperation(value = "保存")
 	@RequestMapping(value = "createWorkCalendarRule")
     public ResponseResult createWorkCalendarRule(@RequestBody @Validated CustomCalendarVO<WorkCalendarRuleCreateVO> createVO) {
 		if (StringUtil.isBlank(createVO.getGroupCode())) {
@@ -99,7 +94,6 @@ public class WorkCalendarRuleController {
     /**
      * 更新
      */
-	@ApiOperation(value = "更新")
 	@RequestMapping(value = "updateWorkCalendarRule")
     public ResponseResult updateWorkCalendarRule(@RequestBody @Validated CustomCalendarVO<WorkCalendarRuleUpdateVO> updateVO) {
 		if (StringUtil.isBlank(updateVO.getGroupCode())) {
@@ -113,7 +107,6 @@ public class WorkCalendarRuleController {
     /**
      * 删除
      */
-    @ApiOperation(value = "删除")
     @RequestMapping(value = "deleteWorkCalendarRule")
     public ResponseResult deleteWorkCalendarRule(@RequestBody @Validated WorkCalendarRuleDeleteVO deleteVO) {
     	if (StringUtil.isBlank(deleteVO.getGroupCode())) {

+ 0 - 5
src/main/java/com/persagy/calendar/controller/WorkTimeEngineController.java

@@ -14,9 +14,6 @@ import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
 /**
  * @version 
  * @description 
@@ -24,7 +21,6 @@ import io.swagger.annotations.ApiOperation;
  * @author zhangqiankun
  * @since 2020年10月3日:	下午2:32:36
  */
-@Api(tags = "NTP服务时间")
 @RestController
 @RequestMapping(value = "/v2.0/ntp", method = RequestMethod.POST)
 public class WorkTimeEngineController {
@@ -32,7 +28,6 @@ public class WorkTimeEngineController {
 	/**
      * 获取NTP服务时间
      */
-    @ApiOperation(value = "获取NTP服务时间")
     @RequestMapping(value = "getNTPServerTime")
     public ResponseResult queryWorkCalendarDateList(@RequestBody @Validated Map<String, String> map) {
     	String ntpServerTime = NTPClientUtil.getNTPServerTime();

+ 2 - 3
src/main/java/com/persagy/calendar/pojo/old/DataRangeVO.java

@@ -2,7 +2,6 @@ package com.persagy.calendar.pojo.old;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,11 +18,11 @@ import lombok.Setter;
 public class DataRangeVO {
 	
 	@NotBlank(message = "开始时间from不可为空[YYYYMMDDHHMMSS]")
-	@ApiModelProperty(value = "开始时间", required = true)
+	//@ApiModelProperty(value = "开始时间", required = true)
 	private String from;
 	
 	@NotBlank(message = "结束时间to不可为空[YYYYMMDDHHMMSS]")
-	@ApiModelProperty(value = "结束时间", required = true)
+	//@ApiModelProperty(value = "结束时间", required = true)
 	private String to;
 	
 }

+ 4 - 7
src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalCreateVO.java

@@ -9,8 +9,6 @@ import javax.validation.constraints.NotEmpty;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,24 +21,23 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarIntervalCreateVO {
 	
 	@NotBlank(message = "code不可为空")
-	@ApiModelProperty(value = "作息时段编码", required = true)
+	//@ApiModelProperty(value = "作息时段编码", required = true)
 	private String code;			// 对应 dictCode
 	
 	@NotEmpty(message = "time不可为空")
-	@ApiModelProperty(value = "一天内的时段", required = true)
+	//@ApiModelProperty(value = "一天内的时段", required = true)
 	private List<String> time;		// 对应 value
 	
 	@Valid
 	@NotEmpty(message = "dates不可为空")
-	@ApiModelProperty(value = "dates", required = true)
+	//@ApiModelProperty(value = "dates", required = true)
 	private List<DataRangeVO> dates;
 	
 	@JsonIgnore
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 }

+ 3 - 6
src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalDeleteVO.java

@@ -8,8 +8,6 @@ import javax.validation.constraints.NotEmpty;
 
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,19 +20,18 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarIntervalDeleteVO {
 	
 	@NotBlank(message = "code不可为空")
-	@ApiModelProperty(value = "作息时段编码", required = true)
+	//@ApiModelProperty(value = "作息时段编码", required = true)
 	private String code;
 	
 	@Valid
 	@NotEmpty(message = "dates不可为空")
-	@ApiModelProperty(value = "dates", required = true)
+	//@ApiModelProperty(value = "dates", required = true)
 	private List<DataRangeVO> dates;
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 }

+ 5 - 8
src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalsByTag.java

@@ -7,8 +7,6 @@ import javax.validation.constraints.NotNull;
 import com.persagy.calendar.constant.WorkCalendarConstant;
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,28 +19,27 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarIntervalsByTag {
 
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
 	@Valid
 	@NotNull(message = "query不可为空")
-	@ApiModelProperty(value = "query", required = true)
+	//@ApiModelProperty(value = "query", required = true)
 	private OldCalendarTagQueryVO query;
 	
 	@Valid
 	@NotNull(message = "set_interval不可为空")
-	@ApiModelProperty(value = "要设置的作息信息", required = true)
+	//@ApiModelProperty(value = "要设置的作息信息", required = true)
 	private OldCalendarSetIntervalVO set_interval;
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 	// 0-新接口规则;1-老接口规则,方便后续解析
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_OLD; 
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/old/OldCalendarIntervalsVO.java

@@ -6,8 +6,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,16 +18,15 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarIntervalsVO<T> {
 	
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
 	@Valid
 	@NotEmpty(message = "intervals不可为空")
-	@ApiModelProperty(value = "intervals", required = true)
+	//@ApiModelProperty(value = "intervals", required = true)
 	private List<T> intervals;
 	
 }

+ 4 - 7
src/main/java/com/persagy/calendar/pojo/old/OldCalendarQueryVO.java

@@ -6,8 +6,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,21 +18,20 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarQueryVO {
 	
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
-	@ApiModelProperty(value = "tags和intervals必填其一")
+	//@ApiModelProperty(value = "tags和intervals必填其一")
 	private Set<String> tags;
 	
-	@ApiModelProperty(value = "tags和intervals必填其一")
+	//@ApiModelProperty(value = "tags和intervals必填其一")
 	private Set<String> intervals;
 	
 	@Valid
 	@NotNull(message = "dates不可为空")
-	@ApiModelProperty(value = "dates日期段[YYYMMDD000000]", required = true)
+	//@ApiModelProperty(value = "dates日期段[YYYMMDD000000]", required = true)
 	private DataRangeVO dates;
 }

+ 6 - 9
src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleCreateVO.java

@@ -8,8 +8,6 @@ import javax.validation.constraints.NotEmpty;
 import com.persagy.calendar.constant.WorkCalendarConstant;
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,29 +20,28 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarRuleCreateVO {
 	
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
 	@NotBlank(message = "tag不可为空")
-	@ApiModelProperty(value = "tag值", required = true)
+	//@ApiModelProperty(value = "tag值", required = true)
 	private String tag;
 	
 	@NotBlank(message = "type不可为空")
-	@ApiModelProperty(value = "type值", required = true)
+	//@ApiModelProperty(value = "type值", required = true)
 	private String type;
 	
 	@NotEmpty(message = "value不可为空")
-	@ApiModelProperty(value = "value值", required = true)
+	//@ApiModelProperty(value = "value值", required = true)
 	private Set<String> value;
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 	// 0-新接口规则;1-老接口规则,方便后续解析
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_OLD; 
 }

+ 4 - 7
src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleDeleteVO.java

@@ -5,8 +5,6 @@ import javax.validation.constraints.NotBlank;
 import com.persagy.calendar.constant.WorkCalendarConstant;
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,22 +17,21 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarRuleDeleteVO {
 
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
 	@NotBlank(message = "tag不可为空")
-	@ApiModelProperty(value = "tag值", required = true)
+	//@ApiModelProperty(value = "tag值", required = true)
 	private String tag;
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 	// 0-新接口规则;1-老接口规则,方便后续解析
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_OLD; 
 
 }

+ 1 - 4
src/main/java/com/persagy/calendar/pojo/old/OldCalendarRuleVO.java

@@ -5,8 +5,6 @@ import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,12 +17,11 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarRuleVO<T> {
 	
 	@Valid
 	@NotEmpty(message = "rules不可为空")
-	@ApiModelProperty(value = "规则集合", required = true)
+	//@ApiModelProperty(value = "规则集合", required = true)
 	private List<T> rules;
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/old/OldCalendarSetIntervalVO.java

@@ -5,8 +5,6 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,15 +17,14 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarSetIntervalVO {
 	
 	@NotBlank(message = "code不可为空")
-	@ApiModelProperty(value = "作息时段编码", required = true)
+	//@ApiModelProperty(value = "作息时段编码", required = true)
 	private String code;
 	
 	@NotEmpty(message = "time不可为空")
-	@ApiModelProperty(value = "一天内的时段", required = true)
+	//@ApiModelProperty(value = "一天内的时段", required = true)
 	private List<String> time;
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagQueryVO.java

@@ -4,8 +4,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,16 +16,15 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarTagQueryVO {
 	
 	@NotBlank(message = "tag不可为空")
-	@ApiModelProperty(value = "tag值", required = true)
+	//@ApiModelProperty(value = "tag值", required = true)
 	private String tag;
 	
 	@Valid
 	@NotNull(message = "dates不可为空")
-	@ApiModelProperty(value = "dates", required = true)
+	//@ApiModelProperty(value = "dates", required = true)
 	private DataRangeVO dates;
 	
 }

+ 3 - 6
src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagVO.java

@@ -8,8 +8,6 @@ import javax.validation.constraints.NotEmpty;
 
 import com.persagy.common.constant.CommonConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,19 +20,18 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarTagVO {
 	
 	@NotBlank(message = "tag不可为空")
-	@ApiModelProperty(value = "tag值", required = true)
+	//@ApiModelProperty(value = "tag值", required = true)
 	private String tag;
 	
 	@Valid
 	@NotEmpty(message = "dates不可为空")
-	@ApiModelProperty(value = "dates", required = true)
+	//@ApiModelProperty(value = "dates", required = true)
 	private List<DataRangeVO> dates;
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String projectId = CommonConstant.DEFAULT_USER_ID;
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/old/OldCalendarTagsVO.java

@@ -6,8 +6,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,15 +18,14 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@ApiModel
 public class OldCalendarTagsVO {
 	
 	@NotBlank(message = "id不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String id;
 	
 	@Valid
 	@NotEmpty(message = "tags不可为空")
-	@ApiModelProperty(value = "tags", required = true)
+	//@ApiModelProperty(value = "tags", required = true)
 	private List<OldCalendarTagVO> tags;
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/old/OldWorkCalendarVO.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.old;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +15,6 @@ import lombok.Setter;
 
 @Getter
 @Setter
-@ApiModel
 public class OldWorkCalendarVO {
 	
 	private String id;
@@ -25,11 +22,11 @@ public class OldWorkCalendarVO {
 	private String from_id;
 	
 	@NotBlank(message = "name不可为空")
-	@ApiModelProperty(value = "工作历名称", required = true)
+	//@ApiModelProperty(value = "工作历名称", required = true)
 	private String name;
 	
 	@NotBlank(message = "desc不可为空")
-	@ApiModelProperty(value = "工作历描述", required = true)
+	//@ApiModelProperty(value = "工作历描述", required = true)
 	private String desc;
 	
 }

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

@@ -1,6 +1,5 @@
 package com.persagy.calendar.pojo.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,7 +17,7 @@ import lombok.ToString;
 @ToString
 public class BaseQueryVO extends BaseVO {
 	
-	@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
+	//@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
 	private String id;
 	
 }

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

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,11 +17,10 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class BaseUpdateVO extends BaseVO {
 	
 	@NotBlank(message = "ID不可为空")
-	@ApiModelProperty(value = "主键ID", required = true)
+	//@ApiModelProperty(value = "主键ID", required = true)
 	private String id;
 	
 }

+ 3 - 4
src/main/java/com/persagy/calendar/pojo/vo/BaseVO.java

@@ -2,7 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,14 +17,14 @@ import lombok.Setter;
 public class BaseVO {
 
 	@NotBlank(message = "用户ID不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@ApiModelProperty(value = "集团编码", required = true)
+	//@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	@NotBlank(message = "项目ID不可为空")
-	@ApiModelProperty(value = "项目ID", required = true)
+	//@ApiModelProperty(value = "项目ID", required = true)
 	private String projectId; 		// 项目
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/vo/CalculateExtraDateVO.java

@@ -5,8 +5,6 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,15 +19,14 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class CalculateExtraDateVO {
 
 	@NotBlank(message = "用户ID,不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
 	@NotNull(message = "标签有效时间段范围,不可为空")
-	@ApiModelProperty(value = "标签有效时间段范围", required = true)
+	//@ApiModelProperty(value = "标签有效时间段范围", required = true)
 	private List<String> labelDates;
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/vo/CustomCalendarVO.java

@@ -5,8 +5,6 @@ import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,15 +19,14 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "批量请求参数")
 public class CustomCalendarVO<T> extends BaseVO {
 
-	@ApiModelProperty(value = "是否删除此工作历下已存在的规则,重新添加,默认false")
+	//@ApiModelProperty(value = "是否删除此工作历下已存在的规则,重新添加,默认false")
 	private Boolean isDelete;
 	
 	@Valid
 	@NotEmpty(message = "批量信息集合,不可为空")
-	@ApiModelProperty(value = "批量信息不可为空", required = true)
+	//@ApiModelProperty(value = "批量信息不可为空", required = true)
 	private List<T>  batchInfo;
 	
 }

+ 2 - 5
src/main/java/com/persagy/calendar/pojo/vo/DictCodeCreate.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,14 +16,13 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class DictCodeCreate {
 	
-	@ApiModelProperty(value = "字典编码", required = true)
+	//@ApiModelProperty(value = "字典编码", required = true)
 	private String dictCode; // 字典编码
 	
 	@NotBlank(message = "字典编码描述不可为空")
-	@ApiModelProperty(value = "字典编码描述", required = true)
+	//@ApiModelProperty(value = "字典编码描述", required = true)
 	private String dictDesc; // 字典编码描述
 	
 }

+ 3 - 6
src/main/java/com/persagy/calendar/pojo/vo/DictCreateVO.java

@@ -6,8 +6,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,19 +20,18 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "字典值创建请求参数")
 public class DictCreateVO<T> extends BaseVO {
 
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; // 工作历ID
 	
 	@NotBlank(message = "字典类型不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; // 字典类型
 	
 	@Valid
 	@NotEmpty(message = "字典类型不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private List<T> codes;
 	
 }

+ 6 - 9
src/main/java/com/persagy/calendar/pojo/vo/DictQueryVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,26 +18,25 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "字典值查询请求参数")
 public class DictQueryVO {
 
 	@NotBlank(message = "用户ID不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@ApiModelProperty(value = "集团编码")
+	//@ApiModelProperty(value = "集团编码")
 	private String groupCode;
 	
-	@ApiModelProperty(value = "项目ID")
+	//@ApiModelProperty(value = "项目ID")
 	private String projectId;
 	
-	@ApiModelProperty(value = "字典类型")
+	//@ApiModelProperty(value = "字典类型")
 	private String dictType; // 字典类型
 	
-	@ApiModelProperty(value = "字典类型集合")
+	//@ApiModelProperty(value = "字典类型集合")
 	private Set<String> dictTypes; // 字典类型
 	
-	@ApiModelProperty(value = "工作历ID")
+	//@ApiModelProperty(value = "工作历ID")
 	private String calendarId; // 工作历ID
 	
 }

+ 8 - 11
src/main/java/com/persagy/calendar/pojo/vo/RwdObjectQueryVO.java

@@ -6,8 +6,6 @@ import javax.validation.constraints.NotBlank;
 
 import com.google.common.collect.Sets;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,35 +19,34 @@ import lombok.ToString;
  */
 @Getter
 @Setter
-@ApiModel
 @ToString(callSuper = true)
 public class RwdObjectQueryVO {
 	
 	@NotBlank(message = "userId不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
 	@NotBlank(message = "groupCode不可为空")
-	@ApiModelProperty(value = "集团编码", required = true)
+	//@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	//@NotBlank(message = "项目ID不可为空")
-	@ApiModelProperty(value = "项目ID")
+	//@ApiModelProperty(value = "项目ID")
 	private String projectId;
 	
-	@ApiModelProperty(value = "应用ID")
+	//@ApiModelProperty(value = "应用ID")
 	private String appId;
 	
-	@ApiModelProperty(value = "主键ID", example = "Sp44030700030006cf1d00c2462499a292faf9411993")
+	//@ApiModelProperty(value = "主键ID", example = "Sp44030700030006cf1d00c2462499a292faf9411993")
 	private String id;
 	
-	@ApiModelProperty(value = "类型编码", example = "project")
+	//@ApiModelProperty(value = "类型编码", example = "project")
 	private String classCode;
 	
-	@ApiModelProperty(value = "是否可用, 1-可用,0-不可用", example = "1")
+	//@ApiModelProperty(value = "是否可用, 1-可用,0-不可用", example = "1")
 	private Integer valid = 1;
 	
-	@ApiModelProperty(value = "对象类型,默认space, floor, building, project", example = "[space, floor]")
+	//@ApiModelProperty(value = "对象类型,默认space, floor, building, project", example = "[space, floor]")
 	private Set<String> objType = Sets.newHashSet("space", "floor", "building", "project");
 	
 }

+ 5 - 8
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateCreateVO.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,27 +16,26 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "自定义作息时间请求参数")
 public class WorkCalendarDateCreateVO {
 	
 	@NotBlank(message = "工作历ID,不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; // 工作历ID
 	
 	@NotBlank(message = "字典类型,不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; // 字典类型
 
 	@NotBlank(message = "字典数据code,不可为空")
-	@ApiModelProperty(value = "字典数据code", required = true)
+	//@ApiModelProperty(value = "字典数据code", required = true)
 	private String dictCode; // 字典数据code
 	
 	@NotBlank(message = "作息日期,不可为空")
-	@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
 	private String workDate; // 具体执行日期,新接口YYYYMMDD
 
 	@NotBlank(message = "作息时间点,不可为空")
-	@ApiModelProperty(value = "作息时间点[HHMMSS]", required = true)
+	//@ApiModelProperty(value = "作息时间点[HHMMSS]", required = true)
 	private String workTime; // 具体时间段
 	
 }

+ 5 - 8
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateDeleteVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,26 +18,25 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "删除自定义作息时间请求参数")
 public class WorkCalendarDateDeleteVO extends BaseQueryVO {
 
 	@NotBlank(message = "字典类型,不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; // 字典类型
 
 	//@NotEmpty(message = "字典数据code,不可为空")
-	@ApiModelProperty(value = "字典数据code", required = true)
+	//@ApiModelProperty(value = "字典数据code", required = true)
 	private Set<String> dictCode; // 字典数据code
 	
-	@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
 	private String workDate; // 具体执行日期,新接口YYYYMMDD
 	
 	@NotBlank(message = "workDateStart不可为空[YYYYMMDD]")
-	@ApiModelProperty(value = "查询从此日开始的作息详情 [YYYYMMDD]")
+	//@ApiModelProperty(value = "查询从此日开始的作息详情 [YYYYMMDD]")
 	private String workDateStart; // 具体执行日期 YYYYMMDD
 	
 	@NotBlank(message = "workDateEnd不可为空[YYYYMMDD]")
-	@ApiModelProperty(value = "查询从此日结束的作息详情 [YYYYMMDD]")
+	//@ApiModelProperty(value = "查询从此日结束的作息详情 [YYYYMMDD]")
 	private String workDateEnd; // 具体执行日期 YYYYMMDD
 	
 }

+ 12 - 15
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateQueryVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,46 +20,45 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarDateQueryVO {
 	
 	@NotBlank(message = "用户ID不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
+	//@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
 	private String id;
 	
-	@ApiModelProperty(value = "项目ID", required = true)
+	//@ApiModelProperty(value = "项目ID", required = true)
 	private String projectId;  // 项目
 	
-	@ApiModelProperty(value = "规则ID")
+	//@ApiModelProperty(value = "规则ID")
 	private String ruleId; 		// 规则ID
 	
-	@ApiModelProperty(value = "工作历ID")
+	//@ApiModelProperty(value = "工作历ID")
 	private String calendarId; // 工作历ID
 
-	@ApiModelProperty(value = "工作历名称")
+	//@ApiModelProperty(value = "工作历名称")
 	private String calendarName; // 工作历名称
 
-	@ApiModelProperty(value = "字典类型")
+	//@ApiModelProperty(value = "字典类型")
 	private String dictType; // 字典类型
 	
-	@ApiModelProperty(value = "字典类型")
+	//@ApiModelProperty(value = "字典类型")
 	private Set<String> dictTypes; // 字典类型
 
-	@ApiModelProperty(value = "字典数据code")
+	//@ApiModelProperty(value = "字典数据code")
 	private Set<String> dictCode; // 字典数据code
 
 	@NotBlank(message = "workDateStart不可为空[YYYYMMDD]")
-	@ApiModelProperty(value = "查询从此日开始的作息详情 [YYYYMMDD]")
+	//@ApiModelProperty(value = "查询从此日开始的作息详情 [YYYYMMDD]")
 	private String workDateStart; // 具体执行日期 YYYYMMDD
 	
 	@NotBlank(message = "workDateEnd不可为空[YYYYMMDD]")
-	@ApiModelProperty(value = "查询从此日结束的作息详情 [YYYYMMDD]")
+	//@ApiModelProperty(value = "查询从此日结束的作息详情 [YYYYMMDD]")
 	private String workDateEnd; // 具体执行日期 YYYYMMDD
 	
-	@ApiModelProperty(value = "对象ID")
+	//@ApiModelProperty(value = "对象ID")
 	private String objId; 		// 对象D 
 	
 }

+ 6 - 9
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarDateUpdateVO.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,31 +16,30 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "自定义作息时间请求参数")
 public class WorkCalendarDateUpdateVO {
 	
 	@NotBlank(message = "作息时间ID,不可为空")
-	@ApiModelProperty(value = "作息时间ID", required = true)
+	//@ApiModelProperty(value = "作息时间ID", required = true)
 	private String id; // 作息时间ID
 	
 	//@NotBlank(message = "工作历ID,不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; // 工作历ID
 	
 	@NotBlank(message = "字典类型,不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; // 字典类型
 
 	@NotBlank(message = "字典数据code,不可为空")
-	@ApiModelProperty(value = "字典数据code", required = true)
+	//@ApiModelProperty(value = "字典数据code", required = true)
 	private String dictCode; // 字典数据code
 	
 	@NotBlank(message = "作息日期,不可为空")
-	@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "作息时间点[YYYYMMDD]", required = true)
 	private String workDate; // 具体执行日期,新接口YYYYMMDD
 
 	@NotBlank(message = "作息时间点,不可为空")
-	@ApiModelProperty(value = "作息时间点[HHMMSS]", required = true)
+	//@ApiModelProperty(value = "作息时间点[HHMMSS]", required = true)
 	private String workTime; // 具体时间段
 	
 }

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

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,43 +16,42 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarLabelQueryVO {
 	
 	@NotBlank(message = "用户ID不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
 	//@NotBlank(message = "集团编码不可为空")
-	@ApiModelProperty(value = "集团编码")
+	//@ApiModelProperty(value = "集团编码")
 	private String groupCode;
 	
 	//@NotBlank(message = "项目ID不可为空")
-	@ApiModelProperty(value = "项目ID")
+	//@ApiModelProperty(value = "项目ID")
 	private String projectId; 		// 项目
 	
-	@ApiModelProperty(value = "工作历ID")
+	//@ApiModelProperty(value = "工作历ID")
 	private String calendarId; 			// 工作历ID
 	
-	@ApiModelProperty(value = "对象ID")
+	//@ApiModelProperty(value = "对象ID")
 	private String objId;	//对象ID
 	
-	@ApiModelProperty(value = "标签所属开始日期[yyyyMMdd]")
+	//@ApiModelProperty(value = "标签所属开始日期[yyyyMMdd]")
 	private String labelDateStart; 		// 标签所属开始日期
 	
-	@ApiModelProperty(value = "标签所属结束日期[yyyyMMdd]")
+	//@ApiModelProperty(value = "标签所属结束日期[yyyyMMdd]")
 	private String labelDateEnd; 		// 标签所属结束日期
 	
-	@ApiModelProperty(value = "字典类型")
+	//@ApiModelProperty(value = "字典类型")
 	private String dictType;
 	
-	@ApiModelProperty(value = "字典编码")
+	//@ApiModelProperty(value = "字典编码")
 	private String dictCode;
 	
-	@ApiModelProperty(value = "是否自定义,0-非自定义,1-自定义")
+	//@ApiModelProperty(value = "是否自定义,0-非自定义,1-自定义")
 	private String diyLabel;
 	
-	@ApiModelProperty(value = "分组条件,传列名:不传默认为DICT_TYPE, DICT_CODE")
+	//@ApiModelProperty(value = "分组条件,传列名:不传默认为DICT_TYPE, DICT_CODE")
 	private String groupBy = "DICT_TYPE, DICT_CODE";
 	
 }

+ 9 - 12
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarLabelUpdateVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,39 +18,38 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarLabelUpdateVO extends BaseVO {
 	
-	@ApiModelProperty(value = "是否在创建或更新之前,优先删除此段日期下已存在的标签属性,默认true")
+	//@ApiModelProperty(value = "是否在创建或更新之前,优先删除此段日期下已存在的标签属性,默认true")
 	private Boolean isUpdate = true;
 	
-	@ApiModelProperty(value = "是否仅删除此段日期下已存在的标签属性,默认false")
+	//@ApiModelProperty(value = "是否仅删除此段日期下已存在的标签属性,默认false")
 	private Boolean isDelete;
 	
 	@NotBlank(message = "工作历ID,不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; 			// 工作历ID
 	
 	@NotBlank(message = "标签所属开始日期,不可为空")
-	@ApiModelProperty(value = "标签所属开始日期[yyyyMMdd]", required = true)
+	//@ApiModelProperty(value = "标签所属开始日期[yyyyMMdd]", required = true)
 	private String labelDateStart; 		// 标签所属开始日期
 	
 	@NotBlank(message = "标签所属结束日期,不可为空")
-	@ApiModelProperty(value = "标签所属结束日期[yyyyMMdd]", required = true)
+	//@ApiModelProperty(value = "标签所属结束日期[yyyyMMdd]", required = true)
 	private String labelDateEnd; 		// 标签所属结束日期
 	
 	//@NotBlank(message = "标签编码,不可为空")
-	@ApiModelProperty(value = "字典类型,非自定义时,必填")
+	//@ApiModelProperty(value = "字典类型,非自定义时,必填")
 	private String dictType;
 	
-	@ApiModelProperty(value = "字典编码,非自定义时,必填")
+	//@ApiModelProperty(value = "字典编码,非自定义时,必填")
 	private String dictCode;
 	
 	@NotBlank(message = "是否自定义,不可为空")
-	@ApiModelProperty(value = "是否自定义,0-非自定义,1-自定义", required = true)
+	//@ApiModelProperty(value = "是否自定义,0-非自定义,1-自定义", required = true)
 	private String diyLabel;
 	
-	@ApiModelProperty(value = "字典描述,自定义时,必填")
+	//@ApiModelProperty(value = "字典描述,自定义时,必填")
 	private Set<String> diyValue;
 	
 }

+ 8 - 11
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarMoreDateCreateVO.java

@@ -6,8 +6,6 @@ import javax.validation.constraints.NotBlank;
 
 import com.persagy.calendar.constant.WorkCalendarConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,36 +20,35 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel(description = "自定义作息时间请求参数")
 public class WorkCalendarMoreDateCreateVO extends BaseVO {
 	
-	@ApiModelProperty(value = "是否只删除此段日期下已存在的作息时间属性,重新添加,默认false")
+	//@ApiModelProperty(value = "是否只删除此段日期下已存在的作息时间属性,重新添加,默认false")
 	private Boolean isDelete;
 	
 	@NotBlank(message = "工作历ID,不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; // 工作历ID
 	
 	@NotBlank(message = "字典类型,不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; // 字典类型
 
-	@ApiModelProperty(value = "字典数据code")
+	//@ApiModelProperty(value = "字典数据code")
 	private String dictCode; // 字典数据code
 	
 	@NotBlank(message = "开始作息时间,不可为空")
-	@ApiModelProperty(value = "开始作息时间[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "开始作息时间[YYYYMMDD]", required = true)
 	private String workDateStart;
 
 	@NotBlank(message = "结束作息时间,不可为空")
-	@ApiModelProperty(value = "结束作息时间[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "结束作息时间[YYYYMMDD]", required = true)
 	private String workDateEnd;
 
 	//@NotEmpty(message = "作息时间点集合timetable,不可为空")
-	@ApiModelProperty(value = "作息时间点集合[HH:mm-HH:mm]", required = true)
+	//@ApiModelProperty(value = "作息时间点集合[HH:mm-HH:mm]", required = true)
 	private Set<String> timetable;
 	
-	@ApiModelProperty(value = "0-非自定义作息时间,1-自定义作息时间")
+	//@ApiModelProperty(value = "0-非自定义作息时间,1-自定义作息时间")
 	private String customFlag = WorkCalendarConstant.CUSTOM_CALENDAR_DATE_YES; 	//默认自定义
 	
 }

+ 6 - 9
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarObjectUpdateVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,28 +17,27 @@ import lombok.ToString;
  */
 @Getter
 @Setter
-@ApiModel
 @ToString
 public class WorkCalendarObjectUpdateVO {
 
 	@NotBlank(message = "用户ID,不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@ApiModelProperty(value = "集团编码", required = true)
+	//@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	//@NotBlank(message = "项目ID,不可为空")
-	@ApiModelProperty(value = "项目ID", required = true)
+	//@ApiModelProperty(value = "项目ID", required = true)
 	private String projectId; 		// 项目
 	
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; 	// 工作历ID
 	
-	@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
+	//@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
 	private Set<String> objIds;
 	
-	@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
+	//@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
 	private String objId;
 	
 }

+ 6 - 9
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarQueryVO.java

@@ -2,8 +2,6 @@ package com.persagy.calendar.pojo.vo;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,27 +16,26 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarQueryVO {
 
 	@NotBlank(message = "用户ID不可为空")
-	@ApiModelProperty(value = "用户ID", required = true)
+	//@ApiModelProperty(value = "用户ID", required = true)
 	private String userId;
 	
-	@ApiModelProperty(value = "集团编码", required = true)
+	//@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	//@NotBlank(message = "项目ID不可为空")
-	@ApiModelProperty(value = "项目ID", required = true)
+	//@ApiModelProperty(value = "项目ID", required = true)
 	private String projectId; 		// 项目
 	
-	@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
+	//@ApiModelProperty(name = "ID", value = "主键ID,更新时不可为空")
 	private String id;
 	
-	@ApiModelProperty(value = "工作历名称[支持模糊查询]")
+	//@ApiModelProperty(value = "工作历名称[支持模糊查询]")
 	private String calendarName;	// 同一GROUP_ID下唯一,代码判断
 	
-	@ApiModelProperty(value = "对象ID")
+	//@ApiModelProperty(value = "对象ID")
 	private String objId;
 
 }

+ 8 - 11
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleCreateVO.java

@@ -7,8 +7,6 @@ import javax.validation.constraints.Pattern;
 
 import com.persagy.calendar.constant.WorkCalendarConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,39 +21,38 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarRuleCreateVO {
 	
 	@NotBlank(message = "工作历ID不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; 	// 工作历ID
 	
 	@NotBlank(message = "dictType不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; 	// 字典类型
 
 	//@NotBlank(message = "dictCode不可为空")
-	@ApiModelProperty(value = "字典数据code", required = true)
+	//@ApiModelProperty(value = "字典数据code", required = true)
 	private String dictCode; 	// 字典数据code
 
 	@NotBlank(message = "ruleDateStart不可为空")
-	@ApiModelProperty(value = "开始日期[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "开始日期[YYYYMMDD]", required = true)
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_YYYYMMDD, message = "时间格式必须是YYYYMMDD")
 	private String ruleDateStart; // 规则生效的开始日期YYYYMMDD
 
 	@NotBlank(message = "ruleDateEnd不可为空")
-	@ApiModelProperty(value = "结束日期[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "结束日期[YYYYMMDD]", required = true)
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_YYYYMMDD, message = "时间格式必须是YYYYMMDD")
 	private String ruleDateEnd; // 规则生效的结束日期YYYYMMDD
 
-	@ApiModelProperty(value = "规则生效时间点[HHMMSS]")
+	//@ApiModelProperty(value = "规则生效时间点[HHMMSS]")
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_HHMMSS, message = "时间格式必须是HHMMSS")
 	private String ruleTime; 	// HHMMSS
 
-	@ApiModelProperty(value = "规则生效时间")
+	//@ApiModelProperty(value = "规则生效时间")
 	private Set<String> value; 	// 非严格开始结束日期的类型下,结合dictCode填写此值,后台不解析,实时解析查询
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_NEW; // 0-解析规则;1-不解析规则,方便后续解析
 	
 }

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

@@ -1,7 +1,5 @@
 package com.persagy.calendar.pojo.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -16,10 +14,9 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarRuleDeleteVO extends BaseQueryVO {
 	
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; 	// 工作历ID
 	
 }

+ 4 - 7
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleQueryVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import com.persagy.calendar.constant.WorkCalendarConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,19 +18,18 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarRuleQueryVO extends BaseQueryVO {
 	
-	@ApiModelProperty(value = "工作历ID")
+	//@ApiModelProperty(value = "工作历ID")
 	private String calendarId; 	// 工作历ID
 	
-	@ApiModelProperty(value = "字典类型")
+	//@ApiModelProperty(value = "字典类型")
 	private String dictType; 	// 字典类型
 
-	@ApiModelProperty(value = "字典数据code")
+	//@ApiModelProperty(value = "字典数据code")
 	private Set<String> dictCode; 	// 字典数据code
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_NEW; // 0-解析规则;1-不解析规则,方便后续解析
 	
 }

+ 9 - 12
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarRuleUpdateVO.java

@@ -7,8 +7,6 @@ import javax.validation.constraints.Pattern;
 
 import com.persagy.calendar.constant.WorkCalendarConstant;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,43 +21,42 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarRuleUpdateVO {
 	
 	@NotBlank(message = "规则ID不可为空")
-	@ApiModelProperty(value = "规则ID", required = true)
+	//@ApiModelProperty(value = "规则ID", required = true)
 	private String id;
 	
 	@NotBlank(message = "工作历ID不可为空")
-	@ApiModelProperty(value = "工作历ID", required = true)
+	//@ApiModelProperty(value = "工作历ID", required = true)
 	private String calendarId; 	// 工作历ID
 	
 	@NotBlank(message = "dictType不可为空")
-	@ApiModelProperty(value = "字典类型", required = true)
+	//@ApiModelProperty(value = "字典类型", required = true)
 	private String dictType; 	// 字典类型
 
 	@NotBlank(message = "dictCode不可为空")
-	@ApiModelProperty(value = "字典数据code", required = true)
+	//@ApiModelProperty(value = "字典数据code", required = true)
 	private String dictCode; 	// 字典数据code
 
 	@NotBlank(message = "ruleDateStart不可为空")
-	@ApiModelProperty(value = "开始日期[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "开始日期[YYYYMMDD]", required = true)
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_YYYYMMDD, message = "时间格式必须是YYYYMMDD")
 	private String ruleDateStart; // 规则生效的开始日期YYYYMMDD
 
 	@NotBlank(message = "ruleDateEnd不可为空")
-	@ApiModelProperty(value = "结束日期[YYYYMMDD]", required = true)
+	//@ApiModelProperty(value = "结束日期[YYYYMMDD]", required = true)
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_YYYYMMDD, message = "时间格式必须是YYYYMMDD")
 	private String ruleDateEnd; // 规则生效的结束日期YYYYMMDD
 
-	@ApiModelProperty(value = "规则生效时间点[HHMMSS]")
+	//@ApiModelProperty(value = "规则生效时间点[HHMMSS]")
 	@Pattern(regexp = WorkCalendarConstant.DATE_REG_HHMMSS, message = "时间格式必须是HHMMSS")
 	private String ruleTime; 	// HHMMSS
 
-	@ApiModelProperty(value = "规则生效时间")
+	//@ApiModelProperty(value = "规则生效时间")
 	private Set<String> value; 	// 非严格开始结束日期的类型下,结合dictCode填写此值,后台不解析,实时解析查询
 	
-	@ApiModelProperty(hidden = true)
+	//@ApiModelProperty(hidden = true)
 	private String ruleFlag = WorkCalendarConstant.WORK_CALENDAR_RULE_FLAG_NEW; // 0-解析规则;1-不解析规则,方便后续解析
 	
 }

+ 5 - 8
src/main/java/com/persagy/calendar/pojo/vo/WorkCalendarUpdateVO.java

@@ -4,8 +4,6 @@ import java.util.Set;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,23 +18,22 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkCalendarUpdateVO extends BaseQueryVO {
 	
 	@NotBlank(message = "工作历名称不可为空")
-	@ApiModelProperty(value = "工作历名称", required = true)
+	//@ApiModelProperty(value = "工作历名称", required = true)
 	private String calendarName;	// 同一GROUP_ID下唯一,代码判断
 
-	@ApiModelProperty(value = "工作历描述")
+	//@ApiModelProperty(value = "工作历描述")
 	private String calendarDesc; 	// 工作历描述
 
-	@ApiModelProperty(value = "工作历来源ID,当模板创建时,不可为空")
+	//@ApiModelProperty(value = "工作历来源ID,当模板创建时,不可为空")
 	private String fromId;
 	
-	@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
+	//@ApiModelProperty(value = "对象ID集合,空间、建筑、楼层、项目", example = "Sp4403070003f55c8b33cf1f45e5bfc699caaba4eedc")
 	private Set<String> objIds;
 	
-	@ApiModelProperty(value = "新项目ID,可支持跨项目复制")
+	//@ApiModelProperty(value = "新项目ID,可支持跨项目复制")
 	private String newProjectId; 		// 新项目ID
 	
 }

+ 3 - 6
src/main/java/com/persagy/calendar/pojo/vo/WorkLabelBatchUpdateVO.java

@@ -4,8 +4,6 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,20 +18,19 @@ import lombok.ToString;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class WorkLabelBatchUpdateVO {
 	
-	@ApiModelProperty(value = "集团编码", required = true)
+	//@ApiModelProperty(value = "集团编码", required = true)
 	private String groupCode;
 	
 	@Valid
 	//@NotEmpty(message = "日期标签属性不可为空")
-	@ApiModelProperty(value = "日期标签属性", required = true)
+	//@ApiModelProperty(value = "日期标签属性", required = true)
 	private List<WorkCalendarLabelUpdateVO> labels;
 	
 	@Valid
 	//@NotEmpty(message = "日期作息时间属性不可为空")
-	@ApiModelProperty(value = "日期作息时间属性", required = true)
+	//@ApiModelProperty(value = "日期作息时间属性", required = true)
 	private List<WorkCalendarMoreDateCreateVO> times;
 	
 }

+ 0 - 7
src/main/java/com/persagy/dye/controller/DyeBasicController.java

@@ -8,8 +8,6 @@ import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseUtil;
 import com.persagy.dye.pojo.dto.DyeBasic;
 import com.persagy.dye.service.IDyeBasicService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,7 +23,6 @@ import java.util.List;
  * @date 2021-10-25 15:58:56
  */
 
-@Api(tags = "染色基础表")
 @RestController
 @RequestMapping(value = "/dyeBasic", method = RequestMethod.POST)
 public class DyeBasicController {
@@ -36,7 +33,6 @@ public class DyeBasicController {
     /**
      * 列表查询
      */
-    @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryDyeBasicList")
     public ResponseResult queryDyeBasicList(@RequestBody DyeBasic dyeBasic) {
         LambdaQueryWrapper<DyeBasic> queryWrapper = new DyeBasic.BuilderQueryWrapper().builder();
@@ -50,7 +46,6 @@ public class DyeBasicController {
     /**
      * 新增
      */
-    @ApiOperation(value = "保存")
     @RequestMapping(value = "createDyeBasic")
     public ResponseResult createDyeBasic(@RequestBody DyeBasic dyeBasic) {
         dyeBasic.setCreateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -61,7 +56,6 @@ public class DyeBasicController {
     /**
      * 更新
      */
-    @ApiOperation(value = "更新")
     @RequestMapping(value = "updateDyeBasic")
     public ResponseResult updateDyeBasic(@RequestBody DyeBasic dyeBasic) {
         dyeBasic.setUpdateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -72,7 +66,6 @@ public class DyeBasicController {
     /**
      * 逻辑删除
      */
-    @ApiOperation(value = "逻辑删除")
     @RequestMapping(value = "deleteDyeBasic")
     public ResponseResult deleteDyeBasic(@RequestParam String dyeBasicId, @RequestParam String updateUserId) {
         boolean result = this.dyeBasicService.deleteDyeBasicById(dyeBasicId, updateUserId);

+ 0 - 7
src/main/java/com/persagy/dye/controller/DyeRuleCustomController.java

@@ -20,8 +20,6 @@ import com.persagy.dye.service.IDyeRuleCustomService;
 import com.persagy.dye.service.impl.DyeSdkServiceImpl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 染色规则自定义表
@@ -32,7 +30,6 @@ import io.swagger.annotations.ApiOperation;
  * @date 2021-10-25 15:58:56
  */
 
-@Api(tags = "染色规则自定义表")
 @RestController
 @RequestMapping(value = "/dyeRuleCustom", method = RequestMethod.POST)
 public class DyeRuleCustomController {
@@ -46,7 +43,6 @@ public class DyeRuleCustomController {
     /**
      * 列表查询
      */
-    @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryDyeRuleCustomList")
     public ResponseResult queryDyeRuleCustomList(@RequestBody DyeRuleCustom dyeRuleCustom) {
         LambdaQueryWrapper<DyeRuleCustom> queryWrapper = new DyeRuleCustom.BuilderQueryWrapper().builder();
@@ -66,7 +62,6 @@ public class DyeRuleCustomController {
     /**
      * 新增
      */
-    @ApiOperation(value = "保存")
     @RequestMapping(value = "createDyeRuleCustom")
     public ResponseResult createDyeRuleCustom(@RequestBody DyeRuleCustom dyeRuleCustom) {
         dyeRuleCustom.setCreateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -79,7 +74,6 @@ public class DyeRuleCustomController {
     /**
      * 更新
      */
-    @ApiOperation(value = "更新")
     @RequestMapping(value = "updateDyeRuleCustom")
     public ResponseResult updateDyeRuleCustom(@RequestBody DyeRuleCustom dyeRuleCustom) {
         dyeRuleCustom.setUpdateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -92,7 +86,6 @@ public class DyeRuleCustomController {
     /**
      * 逻辑删除
      */
-    @ApiOperation(value = "逻辑删除")
     @RequestMapping(value = "deleteDyeRuleCustom")
     public ResponseResult deleteDyeRuleCustom(@RequestParam String dyeRuleCustomId, @RequestParam String updateUserId) {
         boolean result = this.dyeRuleCustomService.deleteDyeRuleCustomById(dyeRuleCustomId, updateUserId);

+ 0 - 7
src/main/java/com/persagy/dye/controller/DyeRuleDefaultController.java

@@ -20,8 +20,6 @@ import com.persagy.dye.service.IDyeRuleDefaultService;
 import com.persagy.dye.service.impl.DyeSdkServiceImpl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 默认染色规则
@@ -32,7 +30,6 @@ import io.swagger.annotations.ApiOperation;
  * @date 2021-10-25 15:58:56
  */
 
-@Api(tags = "默认染色规则")
 @RestController
 @RequestMapping(value = "/dyeRuleDefault", method = RequestMethod.POST)
 public class DyeRuleDefaultController {
@@ -46,7 +43,6 @@ public class DyeRuleDefaultController {
     /**
      * 列表查询
      */
-    @ApiOperation(value = "列表查询")
     @RequestMapping(value = "queryDyeRuleDefaultList")
     public ResponseResult queryDyeRuleDefaultList(@RequestBody DyeRuleDefault dyeRuleDefault) {
         LambdaQueryWrapper<DyeRuleDefault> queryWrapper = new DyeRuleDefault.BuilderQueryWrapper().builder();
@@ -66,7 +62,6 @@ public class DyeRuleDefaultController {
     /**
      * 新增
      */
-    @ApiOperation(value = "保存")
     @RequestMapping(value = "createDyeRuleDefault")
     public ResponseResult createDyeRuleDefault(@RequestBody DyeRuleDefault dyeRuleDefault) {
         dyeRuleDefault.setCreateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -79,7 +74,6 @@ public class DyeRuleDefaultController {
     /**
      * 更新
      */
-    @ApiOperation(value = "更新")
     @RequestMapping(value = "updateDyeRuleDefault")
     public ResponseResult updateDyeRuleDefault(@RequestBody DyeRuleDefault dyeRuleDefault) {
         dyeRuleDefault.setUpdateTime(DateUtil.format(new Date(), DateUtil.FORMAT_DATE_YYYY_MM_DD_HH_MM_SS));
@@ -92,7 +86,6 @@ public class DyeRuleDefaultController {
     /**
      * 物理删除
      */
-    @ApiOperation(value = "删除")
     @RequestMapping(value = "deleteDyeRuleDefault")
     public ResponseResult deleteDyeRuleDefault(@RequestParam String dyeRuleDefaultId, @RequestParam String updateUserId) {
         boolean result = this.dyeRuleDefaultService.deleteDyeRuleDefaultById(dyeRuleDefaultId, updateUserId);

+ 0 - 5
src/main/java/com/persagy/dye/controller/DyeSdkController.java

@@ -5,8 +5,6 @@ import com.persagy.common.utils.ResponseResult;
 import com.persagy.common.utils.ResponseUtil;
 import com.persagy.dye.pojo.vo.DyeScaleplateVO;
 import com.persagy.dye.service.IDyeSdkService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +19,6 @@ import java.util.Map;
  * @author: YangWanYi
  * @create: 2021-10-25 18:16
  **/
-@Api(tags = "sdk调用相关接口")
 @RestController
 @RequestMapping(value = "/dye/sdk", method = RequestMethod.POST)
 public class DyeSdkController {
@@ -35,7 +32,6 @@ public class DyeSdkController {
      * @param dyeScaleplateVO
      * @return
      */
-    @ApiOperation(value = "根据空间查询对应染色标尺")
     @RequestMapping(value = "listDyeScaleplateWithSpaceIds")
     public ResponseResult listDyeScaleplateWithSpaceIds(@RequestBody DyeScaleplateVO dyeScaleplateVO) {
         List<Map<String, Object>> result = this.dyeSdkService.listDyeScaleplateWithSpaceIds(dyeScaleplateVO);
@@ -47,7 +43,6 @@ public class DyeSdkController {
      * @param dyeScaleplateVO
      * @return
      */
-    @ApiOperation(value = "查询指定集团、项目和类型的染色标尺列表")
     @RequestMapping(value = "listDyeScaleplateByType")
     public ResponseResult listDyeScaleplateByType(@RequestBody DyeScaleplateVO dyeScaleplateVO) {
         List<Map<String, Object>> result = this.dyeSdkService.listDyeScaleplateByType(dyeScaleplateVO);

+ 8 - 10
src/main/java/com/persagy/dye/pojo/vo/DyeScaleplateVO.java

@@ -1,15 +1,14 @@
 package com.persagy.dye.pojo.vo;
 
+import java.util.List;
+import java.util.Map;
+
 import com.persagy.dye.pojo.dto.DyeBasic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @description: 染色标尺与页面交互传参对象(因为涉及两个表传参,所以增加这个对象)
  * @author: YangWanYi
@@ -18,20 +17,19 @@ import java.util.Map;
 @Getter
 @Setter
 @ToString
-@ApiModel
 public class DyeScaleplateVO extends DyeBasic {
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "动态监测数据")
+	////@ApiModelProperty(value = "动态监测数据")
     private List<Map<String, Object>> dynamicArray;
 
-    @ApiModelProperty(value = "参数查询日期")
+    ////@ApiModelProperty(value = "参数查询日期")
     private String queryDate;
 
-    @ApiModelProperty(value = "集团编码")
+    //@ApiModelProperty(value = "集团编码")
     private String groupCode;
 
-    @ApiModelProperty(value = "项目ID")
+    //@ApiModelProperty(value = "项目ID")
     private String projectId;