feat: 一些调整
This commit is contained in:
曹鹏飞
parent
bc58622536
commit
5296aab048
|
|
@ -7,7 +7,6 @@ import com.nflg.mobilebroken.common.constant.STATE;
|
|||
import com.nflg.mobilebroken.common.constant.UserState;
|
||||
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
|
||||
import com.nflg.mobilebroken.common.util.SaTokenAdminUtil;
|
||||
import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
|
||||
import com.nflg.mobilebroken.common.util.VUtils;
|
||||
import com.nflg.mobilebroken.repository.entity.AppUser;
|
||||
|
|
@ -54,7 +53,7 @@ public class AppController extends ControllerBase {
|
|||
.setExtra("isPrimary", user.getIsPrimary()));
|
||||
user.setLastLoginTime(LocalDateTime.now());
|
||||
appUserService.updateById(user);
|
||||
SaTokenInfo tokenInfo = SaTokenAdminUtil.getTokenInfo();
|
||||
SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
|
||||
return ApiResult.success(new AppLoginVO()
|
||||
.setToken(tokenInfo.getTokenValue())
|
||||
.setExpire(tokenInfo.getTokenTimeout())
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ public class MenuAddRequest {
|
|||
private String name;
|
||||
|
||||
// 菜单组件
|
||||
@NotEmpty
|
||||
private String component;
|
||||
|
||||
// 菜单地址
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ public class MenuVO {
|
|||
private String url;
|
||||
|
||||
// 是否启用
|
||||
private boolean enable;
|
||||
private Boolean enable;
|
||||
|
||||
// 是否显示
|
||||
private boolean show;
|
||||
private Boolean show;
|
||||
|
||||
// 排序
|
||||
private int sort;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public interface TicketMapper extends BaseMapper<Ticket> {
|
|||
|
||||
IPage<AdminTicketVO> searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage<?> page);
|
||||
|
||||
void completeTicket(List<Integer> ids, Integer userId);
|
||||
// void completeTicket(List<Integer> ids, Integer userId);
|
||||
|
||||
List<AdminTicketVO> searchAllFromAdmin(AdminTicketSearchRequest request);
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,7 @@ import org.springframework.stereotype.Service;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -110,7 +108,34 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
|||
|
||||
@Override
|
||||
public void completeTicket(List<Integer> ids) {
|
||||
baseMapper.completeTicket(ids, AdminUserUtil.getUserId());
|
||||
// baseMapper.completeTicket(ids, AdminUserUtil.getUserId());
|
||||
List<Ticket> tickets=listByIds(ids);
|
||||
List<String> stateErrors=new ArrayList<>();
|
||||
List<String> handleErrors=new ArrayList<>();
|
||||
for (Ticket ticket : tickets) {
|
||||
if (!Objects.equals(ticket.getState(), TicketState.Processing.getState())){
|
||||
stateErrors.add(ticket.getTitle());
|
||||
}else if(Arrays.stream(ticket.getHandle().split(","))
|
||||
.noneMatch(uid->StrUtil.equals(uid, AdminUserUtil.getUserId().toString()))
|
||||
){
|
||||
handleErrors.add(ticket.getTitle());
|
||||
}
|
||||
}
|
||||
StringBuilder sb=new StringBuilder();
|
||||
if (!stateErrors.isEmpty()){
|
||||
sb.append("以下工单状态不允许完成:").append(StrUtil.join(",", stateErrors));
|
||||
}
|
||||
if (!handleErrors.isEmpty()){
|
||||
sb.append("以下工单你无权操作:").append(StrUtil.join(",", handleErrors));
|
||||
}
|
||||
String msg=sb.toString();
|
||||
VUtils.trueThrowBusinessError(StrUtil.isNotBlank(msg))
|
||||
.throwMessage(msg);
|
||||
lambdaUpdate()
|
||||
.in(Ticket::getId, ids)
|
||||
.set(Ticket::getState, TicketState.ProcessingCompleted.getState())
|
||||
.set(Ticket::getUpdateTime, LocalDateTime.now())
|
||||
.update();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</select>
|
||||
|
||||
<select id="getMenusByRoleCodes" resultType="com.nflg.mobilebroken.common.pojo.vo.MenuVO">
|
||||
SELECT DISTINCT m.`name`,m.url
|
||||
SELECT DISTINCT m.id,m.`name`,m.url,m.component
|
||||
FROM admin_role r
|
||||
INNER JOIN admin_role_menu_map rmm ON r.id=rmm.role_id
|
||||
INNER JOIN admin_menu m ON rmm.menu_id=m.id
|
||||
|
|
|
|||
|
|
@ -122,14 +122,14 @@
|
|||
ORDER BY t.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="completeTicket">
|
||||
UPDATE ticket
|
||||
SET state=2,update_time=NOW()
|
||||
WHERE state=1 AND FIND_IN_SET(#{userId},handle)>0 AND id IN
|
||||
<foreach collection="ids" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</select>
|
||||
<!-- <select id="completeTicket">-->
|
||||
<!-- UPDATE ticket-->
|
||||
<!-- SET state=2,update_time=NOW()-->
|
||||
<!-- WHERE state=1 AND FIND_IN_SET(#{userId},handle)>0 AND id IN-->
|
||||
<!-- <foreach collection="ids" item="id" open="(" separator="," close=")">-->
|
||||
<!-- #{id}-->
|
||||
<!-- </foreach>-->
|
||||
<!-- </select>-->
|
||||
|
||||
<select id="searchAllFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
|
||||
SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution,a.`name` AS 'areaName'
|
||||
|
|
|
|||
Loading…
Reference in New Issue