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/house/controller/UserHouseLabelController.java | 228 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 160 insertions(+), 68 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java b/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
index d122a9b..7950cf4 100644
--- a/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
@@ -17,149 +17,241 @@
package org.springblade.modules.house.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.AesUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.house.dto.UserHouseLabelDTO;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.vo.HouseLabelVO;
-import org.springblade.modules.house.wrapper.HouseLabelWrapper;
+import org.springblade.modules.house.excel.UserHouseLabelExcel;
+import org.springblade.modules.house.excel.UserHouseLabelImporter;
import org.springblade.modules.house.service.IUserHouseLabelService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
+import org.springblade.modules.house.wrapper.HouseholdLabelWrapper;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
/**
- * 房屋-标签 控制器
+ * 住户-标签 控制器
*
* @author BladeX
* @since 2023-10-28
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-houseLabel/userHouseLabel")
-@Api(value = "用户房屋-标签", tags = "用户房屋-标签接口")
+@RequestMapping("blade-householdLabel/householdLabel")
+@Api(value = "住户-标签", tags = "住户-标签接口")
public class UserHouseLabelController extends BladeController {
- private final IUserHouseLabelService userHouseLabelService;
+ private final IUserHouseLabelService householdLabelService;
/**
- * 房屋-标签 详情
+ * 住户-标签 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入houseLabel")
- public R<HouseLabelVO> detail(UserHouseLabelEntity houseLabel) {
- UserHouseLabelEntity detail = userHouseLabelService.getOne(Condition.getQueryWrapper(houseLabel));
- return R.data(HouseLabelWrapper.build().entityVO(detail));
+ @ApiOperation(value = "详情", notes = "传入householdLabel")
+ public R<HouseholdLabelVO> detail(UserHouseLabelEntity householdLabel) {
+ UserHouseLabelEntity detail = householdLabelService.getOne(Condition.getQueryWrapper(householdLabel));
+ return R.data(HouseholdLabelWrapper.build().entityVO(detail));
}
/**
- * 房屋-标签 分页
+ * 住户-标签 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入houseLabel")
- public R<IPage<HouseLabelVO>> list(UserHouseLabelEntity houseLabel, Query query) {
- IPage<UserHouseLabelEntity> pages = userHouseLabelService.page(Condition.getPage(query), Condition.getQueryWrapper(houseLabel));
- return R.data(HouseLabelWrapper.build().pageVO(pages));
+ @ApiOperation(value = "分页", notes = "传入householdLabel")
+ public R<IPage<HouseholdLabelVO>> list(UserHouseLabelEntity householdLabel, Query query) {
+ IPage<UserHouseLabelEntity> pages = householdLabelService.page(Condition.getPage(query), Condition.getQueryWrapper(householdLabel));
+ return R.data(HouseholdLabelWrapper.build().pageVO(pages));
}
/**
- * 房屋-标签 自定义分页
+ * 住户-标签 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入houseLabel")
- public R<IPage<HouseLabelVO>> page(HouseLabelVO houseLabel, Query query) {
- IPage<HouseLabelVO> pages = userHouseLabelService.selectHouseLabelPage(Condition.getPage(query), houseLabel);
+ @ApiOperation(value = "分页", notes = "传入householdLabel")
+ public R<IPage<HouseholdLabelVO>> page(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.selectHouseholdLabelPage(Condition.getPage(query), householdLabel);
return R.data(pages);
}
/**
- * 房屋-标签 自定义分页
- */
- @GetMapping("/userLabelList")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "查询用户的标签", notes = "传入houseLabel")
- public R<List<Integer>> userLabelList() {
- List<Integer> pages = userHouseLabelService.selectUserLabelList(new UserHouseLabelDTO());
- return R.data(pages);
- }
-
- /**
- * 房屋-标签 新增
+ * 住户-标签 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入houseLabel")
- public R save(@Valid @RequestBody UserHouseLabelEntity houseLabel) {
- return R.status(userHouseLabelService.save(houseLabel));
+ @ApiOperation(value = "新增", notes = "传入householdLabel")
+ public R save(@Valid @RequestBody UserHouseLabelEntity householdLabel) {
+ return R.status(householdLabelService.save(householdLabel));
}
/**
- * 房屋-标签 修改
+ * 住户-标签 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入houseLabel")
- public R update(@Valid @RequestBody UserHouseLabelEntity houseLabel) {
- return R.status(userHouseLabelService.updateById(houseLabel));
+ @ApiOperation(value = "修改", notes = "传入householdLabel")
+ public R update(@Valid @RequestBody UserHouseLabelEntity householdLabel) {
+ return R.status(householdLabelService.updateById(householdLabel));
}
/**
- * 房屋-标签 新增或修改
+ * 住户-标签 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入houseLabel")
- public R submit(@Valid @RequestBody UserHouseLabelEntity houseLabel) {
- return R.status(userHouseLabelService.saveOrUpdate(houseLabel));
+ @ApiOperation(value = "新增或修改", notes = "传入householdLabel")
+ public R submit(@Valid @RequestBody UserHouseLabelEntity householdLabel) {
+ return R.status(householdLabelService.saveOrUpdate(householdLabel));
}
/**
- * 房屋-标签 自定义新增或修改
- * @param houseLabel
+ * 住户-标签 自定义新增或修改
+ * @param householdLabel
+ * @return
+ */
+ @PostMapping("/saveOrUpdateHouseholdLabel")
+ @ApiOperation(value = "自定义新增或修改", notes = "传入householdLabel")
+ public R saveOrUpdateHouseholdLabel(@Valid @RequestBody UserHouseLabelEntity householdLabel) {
+ return R.status(householdLabelService.saveOrUpdateHouseholdLabel(householdLabel));
+ }
+
+ /**
+ * 房屋-标签 房屋自定义新增或修改
+ * @param householdLabel
* @return
*/
@PostMapping("/saveOrUpdateHouseLabel")
- @ApiOperation(value = "自定义新增或修改", notes = "传入houseLabel")
- public R saveOrUpdateHouseLabel(@Valid @RequestBody UserHouseLabelEntity houseLabel) {
- return R.status(userHouseLabelService.saveOrUpdateHouseLabel(houseLabel));
+ @ApiOperation(value = "自定义新增或修改", notes = "传入householdLabel")
+ public R saveOrUpdateHouseLabel(@Valid @RequestBody UserHouseLabelEntity householdLabel) {
+ return R.status(householdLabelService.saveOrUpdateHouseLabel(householdLabel));
}
/**
- * 房屋-标签 删除
+ * 住户-标签 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(userHouseLabelService.removeByIds(Func.toLongList(ids)));
+ return R.status(householdLabelService.removeByIds(Func.toLongList(ids)));
+ }
+
+
+ /**
+ * 住户-标签 自定义删除
+ */
+ @PostMapping("/removeHouseholdLabel")
+ public R removeHouseholdLabel(@RequestBody UserHouseLabelEntity householdLabel) {
+ QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("household_id", householdLabel.getHouseholdId())
+ .eq("label_id", householdLabel.getLabelId());
+ // 返回
+ return R.status(householdLabelService.remove(wrapper));
}
/**
- * 房屋-标签 自定义删除
+ * 导入用户
*/
- @PostMapping("/removeHouseLabel")
- @ApiOperationSupport(order = 7)
- public R removeHouseLabel(@RequestBody UserHouseLabelEntity houseLabel) {
- QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("label_id",houseLabel.getLabelId())
- .eq("house_code",houseLabel.getHouseCode());
- // 返回
- return R.status(userHouseLabelService .remove(wrapper));
+ @PostMapping("import-userHouseLabel")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "标签住户导入", notes = "传入excel")
+ public R importUser(MultipartFile file, @RequestParam(value = "isCovered", defaultValue = "0") Integer isCovered) {
+ UserHouseLabelImporter userHouseLabelImporter = new UserHouseLabelImporter(householdLabelService, isCovered == 1);
+ ExcelUtil.save(file, userHouseLabelImporter, UserHouseLabelExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-userHouseLabel")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出标签住户模板")
+ public void exportUser(HttpServletResponse response) {
+ List<UserHouseLabelExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "标签住户数据模板", "标签住户数据表", list, UserHouseLabelExcel.class);
+ }
+
+
+ /**
+ * 街道重点人员标签统计
+ * @param householdLabel
+ * @param query
+ * @return
+ */
+ @GetMapping("/getRegionStatisticalLabels")
+ @ApiOperation(value = "街道重点人员标签统计", notes = "")
+ public R<IPage<HouseholdLabelVO>> statisticalLabels(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.statisticalLabels(Condition.getPage(query), householdLabel);
+ return R.data(pages);
+ }
+
+ /**
+ * 组织部标签统计
+ * @param householdLabel
+ * @param query
+ * @return
+ */
+ @GetMapping("/getOrgStatisticalLabels")
+ @ApiOperation(value = "组织部标签统计", notes = "")
+ public R<IPage<HouseholdLabelVO>> orgStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.orgStatisticalLabels(Condition.getPage(query), householdLabel);
+ return R.data(pages);
+ }
+
+
+ /**
+ * 统战标签统计
+ * @param householdLabel
+ * @param query
+ * @return
+ */
+ @GetMapping("/getUnitedFrontStatisticalLabels")
+ @ApiOperation(value = "统战标签统计", notes = "")
+ public R<IPage<HouseholdLabelVO>> unitedFrontStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.unitedFrontStatisticalLabels(Condition.getPage(query), householdLabel);
+ return R.data(pages);
+ }
+
+ /**
+ * 关注人员标签统计
+ * @param householdLabel
+ * @param query
+ * @return
+ */
+ @GetMapping("/getFollowStatisticalLabels")
+ @ApiOperation(value = "统战标签统计", notes = "")
+ public R<IPage<HouseholdLabelVO>> followStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.followStatisticalLabels(Condition.getPage(query), householdLabel);
+ return R.data(pages);
+ }
+
+ /**
+ * 社区重点人员标签统计
+ * @param householdLabel
+ * @param query
+ * @return
+ */
+ @GetMapping("/getCommunityStatisticalLabels")
+ @ApiOperation(value = "社区重点人员标签统计", notes = "")
+ public R<IPage<HouseholdLabelVO>> getCommunityStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
+ IPage<HouseholdLabelVO> pages = householdLabelService.getCommunityStatisticalLabels(Condition.getPage(query), householdLabel);
+ return R.data(pages);
}
--
Gitblit v1.9.3