zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-02-27 15:58:23 +08:00
parent f044bc2bd0
commit be3f814cda
17 changed files with 130 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtDailyClockController.java
View File

@ -59,8 +59,8 @@ public class AppBgtDailyClockController extends BaseController {
@Log(title = "已读和审批日报", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody BgtDailyClockUpdateDTO dto) {
return toAjax(iWgzDailyClockService.appUpdate(dto) ? 1 : 0);
public AjaxResult<Boolean> edit(@Validated @RequestBody BgtDailyClockUpdateDTO dto) {
return AjaxResult.success(iWgzDailyClockService.appUpdate(dto));
}
}

86
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java
View File

@ -1,32 +1,21 @@
package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.bo.BgtMessageQueryBo;
import com.ruoyi.bgt.domain.BgtMessage;
import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO;
import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO;
import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO;
import com.ruoyi.bgt.domain.vo.BgtMessageCountVO;
import com.ruoyi.bgt.domain.vo.BgtMessageDetailVO;
import com.ruoyi.bgt.domain.vo.BgtMessageVO;
import com.ruoyi.bgt.service.IBgtMessageService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 消息Controller
@ -61,71 +50,4 @@ public class AppBgtMessageController extends BaseController {
}
/**
* 查询消息列表
*/
@ApiOperation("查询消息列表")
@GetMapping("/list")
public TableDataInfo<BgtMessage> list(@Validated BgtMessageQueryBo bo) {
return iBgtMessageService.queryPageList(bo);
}
/**
* 导出消息列表
*/
@ApiOperation("导出消息列表")
@Log(title = "消息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<BgtMessage> export(@Validated BgtMessageQueryBo bo) {
List<BgtMessage> list = iBgtMessageService.queryList(bo);
ExcelUtil<BgtMessage> util = new ExcelUtil<BgtMessage>(BgtMessage.class);
return util.exportExcel(list, "消息");
}
/**
* 获取消息详细信息
*/
@ApiOperation("获取消息详细信息")
@PreAuthorize("@ss.hasPermi('bgt:message:query')")
@GetMapping("/{id}")
public AjaxResult<BgtMessage> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iBgtMessageService.queryById(id));
}
/**
* 新增消息
*/
@ApiOperation("新增消息")
@PreAuthorize("@ss.hasPermi('bgt:message:add')")
@Log(title = "消息", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody BgtMessage bo) {
return toAjax(iBgtMessageService.insert(bo) ? 1 : 0);
}
/**
* 修改消息
*/
@ApiOperation("修改消息")
@PreAuthorize("@ss.hasPermi('bgt:message:edit')")
@Log(title = "消息", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody BgtMessage bo) {
return toAjax(iBgtMessageService.update(bo) ? 1 : 0);
}
/**
* 删除消息
*/
@ApiOperation("删除消息")
@PreAuthorize("@ss.hasPermi('bgt:message:remove')")
@Log(title = "消息" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iBgtMessageService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java
View File

@ -62,8 +62,8 @@ public class AppBgtPayCalculationController extends BaseController {
@Log(title = "审核工资结算", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody BgtPayCalculationUpdateDTO dto) {
return toAjax(iWgzPayCalculationService.appUpdate(dto) ? 1 : 0);
public AjaxResult<Boolean> edit(@Validated @RequestBody BgtPayCalculationUpdateDTO dto) {
return AjaxResult.success(iWgzPayCalculationService.appUpdate(dto));
}

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java
View File

@ -70,16 +70,16 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
@Log(title = "App务工者招工报名", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody BgtProjectRecruitApply bo) {
return toAjax(iBgtProjectRecruitApplyService.insert(bo) ? 1 : 0);
public AjaxResult<Boolean> add(@Validated @RequestBody BgtProjectRecruitApply bo) {
return AjaxResult.success(iBgtProjectRecruitApplyService.insert(bo));
}
@ApiOperation("App同意申请")
@Log(title = "App同意申请", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> consent(@Validated @RequestBody BgtProjectRecruitApplyConsentDTO dto) {
return toAjax(iBgtProjectRecruitApplyService.consent(dto));
public AjaxResult<Boolean> consent(@Validated @RequestBody BgtProjectRecruitApplyConsentDTO dto) {
return AjaxResult.success(iBgtProjectRecruitApplyService.consent(dto));
}
@ -94,17 +94,17 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
@Log(title = "App务工者退场", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping("/quit/{id}")
public AjaxResult<Void> quit(@NotNull(message = "主键不能为空")
public AjaxResult<Boolean> quit(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return toAjax(iBgtProjectRecruitApplyService.quit(id) ? 1 : 0);
return AjaxResult.success(iBgtProjectRecruitApplyService.quit(id));
}
@ApiOperation("App务工者打分")
@Log(title = "App务工者打分", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping("/score")
public AjaxResult<Void> score(@Validated @RequestBody BgtScoreDTO dto) {
return toAjax(iBgtProjectRecruitApplyService.score(dto) ? 1 : 0);
public AjaxResult<Boolean> score(@Validated @RequestBody BgtScoreDTO dto) {
return AjaxResult.success(iBgtProjectRecruitApplyService.score(dto));
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskProgressController.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.web.controller.bgt;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.bgt.domain.BgtProjectTaskProgress;
import com.ruoyi.bgt.domain.dto.BgtProjectTaskProgressDTO;
import com.ruoyi.bgt.domain.dto.BgtProjectTaskProgressQueryDTO;
import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressDetailVO;
import com.ruoyi.bgt.domain.vo.BgtProjectTaskProgressVO;
@ -61,8 +63,8 @@ public class AppBgtProjectTaskProgressController extends BaseController {
@Log(title = "App上传任务进度", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Boolean> add(@Validated @RequestBody BgtProjectTaskProgress bo) {
return AjaxResult.success(iBgtProjectTaskProgressService.insert(bo));
public AjaxResult<Boolean> add(@Validated @RequestBody BgtProjectTaskProgressDTO dto) {
return AjaxResult.success(iBgtProjectTaskProgressService.insert(BeanUtil.copyProperties(dto, BgtProjectTaskProgress.class)));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java
View File

@ -55,8 +55,8 @@ public class AppBgtReissueacardController extends BaseController {
@Log(title = "补卡审核", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody BgtReissueacardUpdateDTO dto) {
return toAjax(iWgzReissueacardService.appUpdate(dto) ? 1 : 0);
public AjaxResult<Boolean> edit(@Validated @RequestBody BgtReissueacardUpdateDTO dto) {
return AjaxResult.success(iWgzReissueacardService.appUpdate(dto));
}
}

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtUserController.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.BgtUser;
import com.ruoyi.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
/**
* 后台管理包工头Controller
*
@ -35,16 +38,19 @@ public class AppBgtUserController extends BaseController {
@Log(title = "App管理包工头", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping
public AjaxResult<Void> realNameAuthentication(@Validated @RequestBody UserRealNameAuthenticationDTO dto) {
return toAjax(iBgtUserService.realNameAuthentication(dto));
public AjaxResult<Boolean> realNameAuthentication(@Validated @RequestBody UserRealNameAuthenticationDTO dto) {
return AjaxResult.success(iBgtUserService.realNameAuthentication(dto));
}
@ApiOperation("个人信息")
@RepeatSubmit
/**
* 获取后台管理包工头详细信息
*/
@ApiOperation("获取后台管理包工头详细信息")
@GetMapping("/{id}")
public AjaxResult<Void> getInfo(@Validated @RequestBody UserRealNameAuthenticationDTO dto) {
return toAjax(iBgtUserService.realNameAuthentication(dto));
public AjaxResult<BgtUser> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") String id) {
return AjaxResult.success(iBgtUserService.queryById(id));
}
}

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java
View File

@ -36,16 +36,16 @@ public class AppFbsProjectTaskApplyController extends BaseController {
@Log(title = "App申请承接项目任务", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> appTaskApply(@Validated @RequestBody TaskApplyDTO dto) {
return toAjax(iFbsProjectTaskApplyService.appTaskApply(dto) ? 1 : 0);
public AjaxResult<Boolean> appTaskApply(@Validated @RequestBody TaskApplyDTO dto) {
return AjaxResult.success(iFbsProjectTaskApplyService.appTaskApply(dto));
}
@ApiOperation("App取消申请项目任务")
@Log(title = "App取消申请项目任务" , businessType = BusinessType.DELETE)
@DeleteMapping()
public AjaxResult<Void> cancelApply(TaskApplyDTO dto) {
return toAjax(iFbsProjectTaskApplyService.cancelApply(dto) ? 1 : 0);
public AjaxResult<Boolean> cancelApply(TaskApplyDTO dto) {
return AjaxResult.success(iFbsProjectTaskApplyService.cancelApply(dto));
}