From 83eb4441779cd5f85061a729039d8d34580d6b21 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 21 十二月 2023 16:51:28 +0800
Subject: [PATCH] 前后端对接，接口调整
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java | 15 +++----
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 44 +++++++++++++--------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 5 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 12 +++---
4 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
index 4fa9842..3d60a5e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
@@ -1,22 +1,19 @@
package com.doumee.api.business;
-import com.alibaba.fastjson.JSON;
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Problems;
import com.doumee.service.business.ProblemsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +39,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:problems:delete")
+ //@RequiresPermissions("business:problems:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
problemsService.deleteById(id);
return ApiResponse.success(null);
@@ -50,7 +47,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:problems:delete")
+ //@RequiresPermissions("business:problems:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -71,14 +68,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:problems:query")
+ //@RequiresPermissions("business:problems:query")
public ApiResponse<PageData<Problems>> findPage (@RequestBody PageWrap<Problems> pageWrap) {
return ApiResponse.success(problemsService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:problems:exportExcel")
+ //@RequiresPermissions("business:problems:exportExcel")
public void exportExcel (@RequestBody PageWrap<Problems> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Problems.class).export(problemsService.findPage(pageWrap).getRecords(), "璇曢淇℃伅琛�", response);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 1bfa566..79d0248 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -49,7 +49,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -76,16 +76,16 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnu;
- @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� ", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� ")
+ @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇")
private Integer type;
@ApiModelProperty(value = "鍒嗗��", example = "1")
@ExcelColumn(name="鍒嗗��")
private BigDecimal score;
- @ApiModelProperty(value = "浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�", example = "1")
- @ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
+ @ApiModelProperty(value = "浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�", example = "1")
+ @ExcelColumn(name="浣跨敤鍦烘櫙 浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�")
private Integer useType;
@ApiModelProperty(value = "閫夐」闆嗗璞￠泦鍚�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index de873b3..ba9e77f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -45,25 +45,25 @@
@Override
public Integer create(Problems problems) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Problems insert = new Problems();
+ Problems newProblems = new Problems();
- insert.setCreator(loginUserInfo.getId());
- insert.setCreateDate(new Date());
- insert.setEditor(loginUserInfo.getId());
- insert.setEditDate(new Date());
- insert.setIsdeleted(Constants.ZERO);
- insert.setRemark(problems.getRemark());
- insert.setTitle(problems.getTitle());
+ newProblems.setCreator(loginUserInfo.getId());
+ newProblems.setCreateDate(new Date());
+ newProblems.setEditor(loginUserInfo.getId());
+ newProblems.setEditDate(new Date());
+ newProblems.setIsdeleted(Constants.ZERO);
+ newProblems.setRemark(problems.getRemark());
+ newProblems.setTitle(problems.getTitle());
if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
- insert.setOptions(JSON.toJSONString(problems.getObjectList()));
+ newProblems.setOptions(JSON.toJSONString(problems.getObjectList()));
}
- insert.setAnswer(problems.getAnswer());
- insert.setSortnu(problems.getSortnu());
- insert.setType(problems.getType());
- insert.setScore(problems.getScore());
- insert.setUseType(problems.getUseType());
- problemsMapper.insert(problems);
- return insert.getId();
+ newProblems.setAnswer(problems.getAnswer());
+ newProblems.setSortnu(problems.getSortnu());
+ newProblems.setType(problems.getType());
+ newProblems.setScore(problems.getScore());
+ newProblems.setUseType(problems.getUseType());
+ problemsMapper.insert(newProblems);
+ return newProblems.getId();
}
@Override
@@ -184,7 +184,17 @@
}
queryWrapper.lambda().orderByAsc(Problems::getSortnu);
queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
- return PageData.from(problemsMapper.selectPage(page, queryWrapper));
+ IPage<Problems> problemsIPage = problemsMapper.selectPage(page, queryWrapper);
+ if(null != problemsIPage && problemsIPage.getRecords().size() > 0) {
+ List<Problems> newProblems = new ArrayList<>();
+ List<Problems> newDatas = problemsIPage.getRecords();
+ for (Problems dto:newDatas) {
+ dto.setObjectList(JSON.parseArray(dto.getOptions(), OptionsObject.class));
+ newProblems.add(dto);
+ }
+ problemsIPage.setRecords(newProblems);
+ }
+ return PageData.from(problemsIPage);
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 7b3865d..130d53a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -193,7 +193,10 @@
@Override
public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
-
+ Random random = new Random();
+ int randomNumber = random.nextInt(999999);
+ String formattedNumber = String.format("%06d", randomNumber);
+ System.out.println(formattedNumber);
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
--
Gitblit v1.9.3