From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java | 109 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 36 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
index de84090..5044057 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
@@ -16,30 +16,36 @@
*/
package org.springblade.modules.place.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-
-import javax.validation.Valid;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.secure.BladeUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
+import org.springblade.modules.place.excel.ImportPractitionerExcel;
+import org.springblade.modules.place.excel.PractitionerExcel;
+import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.wrapper.PlacePractitionerWrapper;
-import org.springblade.modules.place.service.IPlacePractitionerService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.Date;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
/**
* 场所从业人员 控制器
@@ -53,7 +59,11 @@
@Api(value = "场所从业人员", tags = "场所从业人员接口")
public class PlacePractitionerController {
+ private static Logger logger = LoggerFactory.getLogger(PlacePractitionerController.class);
+
+
private final IPlacePractitionerService placePractitionerService;
+ private final BladeLogger bladeLogger;
/**
* 场所从业人员 详情
@@ -81,9 +91,11 @@
* 场所从业人员 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("场所从业人员 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入placePractitioner")
public R<IPage<PlacePractitionerVO>> page(PlacePractitionerVO placePractitioner, Query query) {
+ bladeLogger.info("场所从业人员 自定义分页", JsonUtil.toJson(placePractitioner));
IPage<PlacePractitionerVO> pages = placePractitionerService.selectPlacePractitionerPage(Condition.getPage(query), placePractitioner);
return R.data(pages);
}
@@ -95,13 +107,6 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入placePractitioner")
public R save(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.save(placePractitioner));
}
@@ -112,14 +117,19 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入placePractitioner")
public R update(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.updateById(placePractitioner));
+ }
+
+ /**
+ * 场所从业人员 修改
+ */
+ @PostMapping("/auditing")
+ @ApiOperationSupport(order = 5)
+ @ApiLog("场所从业人员 修改")
+ @ApiOperation(value = "修改", notes = "传入placePractitioner")
+ public R auditing(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
+ bladeLogger.info("场所从业人员 修改", JsonUtil.toJson(placePractitioner));
+ return R.status(placePractitionerService.auditing(placePractitioner));
}
/**
@@ -129,13 +139,6 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入placePractitioner")
public R submit(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.saveOrUpdate(placePractitioner));
}
@@ -144,20 +147,54 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("场所从业人员 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(placePractitionerService.removeByIds(Func.toLongList(ids)));
+ bladeLogger.info("场所从业人员 删除", JsonUtil.toJson(ids));
+ return R.status(placePractitionerService.removeBatchByIds(Func.toLongList(ids)));
}
/**
* 统计少数民族和未成年数量
*/
- @PostMapping("/countByType")
+ @GetMapping("/countByType")
@ApiOperationSupport(order = 8)
+ @ApiLog("统计少数民族和未成年数量")
@ApiOperation(value = "统计少数民族和未成年数量", notes = "")
- public R countByType() {
- return R.data(placePractitionerService.countByType());
+ public R countByType(PlacePractitionerVO placePractitioner) {
+ bladeLogger.info("统计少数民族和未成年数量", JsonUtil.toJson(placePractitioner));
+ return R.data(placePractitionerService.countByType(placePractitioner));
}
+ /**
+ * 导入场所数据
+ */
+ @PostMapping("/import-practitioner")
+ public R importPractitioner(MultipartFile file, @RequestParam(value = "isCovered",defaultValue = "0") Integer isCovered) {
+ bladeLogger.info("从业人员信息批量导入", JsonUtil.toJson(isCovered));
+ String data = null;
+ try {
+ List<ImportPractitionerExcel> read = ExcelUtil.read(file, ImportPractitionerExcel.class);
+ data = placePractitionerService.importPractitioner(read, isCovered == 1);
+ } catch (Exception e) {
+ logger.error("导入失败！", e);
+ }
+ return R.data(200, data, "");
+ }
+
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-practitioner-template")
+ @ApiOperationSupport(order = 13)
+ @ApiLog("从业人员导出模板")
+ @ApiOperation(value = "从业人员导出模板", notes = "传入place")
+ public void exportPractitionerTemplate(HttpServletResponse response) {
+ List<PractitionerExcel> list = new ArrayList<>();
+ PractitionerExcel importPlaceExcel = new PractitionerExcel();
+ list.add(importPlaceExcel);
+ ExcelUtil.export(response, "从业人员数据" + DateUtil.time(), "从业人员数据表", list, PractitionerExcel.class);
+ }
}
--
Gitblit v1.9.3