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); } 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 = "选项集对象集合") 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 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()); //是否包含中文
