rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into test

This commit is contained in:
曹鹏飞 2025-09-02 09:08:28 +08:00
parent e634c4c789 51282ede84
commit 2a1420c2ff
37 changed files with 218 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
View File

@ -90,6 +90,7 @@ public class PositionController extends ControllerBase {
}
}
result.setLanguage(positionLanguageResult);
result.setTicketManage(ent.getTicketManage());
return ApiResult.success(result);
@ -121,6 +122,7 @@ public class PositionController extends ControllerBase {
// ent.setDataModifyUserNo(AdminUserUtil.getUserNo());
// ent.setDataModifyUserName(AdminUserUtil.getUserName());
// ent.setDataModifyTime(LocalDateTime.now());
ent.setTicketManage(positionDetailDto.getTicketManage());
positionService.save(ent);
return ApiResult.success(true);
}
@ -136,6 +138,7 @@ public class PositionController extends ControllerBase {
ent.setDataModifyUserNo(AdminUserUtil.getUserNo());
ent.setDataModifyUserName(AdminUserUtil.getUserName());
ent.setDataModifyTime(LocalDateTime.now());
ent.setTicketManage(positionDetailDto.getTicketManage());
positionService.updateById(ent);
return ApiResult.success(true);
}

4
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductBaseController.java
View File

@ -166,7 +166,7 @@ public class ProductBaseController extends ControllerBase{
* @param request 请求参数
*/
@PostMapping("/publishHonor")
public ApiResult<Void> publishHonor(@Valid @RequestBody ProductPublishRequest request){
public ApiResult<Void> publishHonor(@Valid @RequestBody BatchPublishRequest request) {
productHonorService.publish(request);
return ApiResult.success();
}
@ -233,7 +233,7 @@ public class ProductBaseController extends ControllerBase{
* @param request 请求参数
*/
@PostMapping("/publishCase")
public ApiResult<Void> publishCase(@Valid @RequestBody ProductPublishRequest request){
public ApiResult<Void> publishCase(@Valid @RequestBody BatchPublishRequest request) {
productCaseService.publish(request);
return ApiResult.success();
}

7
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
View File

@ -62,9 +62,6 @@ public class ProductModelController extends ControllerBase{
@Resource
private IProductModelParamsItemService productModelParamsItemService;
@Resource
private IProductModelImageService productModelImageService;
@Resource
private IProductModelVideoService productModelVideoService;
@ -848,7 +845,7 @@ public class ProductModelController extends ControllerBase{
* @param request 请求参数
*/
@PostMapping("/publishVideo")
public ApiResult<Void> publishVideo(@Valid @RequestBody ProductPublishRequest request){
public ApiResult<Void> publishVideo(@Valid @RequestBody BatchPublishRequest request) {
productModelVideoService.publish(request);
return ApiResult.success();
}
@ -934,7 +931,7 @@ public class ProductModelController extends ControllerBase{
* @param request 请求参数
*/
@PostMapping("/publishFile")
public ApiResult<Void> publishFile(@Valid @RequestBody ProductModelPublishRequest request) {
public ApiResult<Void> publishFile(@Valid @RequestBody BatchPublishRequest request) {
productModelFileService.publish(request);
return ApiResult.success();
}

8
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java
View File

@ -49,10 +49,10 @@ public class TestController extends ControllerBase{
}
}
@GetMapping("test")
public ApiResult<Boolean> test(@RequestParam Integer userId){
return ApiResult.success(ticketCallService.isInCall(userId));
}
// @GetMapping("test")
// public ApiResult<Boolean> test(@RequestParam Integer userId){
// return ApiResult.success(ticketCallService.isInCall(userId));
// }
/**
* 翻译为日语

6
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/PositionDetailDTO.java
View File

@ -6,7 +6,6 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -31,6 +30,11 @@ public class PositionDetailDTO {
@NotNull(message = "属性不能为空")
private Integer positionAttribute;
/**
* 是否授予工单权限
*/
private Boolean ticketManage;

5
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/vo/PositionDetailVO.java
View File

@ -28,6 +28,11 @@ public class PositionDetailVO {
*/
private Integer positionAttribute;
/**
* 是否授予工单权限
*/
private Boolean ticketManage;
/**
* 创建人-账号
*/

33
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/task/ProductScheduledTasks.java
View File

@ -1,33 +0,0 @@
package com.nflg.mobilebroken.admin.task;
import com.nflg.mobilebroken.repository.entity.ProductModel;
import com.nflg.mobilebroken.repository.service.IProductModelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
@Slf4j
@Component
public class ProductScheduledTasks {
@Resource
private IProductModelService productModelService;
/**
* 机型是否新版本设置
* 每天午夜12点执行一次
*/
@Scheduled(cron = "0 0 0 * * ?")
public void resetRecommend() {
log.info("【产品中心-机型-新品】开始执行");
productModelService.lambdaUpdate()
.set(ProductModel::getRecommend, false)
.eq(ProductModel::getRecommend, true)
.gt(ProductModel::getRecommendTime, LocalDateTime.now().minusYears(2))
.update();
log.info("【产品中心-机型-新品】执行完毕");
}
}

7
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java
View File

@ -1,9 +1,5 @@
package com.nflg.mobilebroken.common.constant;
import cn.hutool.core.collection.ListUtil;
import java.util.List;
public class Constant {
public static final String FROM_APP = "app";
@ -112,9 +108,8 @@ public class Constant {
public static final String DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED="AccountHasExpired";
public static final List<String> ROLE_CODE_TICKET_MANAGERS = ListUtil.of(TITLE_DIRECTOROF_BUSINESS_UNIT,TITLE_TECHNICAL_MANAGER,TITLE_SALES_MANAGER,TITLE_TEST_MANAGER,TITLE_QUALITY_MANAGER,DICTIONARY_TYPE_TITLE_CQM);
public static final String DICTIONARY_SOLUTION_MEASURES = "SolutionMeasures";
public static final String DICTIONARY_SOLUTION_REVIEW_DEPARTMENT = "SolutionReviewDepartment";
public static final String DICTIONARY_DEVICE_STATE ="deviceState";

4
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelPublishRequest.java → nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/BatchPublishRequest.java
View File

@ -1,13 +1,15 @@
package com.nflg.mobilebroken.common.pojo.request;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ProductModelPublishRequest {
@Accessors(chain = true)
public class BatchPublishRequest {
@NotEmpty
private List<Integer> ids;

6
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductModelAddRequest.java
View File

@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Data
public class ProductModelAddRequest {
@ -48,6 +49,11 @@ public class ProductModelAddRequest {
*/
private Boolean recommend;
/**
* 新品过期时间
*/
private LocalDateTime recommendExpireTime;
/**
* 是否发布
*/

11
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java
View File

@ -3,7 +3,9 @@ package com.nflg.mobilebroken.common.pojo.vo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
@Data
@Accessors
@ -56,6 +58,15 @@ public class FrontendProductModelSearchVO {
*/
private Boolean recommend;
public Boolean getRecommend() {
return recommend && (Objects.nonNull(recommendExpireTime) && LocalDateTime.now().isBefore(recommendExpireTime));
}
/**
* 新品过期时间
*/
private LocalDateTime recommendExpireTime;
/**
* 机型介绍
*/

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelSearchVO.java
View File

@ -54,6 +54,11 @@ public class ProductModelSearchVO {
*/
private Boolean recommend;
/**
* 新品过期时间
*/
private LocalDateTime recommendExpireTime;
/**
* 是否启用
*/

11
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductModelVO.java
View File

@ -3,7 +3,9 @@ package com.nflg.mobilebroken.common.pojo.vo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
@Data
@Accessors(chain = true)
@ -26,6 +28,15 @@ public class ProductModelVO {
*/
private Boolean recommend;
public Boolean getRecommend() {
return recommend && (Objects.nonNull(recommendExpireTime) && LocalDateTime.now().isBefore(recommendExpireTime));
}
/**
* 新品过期时间
*/
private LocalDateTime recommendExpireTime;
/**
* 主要参数列表
*/

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModel.java
View File

@ -65,9 +65,9 @@ public class ProductModel implements Serializable {
private Boolean recommend;
/**
* 设置为新品的时间
* 新品过期时间
*/
private LocalDateTime recommendTime;
private LocalDateTime recommendExpireTime;
/**
* 排序

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java
View File

@ -3,12 +3,13 @@ package com.nflg.mobilebroken.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 职位管理
@ -85,4 +86,9 @@ public class TBasePosition implements Serializable {
* 语言-json
*/
private String positionLanguage;
/**
* 是否授予工单权限
*/
private Boolean ticketManage;
}

21
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketCall.java
View File

@ -1,7 +1,6 @@
package com.nflg.mobilebroken.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
@ -35,16 +34,16 @@ public class TicketCall implements Serializable {
*/
private Integer ticketId;
/**
* 呼叫来源，app或者admin
*/
@TableField("`from`")
private String from;
/**
* 呼叫人id
*/
private Integer callerUserId;
// /**
// * 呼叫来源，app或者admin
// */
// @TableField("`from`")
// private String from;
//
// /**
// * 呼叫人id
// */
// private Integer callerUserId;
/**
* 状态，0-呼叫中；1-通话中；2-已结束

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserMapper.java
View File

@ -20,5 +20,7 @@ public interface AdminUserMapper extends BaseMapper<AdminUser> {
List<AdminUserSimpleVO> getSimples(List<Integer> userIds);
List<Integer> getTickerMangagers(List<String> titleCodes);
List<Integer> getTickerMangagers();
List<Integer> getCQMIds(String titleCode);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketCallJoinMapper.java
View File

@ -13,5 +13,5 @@ import com.nflg.mobilebroken.repository.entity.TicketCallJoin;
*/
public interface TicketCallJoinMapper extends BaseMapper<TicketCallJoin> {
boolean isInCall(Integer userId);
boolean isInCall(Integer ticketId, String from, Integer userId);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductCaseService.java
View File

@ -34,7 +34,7 @@ public interface IProductCaseService extends IService<ProductCase> {
void delete(@Valid BatchDeleteRequest request);
void publish(@Valid ProductPublishRequest request);
void publish(@Valid BatchPublishRequest request);
ProductCaseInfoVO getInfo(@Valid @NotNull Integer caseId);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductHonorService.java
View File

@ -30,7 +30,7 @@ public interface IProductHonorService extends IService<ProductHonor> {
List<ProductHonorVO> get(String language);
void publish(@Valid ProductPublishRequest request);
void publish(@Valid BatchPublishRequest request);
void delete(@Valid BatchDeleteRequest request);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java
View File

@ -31,7 +31,7 @@ public interface IProductModelFileService extends IService<ProductModelFile> {
void delete(@Valid BatchDeleteRequest request);
void publish(@Valid ProductModelPublishRequest request);
void publish(@Valid BatchPublishRequest request);
IPage<ProductModelFile> getList(@Valid ProductModelImageSearchRequest request);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java
View File

@ -27,7 +27,7 @@ public interface IProductModelImageService extends IService<ProductModelImage> {
void delete(@Valid BatchDeleteRequest request);
void publish(@Valid ProductPublishRequest request);
void publish(@Valid BatchPublishRequest request);
IPage<ProductModelImage> getList(@Valid ProductModelImageSearchRequest request);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java
View File

@ -29,7 +29,7 @@ public interface IProductModelVideoService extends IService<ProductModelVideo> {
void delete(@Valid BatchDeleteRequest request);
void publish(@Valid ProductPublishRequest request);
void publish(@Valid BatchPublishRequest request);
IPage<ProductModelVideo> getList(@Valid ProductModelImageSearchRequest request);

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallJoinService.java
View File

@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
*/
public interface ITicketCallJoinService extends IService<TicketCallJoin> {
boolean isInCall(Integer userId);
boolean isInCall(Integer ticketId, String from, Integer userId);
void join(@Valid @NotNull Integer ticketId, Integer userId, String from);
@ -25,6 +25,4 @@ public interface ITicketCallJoinService extends IService<TicketCallJoin> {
boolean hangUp(Integer callId, Integer userId, String from, boolean reject);
void add(Integer callId, Integer userId, String from);
void hangUpAll(Integer id);
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java
View File

@ -15,11 +15,11 @@ import javax.validation.constraints.NotNull;
*/
public interface ITicketCallService extends IService<TicketCall> {
boolean isInCall(Integer userId);
// boolean isInCall(Integer userId);
void add(Integer ticketId, Integer callerUserId,String callerUserFrom, Integer calledUserId, String calledUserFrom);
boolean hangUp(@NotNull Integer ticketId, Integer userId, String from, boolean reject);
// boolean hangUp(@NotNull Integer ticketId, Integer userId, String from, boolean reject);
TicketCall getLast(@NotNull Integer ticketId);
}

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -351,12 +350,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
@Override
public List<Integer> getTickerMangagers() {
return baseMapper.getTickerMangagers(Constant.ROLE_CODE_TICKET_MANAGERS);
return baseMapper.getTickerMangagers();
}
@Override
public List<Integer> getCQMIds() {
return baseMapper.getTickerMangagers(ListUtil.of(Constant.DICTIONARY_TYPE_TITLE_CQM));
return baseMapper.getCQMIds(Constant.DICTIONARY_TYPE_TITLE_CQM);
}
private String getDepartmentName(Long departmentId) {

29
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java
View File

@ -1,7 +1,9 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -27,6 +29,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -54,8 +57,8 @@ public class ProductCaseServiceImpl extends ServiceImpl<ProductCaseMapper, Produ
.setCreateTime(LocalDateTime.now());
save(entity);
if (request.getPublish()) {
publish(new ProductPublishRequest()
.setId(entity.getId())
publish(new BatchPublishRequest()
.setIds(List.of(entity.getId()))
.setState(PublishState.Published.getState()));
}
productCaseInfoService.add(entity.getId(), request.getItems());
@ -79,8 +82,8 @@ public class ProductCaseServiceImpl extends ServiceImpl<ProductCaseMapper, Produ
info.setUpdateTime(LocalDateTime.now());
updateById(info);
if (request.getPublish()) {
publish(new ProductPublishRequest()
.setId(info.getId())
publish(new BatchPublishRequest()
.setIds(List.of(info.getId()))
.setState(PublishState.Published.getState()));
}
productCaseInfoService.update(request.getItems());
@ -145,14 +148,20 @@ public class ProductCaseServiceImpl extends ServiceImpl<ProductCaseMapper, Produ
productCaseInfoService.delete(request.getIds());
}
@Transactional
@Override
public void publish(ProductPublishRequest request) {
ProductCase info = getById(request.getId());
VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
VUtils.trueThrowBusinessError(Objects.equals(info.getState(), request.getState()))
.throwMessage("请勿重复操作");
public void publish(BatchPublishRequest request) {
List<ProductCase> list = listByIds(request.getIds());
if (Objects.equals(request.getState(), PublishState.Published.getState())) {
VUtils.trueThrowBusinessError(!info.getEnable()).throwMessage("不能发布已禁用的数据");
List<String> names = list.stream().filter(ph -> !ph.getEnable()).map(ProductCase::getTitle).collect(Collectors.toList());
VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下案例被禁用不能发布：" + StrUtil.join(",", names));
}
list.forEach(it -> publish(it, request.getState()));
}
private void publish(ProductCase info, Integer state) {
if (Objects.equals(state, info.getState())) return;
if (Objects.equals(state, PublishState.Published.getState())) {
info.setState(PublishState.Published.getState());
info.setPublishBy(AdminUserUtil.getUserName());
info.setPublishTime(LocalDateTime.now());

28
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -23,6 +24,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -55,8 +57,8 @@ public class ProductHonorServiceImpl extends ServiceImpl<ProductHonorMapper, Pro
.setCreateTime(LocalDateTime.now());
save(productHonor);
if (request.getPublish()) {
publish(new ProductPublishRequest()
.setId(productHonor.getId())
publish(new BatchPublishRequest()
.setIds(List.of(productHonor.getId()))
.setState(PublishState.Published.getState()));
}
productHonorInfoService.add(productHonor.getId(), request.getItems());
@ -86,8 +88,8 @@ public class ProductHonorServiceImpl extends ServiceImpl<ProductHonorMapper, Pro
.eq(ProductHonor::getId, request.getId())
.update();
if (request.getPublish()) {
publish(new ProductPublishRequest()
.setId(request.getId())
publish(new BatchPublishRequest()
.setIds(List.of(request.getId()))
.setState(PublishState.Published.getState()));
}
productHonorInfoService.update(request.getItems());
@ -105,14 +107,20 @@ public class ProductHonorServiceImpl extends ServiceImpl<ProductHonorMapper, Pro
return baseMapper.get(language);
}
@Transactional
@Override
public void publish(ProductPublishRequest request) {
ProductHonor info = getById(request.getId());
VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
VUtils.trueThrowBusinessError(Objects.equals(info.getState(), request.getState()))
.throwMessage("请勿重复操作");
public void publish(BatchPublishRequest request) {
List<ProductHonor> list = listByIds(request.getIds());
if (Objects.equals(request.getState(), PublishState.Published.getState())) {
VUtils.trueThrowBusinessError(!info.getEnable()).throwMessage("不能发布已禁用的数据");
List<String> names = list.stream().filter(ph -> !ph.getEnable()).map(ProductHonor::getTitle).collect(Collectors.toList());
VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下荣誉被禁用不能发布：" + StrUtil.join(",", names));
}
list.forEach(it -> publish(it, request.getState()));
}
private void publish(ProductHonor info, Integer state) {
if (Objects.equals(state, info.getState())) return;
if (Objects.equals(state, PublishState.Published.getState())) {
info.setState(PublishState.Published.getState());
info.setPublishBy(AdminUserUtil.getUserName());
info.setPublishTime(LocalDateTime.now());

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java
View File

@ -132,7 +132,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Transactional
@Override
public void publish(ProductModelPublishRequest request) {
public void publish(BatchPublishRequest request) {
List<ProductModelFile> datas = listByIds(request.getIds());
datas.removeIf(item -> !item.getEnable());
datas.forEach(info -> {

19
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -25,6 +26,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -89,13 +91,18 @@ public class ProductModelImageServiceImpl extends ServiceImpl<ProductModelImageM
}
@Override
public void publish(ProductPublishRequest request) {
ProductModelImage info = getById(request.getId());
VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
VUtils.trueThrowBusinessError(Objects.equals(info.getState(), request.getState()))
.throwMessage("请勿重复操作");
public void publish(BatchPublishRequest request) {
List<ProductModelImage> list = listByIds(request.getIds());
if (Objects.equals(request.getState(), PublishState.Published.getState())) {
VUtils.trueThrowBusinessError(!info.getEnable()).throwMessage("不能发布已禁用的数据");
List<String> names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelImage::getName).collect(Collectors.toList());
VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下图片被禁用不能发布：" + StrUtil.join(",", names));
}
list.forEach(it -> publish(it, request.getState()));
}
private void publish(ProductModelImage info, Integer state) {
if (Objects.equals(state, info.getState())) return;
if (Objects.equals(state, PublishState.Published.getState())) {
info.setState(PublishState.Published.getState());
info.setPublishBy(AdminUserUtil.getUserName());
info.setPublishTime(LocalDateTime.now());

16
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
View File

@ -67,13 +67,11 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
// .setBatchNumber(request.getBatchNumber())
.setNo(request.getNo())
.setRecommend(request.getRecommend())
.setRecommendExpireTime(request.getRecommendExpireTime())
.setSort(RandomUtil.randomInt(0,10000))
.setImage(request.getImage())
.setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now());
if (request.getRecommend()){
productModel.setRecommendTime(LocalDateTime.now());
}
save(productModel);
if (request.getPublish()) {
publish(new ProductPublishRequest()
@ -95,15 +93,8 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
} else {
info.setNo(request.getNo());
// info.setSort(request.getSort());
if (request.getRecommend()) {
if (!info.getRecommend()) {
info.setRecommend(true);
info.setRecommendTime(LocalDateTime.now());
}
} else {
info.setRecommend(false);
info.setRecommendTime(null);
}
info.setRecommend(request.getRecommend());
info.setRecommendExpireTime(request.getRecommendExpireTime());
info.setModuleId(request.getModuleId());
info.setSeriesNumber(request.getSeriesNumber());
info.setTypeNumber(request.getTypeNumber());
@ -205,6 +196,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
.setId(item.getId())
.setNo(item.getNo())
.setRecommend(item.getRecommend())
.setRecommendExpireTime(item.getRecommendExpireTime())
.setImage(item.getImage())
.setParams(productPartParamsService.getMainListByLanguage(item.getId(), language))
.setFile(productModelFileService.getDefaultByLanguage(item.getId(), language)))

23
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -25,6 +26,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -110,26 +112,31 @@ public class ProductModelVideoServiceImpl extends ServiceImpl<ProductModelVideoM
}
@Override
public void publish(ProductPublishRequest request) {
ProductModelVideo info = getById(request.getId());
VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
VUtils.trueThrowBusinessError(Objects.equals(info.getState(), request.getState()))
.throwMessage("请勿重复操作");
public void publish(BatchPublishRequest request) {
List<ProductModelVideo> list = listByIds(request.getIds());
if (Objects.equals(request.getState(), PublishState.Published.getState())) {
VUtils.trueThrowBusinessError(!info.getEnable()).throwMessage("不能发布已禁用的数据");
List<String> names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelVideo::getName).collect(Collectors.toList());
VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下视频被禁用不能发布：" + StrUtil.join(",", names));
}
list.forEach(it -> publish(it, request.getState()));
}
private void publish(ProductModelVideo info, Integer state) {
if (Objects.equals(state, info.getState())) return;
if (Objects.equals(state, PublishState.Published.getState())) {
info.setState(PublishState.Published.getState());
info.setPublishBy(AdminUserUtil.getUserName());
info.setPublishTime(LocalDateTime.now());
lambdaUpdate()
.set(ProductModelVideo::getState, PublishState.Obsolete.getState())
.eq(ProductModelVideo::getModelId, info.getModelId())
.eq(ProductModelVideo::getBatchNumber,info.getBatchNumber())
.eq(ProductModelVideo::getBatchNumber, info.getBatchNumber())
.eq(ProductModelVideo::getState, PublishState.Published.getState())
.update();
} else {
ProductModelVideo obsolete = lambdaQuery()
.eq(ProductModelVideo::getModelId, info.getModelId())
.eq(ProductModelVideo::getBatchNumber,info.getBatchNumber())
.eq(ProductModelVideo::getBatchNumber, info.getBatchNumber())
.eq(ProductModelVideo::getState, PublishState.Obsolete.getState())
.orderByDesc(ProductModelVideo::getPublishTime)
.last("Limit 1")

21
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java
View File

@ -31,8 +31,8 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
private ITicketCallService ticketCallService;
@Override
public boolean isInCall(Integer userId) {
return baseMapper.isInCall(userId);
public boolean isInCall(Integer ticketId, String from, Integer userId) {
return baseMapper.isInCall(ticketId, from, userId);
}
@Transactional
@ -84,7 +84,14 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
.set(TicketCallJoin::getState, 2)
.set(reject, TicketCallJoin::getHangupTime, LocalDateTime.now())
.eq(TicketCallJoin::getCallId, callId)
.ne(TicketCallJoin::getFrom, from)
.update();
} else {
lambdaUpdate()
.set(TicketCallJoin::getState, 2)
.set(reject, TicketCallJoin::getHangupTime, LocalDateTime.now())
.eq(TicketCallJoin::getCallId, callId)
.eq(TicketCallJoin::getUserId, userId)
.eq(TicketCallJoin::getFrom, from)
.update();
}
if (!lambdaQuery()
@ -119,12 +126,4 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
);
}
}
@Override
public void hangUpAll(Integer id) {
lambdaUpdate()
.set(TicketCallJoin::getState, 2)
.eq(TicketCallJoin::getCallId, id)
.update();
}
}

68
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.mobilebroken.common.constant.Constant;
import com.nflg.mobilebroken.repository.entity.TicketCall;
import com.nflg.mobilebroken.repository.entity.TicketCallJoin;
import com.nflg.mobilebroken.repository.mapper.TicketCallMapper;
@ -13,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* <p>
@ -29,26 +26,33 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
@Resource
private ITicketCallJoinService ticketCallJoinService;
@Override
public boolean isInCall(Integer userId) {
return lambdaQuery()
.eq(TicketCall::getState, 1)
.eq(TicketCall::getCallerUserId, userId)
.exists()
||
ticketCallJoinService.isInCall(userId);
}
// @Override
// public boolean isInCall(Integer userId) {
// return lambdaQuery()
// .eq(TicketCall::getState, 1)
// .eq(TicketCall::getCallerUserId, userId)
// .exists()
// ||
// ticketCallJoinService.isInCall(userId);
// }
@Transactional
@Override
public void add(Integer ticketId, Integer callerUserId,String callerUserFrom, Integer calledUserId, String calledUserFrom) {
TicketCall ticketCall = new TicketCall()
.setTicketId(ticketId)
.setCallerUserId(callerUserId)
// .setCallerUserId(callerUserId)
.setState(0)
.setFrom(callerUserFrom)
// .setFrom(callerUserFrom)
.setCreateTime(LocalDateTime.now());
save(ticketCall);
ticketCallJoinService.save(new TicketCallJoin()
.setCallId(ticketCall.getId())
.setFrom(callerUserFrom)
.setUserId(callerUserId)
.setState(0)
.setCreateTime(LocalDateTime.now())
);
ticketCallJoinService.save(new TicketCallJoin()
.setCallId(ticketCall.getId())
.setFrom(calledUserFrom)
@ -58,24 +62,24 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
);
}
@Override
public boolean hangUp(Integer ticketId, Integer userId, String from, boolean reject) {
TicketCall ticketCall = getLast(ticketId);
boolean flag = false;
if (Objects.nonNull(ticketCall)){
if ((Objects.equals(ticketCall.getCallerUserId(), userId) && StrUtil.equals(ticketCall.getFrom(), Constant.FROM_APP))
|| ticketCallJoinService.allIsHangUp(ticketCall.getId())){
ticketCall.setState(2);
ticketCallJoinService.hangUpAll(ticketCall.getId());
if (reject) {
ticketCall.setHangupTime(LocalDateTime.now());
}
updateById(ticketCall);
}
flag=ticketCallJoinService.hangUp(ticketCall.getId(), userId, from, reject);
}
return flag;
}
// @Override
// public boolean hangUp(Integer ticketId, Integer userId, String from, boolean reject) {
// TicketCall ticketCall = getLast(ticketId);
// boolean flag = false;
// if (Objects.nonNull(ticketCall)){
// if ((Objects.equals(ticketCall.getCallerUserId(), userId) && StrUtil.equals(ticketCall.getFrom(), Constant.FROM_APP))
// || ticketCallJoinService.allIsHangUp(ticketCall.getId())){
// ticketCall.setState(2);
// ticketCallJoinService.hangUpAll(ticketCall.getId());
// if (reject) {
// ticketCall.setHangupTime(LocalDateTime.now());
// }
// updateById(ticketCall);
// }
// flag=ticketCallJoinService.hangUp(ticketCall.getId(), userId, from, reject);
// }
// return flag;
// }
@Override
public TicketCall getLast(Integer ticketId) {

12
nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml
View File

@ -28,9 +28,13 @@
SELECT au.id
FROM t_base_position p
INNER JOIN admin_user au ON au.title_id=p.id
WHERE au.state=1 AND au.is_del=0 AND p.position_code IN
<foreach collection="titleCodes" item="titleCode" separator="," open="(" close=")">
#{titleCode}
</foreach>
WHERE au.state=1 AND au.is_del=0 AND p.ticket_manage
</select>
<select id="getCQMIds" resultType="java.lang.Integer">
SELECT au.id
FROM t_base_position p
INNER JOIN admin_user au ON au.title_id=p.id
WHERE au.state=1 AND au.is_del=0 AND p.position_code=#{titleCode}
</select>
</mapper>

4
nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml
View File

@ -12,9 +12,7 @@
</sql>
<select id="getList" resultType="com.nflg.mobilebroken.repository.entity.TBasePosition">
select id, position_code, position_name, position_attribute, data_create_user_no,
data_create_user_name, data_create_time, data_modify_user_no, data_modify_user_name,
data_modify_time
select *
from t_base_position
where data_valid_state=1 <include refid="whr" />
</select>

2
nflg-mobilebroken-repository/src/main/resources/mapper/TicketCallJoinMapper.xml
View File

@ -7,6 +7,6 @@
INNER JOIN ticket_call_join tcj ON tc.id = tcj.call_id
WHERE tc.state = 1
AND tcj.state = 1
AND tcj.user_id = #{userId}
AND tcj.user_id = #{userId} and tcj.from = #{from} and tc.ticket_id = #{ticketId}
</select>
</mapper>