bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

相关功能优化

This commit is contained in:
liang.chao 2024-12-27 15:38:14 +08:00
parent 0352bc784c
commit 7cc2b1410c
7 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
View File

@ -95,9 +95,9 @@ public class BmMessageServiceImpl implements IBmMessageService {
public List<BmMessage> selectBmMessageListFromCacheOne(BmMessage bmMessage) {
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
Long fromCompany = bmMessage.getFromCompany();
Collection<String> keys1 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + fromCompany + ":" + companyId);
Collection<String> keys2 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + fromCompany);
Long toCompany = bmMessage.getToCompany();
Collection<String> keys1 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + toCompany + ":" + companyId);
Collection<String> keys2 = SpringUtils.getBean(RedisService.class).keys(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + toCompany);
List<String> keys = new ArrayList<>();
keys.addAll(keys1);
keys.addAll(keys2);
@ -134,6 +134,7 @@ public class BmMessageServiceImpl implements IBmMessageService {
}
List<BmMessage> list = arrayCache.toList(BmMessage.class);
list.add(bmMessage);
(SpringUtils.getBean(RedisService.class)).deleteObject(msgKey);
(SpringUtils.getBean(RedisService.class)).setCacheObject(msgKey, list, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS);
return bmMessageMapper.insertBmMessage(bmMessage);
} catch (Exception e) {

13
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/MaDevQcController.java
View File

@ -21,7 +21,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/ma_qc")
@Api(value = "装备质检管理",tags = "装备质检")
@Api(value = "装备质检管理", tags = "装备质检")
public class MaDevQcController extends BaseController {
@Resource
@ -29,6 +29,7 @@ public class MaDevQcController extends BaseController {
/**
* 装备质检列表
*
* @param maDevQc
* @return
*/
@ -39,8 +40,10 @@ public class MaDevQcController extends BaseController {
List<MaDevQc> list = maDevQcService.selectDevQcList(maDevQc);
return AjaxResult.success(getDataTable(list));
}
/**
* 装备质检列表
*
* @param maDevQc
* @return
*/
@ -54,6 +57,7 @@ public class MaDevQcController extends BaseController {
/**
* 新增装备质检--含附件上传
*
* @param maDevQc
* @return
*/
@ -65,15 +69,20 @@ public class MaDevQcController extends BaseController {
/**
* 删除装备质检
*
* @param maDevQc
* @return
*/
@ApiOperation(value = "删除装备质检")
@PostMapping("/deleteById")
public AjaxResult deleteById(@RequestBody MaDevQc maDevQc) {
if (maDevQc == null || maDevQc.getFileId() == null) {
if (maDevQc == null || maDevQc.getFileId() == null || maDevQc.getMaId() == null) {
return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg());
}
Integer count = maDevQcService.selectDevQcListByMaId(maDevQc.getMaId());
if (count <= 1) {
return AjaxResult.error("请保持质检数据至少有一条");
}
Integer i = maDevQcService.deleteById(maDevQc);
return i > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
}

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java
View File

@ -54,4 +54,6 @@ public interface MaDevQcMapper {
List<MaDevQc> checkQcTime();
Integer updateFileId(@Param("id") Integer id, @Param("fileId") Integer fileId);
Integer selectDevQcListByMaId(Integer maId);
}

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/MaDevQcService.java
View File

@ -34,4 +34,6 @@ public interface MaDevQcService {
Integer deleteById(MaDevQc maDevQc);
List<MaDevQc> selectQcList(MaDevQc maDevQc);
Integer selectDevQcListByMaId(Integer maId);
}

5
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/MaDevQcServiceImpl.java
View File

@ -154,4 +154,9 @@ public class MaDevQcServiceImpl implements MaDevQcService {
public List<MaDevQc> selectQcList(MaDevQc maDevQc) {
return maDevQcMapper.selectQcList(maDevQc);
}
@Override
public Integer selectDevQcListByMaId(Integer maId) {
return maDevQcMapper.selectDevQcListByMaId(maId);
}
}

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java
View File

@ -386,7 +386,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService {
try {
BmMessage bmMessage = new BmMessage();
bmMessage.setCreateTime(DateUtils.getNowDate());
bmMessage.setMessageContent("您好，您的需求已被" + leaseInfo.getOrderCompanyName() + "公司接单，请及时查看");
bmMessage.setMessageContent("您好，您的需求已被" + leaseInfo.getOrderCompanyName() + "接单，请及时查看");
bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
bmMessage.setFromCompany(0L);
bmMessage.setFromUser(0L);

3
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
View File

@ -171,5 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on mdc.qc_com = sd.dept_id
where mdc.next_check_time &lt; now()
</select>
<select id="selectDevQcListByMaId" resultType="java.lang.Integer">
select count(*) from ma_dev_qc where ma_id = #{maId}
</select>
</mapper>