diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java index f61b5f9..c37b900 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java @@ -135,4 +135,8 @@ public class AppParamsDto { * 结束时间 */ private String endTime; + + private String file; + + private String params; } diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java index e1e1ef2..a81cacc 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/BraceletController.java @@ -8,6 +8,7 @@ import com.bonus.common.core.utils.UploadCheckUtils; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.entity.app.AppParamsDto; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import lombok.extern.slf4j.Slf4j; @@ -119,12 +120,12 @@ public class BraceletController extends BaseController { */ @PostMapping("addLsUser") @SysLog(title = "app->手环管理", businessType = OperaType.QUERY, module = "app->手环管理->新增临时人员", details = "新增临时人员") - public AjaxResult addLsUser(String file, String params) { - MultipartFile fileData = BASE64DecodedMultipartFile.base64ToMultipart2(file); - String result = UploadCheckUtils.uploadExcelVerify(fileData); + public AjaxResult addLsUser(@RequestBody AppParamsDto dto) { + MultipartFile fileData = BASE64DecodedMultipartFile.base64ToMultipart2(dto.getFile()); + String result = UploadCheckUtils.uploadImgVerify(fileData); if (StringUtils.isNotBlank(result)) { return AjaxResult.error(result); } - return service.addLsUser(fileData, params); + return service.addLsUser(fileData, dto.getParams()); } }