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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
罗成
2025-03-20 17:32:14 +08:00
parent 07f30c1a47 2aaea69282
commit 3c4417ffde
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
View File

@ -35,7 +35,6 @@ import com.ruoyi.wgz.domain.WgzReissueacard;
import com.ruoyi.wgz.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -47,6 +46,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.ruoyi.common.constants.BgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_ALREADY;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_NEED;
/**
@ -265,7 +265,6 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
}
@Override
@Async
public void operation(String senderType,Long senderId,String recipientType,Long recipientId,Long tableId,String tableName) {
LambdaUpdateWrapper<BgtMessage> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(BgtMessage::getRecipientId, recipientId);
@ -274,7 +273,7 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
wrapper.eq(BgtMessage::getSenderType, senderType);
wrapper.eq(BgtMessage::getTableId, tableId);
wrapper.eq(BgtMessage::getTableName, tableName);
wrapper.set(BgtMessage::getIsOperation, OPERATION_NEED);
wrapper.set(BgtMessage::getIsOperation, OPERATION_ALREADY);
update(wrapper);
}
}

108
ruoyi-system/src/main/java/com/ruoyi/common/controller/AnnexController.java
View File

@ -1,108 +0,0 @@
package com.ruoyi.common.controller;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.common.domain.Annex;
import lombok.RequiredArgsConstructor;
import javax.validation.constraints.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.bo.AnnexQueryBo;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* 附件Controller
*
* @author ruoyi
* @date 2025-02-14
*/
@Api(value = "附件控制器", tags = {"附件管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/common/annex")
public class AnnexController extends BaseController {
private final IAnnexService iAnnexService;
/**
* 查询附件列表
*/
@ApiOperation("查询附件列表")
@PreAuthorize("@ss.hasPermi('common:annex:list')")
@GetMapping("/list")
public TableDataInfo<Annex> list(@Validated AnnexQueryBo bo) {
return iAnnexService.queryPageList(bo);
}
/**
* 导出附件列表
*/
@ApiOperation("导出附件列表")
@PreAuthorize("@ss.hasPermi('common:annex:export')")
@Log(title = "附件", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<Annex> export(@Validated AnnexQueryBo bo) {
List<Annex> list = iAnnexService.queryList(bo);
ExcelUtil<Annex> util = new ExcelUtil<Annex>(Annex.class);
return util.exportExcel(list, "附件");
}
/**
* 获取附件详细信息
*/
@ApiOperation("获取附件详细信息")
@PreAuthorize("@ss.hasPermi('common:annex:query')")
@GetMapping("/{id}")
public AjaxResult<Annex> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") String id) {
return AjaxResult.success(iAnnexService.queryById(id));
}
/**
* 新增附件
*/
@ApiOperation("新增附件")
@PreAuthorize("@ss.hasPermi('common:annex:add')")
@Log(title = "附件", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody Annex bo) {
return toAjax(iAnnexService.insert(bo) ? 1 : 0);
}
/**
* 修改附件
*/
@ApiOperation("修改附件")
@PreAuthorize("@ss.hasPermi('common:annex:edit')")
@Log(title = "附件", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody Annex bo) {
return toAjax(iAnnexService.update(bo) ? 1 : 0);
}
/**
* 删除附件
*/
@ApiOperation("删除附件")
@PreAuthorize("@ss.hasPermi('common:annex:remove')")
@Log(title = "附件" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
return toAjax(iAnnexService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}