build: remove swagger

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
@@ -128,9 +127,6 @@ import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -192,7 +188,6 @@ import java.util.stream.Stream;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api")
-@Api(value = "api", tags = "api接口")
 public class ApiController {
 	private final WmTaskContentService wmTaskContentService;
 	private final WmTaskContentConfigService wmTaskContentConfigService;
@@ -232,11 +227,9 @@ public class ApiController {
 	private final WmScorePackageSettleNoteMapper wmScorePackageSettleNoteMapper;
 	private final Sequence taskSequence;
 	private final WmPkgQuizRelationService quizRelationService;
+	private final WmDaHospitalService wmDaHospitalService;
 
 	@SysLog("通过任务类型获取表单配置")
-	@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "taskTypeId", value = "任务类型ID", dataType = "long", paramType = "path")})
 	@GetMapping("/getTaskContentConfigByTaskTypeId/{taskTypeId}")
 	public R getById(@PathVariable String taskTypeId) {
 		if (null == taskTypeId) {
@@ -468,9 +461,6 @@ public class ApiController {
 	}
 
 	@SysLog("通过任务类型获取表单配置")
-	@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "taskTypeId", value = "任务类型ID", dataType = "long", paramType = "path")})
 	@GetMapping("/getTaskContentConfigByTaskTypeByShareId/{taskTypeId}")
 	public R getShareById(@PathVariable String taskTypeId) {
 		if (null == taskTypeId) {
@@ -660,8 +650,6 @@ public class ApiController {
 	 * @param avatar 头像
 	 * @return 用户信息
 	 */
-	@ApiOperation(value = "用户信息-获取用户基本信息", notes = "登录认证成功后，调用此接口获取用户基本信息")
-	@ApiImplicitParams({@ApiImplicitParam(name = "code", value = "小程序信息code", dataType = "String", paramType = "query")})
 	@GetMapping("/getUserInfoByCode")
 	public R<Map<String, Object>> getUserInfo(String code, String avatar) {
 		Map<String, Object> result = new HashMap<>();
@@ -949,7 +937,6 @@ public class ApiController {
 	 * @param input
 	 * @return
 	 */
-	@ApiOperation(value = "积分-获取积分规则", notes = "获取积分规则")
 	@SysLog("获取积分规则")
 	@GetMapping("/getPackageCanTaskList")
 	public R getPackageCanTaskList(WmScorePackageApiInput input) {
@@ -1074,7 +1061,6 @@ public class ApiController {
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "积分-获取积分规则", notes = "获取积分规则")
 	@SysLog("获取积分规则")
 	@GetMapping("/getTaskTypeListByRuleId")
 	public R getTaskTypeListByRuleId(WmTaskType wmTaskType) {
@@ -1114,7 +1100,6 @@ public class ApiController {
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "积分-获取积分规则", notes = "获取积分规则")
 	@SysLog("获取积分规则")
 	@GetMapping("/taskTypeScoreList")
 	public R taskTypeScoreList(WmTaskType wmTaskType) {
@@ -1151,7 +1136,6 @@ public class ApiController {
 	 * @param wmTaskContent 任务内容表
 	 * @return R
 	 */
-	@ApiOperation(value = "任务-新增任务内容表", notes = "新增任务内容表")
 	@SysLog("新增任务内容表")
 	@PostMapping("/saveTaskContent")
 	public R<?> saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
@@ -1278,7 +1262,6 @@ public class ApiController {
 	 * @param wmTaskContent 任务内容表
 	 * @return R
 	 */
-	@ApiOperation(value = "任务-保存任务内容", notes = "保存任务内容")
 	@SysLog("保存任务内容")
 	@PostMapping("/task-content/draft")
 	public R taskContentDraft(@RequestBody WmTaskContent wmTaskContent) {
@@ -1302,7 +1285,6 @@ public class ApiController {
 	 * @param taskTypeId 任务类型id
 	 * @return R
 	 */
-	@ApiOperation(value = "任务-获取任务草稿", notes = "获取任务草稿")
 	@SysLog("获取任务草稿")
 	@GetMapping("/task-content/draft/{task_type_id}")
 	public R taskContentDraft(@PathVariable(value = "task_type_id") Integer taskTypeId) {
@@ -1323,7 +1305,6 @@ public class ApiController {
 	 * @param wmTaskContent 任务内容表
 	 * @return R
 	 */
-	@ApiOperation(value = "任务-修改任务内容表", notes = "修改任务内容表")
 	@SysLog("修改任务内容表")
 	@PostMapping("/updateTaskContent")
 	public R updateById(@RequestBody WmTaskContent wmTaskContent) {
@@ -1337,12 +1318,6 @@ public class ApiController {
 	 * @param wmWkArticle 文库-文章
 	 * @return
 	 */
-	/**
-	 * @param page
-	 * @param wmWkArticle
-	 * @return
-	 */
-	@ApiOperation(value = "文章-分页获取资讯列表", notes = "分页获取资讯列表")
 	@GetMapping("/getArticlePage")
 	public R getWmWkArticlePage(Page page, WmWkArticle wmWkArticle) {
 		WmWkArticle query = new WmWkArticle();
@@ -1395,17 +1370,10 @@ public class ApiController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "文章-通过id获取资讯列表", notes = "通过id获取资讯列表")
 	@GetMapping("/getArticleById")
 	public R getArticleById(Integer id) {
 		WmWkArticle wmWkArticle = wmWkArticleService.getById(id);
 		wmWkArticle.setReadNum(wmWkArticle.getReadNum() + 1);
-
-//		if (null != id) {
-//			redisTemplate.opsForZSet().add(CacheConstants.ARTICLE_HOT_KEY, id.toString(),
-//					wmWkArticle.getForwardNum() + wmWkArticle.getReadNum());
-//		}
-
 		return R.ok(wmWkArticle);
 	}
 
@@ -1420,16 +1388,6 @@ public class ApiController {
 	 * @param sharePicUrl 分享图片链接
 	 * @return 结果
 	 */
-	@ApiOperation(value = "文章-通过分享链接，获取文章", notes = "文章-通过分享链接，获取文章")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "articleId", value = "文章ID", dataType = "String"),
-			@ApiImplicitParam(name = "shareUserId", value = "分享人ID", dataType = "String"),
-			@ApiImplicitParam(name = "openUserId", value = "获取打开人openid的授权码", dataType = "String"),
-			@ApiImplicitParam(name = "type", value = "操作类型", dataType = "String"),
-			@ApiImplicitParam(name = "packageId", value = "所属积分包id", dataType = "String"),
-			@ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String"),
-			@ApiImplicitParam(name = "remark", value = "备注", dataType = "String")
-	})
 	@GetMapping("/shareArticleById")
 	public R<?> shareArticleById(String articleId, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl, String remark) {
 		return shareAndReadTaskMethod(articleId, shareUserId, openUserId, type, packageId, sharePicUrl, "article", remark);
@@ -1443,7 +1401,6 @@ public class ApiController {
 	 * @param wmWkAlbum 文库-相册
 	 * @return
 	 */
-	@ApiOperation(value = "相册-分页获取相册列表", notes = "分页获取相册列表")
 	@GetMapping("/getAlbumPage")
 	public R getWmWkAlbumPage(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
@@ -1491,7 +1448,6 @@ public class ApiController {
 	 * @return
 	 */
 	@Inner(false)
-	@ApiOperation(value = "相册-分页获取相册列表", notes = "分页获取相册列表")
 	@GetMapping("/getAlbumPageNew")
 	public R getAlbumPageNew(Page page, WmWkAlbum wmWkAlbum, String shareUserId) {
 
@@ -1521,7 +1477,6 @@ public class ApiController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "相册-通过id获取相册信息", notes = "通过id获取相册信息")
 	@GetMapping("/getAlbumById")
 	public R getById(Integer id) {
 		WmWkAlbum wmWkAlbum = wmWkAlbumService.getById(id);
@@ -1567,16 +1522,6 @@ public class ApiController {
 	 * @param sharePicUrl 分享图片链接
 	 * @return 结果
 	 */
-	@ApiOperation(value = "相册-分享通过分享链接，获取相册", notes = "通过分享链接，获取相册  type=share 分享， type=open 分享链接打开")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "相册id", dataType = "String"),
-			@ApiImplicitParam(name = "shareUserId", value = "分享人ID", dataType = "String"),
-			@ApiImplicitParam(name = "openUserId", value = "获取打开人openid的授权码", dataType = "String"),
-			@ApiImplicitParam(name = "type", value = "操作类型", dataType = "String"),
-			@ApiImplicitParam(name = "packageId", value = "所属积分包id", dataType = "String"),
-			@ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String"),
-			@ApiImplicitParam(name = "remark", value = "备注", dataType = "String")
-	})
 	@GetMapping("/shareAlbumById")
 	public R<?> shareAlbumById(String id, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl, String remark) {
 		return shareAndReadTaskMethod(id, shareUserId, openUserId, type, packageId, sharePicUrl, "album", remark);
@@ -1588,7 +1533,6 @@ public class ApiController {
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "药企-获取药企列表", notes = "获取药企列表")
 	@GetMapping("/getDrugEntList")
 	public R listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
 		System.out.println("SecurityUtils.getUser():" + SecurityUtils.getUser());
@@ -1672,7 +1616,6 @@ public class ApiController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "签到-通过ID获取签到信息", notes = "通过id查询")
 	@GetMapping("/getSignInfoById")
 	public R getSignInfoById(Integer id) {
 		return R.ok(wmUserSignService.getById(id));
@@ -1684,7 +1627,6 @@ public class ApiController {
 	 * @param wmUserSign 用户签到表
 	 * @return R
 	 */
-	@ApiOperation(value = "签到-新增用户签到表", notes = "新增用户签到表")
 	@SysLog("新增用户签到表")
 	@PostMapping("/saveSignInfo")
 	public R save(@RequestBody WmUserSign wmUserSign) {
@@ -1708,20 +1650,18 @@ public class ApiController {
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "签到-通过用户ID获取签到列表", notes = "通过用户ID获取签到列表")
 	@GetMapping("/getSignListByUserId")
 	public R listDrugEnt(WmUserSign wmUserSign) {
 		return R.ok(wmUserSignService.list(Wrappers.query(wmUserSign)));
 	}
 
-	private final WmDaHospitalService wmDaHospitalService;
+
 
 	/**
 	 * 获取药企列表
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "医院-获取医院列表", notes = "医院-获取医院列表")
 	@GetMapping("/getHospitalList")
 	public R getHospitalList(String longitude, String latitude, String type) {
 		return R.ok(wmDaHospitalService.list(Wrappers.emptyWrapper()));
@@ -1961,423 +1901,20 @@ public class ApiController {
 
 	}
 
-
-//	/**
-//	 * 获取用户积分包
-//	 *
-//	 * @return 获取用户积分包
-//	 */
-//	@ApiOperation(value = "积分包-获取用户积分包", notes = "积分包-获取用户积分包，selType  众包用户传值，1 可领取  2 已领取")
-//	@GetMapping("/getUserScorePackageList")
-//	public R getUserScorePackageList(Page page, int selType, String taskTypeId, String selDate, String packagename, String activeId) {
-//
-//		if (!"null".equals(selDate) || !"".equals(selDate)) {
-//			selDate = null;
-//		}
-//		boolean isRule = false;
-//
-//		List<Map<String, Object>> answerList = new ArrayList<>();
-//
-//		UserVO userVO1 = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
-//
-//		Page scorePage = null;
-//		WmScorePackage wmScorePackage = new WmScorePackage();
-//		if (isZbRole(userVO1.getRoleList(), 5)) {
-//			if (1 == selType) {
-//				return R.ok();
-//			}
-//		}
-//
-//		if (null != selDate && !"".equals(selDate) || null != taskTypeId && !"".equals(taskTypeId)) {
-//			WmTaskRule qwmTaskRule = new WmTaskRule();
-//			qwmTaskRule.setDrugentId(userVO1.getDrugEntId());
-//			qwmTaskRule.setDelFlag("0");
-//
-//			if (null == selDate || "".equals(selDate)) {
-//				qwmTaskRule.setRuleMonth(taskTypeId);
-//
-//			} else {
-//				qwmTaskRule.setRuleMonth(selDate);
-//			}
-//			List<WmTaskRule> listWmTaskRule = wmTaskRuleService.list(Wrappers.query(qwmTaskRule));
-//			if (listWmTaskRule.size() > 0) {
-//				wmScorePackage.setTaskRuleId(listWmTaskRule.get(0).getId());
-//			} else {
-//				wmScorePackage.setTaskRuleId("-1");
-//				isRule = true;
-//
-//			}
-//		}
-//
-//
-//		wmScorePackage.setDeptId(userVO1.getDeptId() + "");
-//		LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.query(wmScorePackage).lambda().
-//				orderByAsc(WmScorePackage::getPackageStatus).orderByDesc(WmScorePackage::getCreateTime);
-//		if (StringUtils.isNotEmpty(packagename)) {
-//			queryWrapper.like(WmScorePackage::getScoreName, packagename);
-//		}
-//
-//		if (isZbRole(userVO1.getRoleList(), 5)) {
-//
-//			if (2 == selType && StringUtils.isNotEmpty(activeId)) {
-//				if ("2".equals(activeId)) {
-//					queryWrapper.eq(WmScorePackage::getPackageStatus, "2");
-//					queryWrapper.eq(WmScorePackage::getPackageFinishStatus, "0");
-//				} else if ("4".equals(activeId)) {
-//					queryWrapper.eq(WmScorePackage::getPackageStatus, "2");
-//					queryWrapper.eq(WmScorePackage::getPackageFinishStatus, "1");
-//				}
-//			}
-//
-//			wmScorePackage.setTypeid("3");
-//			wmScorePackage.setXxdbId(userVO1.getUserId() + "");
-//			scorePage = wmScorePackageService.page(page, queryWrapper);
-//		}
-//
-//
-//		List<WmScorePackage> type2List = new ArrayList<>();
-//
-//		if (isZbRole(userVO1.getRoleList(), 6)) {
-//			wmScorePackage.setTypeid("4");
-//			if (1 == selType) {
-//				wmScorePackage.setZbId("");
-//				queryWrapper = queryWrapper.isNull(WmScorePackage::getPackageStatus);
-//				wmScorePackage.setDeptId(userVO1.getDeptId() + "");
-//
-//				scorePage = wmScorePackageService.page(page, queryWrapper);
-//
-//			} else {
-//				if (StringUtils.isNotEmpty(activeId) && "2".equals(activeId)) {
-//					wmScorePackage.setZbId(userVO1.getUserId() + "");
-//					wmScorePackage.setPackageStatus("2");
-//					wmScorePackage.setPackageFinishStatus("0");
-//					scorePage = wmScorePackageService.page(page, queryWrapper);
-//
-//				} else if (StringUtils.isNotEmpty(activeId) && "4".equals(activeId)) {
-//					wmScorePackage.setZbId(userVO1.getUserId() + "");
-//					wmScorePackage.setPackageStatus("2");
-//					wmScorePackage.setPackageFinishStatus("1");
-//					scorePage = wmScorePackageService.page(page, queryWrapper);
-//
-//				} else {
-//					WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
-//					if (isRule) {
-//						wmScorePackageStatus.setId(-1);
-//					}
-//
-//					LambdaQueryWrapper<WmScorePackageStatus> wmScorePackageStatusLambdaQueryWrapper = Wrappers.query(wmScorePackageStatus).lambda();
-//					if (null != packagename && !"".equals(packagename)) {
-//						LambdaQueryWrapper<WmScorePackage> lambdaQueryWrapper = Wrappers.lambdaQuery();
-//						lambdaQueryWrapper.like(WmScorePackage::getScoreName, packagename);
-//
-//						List<WmScorePackage> list = wmScorePackageService.list(lambdaQueryWrapper);
-//						List<String> list1 = new ArrayList<>();
-//						if (list.size() > 0) {
-//							for (WmScorePackage wmScorePackage1 : list) {
-//								list1.add(wmScorePackage1.getId());
-//							}
-//						} else {
-//							list1.add("-1");
-//						}
-//						wmScorePackageStatusLambdaQueryWrapper.in(WmScorePackageStatus::getPackageId, list1);
-//					}
-//
-//					if (null != selDate && !"".equals(selDate) || null != taskTypeId && !"".equals(taskTypeId)) {
-//						String dateStr = "";
-//						if (null != selDate && !"".equals(selDate)) {
-//							dateStr = selDate;
-//
-//						} else {
-//							dateStr = taskTypeId;
-//
-//						}
-//
-//						wmScorePackageStatusLambdaQueryWrapper.ge(WmScorePackageStatus::getCreateTime, getLocalDateTime(dateStr, "start"));
-//						wmScorePackageStatusLambdaQueryWrapper.le(WmScorePackageStatus::getCreateTime, getLocalDateTime(dateStr, "end"));
-//					}
-//
-//					if (StringUtils.isNotEmpty(activeId) && "3".equals(activeId)) {
-//						wmScorePackageStatusLambdaQueryWrapper.eq(WmScorePackageStatus::getStatus, "1");
-//
-//					}
-//
-//					wmScorePackageStatusLambdaQueryWrapper.orderByDesc(WmScorePackageStatus::getCreateTime);
-//					wmScorePackageStatus.setUserId(userVO1.getUserId() + "");
-//					scorePage = wmScorePackageStatusService.page(page, wmScorePackageStatusLambdaQueryWrapper);
-//					List<WmScorePackageStatus> statusList = scorePage.getRecords();
-//
-//					List<String> stringList = new ArrayList<>();
-//
-//					if (statusList.size() > 0) {
-//						for (WmScorePackageStatus wmScorePackageStatus1 : statusList) {
-//							stringList.add(wmScorePackageStatus1.getPackageId());
-//						}
-//					}
-//
-//					if (stringList.size() > 0) {
-//						for (String str1 : stringList) {
-//							WmScorePackage wmScorePackage1 = wmScorePackageService.getById(str1);
-//							if (null != wmScorePackage1) {
-//								type2List.add(wmScorePackage1);
-//							}
-//						}
-//					} else {
-//						wmScorePackage.setZbId(SecurityUtils.getUser().getId() + "");
-//					}
-//				}
-//
-//			}
-//		}
-//
-//		//获取积分包配置
-//
-//		List<WmScorePackage> list = new ArrayList<>();
-//		if (isZbRole(userVO1.getRoleList(), 5)) {
-//			list = scorePage.getRecords();
-//		} else {
-//			if (1 == selType) {
-//				list = scorePage.getRecords();
-//			} else {
-//				if (StringUtils.isNotEmpty(activeId) && "2".equals(activeId)) {
-//					list = scorePage.getRecords();
-//
-//				} else if (StringUtils.isNotEmpty(activeId) && "4".equals(activeId)) {
-//
-//					list = scorePage.getRecords();
-//				} else {
-//					list = type2List;
-//				}
-//
-//			}
-//		}
-//
-//
-//		System.out.println("list:" + list.size());
-//		if (list.size() > 0) {
-//			List<String> notInStatus = new ArrayList<>();
-//			notInStatus.add("1000000000");
-//			for (WmScorePackage wms : list) {
-//				Map<String, Object> map = new HashMap<>();
-//				WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.getById(wms.getDrugEntId());
-//				if (null != wmDaDrugEnt) {
-//					map.put("drugEntName", wmDaDrugEnt.getEntname());
-//				} else {
-//					map.put("drugEntName", "");
-//				}
-//
-//				if (null != wms.getLevel2Id() && !"".equals(wms.getLevel2Id())) {
-//					WmDaAgent wmDaAgent = wmDaAgentService.getById(wms.getLevel2Id());
-//					map.put("packageEntName", wmDaAgent.getGsmc());
-//				} else {
-//					if (null != wms.getLevel1Id() && !"".equals(wms.getLevel1Id())) {
-//						WmDaAgent wmDaAgent = wmDaAgentService.getById(wms.getLevel1Id());
-//						map.put("packageEntName", wmDaAgent.getGsmc());
-//					} else {
-//						map.put("packageEntName", wmDaDrugEnt.getEntname());
-//					}
-//				}
-//				if (null != wms.getTaskRuleId()) {
-//					WmTaskRule wmTaskRule = wmTaskRuleService.getById(wms.getTaskRuleId());
-//					if (null != wmTaskRule) {
-//						map.put("termDate", wmTaskRule.getRuleMonth() + "-01 至 " + wmTaskRule.getRuleMonth() + "-30");
-//						DateFormat format = new SimpleDateFormat("yyyy-MM");
-//						DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
-//
-//						try {
-//							Date adata = format.parse(wmTaskRule.getRuleMonth());
-//							// 获取Calendar
-//							Calendar calendar = Calendar.getInstance();
-//							// 设置时间,当前时间不用设置
-//							calendar.setTime(adata);
-//							// 设置日期为本月最大日期
-//							calendar.set(Calendar.DATE, calendar.getActualMaximum(Calendar.DATE));
-//
-//							// 打印
-//							String endDate = format1.format(calendar.getTime());
-//							if (null != endDate) {
-//								map.put("termDate", wmTaskRule.getRuleMonth() + "-01 至 " + endDate);
-//							}
-//
-//						} catch (ParseException e) {
-//							e.printStackTrace();
-//						}
-//
-//					}
-//				}
-//
-//				map.put("packageName", wms.getScoreName());
-//				map.put("socre", wms.getScore());
-//				map.put("createTime", wms.getCreateTime());
-//				map.put("id", wms.getId());
-//				map.put("finishScore", "0");
-//				map.put("submitScore", "0");
-//				map.put("cannelAuditScore", "0");
-//				map.put("speedProgress", "0");
-//
-//
-//				WmTask wmTask = new WmTask();
-//				wmTask.setDelFlag("0");
-//				wmTask.setEnableFlag("0");
-//				wmTask.setScorePackageId(wms.getId());
-//				/**
-//				 * TODO 审核不通过的分数 不计入积分包
-//				 * .ne(WmTask::getRealFlag,"1")
-//				 */
-//				List<WmTask> wmTaskList = wmTaskService.
-//						list(Wrappers.query(wmTask).lambda().ne(WmTask::getRealFlag, "1"));
-//				if (wmTaskList.size() > 0) {
-//					Integer submitScore = 0;
-//					Integer finishScore = 0;
-//					Integer cannelAuditScore = 0;
-//					for (WmTask wmT : wmTaskList
-//					) {
-//						if ("4".equals(wmT.getTaskStatus())) {
-//							cannelAuditScore += wmT.getScore();
-//						} else {
-//							submitScore += wmT.getScore();
-//						}
-//						finishScore += wmT.getScore();
-//					}
-//
-//					map.put("finishScore", finishScore + "");
-//					map.put("submitScore", submitScore + "");
-//					if (wms.getScore() > 0) {
-//						double d = Math.ceil(submitScore * 100 / wms.getScore());
-//						if (d > 100) {
-//							d = 100;
-//						}
-//						map.put("speedProgress", new Double(d).intValue());
-//
-//					}
-//					map.put("cannelAuditScore", cannelAuditScore + "");
-//				}
-//
-//				if (isZbRole(userVO1.getRoleList(), 5)) {
-//					if ("4".equals(wms.getPackageStatus())) {
-//						map.put("status", "已终止");
-//						map.put("statusId", "4");
-//					} else {
-//						map.put("status", "已领取");
-//					}
-//				}
-//
-//
-//				if (SecurityUtils.getRoles().contains(6)) {
-//					if (1 == selType) {
-//						map.put("status", "未领取");
-//						map.put("statusId", 0);
-//					} else {
-//						WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
-//						wmScorePackageStatus.setPackageId(wms.getId());
-//						wmScorePackageStatus.setUserId(userVO1.getUserId() + "");
-//						List<WmScorePackageStatus> statusList = wmScorePackageStatusService.list(Wrappers.query(wmScorePackageStatus).lambda().notIn(true, WmScorePackageStatus::getId, notInStatus).orderByDesc(WmScorePackageStatus::getCreateTime));
-//						if (statusList.size() > 0) {
-//							notInStatus.add(statusList.get(0).getId() + "");
-//							if ("1".equals(statusList.get(0).getStatus())) {
-//								map.put("status", "审核中");
-//								map.put("statusId", 1);
-//							} else if ("2".equals(statusList.get(0).getStatus())) {
-//								map.put("status", "审核通过");
-//								map.put("statusId", 2);
-//							} else if ("3".equals(statusList.get(0).getStatus())) {
-//								map.put("status", "审核不通过");
-//								map.put("statusId", 3);
-//							} else if ("3".equals(statusList.get(0).getStatus())) {
-//								map.put("status", "审核不通过");
-//								map.put("statusId", 3);
-//							}
-//
-//							map.put("statusId", statusList.get(0).getStatus());
-//
-//							if ("4".equals(wms.getPackageStatus())) {
-//								map.put("status", "已终止");
-//								map.put("statusId", "4");
-//
-//							}
-//						}
-//						//map.put("status","审核通过");
-//						//map.put("statusId",2);
-//					}
-//				}
-//				map.put("packageFinishStatus", wms.getPackageFinishStatus());
-//				answerList.add(map);
-//			}
-//		}
-//		scorePage.setRecords(answerList);
-//		return R.ok(scorePage);
-//
-//	}
-
-
 	/**
 	 * 通过id查询积分包
 	 *
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "积分包-", notes = "通过id查询")
 	@GetMapping("/getScorePackageInfoById")
 	public R getScorePackageInfoById(String id) {
 		WmScorePackage wms = wmScorePackageService.getById(id);
 		Map<String, Object> map = new HashMap<>();
-//		WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.getById(wms.getDrugEntId());
-//		map.put("drugEntId", wmDaDrugEnt.getId());
-//		if (null != wmDaDrugEnt) {
-//			map.put("drugEntName", wmDaDrugEnt.getEntname());
-//		} else {
-//			map.put("drugEntName", "");
-//		}
-//
-//		if (null != wms.getLevel2Id() && !"".equals(wms.getLevel2Id())) {
-//			WmDaAgent wmDaAgent = wmDaAgentService.getById(wms.getLevel2Id());
-//			map.put("packageEntName", wmDaAgent.getGsmc());
-//			map.put("packageEntId", wmDaAgent.getId());
-//
-//		} else {
-//			if (null != wms.getLevel1Id() && !"".equals(wms.getLevel1Id())) {
-//				WmDaAgent wmDaAgent = wmDaAgentService.getById(wms.getLevel1Id());
-//				map.put("packageEntName", wmDaAgent.getGsmc());
-//				map.put("packageEntId", wmDaAgent.getId());
-//
-//			} else {
-//				map.put("packageEntName", wmDaDrugEnt.getEntname());
-//				map.put("packageEntId", wmDaDrugEnt.getId());
-//
-//			}
-//		}
-
 		SysDept dept = sysDeptService.getById(wms.getSendPackageDeptId());
 		map.put("packageEntName", dept.getName());
 		map.put("packageEntId", dept.getDeptId());
 
-//		if (null != wms.getTaskRuleId()) {
-//			WmTaskRule wmTaskRule = wmTaskRuleService.getById(wms.getTaskRuleId());
-//			if (null != wmTaskRule) {
-//				map.put("termDate", wmTaskRule.getRuleMonth() + "-01 至 " + wmTaskRule.getRuleMonth() + "-30");
-//				DateFormat format = new SimpleDateFormat("yyyy-MM");
-//				DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
-//
-//				try {
-//					Date adata = format.parse(wmTaskRule.getRuleMonth());
-//					// 获取Calendar
-//					Calendar calendar = Calendar.getInstance();
-//					// 设置时间,当前时间不用设置
-//					calendar.setTime(adata);
-//					// 设置日期为本月最大日期
-//					calendar.set(Calendar.DATE, calendar.getActualMaximum(Calendar.DATE));
-//
-//					// 打印
-//					String endDate = format1.format(calendar.getTime());
-//					if (null != endDate) {
-//						map.put("termDate", wmTaskRule.getRuleMonth() + "-01 至 " + endDate);
-//					}
-//
-//				} catch (ParseException e) {
-//					e.printStackTrace();
-//				}
-//
-//			}
-//		}
 		if (StringUtils.isNotEmpty(wms.getBelongDate())) {
 			map.put("termDate", wms.getBelongDate() + "-01 至 " + wms.getBelongDate() + "-30");
 			DateFormat format = new SimpleDateFormat("yyyy-MM");
@@ -2405,7 +1942,6 @@ public class ApiController {
 		}
 		map.put("status", wms.getPackageStatus());
 		map.put("packageName", wms.getScorePackageName());
-//		map.put("packageName", wms.getScoreName());
 		if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wms.getPackageType1())) {
 			// 如果是患者教育，则需要转换积分包单位 ‘分’->‘元’
 			map.put("score", String.format("%.2f", wms.getScore() / 100.0) + "分");
@@ -2417,7 +1953,6 @@ public class ApiController {
 		map.put("packageType1", wms.getPackageType1());
 		map.put("id", wms.getId());
 		map.put("finishScore", "0");
-//		map.put("packageFinishStatus", wms.getPackageFinishStatus()+"");
 
 		WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
 		wmScorePackageStatus.setUserId(SecurityUtils.getUser().getId() + "");
@@ -2439,18 +1974,11 @@ public class ApiController {
 			}
 		}
 
-		/**
-		 * 判断是否可导出任务明细
-		 */
+		// 判断是否可导出任务明细
 		WmTask wmTask = new WmTask();
-//		List<String> list = new ArrayList<>();
-//		list.add(id);
-//		wmTask.setExtIds(list);
 		wmTask.setScorePackageId(id);
 		wmTask.setTaskStatus("3");
-//		List<WmTask> wmTaskList = wmTaskService.list(Wrappers.query(wmTask));
 		int count = wmTaskService.count(Wrappers.query(wmTask));
-//		List<WmTask> wmTaskList = wmTaskService.getTaskListByPackageIdsReturnWmtaskInfo(wmTask);
 		if (count > 0) {
 			map.put("exportFlag", "1");
 		} else {
@@ -2479,7 +2007,6 @@ public class ApiController {
 	 * @return R
 	 */
 	@Deprecated
-	@ApiOperation(value = "积分包-领取", notes = "积分包-领取")
 	@GetMapping("/receivePackage")
 	public R receivePackage(String packageId) {
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(packageId);
@@ -2499,11 +2026,7 @@ public class ApiController {
 			return R.failed("积分包不能领取");
 		}
 
-//		UserDTO userDTO = new UserDTO();
-//		userDTO.setPlatId(SecurityUtils.getUser().getPlatId());
-//		userDTO.setDrugEntId(wmScorePackage.getDrugEntId());
 		UserVO userVO = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
-//		List<UserVO> userVOList = sysUserService.getUserVoByPlatId(userDTO);
 		if (null == userVO) {
 			return R.failed("账号出错");
 		}
@@ -2549,14 +2072,12 @@ public class ApiController {
 		query.setDelFlag("0");
 		query.setEnableFlag("0");
 		int total = wmScorePackageStatusService.count(Wrappers.query(query));
-		/**
-		 * 显示用的
-		 */
+
+		// 显示用的
 		if (total == 1) {
 			WmScorePackage update = new WmScorePackage();
 			update.setId(wmScorePackage.getId());
 			update.setScorePackageStatus("2");
-//			wmScorePackage.setPackageStatus("1");
 			update.setIsConduct("1");
 			wmScorePackageService.updateById(update);
 		}
@@ -2655,7 +2176,6 @@ public class ApiController {
 	 *
 	 * @return 根据积分包获取任务列表
 	 */
-	@ApiOperation(value = "根据积分包获取任务列表", notes = "根据积分包获取任务列表")
 	@GetMapping("/getTaskListByPackageId")
 	public R getTaskListByPackageId(Page page, WmTask wmTask) {
 
@@ -2690,7 +2210,6 @@ public class ApiController {
 	 *
 	 * @return 角色列表
 	 */
-	@ApiOperation(value = "任务-我的任务记录列表", notes = "任务-我的任务记录列表")
 	@GetMapping("/getHistoryTaskList")
 	public R getHistoryTaskList(Page page, WmTask wmTask) {
 		wmTask.setEnableFlag("0");
@@ -2698,7 +2217,7 @@ public class ApiController {
 		UserDTO userDTO = new UserDTO();
 		userDTO.setPlatId(SecurityUtils.getUser().getPlatId());
 		List<UserVO> userVOList = sysUserService.getUserVoByPlatId(userDTO);
-		Page<WmTask> taskPage = null;
+		Page<WmTask> taskPage;
 		LambdaQueryWrapper<WmTask> queryWrapper = Wrappers.lambdaQuery();
 
 		int num = 0;
@@ -2728,10 +2247,6 @@ public class ApiController {
 				}
 				num++;
 
-
-//				queryWrapper.ge(WmTask::getCreateTime,getLocalDateTime(wmTask.getTaskRuleId(),"start"));
-//				queryWrapper.le(WmTask::getCreateTime,getLocalDateTime(wmTask.getTaskRuleId(),"end"));
-
 			} else {
 				if (allnum == 0) {
 					queryWrapper.and(Wrapper -> Wrapper.eq(WmTask::getTaskUserId, userVO.getUserId()));
@@ -2766,7 +2281,6 @@ public class ApiController {
 	 * @param taskId 任务内容表
 	 * @return R
 	 */
-	@ApiOperation(value = "任务-根据ID获取任务", notes = "任务-根据ID获取任务")
 	@SysLog("任务-根据ID获取任务")
 	@GetMapping("/getTaskInfoById")
 	public R getTaskInfoById(String taskId) {
@@ -2825,7 +2339,6 @@ public class ApiController {
 	 * @param id id
 	 * @return R
 	 */
-	@ApiOperation(value = "签到-通过ID获取签到信息", notes = "通过id查询")
 	@GetMapping("/getSignInfoByTaskId")
 	public R getSignInfoByTaskId(Integer id) {
 		WmTask wmTask = wmTaskService.getById(id);
@@ -2891,7 +2404,6 @@ public class ApiController {
 	 *
 	 * @return R
 	 */
-	@ApiOperation(value = "根据链接生成二维码图片", notes = "根据链接生成二维码图片")
 	@GetMapping("/getQrCodeByUrl")
 	public R getQrCodeByUrl(String url, int width, int height) throws FileNotFoundException {
 
@@ -2921,7 +2433,6 @@ public class ApiController {
 	 *
 	 * @return R
 	 */
-	@ApiOperation(value = "修改用户信息接口", notes = "修改用户信息接口")
 	@SysLog("修改用户信息接口")
 	@PostMapping("/updateUserInfo")
 	public R<?> updateUserInfo(@RequestBody UserUpdateInput userUpdateInput) {
@@ -3197,7 +2708,6 @@ public class ApiController {
 	 * @param wmFeedback 意见反馈
 	 * @return R
 	 */
-	@ApiOperation(value = "修改意见反馈", notes = "修改意见反馈")
 	@SysLog("修改意见反馈")
 	@PostMapping("/saveFeedBack")
 	public R saveFeedBack(@RequestBody WmFeedback wmFeedback) {
@@ -3210,10 +2720,9 @@ public class ApiController {
 	 *
 	 * @return R
 	 */
-	@ApiOperation(value = "分享名片接口", notes = "分享名片接口")
 	@SysLog("分享名片接口")
 	@GetMapping("/shareUserCard")
-	public R shareUserCard(String imgUrl) throws FileNotFoundException {
+	public R shareUserCard(String imgUrl) {
 		int socre = 0;
 		SysUser sysUser = sysUserService.getById(SecurityUtils.getUser().getId());
 
@@ -3369,7 +2878,6 @@ public class ApiController {
 	 * @param wmScorePackage 积分包
 	 * @return
 	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/h5PackagePage")
 	public R h5PackagePage(Page page, WmScorePackage wmScorePackage) {
 		String id = wmScorePackage.getId();
@@ -3394,7 +2902,6 @@ public class ApiController {
 	 * @param wmTask 任务
 	 * @return
 	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/h5TaskPage")
 	public R h5TaskPage(Page page, WmTask wmTask) {
 		if (StringUtils.isBlank(wmTask.getId())) {
@@ -3414,7 +2921,6 @@ public class ApiController {
 	 * @param taskId 积分包
 	 * @return
 	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getH5To")
 	public R getH5To(String taskId) {
 		WmTask wmTask = wmTaskService.getById(taskId);
@@ -3453,7 +2959,6 @@ public class ApiController {
 	 * @param latitude
 	 * @return
 	 */
-	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getPointSignInfo")
 	public R getPointSignInfo(String longitude, String latitude) {
 		List<Map<String, Object>> mapList = new ArrayList<>();
@@ -3520,7 +3025,6 @@ public class ApiController {
 	 *
 	 * @return
 	 */
-	@ApiOperation(value = "不再提示", notes = "不再提示")
 	@SysLog("小程序去掉通知")
 	@PostMapping("/removeNotice")
 	public R removeNotice(@RequestBody NoticeApiInput input) {
@@ -3607,7 +3111,6 @@ public class ApiController {
 	 * @param albumId 产品相册id
 	 * @return 积分包列表
 	 */
-	@ApiOperation(value = "获取登录人积分包", notes = "药品生产商发包或者cso单独发包")
 	@SysLog("获取登录人积分包（药品生产商发包或者cso单独发包")
 	@GetMapping("/getPackageListByTaskTypeAndAlbumId")
 	public R getPackageListByTaskTypeAndAlbumId(String type, Integer albumId) {
@@ -3642,9 +3145,6 @@ public class ApiController {
 		for (WmScorePackageStatus item : statusList) {
 			WmScorePackage wmScorePackage = wmScorePackageService.getOne(Wrappers.<WmScorePackage>lambdaQuery()
 					.eq(WmScorePackage::getId, item.getPackageId()));
-			// Map<String, Object> tmp = wmScorePackageService.getOne(Wrappers.<WmScorePackage>lambdaQuery()
-			// 		.eq(WmScorePackage::getId, item.getPackageId()));
-			// WmScorePackage wmScorePackage = BeanUtil.copyProperties(tmp,WmScorePackage.class);
 			if (null != wmScorePackage) {
 				if ("0".equals(wmScorePackage.getTaskAddFlag())) {
 					continue;
@@ -3674,9 +3174,7 @@ public class ApiController {
 					continue;
 				}
 
-				/**
-				 * 过滤有效任务类型
-				 */
+				// 过滤有效任务类型
 				WmScoreTaskType taskType = new WmScoreTaskType();
 				taskType.setTaskTypeId(type);
 				taskType.setScoreId(wmScorePackage.getId());
@@ -3843,17 +3341,6 @@ public class ApiController {
 				wmWkArticleShare.setShareType("1");
 				wmWkArticleShare.setCreateTime(LocalDateTime.now());
 				wmWkArticleShare.setArctileId(id);
-
-				// if ("open".equals(type)){
-				// 	List<WmWkArticleShare> list = wmWkArticleShareService.list(Wrappers.<WmWkArticleShare>lambdaQuery()
-				// 			.eq(WmWkArticleShare::getArctileId, id)
-				// 			.isNull(WmWkArticleShare::getOpenUser));
-				// 	if (CollUtil.isNotEmpty(list)){
-				// 		int index = (int) (Math.random() * list.size());
-				// 		remark = list.get(index).getTemp1();
-				// 	}
-				// }
-
 				wmWkArticleShare.setTemp1(remark);
 
 				WmTask wmTask = new WmTask();
@@ -4004,36 +3491,6 @@ public class ApiController {
 					wmTask.setTaskUserType("6");
 				}
 
-
-				// 判断是否保存前最后校验一遍文章分享和文章阅读以及产品分享和产品分享阅读所做的积分值是否在比例范围之内
-				// （初始设定为30%，积分包值小于3000不做校验）
-				if (needToCheckLimit && null != scorePackageStatus) {
-//					String value = sysPublicParamService.getSysPublicParamKeyToValue("SHARE_READ_TASK_SCORE_UPPER_LIMIT_RATIO");
-//					value = StringUtils.isEmpty(value) ? "0.3" : value;
-//					log.warn("系统当前分享类及分享阅读类积分上限：【{}】", value);
-//					int limit = (int) (Integer.parseInt(scorePackageStatus.getUserScore()) * Double.parseDouble(value));
-//					List<WmTask> taskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
-//							// 两对分享阅读任务
-//							.in(WmTask::getTaskTypeId, Arrays.asList("8", "9", "10", "11"))
-//							// 同一个积分包
-//							.eq(WmTask::getScorePackageId, tWmScorePackage.getId())
-//							// 分享人
-//							.eq(WmTask::getTaskUserId, shareUserId)
-//							// 审核不通过
-//							.ne(WmTask::getTaskStatus, "4")
-//					);
-//
-//					int sum = taskList.stream().mapToInt(WmTask::getScore).sum();
-//					log.info("当前积分包值限制上限为:{},当前任务积分和为:{}", limit, sum);
-//					if (sum >= limit) {
-//						log.warn("完成任务积分值已经超过上限，设置为0");
-//						wmTask.setScore(0);
-//						msg = String.format("转发类任务所得积分不得大于积分包值的%d%s",
-//								new BigDecimal(value).multiply(new BigDecimal("100"))
-//										.setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "%");
-//					}
-				}
-
 				// 校验任务百分比限制规则（如果积分包值大于【任务配置】-【百分比限制】配置的起始值，
 				// 且【任务配置】-【百分比限制】所选的任务类型对应的任务总完成积分值>积分包值*【任务配置】-【百分比限制】配置的百分比，则校验不通过）
 				R<?> checkPercentRuleResult =
@@ -4419,13 +3876,6 @@ public class ApiController {
 			String hash = new BigInteger(1, digest).toString(16);
 
 			log.info("图片md5:{}", hash);
-			// Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(String.format("%s:%s", id, hash), originalFilename, 7, TimeUnit.DAYS);
-			//
-			// if (aBoolean != null && !aBoolean){
-			// 	log.error("上传了重复的图片");
-			// 	return R.failed(hash,"duplicate");
-			// }
-
 		}
 
 		return sysFileService.uploadFile(file);