新闻、公告API文档

src/main/java/com/xjrsoft/common/model/result/RT.java

@@ -0,0 +1,88 @@
+package com.xjrsoft.common.model.result;
+
+import com.xjrsoft.common.enums.ResponseCode;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 返回数据
+ */
+public class RT<T> {
+    /**
+     * 返回码
+     * 0 正常，其他异常
+     */
+    private int code = 0;
+
+    private boolean success = true;
+
+    /**
+     * 描述
+     */
+    private String msg = "";
+
+    /**
+     * 结果数据
+     */
+    private T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public boolean getSuccess(){
+        return success;
+    }
+
+    public static RT ok() {
+        return new RT();
+    }
+
+    public static <T> RT<T> ok(T result) {
+        RT<T> r = new RT<>();
+        r.data = result;
+        return r;
+    }
+
+    public static <T> RT<T> ok(String msg, T result) {
+        RT<T> r = new RT<>();
+        r.data = result;
+        r.msg = msg;
+        return r;
+    }
+
+    public static <T> RT<T> error() {
+        return error(ResponseCode.INTERNAL_SERVER_ERROR.getCode(), "未知异常，请联系管理员");
+    }
+
+    public static <T> RT<T> error(String msg) {
+        return error(ResponseCode.INTERNAL_SERVER_ERROR.getCode(), msg);
+    }
+
+    public static <T> RT<T> error(int code, String msg) {
+        RT<T> r = new RT();
+        r.code = code;
+        r.msg = msg;
+        return r;
+    }
+
+    public static ResponseEntity<byte[]> fileStream(byte[] bot, String fileName) {
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentDispositionFormData("attachment", fileName);
+        headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+
+        return new ResponseEntity<byte[]>(bot, headers, HttpStatus.OK);
+    }
+}

src/main/java/com/xjrsoft/module/oa/controller/MessageController.java

@@ -15,7 +15,7 @@ import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.IsReadTypeEnum;
 import com.xjrsoft.common.enums.MessageType;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageInput;
 import com.xjrsoft.common.page.PageOutput;
@@ -61,7 +61,7 @@ public class MessageController {
 
     @GetMapping("/list")
     @ApiOperation(value = "获取消息数据")
-    public R list(MessageListDto dto) {
+    public RT<List<MessageListVo>> list(MessageListDto dto) {
         Wrapper<Message> wrapper = Wrappers.<Message>query().lambda()
                 .eq(Message::getUserId, StpUtil.getLoginIdAsLong())
 //                .like(StrUtil.isNotBlank(dto.getKeyword()), Message::getMessageContent, dto.getKeyword())
@@ -106,52 +106,49 @@ public class MessageController {
 //                vo.setTimeFormat(StrUtil.toString(between.toDays()) + "天前");
 //            }
         }
-        return R.ok(vos);
+        return RT.ok(vos);
     }
 
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "消息详情")
-    public R info(@RequestParam Long id) {
+    public RT<MessageVo> info(@RequestParam Long id) {
         Message msg = messageService.getById(id);
         if (msg == null) {
-            R.error("找不到此消息！");
+            RT.error("找不到此消息！");
         }
-        return R.ok(BeanUtil.toBean(msg, MessageVo.class));
+        return RT.ok(BeanUtil.toBean(msg, MessageVo.class));
     }
 
     @PutMapping("/read-all-message")
     @ApiOperation(value = "将所有工作流未读消息改为已读")
-    public R readAllMessage() {
+    public RT<Boolean> readAllMessage() {
         //1、获取用户id
         Long userId = StpUtil.getLoginIdAsLong();
         //2、根据用户id和消息类型修改对应的是否已读字段为已读
         Wrapper<Message> wrapper = Wrappers.<Message>update().lambda().set(Message::getIsRead, IsReadTypeEnum.READ.getCode())
                 .eq(Message::getUserId, userId).eq(Message::getMessageType, MessageType.APPROVE.getCode()).or().eq(Message::getMessageType, MessageType.CIRCULATED.getCode());
-        messageService.update(wrapper);
-        return R.ok();
+        return RT.ok(messageService.update(wrapper));
     }
 
     @PutMapping("/read-message")
     @ApiOperation(value = "将单条未读消息改为已读")
-    public R readMessage(@RequestBody ResetPasswordDto dto) {
+    public RT<Boolean> readMessage(@RequestBody ResetPasswordDto dto) {
         Message message = new Message();
         message.setId(dto.getId());
         message.setIsRead(IsReadTypeEnum.READ.getCode());
         //将是否已读类型改为已读
-        messageService.updateById(message);
-        return R.ok();
+        return RT.ok(messageService.updateById(message));
     }
 
     @PutMapping("/read-all-schedule-message")
     @ApiOperation(value = "将所有日程未读消息改为已读")
-    public R readAllScheduleMessage() {
+    public RT<Boolean> readAllScheduleMessage() {
         //1、获取用户id
         Long userId = StpUtil.getLoginIdAsLong();
         //2、根据用户id和消息类型修改对应的是否已读字段为已读
         Wrapper<Message> wrapper = Wrappers.<Message>update().lambda().set(Message::getIsRead, IsReadTypeEnum.READ.getCode())
                 .eq(Message::getUserId, userId).eq(Message::getMessageType, MessageType.SCHEDULE.getCode());
-        messageService.update(wrapper);
-        return R.ok();
+        return RT.ok(messageService.update(wrapper));
     }
 }

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -11,7 +11,7 @@ import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.EnabledMark;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -60,19 +60,19 @@ public class NewsController {
 
     @GetMapping
     @ApiOperation(value = "获取新闻分页")
-    public R page(NewsPageDto dto) {
+    public RT<PageOutput<NewsPageVo>> page(NewsPageDto dto) {
         Wrapper<News> wrapper = Wrappers.<News>query().lambda()
                 .eq(News::getTypeId, dto.getType())
                 .like(StrUtil.isNotBlank(dto.getKeyword()), News::getFullHead, dto.getKeyword())
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()));
         IPage<News> page = newsService.page(ConventPage.getPage(dto), wrapper);
         PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping("/box")
     @ApiOperation(value = "获取新闻分页")
-    public R box(NewsPageDto dto) {
+    public RT<PageOutput<NewsPageVo>> box(NewsPageDto dto) {
         MPJLambdaWrapper<News> wrapper = MPJWrappers.<News>lambdaJoin()
                 .distinct()
                 .eq(ObjectUtil.isNotEmpty(dto.getType()) && dto.getType() > 0, News::getTypeId, dto.getType())
@@ -86,22 +86,22 @@ public class NewsController {
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()));
         IPage<NewsPageVo> page = newsService.selectJoinListPage(ConventPage.getPage(dto), NewsPageVo.class, wrapper);
         PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
 
     @PostMapping
     @ApiOperation(value = "新增新闻")
-    public R add(@RequestBody AddNewsDto addNewsDto) {
-        return R.ok(newsService.add(addNewsDto));
+    public RT<Long> add(@RequestBody AddNewsDto addNewsDto) {
+        return RT.ok(newsService.add(addNewsDto));
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "新闻详情")
-    public R info(@RequestParam Long id, @RequestParam(required = false) Boolean isRead) {
+    public RT<NewsVo> info(@RequestParam Long id, @RequestParam(required = false) Boolean isRead) {
         News news = newsService.getById(id);
         if (news == null) {
-            R.error("找不到此新闻！");
+            RT.error("找不到此新闻！");
         }
         if (BooleanUtils.isTrue(isRead)) {
 //            NewsRelation newsRelation = new NewsRelation();
@@ -138,26 +138,26 @@ public class NewsController {
             newsVo.setAppendixList(newsAppendixVoList);
         }
 
-        return R.ok(newsVo);
+        return RT.ok(newsVo);
     }
 
     @PutMapping
     @ApiOperation(value = "修改新闻")
-    public R update(@RequestBody UpdateNewsDto updateNewsDto) {
+    public RT<Boolean> update(@RequestBody UpdateNewsDto updateNewsDto) {
         //News news = BeanUtil.toBean(updateNewsDto, News.class);
-        return R.ok(newsService.update(updateNewsDto));
+        return RT.ok(newsService.update(updateNewsDto));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除新闻")
-    public R delete(@RequestBody List<Long> ids) {
-        return R.ok(newsService.delete(ids));
+    public RT<Boolean> delete(@RequestBody List<Long> ids) {
+        return RT.ok(newsService.delete(ids));
     }
 
 
     @PutMapping("/change-status")
     @ApiOperation(value = "发布或下架新闻")
-    public R changeStatus(@RequestParam("id") String id, @RequestParam("type") Integer type) throws Exception {
+    public RT<Boolean> changeStatus(@RequestParam("id") String id, @RequestParam("type") Integer type) throws Exception {
         News xjrNews = newsService.getById(id);
         if (type == null || xjrNews == null) {
             throw new Exception("参数异常");
@@ -170,12 +170,12 @@ public class NewsController {
             }
         }
         xjrNews.setEnabledMark(type);
-        return R.ok(newsService.updateById(xjrNews));
+        return RT.ok(newsService.updateById(xjrNews));
     }
 
     @PutMapping("/read")
     @ApiOperation(value = "读新闻")
-    public R read(@RequestBody List<Long> ids) {
+    public RT<Boolean> read(@RequestBody List<Long> ids) {
         List<NewsRelation> toSaveList = newsRelationService.list(
                 Wrappers.<NewsRelation>query().lambda()
                         .in(NewsRelation::getNewsId, ids)
@@ -187,12 +187,12 @@ public class NewsController {
 //        newsRelationService.remove(Wrappers.<NewsRelation>query().lambda()
 //                .in(NewsRelation::getNewsId, ids)
 //                .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()));
-        return R.ok(newsRelationService.updateBatchById(toSaveList));
+        return RT.ok(newsRelationService.updateBatchById(toSaveList));
     }
 
     @PutMapping("/reply")
     @ApiOperation(value = "新闻回复")
-    public R reply(@RequestBody NewsReplyDto newsReplyDto) {
+    public RT<Boolean> reply(@RequestBody NewsReplyDto newsReplyDto) {
         NewsRelation newsRelation = newsRelationService.getOne(
                 Wrappers.<NewsRelation>query().lambda()
                         .eq(NewsRelation::getNewsId, newsReplyDto.getId())
@@ -204,7 +204,7 @@ public class NewsController {
             newsRelation.setReadMark(1);
             newsRelation.setReadDate(LocalDateTime.now());
             newsRelation.setReplyContent(newsReplyDto.getReplyContent());
-            return R.ok(newsRelationService.save(newsRelation));
+            return RT.ok(newsRelationService.save(newsRelation));
         }
 
         if (newsRelation.getReadMark() == null || newsRelation.getReadMark() == 0) {
@@ -212,12 +212,12 @@ public class NewsController {
             newsRelation.setReadDate(LocalDateTime.now());
         }
         newsRelation.setReplyContent(newsReplyDto.getReplyContent());
-        return R.ok(newsRelationService.updateById(newsRelation));
+        return RT.ok(newsRelationService.updateById(newsRelation));
     }
 
     @GetMapping("/page-relation")
     @ApiOperation(value = "获取新闻阅读权限分页")
-    public R pageRelation(NewsRelationPageDto dto) {
+    public RT<PageOutput<NewsRelationVo>> pageRelation(NewsRelationPageDto dto) {
 
         IPage<NewsRelationVo> page = newsRelationService.selectJoinListPage(ConventPage.getPage(dto), NewsRelationVo.class,
                 new MPJLambdaWrapper<NewsRelation>()
@@ -230,49 +230,49 @@ public class NewsController {
                         .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId, ext -> ext.selectAs(XjrUser::getName, NewsRelationVo::getUserName))
         );
         PageOutput<NewsRelationVo> pageOutput = ConventPage.getPageOutput(page);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
 
     @GetMapping("/page-relation-config")
     @ApiOperation(value = "获取新闻权限分页")
-    public R pageRelationConfig(NewsRelationPageDto dto) {
+    public RT<PageOutput<NewsRelationConfigVo>> pageRelationConfig(NewsRelationPageDto dto) {
         Wrapper<NewsRelationConfig> wrapper = Wrappers.<NewsRelationConfig>query().lambda()
                 .eq(NewsRelationConfig::getNewsId, dto.getNewsId())
                 .select(NewsRelationConfig.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationConfigVo.class).contains(x.getProperty()));
 
         IPage<NewsRelationConfig> page = newsRelationConfigService.page(ConventPage.getPage(dto), wrapper);
         PageOutput<NewsRelationConfigVo> pageOutput = ConventPage.getPageOutput(page, NewsRelationConfigVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping("/count-relation")
     @ApiOperation(value = "新闻阅读权限统计")
-    public R countRelation(@RequestParam Long id) {
+    public RT<Long[]> countRelation(@RequestParam Long id) {
         Long total = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id));
         Long notRead = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).eq(NewsRelation::getReadMark, 0));
         Long isRead = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).eq(NewsRelation::getReadMark, 1));
         Long isReply = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).isNull(NewsRelation::getReplyContent));
         Long notReply = newsRelationService.count(Wrappers.<NewsRelation>query().lambda().eq(NewsRelation::getNewsId, id).isNotNull(NewsRelation::getReplyContent));
         Long[] arrayRefVar = {total, notRead, isRead, isReply, notReply};
-        return R.ok(arrayRefVar);
+        return RT.ok(arrayRefVar);
     }
 
     @PutMapping("/update-relation")
     @ApiOperation(value = "设置新闻阅读权限")
-    public R updateRelation(@RequestBody UpdateNewsRelationDto updateRelationDto) {
-        return R.ok(newsService.updateRelation(updateRelationDto));
+    public RT<Boolean> updateRelation(@RequestBody UpdateNewsRelationDto updateRelationDto) {
+        return RT.ok(newsService.updateRelation(updateRelationDto));
     }
 
     @DeleteMapping("/delete-relation")
     @ApiOperation(value = "删除新闻阅读权限")
-    public R deleteRelation(@RequestBody DeleteNewsRelationDto deleteNewsRelationDto) {
-        return R.ok(newsService.deleteRelation(deleteNewsRelationDto));
+    public RT<Boolean> deleteRelation(@RequestBody DeleteNewsRelationDto deleteNewsRelationDto) {
+        return RT.ok(newsService.deleteRelation(deleteNewsRelationDto));
     }
 
     @GetMapping("/count-type")
     @ApiOperation(value = "未读类型统计")
-    public R countType() {
+    public RT<List<NewsCountTypeVo>> countType() {
         List<NewsCountTypeVo> newsCountTypeVoList = new ArrayList<>();
         Integer typeIds[] = {1, 2, 3};
         for (Integer typeId : typeIds) {
@@ -287,13 +287,12 @@ public class NewsController {
             }
             newsCountTypeVoList.add(newsCountTypeVo);
         }
-        return R.ok(newsCountTypeVoList);
+        return RT.ok(newsCountTypeVoList);
     }
 
     @GetMapping("/send-message")
     @ApiOperation(value = "发送消息")
-    public R sendMessage(@RequestParam Long id) {
-        newsService.SendMessage(id);
-        return R.ok(true);
+    public RT<Boolean> sendMessage(@RequestParam Long id) {
+        return RT.ok(newsService.SendMessage(id));
     }
 }

src/main/java/com/xjrsoft/module/oa/controller/ScheduleController.java

@@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.module.oa.dto.UpdateScheduleDto;
 import com.xjrsoft.module.oa.dto.AddScheduleDto;
 import com.xjrsoft.module.oa.entity.News;
@@ -41,7 +41,7 @@ public class ScheduleController {
 
     @GetMapping
     @ApiOperation(value = "获取日程管理列表")
-    public R list() {
+    public RT<List<ScheduleListVo>> list() {
         List<Schedule> scheduleList = scheduleService.list(Wrappers.<Schedule>query().lambda()
                 .eq(Schedule::getEnabledMark, 1)
                 .eq(Schedule::getCreateUserId, StpUtil.getLoginIdAsLong())
@@ -64,38 +64,38 @@ public class ScheduleController {
             scheduleListVo.setAllDay(false);
             resultList.add(scheduleListVo);
         }
-        return R.ok(resultList);
+        return RT.ok(resultList);
     }
 
     @PostMapping
     @ApiOperation(value = "添加日程管理")
-    public R add(@RequestBody AddScheduleDto scheduleDto) {
+    public RT<Boolean> add(@RequestBody AddScheduleDto scheduleDto) {
         Schedule schedule = BeanUtil.toBean(scheduleDto, Schedule.class);
         //添加消息通知
         boolean save = scheduleService.save(schedule);
-        return R.ok(save);
+        return RT.ok(save);
     }
 
     @PutMapping
     @ApiOperation(value = "修改日程管理")
-    public R update(@RequestBody UpdateScheduleDto scheduleDto) {
+    public RT<Boolean> update(@RequestBody UpdateScheduleDto scheduleDto) {
         Schedule schedule = BeanUtil.toBean(scheduleDto, Schedule.class);
-        return R.ok(scheduleService.updateById(schedule));
+        return RT.ok(scheduleService.updateById(schedule));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除日程管理")
-    public R delete(@RequestBody List<Long> ids) {
-        return R.ok(scheduleService.delete(ids));
+    public RT<Boolean> delete(@RequestBody List<Long> ids) {
+        return RT.ok(scheduleService.delete(ids));
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "日程详情")
-    public R info(@RequestParam Long id) {
+    public RT<ScheduleVo> info(@RequestParam Long id) {
         Schedule schedule = scheduleService.getById(id);
         if (schedule == null) {
-            R.error("找不到当前日程！");
+            RT.error("找不到当前日程！");
         }
-        return R.ok(BeanUtil.toBean(schedule, ScheduleVo.class));
+        return RT.ok(BeanUtil.toBean(schedule, ScheduleVo.class));
     }
 }

src/main/java/com/xjrsoft/module/personnel/controller/CarManagementController.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -46,7 +46,7 @@ public class CarManagementController {
     @GetMapping(value = "/page")
     @ApiOperation(value="车辆列表(分页)")
     @SaCheckPermission("carmanager:detail")
-    public R Page(@Valid CarManagementPageDto dto){
+    public RT<PageOutput<CarManagementVo>> Page(@Valid CarManagementPageDto dto){
         MPJLambdaWrapper<CarManagement> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .like(StrUtil.isNotBlank(dto.getCarNo()), CarManagement::getCarNo, dto.getCarNo())
@@ -56,51 +56,51 @@ public class CarManagementController {
 
         IPage<CarManagement> page = carManagementService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<CarManagementVo> pageOutput = ConventPage.getPageOutput(page, CarManagementVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询车辆信息")
     @SaCheckPermission("carmanager:detail")
-    public R info(@RequestParam Long id){
+    public RT<CarManagementVo> info(@RequestParam Long id){
         CarManagement carManagement = carManagementService.getByIdDeep(id);
         if (carManagement == null) {
-            return R.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
-        return R.ok(BeanUtil.toBean(carManagement, CarManagementVo.class));
+        return RT.ok(BeanUtil.toBean(carManagement, CarManagementVo.class));
     }
 
     @PostMapping
     @ApiOperation(value = "新增车辆")
     @SaCheckPermission("carmanager:add")
-    public R add(@Valid @RequestBody AddCarManagementDto dto){
+    public RT<Boolean> add(@Valid @RequestBody AddCarManagementDto dto){
         CarManagement carManagement = BeanUtil.toBean(dto, CarManagement.class);
-        return R.ok(carManagementService.add(carManagement));
+        return RT.ok(carManagementService.add(carManagement));
 
     }
 
     @PutMapping
     @ApiOperation(value = "修改车辆")
     @SaCheckPermission("carmanager:edit")
-    public R update(@Valid @RequestBody UpdateCarManagementDto dto){
+    public RT<Boolean> update(@Valid @RequestBody UpdateCarManagementDto dto){
 
         CarManagement carManagement = BeanUtil.toBean(dto, CarManagement.class);
-        return R.ok(carManagementService.update(carManagement));
+        return RT.ok(carManagementService.update(carManagement));
 
     }
 
     @PutMapping("/status")
     @ApiOperation(value = "修改车辆状态")
     @SaCheckPermission("carmanager:edit-status")
-    public R updateEnabled(@Valid @RequestBody UpdateCarManagementStatusDto dto) {
+    public RT<Boolean> updateEnabled(@Valid @RequestBody UpdateCarManagementStatusDto dto) {
         //根据id修改表单enabledMark
-        return R.ok(carManagementService.update(Wrappers.<CarManagement>update().lambda().set(CarManagement::getEnabledMark, dto.getEnabledMark()).eq(CarManagement::getId, dto.getId())));
+        return RT.ok(carManagementService.update(Wrappers.<CarManagement>update().lambda().set(CarManagement::getEnabledMark, dto.getEnabledMark()).eq(CarManagement::getId, dto.getId())));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除")
     @SaCheckPermission("carmanager:delete")
-    public R delete(@Valid @RequestBody List<Long> ids){
-        return R.ok(carManagementService.delete(ids));
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(carManagementService.delete(ids));
     }
 }

src/main/java/com/xjrsoft/module/personnel/controller/CarParkRecordsController.java

@@ -8,7 +8,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -39,7 +39,7 @@ public class CarParkRecordsController {
     @GetMapping(value = "/page")
     @ApiOperation(value="车辆进出记录(分页)")
     @SaCheckPermission("carparkrecords:detail")
-    public R Page(@Valid CarParkRecordsPageDto dto) {
+    public RT<PageOutput<CarParkRecordsVo>> Page(@Valid CarParkRecordsPageDto dto) {
         MPJLambdaWrapper<CarParkRecords> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .like(StrUtil.isNotBlank(dto.getCarNo()), CarParkRecords::getCarNo, dto.getCarNo())
@@ -61,6 +61,6 @@ public class CarParkRecordsController {
 
         IPage<CarParkRecords> page = carParkRecordsService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<CarParkRecordsVo> pageOutput = ConventPage.getPageOutput(page, CarParkRecordsVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 }

src/main/java/com/xjrsoft/module/personnel/controller/FaceIdentifyRecordsController.java

@@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -39,7 +40,7 @@ public class FaceIdentifyRecordsController {
     @GetMapping(value = "/page")
     @ApiOperation(value = "人脸识别记录(分页)")
     @SaCheckPermission("faceidentifyrecords:detail")
-    public R Page(@Valid FaceIdentifyRecordsPageDto dto) {
+    public RT<PageOutput<FaceIdentifyRecordsVo>> Page(@Valid FaceIdentifyRecordsPageDto dto) {
         MPJLambdaWrapper<FaceIdentifyRecords> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .eq(StrUtil.isNotBlank(dto.getDeviceName()), FaceIdentifyRecords::getDeviceName, dto.getDeviceName())
@@ -58,12 +59,12 @@ public class FaceIdentifyRecordsController {
 
         IPage<FaceIdentifyRecords> page = faceIdentifyRecordsService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<FaceIdentifyRecordsVo> pageOutput = ConventPage.getPageOutput(page, FaceIdentifyRecordsVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/user/page")
     @ApiOperation(value = "用户人脸识别记录(分页)")
-    public R userPage(@Valid FaceIdentifyRecordsPageUserDto dto) {
+    public RT<PageOutput<FaceIdentifyRecordsVo>> userPage(@Valid FaceIdentifyRecordsPageUserDto dto) {
         if (dto.getUserId() == null) {
             dto.setUserId(StpUtil.getLoginIdAsLong());
         }
@@ -77,6 +78,6 @@ public class FaceIdentifyRecordsController {
 
         IPage<FaceIdentifyRecords> page = faceIdentifyRecordsService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<FaceIdentifyRecordsVo> pageOutput = ConventPage.getPageOutput(page, FaceIdentifyRecordsVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 }

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -13,6 +13,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.ImageUtil;
@@ -53,7 +54,7 @@ public class FaceManagementController {
     @GetMapping(value = "/page")
     @ApiOperation(value = "人脸列表(分页)")
     @SaCheckPermission("facemanager:detail")
-    public R Page(@Valid FaceManagementPageDto dto) {
+    public RT<PageOutput<FaceManagementVo>> Page(@Valid FaceManagementPageDto dto) {
         MPJLambdaWrapper<FaceManagement> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .like(StrUtil.isNotBlank(dto.getFaceCode()), FaceManagement::getFaceCode, dto.getFaceCode())
@@ -63,76 +64,76 @@ public class FaceManagementController {
 
         IPage<FaceManagement> page = faceManagementService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<FaceManagementVo> pageOutput = ConventPage.getPageOutput(page, FaceManagementVo.class);
-        return R.ok(pageOutput);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
     @ApiOperation(value = "根据id查询人脸信息")
     @SaCheckPermission("facemanager:detail")
-    public R info(@RequestParam Long id) {
+    public RT<FaceManagementVo> info(@RequestParam Long id) {
         FaceManagement faceManagement = faceManagementService.getByIdDeep(id);
         if (faceManagement == null) {
-            return R.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
-        return R.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));
+        return RT.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));
     }
 
     @GetMapping(value = "/detail")
     @ApiOperation(value = "根据当前用户查询人脸信息")
     @SaCheckPermission("facemanager:detail")
-    public R detail() {
+    public RT<FaceManagementVo> detail() {
         FaceManagement faceManagement = faceManagementService.getOneDeep(Wrappers.lambdaQuery(FaceManagement.class).eq(FaceManagement::getUserId, StpUtil.getLoginIdAsLong()));
         if (faceManagement == null) {
-            return R.error("找不到此数据！");
+            return RT.error("找不到此数据！");
         }
-        return R.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));
+        return RT.ok(BeanUtil.toBean(faceManagement, FaceManagementVo.class));
     }
 
     @PostMapping(value = "/add")
     @ApiOperation(value = "新增人脸")
     @SaCheckPermission("facemanager:add")
-    public R add(AddFaceManagementDto dto, @RequestParam("file") MultipartFile file) {
+    public RT<Boolean> add(AddFaceManagementDto dto, @RequestParam("file") MultipartFile file) {
         FaceManagement faceManagement = BeanUtil.toBean(dto, FaceManagement.class);
         try {
             faceManagement.setRegisterBase64(ImageHandler(file));
         } catch (Exception e) {
-            return R.error(e.getMessage());
+            return RT.error(e.getMessage());
         }
         boolean isSuccess = faceManagementService.add(faceManagement);
         codeRuleService.useEncode("FACECODE");
-        return R.ok(isSuccess);
+        return RT.ok(isSuccess);
 
     }
 
     @PostMapping(value = "/update")
     @ApiOperation(value = "修改人脸")
     @SaCheckPermission("facemanager:edit")
-    public R update(UpdateFaceManagementDto dto, @RequestParam(name = "file",required = false) MultipartFile file) {
+    public RT<Boolean> update(UpdateFaceManagementDto dto, @RequestParam(name = "file",required = false) MultipartFile file) {
         FaceManagement faceManagement = BeanUtil.toBean(dto, FaceManagement.class);
         if (file != null) {
             try {
                 faceManagement.setRegisterBase64(ImageHandler(file));
             } catch (Exception e) {
-                return R.error(e.getMessage());
+                return RT.error(e.getMessage());
             }
         }
-        return R.ok(faceManagementService.update(faceManagement));
+        return RT.ok(faceManagementService.update(faceManagement));
 
     }
 
     @PutMapping("/status")
     @ApiOperation(value = "修改人脸状态")
     @SaCheckPermission("facemanager:edit-status")
-    public R updateEnabled(@Valid @RequestBody UpdateFaceManagementStatusDto dto) {
+    public RT<Boolean> updateEnabled(@Valid @RequestBody UpdateFaceManagementStatusDto dto) {
         //根据id修改表单enabledMark
-        return R.ok(faceManagementService.update(Wrappers.<FaceManagement>update().lambda().set(FaceManagement::getEnabledMark, dto.getEnabledMark()).eq(FaceManagement::getId, dto.getId())));
+        return RT.ok(faceManagementService.update(Wrappers.<FaceManagement>update().lambda().set(FaceManagement::getEnabledMark, dto.getEnabledMark()).eq(FaceManagement::getId, dto.getId())));
     }
 
     @DeleteMapping
     @ApiOperation(value = "删除")
     @SaCheckPermission("facemanager:delete")
-    public R delete(@Valid @RequestBody List<Long> ids) {
-        return R.ok(faceManagementService.delete(ids));
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids) {
+        return RT.ok(faceManagementService.delete(ids));
     }
 
     // 图片处理