Merge remote-tracking branch '惠信/develop' into develop
# Conflicts: # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/FileUploadRecord.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Language.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBasePosition.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponent.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/WebComponentTranslate.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/FileUploadRecordMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/WebComponentTranslateMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IFileUploadRecordService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IWebComponentTranslateService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/FileUploadRecordServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentTranslateServiceImpl.java # nflg-mobilebroken-repository/src/main/resources/mapper/TBasePositionMapper.xml
This commit is contained in:
曹鹏飞
commit
f4dace2cc3
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,140 @@
|
|||
package com.nflg.mobilebroken.admin.controller;
|
||||
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.admin.pojo.dto.PositionDetailDTO;
|
||||
import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery;
|
||||
import com.nflg.mobilebroken.admin.pojo.query.PositionQuery;
|
||||
import com.nflg.mobilebroken.admin.pojo.vo.PositionDetailVO;
|
||||
import com.nflg.mobilebroken.admin.pojo.vo.PositionLanguageVO;
|
||||
import com.nflg.mobilebroken.common.constant.STATE;
|
||||
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||
import com.nflg.mobilebroken.common.pojo.PageData;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO;
|
||||
import com.nflg.mobilebroken.common.util.TokenUtil;
|
||||
import com.nflg.mobilebroken.common.util.VUtils;
|
||||
import com.nflg.mobilebroken.repository.entity.Language;
|
||||
import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
||||
import com.nflg.mobilebroken.repository.service.ILanguageService;
|
||||
import com.nflg.mobilebroken.repository.service.ITBasePositionService;
|
||||
import com.nflg.mobilebroken.starter.annotation.MethodInfoMark;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.print.DocFlavor;
|
||||
import javax.validation.Valid;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 职位管理
|
||||
*
|
||||
* @author
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/position")
|
||||
public class PositionController {
|
||||
|
||||
|
||||
@Resource
|
||||
ITBasePositionService positionService;
|
||||
|
||||
@Resource
|
||||
ILanguageService languageService;
|
||||
|
||||
/**
|
||||
* 获取职位列表
|
||||
*
|
||||
* @param query
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("getList")
|
||||
@MethodInfoMark(value = "获取职位列表", menuName = "职位管理")
|
||||
public ApiResult<PageData<TBasePosition>> getList(@RequestBody PositionQuery query) {
|
||||
Page<TBasePosition> result = positionService.getList(new Page<>(query.getPage(), query.getPageSize()), query);
|
||||
|
||||
return ApiResult.success(result.getRecords(), query, result.getTotal());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取明细
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("getPositionDetail")
|
||||
@MethodInfoMark(value = "获取职位明细", menuName = "职位管理")
|
||||
public ApiResult<PositionDetailVO> getPositionDetail(@RequestParam("id") Integer id) {
|
||||
TBasePosition ent = positionService.getById(id);
|
||||
VUtils.trueThrow(null == ent).throwMessage(STATE.ParamErr, "职位不存在");
|
||||
|
||||
PositionDetailVO result = Convert.convert(PositionDetailVO.class, ent);
|
||||
List<Language> allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list();
|
||||
List<PositionLanguageVO> positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class);
|
||||
Map<String, String> positionLanguageMp = positionLanguage.stream()
|
||||
.collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue));
|
||||
List<PositionLanguageVO> positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage);
|
||||
for (PositionLanguageVO lan : positionLanguageResult) {
|
||||
if (positionLanguageMp.containsKey(lan.getCode())) {
|
||||
lan.setLanguageValue(positionLanguageMp.get(lan.getCode()));
|
||||
}
|
||||
}
|
||||
result.setLanguage(positionLanguageResult);
|
||||
return ApiResult.success(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取语言列表-新增时调用
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("getLanguage")
|
||||
public ApiResult<List<PositionLanguageVO> > getLanguage() {
|
||||
List<Language> allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list();
|
||||
|
||||
return ApiResult.success(Convert.toList(PositionLanguageVO.class,allLanguage));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("add")
|
||||
@MethodInfoMark(value = "新增", menuName = "职位管理")
|
||||
public ApiResult<Boolean> add(@Valid @RequestBody PositionDetailDTO positionDetailDto) {
|
||||
TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto);
|
||||
ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage()));
|
||||
ent.setDataCreateUserNo(TokenUtil.getUserNo());
|
||||
ent.setDataCreateUserName(TokenUtil.getUserName());
|
||||
ent.setDataCreateTime(LocalDateTime.now());
|
||||
ent.setDataModifyUserNo(TokenUtil.getUserNo());
|
||||
ent.setDataModifyUserName(TokenUtil.getUserName());
|
||||
ent.setDataModifyTime(LocalDateTime.now());
|
||||
positionService.save(ent);
|
||||
return ApiResult.success(true);
|
||||
}
|
||||
|
||||
@PostMapping("update")
|
||||
@MethodInfoMark(value = "编辑", menuName = "职位管理")
|
||||
public ApiResult<Boolean> update(@Valid @RequestBody PositionDetailDTO positionDetailDto) {
|
||||
VUtils.trueThrow(positionDetailDto.getId()<=0).throwMessage(STATE.ParamErr,"编辑时ID不能等于0");
|
||||
TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto);
|
||||
ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage()));
|
||||
ent.setDataModifyUserNo(TokenUtil.getUserNo());
|
||||
ent.setDataModifyUserName(TokenUtil.getUserName());
|
||||
ent.setDataModifyTime(LocalDateTime.now());
|
||||
positionService.save(ent);
|
||||
return ApiResult.success(true);
|
||||
}
|
||||
|
||||
@PostMapping("del")
|
||||
@MethodInfoMark(value = "删除", menuName = "职位管理")
|
||||
public ApiResult<Boolean> del(@Valid @RequestBody List<Integer> ids) {
|
||||
VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的行");
|
||||
positionService.delByIds(ids);
|
||||
return ApiResult.success(true);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
package com.nflg.mobilebroken.admin.controller;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.admin.pojo.query.DepartmentQuery;
|
||||
import com.nflg.mobilebroken.admin.pojo.query.RequestLogQuery;
|
||||
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||
import com.nflg.mobilebroken.common.pojo.PageData;
|
||||
import com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO;
|
||||
import com.nflg.mobilebroken.repository.entity.TBaseRequestLog;
|
||||
import com.nflg.mobilebroken.repository.entity.TBaseRequestLogDetail;
|
||||
import com.nflg.mobilebroken.repository.service.ITBaseRequestLogDetailService;
|
||||
import com.nflg.mobilebroken.repository.service.ITBaseRequestLogService;
|
||||
import com.nflg.mobilebroken.starter.annotation.MethodInfoMark;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 日志管理
|
||||
*
|
||||
* @author
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/requestLog")
|
||||
public class RequestLogController {
|
||||
|
||||
@Resource
|
||||
ITBaseRequestLogService logService;
|
||||
|
||||
@Resource
|
||||
ITBaseRequestLogDetailService logDetailService;
|
||||
/**
|
||||
* 获取日志列表
|
||||
* @param query
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("getList")
|
||||
public ApiResult<PageData<TBaseRequestLog>> getList(@RequestBody RequestLogQuery query){
|
||||
|
||||
Page<TBaseRequestLog> result = logService.getList(new Page<>(query.getPage(), query.getPageSize()), query);
|
||||
return ApiResult.success(result.getRecords(),query,result.getTotal());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取日志详情
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("getLogDetail")
|
||||
public ApiResult<TBaseRequestLogDetail> getLogDetail(@RequestParam("id") Long id){
|
||||
TBaseRequestLogDetail logDetail = logDetailService.getById(id);
|
||||
return ApiResult.success(logDetail);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
package com.nflg.mobilebroken.admin.pojo.dto;
|
||||
|
||||
|
||||
import com.nflg.mobilebroken.admin.pojo.vo.PositionLanguageVO;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 职位详情
|
||||
*/
|
||||
@Data
|
||||
public class PositionDetailDTO {
|
||||
private Integer id=0;
|
||||
|
||||
/**
|
||||
* 职位编码
|
||||
*/
|
||||
@NotBlank(message = "职位编码不能为空")
|
||||
private String positionCode;
|
||||
|
||||
/**
|
||||
* 职位名称
|
||||
*/
|
||||
|
||||
@NotBlank(message = "职位名称不能为空")
|
||||
private String positionName;
|
||||
|
||||
/**
|
||||
* 职位属性 1-内部使用 2-外部使用 3-公用
|
||||
*/
|
||||
@NotBlank(message = "属性不能为空")
|
||||
private Integer positionAttribute;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 职位语言
|
||||
*/
|
||||
List<PositionLanguageVO> language;
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.nflg.mobilebroken.admin.pojo.query;
|
||||
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PositionQuery extends PageBaseQuery {
|
||||
|
||||
/**
|
||||
* 职位编码
|
||||
*/
|
||||
private String positionCode;
|
||||
|
||||
/**
|
||||
* 职位名称
|
||||
*/
|
||||
private String positionName;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
package com.nflg.mobilebroken.admin.pojo.query;
|
||||
|
||||
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class RequestLogQuery extends PageBaseQuery {
|
||||
|
||||
/**
|
||||
* 成功or 失败日志 0-否 1-是
|
||||
*/
|
||||
private Integer requestResult;
|
||||
|
||||
/**
|
||||
* 菜单名称
|
||||
*/
|
||||
private String menuName;
|
||||
|
||||
/**
|
||||
* 方法名称
|
||||
*/
|
||||
private String methodName;
|
||||
|
||||
/**
|
||||
* 账号
|
||||
*/
|
||||
private String dataCreateUserNo;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
private String createStartTime;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
private String createEndTime;
|
||||
}
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
package com.nflg.mobilebroken.admin.pojo.vo;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 职位详情
|
||||
*/
|
||||
@Data
|
||||
public class PositionDetailVO {
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 职位编码
|
||||
*/
|
||||
private String positionCode;
|
||||
|
||||
/**
|
||||
* 职位名称
|
||||
*/
|
||||
private String positionName;
|
||||
|
||||
/**
|
||||
* 职位属性 1-内部使用 2-外部使用 3-公用
|
||||
*/
|
||||
private Integer positionAttribute;
|
||||
|
||||
/**
|
||||
* 创建人-账号
|
||||
*/
|
||||
private String dataCreateUserNo;
|
||||
|
||||
/**
|
||||
* 创建人姓名
|
||||
*/
|
||||
private String dataCreateUserName;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime dataCreateTime;
|
||||
|
||||
/**
|
||||
* 修改人-账号
|
||||
*/
|
||||
private String dataModifyUserNo;
|
||||
|
||||
/**
|
||||
* 修改人姓名
|
||||
*/
|
||||
private String dataModifyUserName;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
private LocalDateTime dataModifyTime;
|
||||
|
||||
|
||||
/**
|
||||
* 职位语言
|
||||
*/
|
||||
List<PositionLanguageVO> language;
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
package com.nflg.mobilebroken.admin.pojo.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 职位多-语言
|
||||
*/
|
||||
@Data
|
||||
public class PositionLanguageVO {
|
||||
|
||||
/**
|
||||
* 语言编码
|
||||
*/
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 语言名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
private String languageValue;
|
||||
}
|
||||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 后台-菜单
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 后台-角色
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import lombok.Setter;
|
|||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 用户端-区域
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 消息
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 用户端-用户
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 用户端-用户申请
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
package com.nflg.mobilebroken.repository.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 公司
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ package com.nflg.mobilebroken.repository.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 机型部件
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ package com.nflg.mobilebroken.repository.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
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>
|
||||
* 字典
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 字典值
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 字典值翻译
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 参数配置
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 基础信息-区域
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 部门表
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 设备类型
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 职位管理
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ package com.nflg.mobilebroken.repository.entity;
|
|||
|
||||
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>
|
||||
* 访问日志
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@ package com.nflg.mobilebroken.repository.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ package com.nflg.mobilebroken.repository.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
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>
|
||||
* 工单
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ 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>
|
||||
* 工单-关注
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package com.nflg.mobilebroken.repository.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
||||
|
||||
/**
|
||||
|
|
@ -13,4 +12,8 @@ import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
|||
*/
|
||||
public interface TBasePositionMapper extends BaseMapper<TBasePosition> {
|
||||
|
||||
|
||||
Page<TBasePosition> getList(@Param("page")Page<PageBaseQuery> page,@Param("query") PageBaseQuery query);
|
||||
|
||||
void delByIds(@Param("ids")List<Integer> ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
package com.nflg.mobilebroken.repository.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import com.nflg.mobilebroken.repository.entity.TBaseRequestLog;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -13,4 +18,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
*/
|
||||
public interface TBaseRequestLogMapper extends BaseMapper<TBaseRequestLog> {
|
||||
|
||||
|
||||
Page<TBaseRequestLog> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
|
||||
|
||||
void delByIds(@Param("ids")List<Long> ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
package com.nflg.mobilebroken.repository.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -13,4 +18,8 @@ import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
|||
*/
|
||||
public interface ITBasePositionService extends IService<TBasePosition> {
|
||||
|
||||
|
||||
Page<TBasePosition> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
|
||||
|
||||
void delByIds(@Param("ids") List<Integer> ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
package com.nflg.mobilebroken.repository.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import com.nflg.mobilebroken.repository.entity.TBaseRequestLog;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -13,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
*/
|
||||
public interface ITBaseRequestLogService extends IService<TBaseRequestLog> {
|
||||
|
||||
|
||||
Page<TBaseRequestLog> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
|
||||
|
||||
void delByIds(@Param("ids") List<Long> ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
package com.nflg.mobilebroken.repository.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import com.nflg.mobilebroken.repository.entity.TBasePosition;
|
||||
import com.nflg.mobilebroken.repository.mapper.TBasePositionMapper;
|
||||
import com.nflg.mobilebroken.repository.service.ITBasePositionService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 职位管理 服务实现类
|
||||
|
|
@ -17,4 +22,12 @@ import org.springframework.stereotype.Service;
|
|||
@Service
|
||||
public class TBasePositionServiceImpl extends ServiceImpl<TBasePositionMapper, TBasePosition> implements ITBasePositionService {
|
||||
|
||||
|
||||
public Page<TBasePosition> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query){
|
||||
return this.getBaseMapper().getList(page,query);
|
||||
}
|
||||
|
||||
public void delByIds(@Param("ids") List<Integer> ids){
|
||||
this.getBaseMapper().delByIds(ids);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
package com.nflg.mobilebroken.repository.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
|
||||
import com.nflg.mobilebroken.repository.entity.TBaseRequestLog;
|
||||
import com.nflg.mobilebroken.repository.mapper.TBaseRequestLogMapper;
|
||||
import com.nflg.mobilebroken.repository.service.ITBaseRequestLogService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 访问日志 服务实现类
|
||||
|
|
@ -17,4 +22,12 @@ import org.springframework.stereotype.Service;
|
|||
@Service
|
||||
public class TBaseRequestLogServiceImpl extends ServiceImpl<TBaseRequestLogMapper, TBaseRequestLog> implements ITBaseRequestLogService {
|
||||
|
||||
|
||||
public Page<TBaseRequestLog> getList(@Param("page")Page<PageBaseQuery> page, @Param("query") PageBaseQuery query){
|
||||
return this.getBaseMapper().getList(page, query);
|
||||
}
|
||||
|
||||
public void delByIds(@Param("ids") List<Long> ids){
|
||||
this.getBaseMapper().delByIds(ids);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
</sql>
|
||||
<select id="getList" resultType="com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO">
|
||||
select * from t_base_area where parent_area_row_id=0
|
||||
select * from t_base_area where parent_area_row_id=0 <include refid="whr" />
|
||||
|
||||
</select>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,27 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nflg.mobilebroken.repository.mapper.TBasePositionMapper">
|
||||
|
||||
<sql id="whr">
|
||||
<if test="query.positionCode!=null and query.positionCode!=''">
|
||||
and position_code=#{positionCode}
|
||||
</if>
|
||||
<if test="query.positionName!=null and query.positionName!=''">
|
||||
and position_name=#{query.positionName}
|
||||
</if>
|
||||
</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
|
||||
from t_base_position
|
||||
where data_valid_state=1 <include refid="whr" />
|
||||
</select>
|
||||
|
||||
<update id="delByIds">
|
||||
update t_base_position set data_valid_state=0 where id in
|
||||
<foreach collection="ids" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,34 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nflg.mobilebroken.repository.mapper.TBaseRequestLogMapper">
|
||||
<sql id="whr">
|
||||
<if test="query.requestResult!=null">
|
||||
and request_result=#{query.requestResult}
|
||||
</if>
|
||||
<if test="query.menuName!=null and query.menuName!=''">
|
||||
and menu_name=#{query.menuName}
|
||||
</if>
|
||||
<if test="query.methodName!=null and query.methodName!=''">
|
||||
and method_name=#{query.methodName}
|
||||
</if>
|
||||
<if test="query.dataCreateUserNo!=null and query.dataCreateUserNo!=''">
|
||||
and data_create_user_no=#{query.dataCreateUserNo}
|
||||
</if>
|
||||
<if test="query.createStartTime!=null and query.createStartTime!=''">
|
||||
and data_create_time>= #{query.createStartTime} and data_create_time <= #{query.createEndTime}
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<select id="getList" resultType="com.nflg.mobilebroken.repository.entity.TBaseRequestLog">
|
||||
select * from t_base_request_log
|
||||
where 1=1
|
||||
<include refid="whr"/>
|
||||
</select>
|
||||
|
||||
<delete id="delByIds">
|
||||
delete from t_base_request_log where id in
|
||||
<foreach collection="ids" open="(" close=")" separator="," item="item">
|
||||
#{item}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue