添加功能

This commit is contained in:
马宝龙
2026-07-03 13:00:37 +08:00
parent edc1be0934
commit fbf2b2da0e
10 changed files with 603 additions and 1 deletions

View File

@@ -18,6 +18,8 @@ public enum ModelTemplateTypeEnum {
MODEL_SUPPLY_MONITOR_POPULATION("劳动力动态监测系统-劳动力供给预测人口"),
MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE("劳动力动态监测系统-劳动力供给预测总和生育率"),
MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE("劳动力动态监测系统-劳动力供给劳动参与率"),
;
private final String desc;
}

View File

@@ -0,0 +1,104 @@
package com.ruoyi.cms.controller;
import com.ruoyi.cms.domain.ModelSupplyMonitorLaborJoinRate;
import com.ruoyi.cms.service.ModelSupplyMonitorLaborJoinRateService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.List;
/**
* 劳动力供给劳动参与率
*
* @author 马宝龙
* @date 2026/7/3
*/
@RestController
@RequestMapping("/model/supplyMonitorLaborJoinRate")
@RequiredArgsConstructor
public class ModelSupplyMonitorLaborJoinRateController extends BaseController {
private final ModelSupplyMonitorLaborJoinRateService modelSupplyMonitorLaborJoinRateService;
/**
* 创建
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 创建结果
*/
@PostMapping("/create")
public AjaxResult create(@Valid @RequestBody ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
modelSupplyMonitorLaborJoinRateService.create(modelSupplyMonitorLaborJoinRate);
return AjaxResult.success();
}
/**
* 更新
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 更新结果
*/
@PutMapping("/update")
public AjaxResult update(@Valid @RequestBody ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
modelSupplyMonitorLaborJoinRateService.update(modelSupplyMonitorLaborJoinRate);
return AjaxResult.success();
}
/**
* 删除
*
* @param id ID
* @return 删除结果
*/
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam Long id) {
modelSupplyMonitorLaborJoinRateService.delete(id);
return AjaxResult.success();
}
/**
* 清空
*
* @return 清空结果
*/
@DeleteMapping("/clear")
public AjaxResult clear() {
modelSupplyMonitorLaborJoinRateService.clear();
return AjaxResult.success();
}
/**
* 查询详情
*
* @param id ID
* @return 劳动力供给劳动参与率
*/
@GetMapping("/detail")
public AjaxResult detail(@RequestParam Long id) {
ModelSupplyMonitorLaborJoinRate data = modelSupplyMonitorLaborJoinRateService.detail(id);
return AjaxResult.success(data);
}
/**
* 查询列表
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 列表
*/
@PostMapping("/list")
public AjaxResult list(@RequestBody ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
List<ModelSupplyMonitorLaborJoinRate> list =
modelSupplyMonitorLaborJoinRateService.list(modelSupplyMonitorLaborJoinRate);
return AjaxResult.success(list);
}
}

View File

@@ -0,0 +1,49 @@
package com.ruoyi.cms.domain;
import com.ruoyi.common.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 劳动力供给劳动参与率
*
* @author 马宝龙
* @date 2026/7/3
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ModelSupplyMonitorLaborJoinRate implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long id;
/**
* 年份
*/
@Excel(name = "年份")
private Integer year;
/**
* 年龄
*/
@Excel(name = "年龄")
private Integer age;
/**
* 男性劳动参与率(%
*/
@Excel(name = "男性劳动参与率(%")
private BigDecimal maleLaborJoinRate;
/**
* 女性劳动参与率(%
*/
@Excel(name = "女性劳动参与率(%")
private BigDecimal femaleLaborJoinRate;
}

View File

@@ -0,0 +1,64 @@
package com.ruoyi.cms.mapper;
import com.ruoyi.cms.domain.ModelSupplyMonitorLaborJoinRate;
import java.util.List;
/**
* 劳动力供给劳动参与率
*
* @author 马宝龙
* @date 2026/7/3
*/
public interface ModelSupplyMonitorLaborJoinRateMapper {
/**
* 新增
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
*/
void insert(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 修改
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
*/
void update(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 通过ID删除
*
* @param id ID
*/
void deleteById(Long id);
/**
* 清空
*/
void clear();
/**
* 通过ID查询
*
* @param id ID
* @return 劳动力供给劳动参与率
*/
ModelSupplyMonitorLaborJoinRate selectById(Long id);
/**
* 查询唯一(按年份)
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 劳动力供给劳动参与率
*/
ModelSupplyMonitorLaborJoinRate findUnique(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 查询列表
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 列表
*/
List<ModelSupplyMonitorLaborJoinRate> list(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
}

View File

@@ -0,0 +1,75 @@
package com.ruoyi.cms.service;
import com.ruoyi.cms.domain.ModelSupplyMonitorLaborJoinRate;
import com.ruoyi.cms.domain.dto.ModelExportParamDto;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 劳动力供给劳动参与率
*
* @author 马宝龙
* @date 2026/7/3
*/
public interface ModelSupplyMonitorLaborJoinRateService {
/**
* 创建
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
*/
void create(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 更新
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
*/
void update(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 删除
*
* @param id ID
*/
void delete(Long id);
/**
* 清空
*/
void clear();
/**
* 查询详情
*
* @param id ID
* @return 劳动力供给劳动参与率
*/
ModelSupplyMonitorLaborJoinRate detail(Long id);
/**
* 查询列表
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 列表
*/
List<ModelSupplyMonitorLaborJoinRate> list(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate);
/**
* 导入数据
*
* @param file 文件
* @return 导入结果
*/
String importExcel(MultipartFile file);
/**
* 导出数据
*
* @param response 响应体
* @param dto 导出参数
*/
void exportExcel(HttpServletResponse response, ModelExportParamDto dto);
}

View File

@@ -3,6 +3,7 @@ package com.ruoyi.cms.service.impl;
import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum;
import com.ruoyi.cms.domain.dto.ModelExportParamDto;
import com.ruoyi.cms.service.ModelCommonService;
import com.ruoyi.cms.service.ModelSupplyMonitorLaborJoinRateService;
import com.ruoyi.cms.service.ModelSupplyMonitorPopulationService;
import com.ruoyi.cms.service.ModelSupplyMonitorTotalFertilityRateService;
import com.ruoyi.cms.service.ModelWarningIndicatorDataService;
@@ -38,6 +39,7 @@ public class ModelCommonServiceImpl implements ModelCommonService {
private final ModelWarningIndicatorDataService modelWarningIndicatorDataService;
private final ModelSupplyMonitorPopulationService modelSupplyMonitorPopulationService;
private final ModelSupplyMonitorTotalFertilityRateService modelSupplyMonitorTotalFertilityRateService;
private final ModelSupplyMonitorLaborJoinRateService modelSupplyMonitorLaborJoinRateService;
@Override
public void template(HttpServletResponse response,
@@ -87,6 +89,8 @@ public class ModelCommonServiceImpl implements ModelCommonService {
return modelSupplyMonitorPopulationService.importExcel(file);
case MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE:
return modelSupplyMonitorTotalFertilityRateService.importExcel(file);
case MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE:
return modelSupplyMonitorLaborJoinRateService.importExcel(file);
default:
throw new ServiceException("模板类型错误");
}
@@ -108,6 +112,9 @@ public class ModelCommonServiceImpl implements ModelCommonService {
case MODEL_SUPPLY_MONITOR_TOTAL_FERTILITY_RATE:
modelSupplyMonitorTotalFertilityRateService.exportExcel(response, dto);
break;
case MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE:
modelSupplyMonitorLaborJoinRateService.exportExcel(response, dto);
break;
default:
throw new ServiceException("模板类型错误");
}

View File

@@ -0,0 +1,200 @@
package com.ruoyi.cms.service.impl;
import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum;
import com.ruoyi.cms.domain.ModelSupplyMonitorLaborJoinRate;
import com.ruoyi.cms.domain.dto.ModelExportParamDto;
import com.ruoyi.cms.mapper.ModelSupplyMonitorLaborJoinRateMapper;
import com.ruoyi.cms.service.ModelSupplyMonitorLaborJoinRateService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Validator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
/**
* 劳动力供给劳动参与率
*
* @author 马宝龙
* @date 2026/7/3
*/
@Slf4j
@Service
@Validated
@RequiredArgsConstructor
public class ModelSupplyMonitorLaborJoinRateServiceImpl implements ModelSupplyMonitorLaborJoinRateService {
private final ModelSupplyMonitorLaborJoinRateMapper modelSupplyMonitorLaborJoinRateMapper;
private final Validator validator;
@Override
public void create(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
check(modelSupplyMonitorLaborJoinRate);
// 查询唯一(按年份)
Optional<ModelSupplyMonitorLaborJoinRate> optional = findUnique(modelSupplyMonitorLaborJoinRate);
if (optional.isPresent()) {
// 更新
ModelSupplyMonitorLaborJoinRate exists = optional.get();
modelSupplyMonitorLaborJoinRate.setId(exists.getId());
modelSupplyMonitorLaborJoinRateMapper.update(modelSupplyMonitorLaborJoinRate);
} else {
// 新增
modelSupplyMonitorLaborJoinRateMapper.insert(modelSupplyMonitorLaborJoinRate);
}
}
/**
* 检查
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
*/
void check(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
if (Objects.isNull(modelSupplyMonitorLaborJoinRate.getYear())) {
throw new ServiceException("年份不能为空");
}
if (Objects.isNull(modelSupplyMonitorLaborJoinRate.getAge())) {
throw new ServiceException("年龄不能为空");
}
if (Objects.isNull(modelSupplyMonitorLaborJoinRate.getMaleLaborJoinRate())) {
throw new ServiceException("男性劳动参与率不能为空");
}
if (Objects.isNull(modelSupplyMonitorLaborJoinRate.getFemaleLaborJoinRate())) {
throw new ServiceException("女性劳动参与率不能为空");
}
}
@Override
public void update(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
check(modelSupplyMonitorLaborJoinRate);
if (Objects.isNull(modelSupplyMonitorLaborJoinRate.getId())) {
throw new ServiceException("id不能为空");
}
Optional<ModelSupplyMonitorLaborJoinRate> unique = findUnique(modelSupplyMonitorLaborJoinRate);
if (!unique.isPresent()) {
modelSupplyMonitorLaborJoinRateMapper.update(modelSupplyMonitorLaborJoinRate);
return;
}
ModelSupplyMonitorLaborJoinRate exists = unique.get();
if (!exists.getId().equals(modelSupplyMonitorLaborJoinRate.getId())) {
throw new ServiceException("数据已存在");
}
modelSupplyMonitorLaborJoinRateMapper.update(modelSupplyMonitorLaborJoinRate);
}
@Override
public void delete(Long id) {
if (Objects.isNull(id)) {
throw new ServiceException("id不能为空");
}
modelSupplyMonitorLaborJoinRateMapper.deleteById(id);
}
@Override
public void clear() {
modelSupplyMonitorLaborJoinRateMapper.clear();
}
@Override
public ModelSupplyMonitorLaborJoinRate detail(Long id) {
if (Objects.isNull(id)) {
throw new ServiceException("id不能为空");
}
return modelSupplyMonitorLaborJoinRateMapper.selectById(id);
}
/**
* 查询唯一
*
* @param modelSupplyMonitorLaborJoinRate 劳动力供给劳动参与率
* @return 劳动力供给劳动参与率
*/
private Optional<ModelSupplyMonitorLaborJoinRate> findUnique(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
ModelSupplyMonitorLaborJoinRate unique =
modelSupplyMonitorLaborJoinRateMapper.findUnique(modelSupplyMonitorLaborJoinRate);
return Optional.ofNullable(unique);
}
@Override
public List<ModelSupplyMonitorLaborJoinRate> list(ModelSupplyMonitorLaborJoinRate modelSupplyMonitorLaborJoinRate) {
return modelSupplyMonitorLaborJoinRateMapper.list(modelSupplyMonitorLaborJoinRate);
}
@Override
public String importExcel(MultipartFile file) {
try {
ExcelUtil<ModelSupplyMonitorLaborJoinRate> util = new ExcelUtil<>(ModelSupplyMonitorLaborJoinRate.class);
List<ModelSupplyMonitorLaborJoinRate> list = util.importExcel(file.getInputStream());
ModelSupplyMonitorLaborJoinRate exists;
int successNum = 0;
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
for (ModelSupplyMonitorLaborJoinRate item : list) {
try {
check(item);
exists = modelSupplyMonitorLaborJoinRateMapper.findUnique(item);
if (exists == null) {
BeanValidators.validateWithException(validator, item);
modelSupplyMonitorLaborJoinRateMapper.insert(item);
successNum++;
String msg =
"<br/>" + successNum + "" + "年份:" + item.getYear() + "数据导入成功。";
successMsg.append(msg);
} else {
item.setId(exists.getId());
BeanValidators.validateWithException(validator, item);
modelSupplyMonitorLaborJoinRateMapper.update(item);
successNum++;
String msg =
"<br/>" + successNum + "" + "年份:" + item.getYear() + "数据更新成功。";
successMsg.append(msg);
}
} catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "" + "年份:" + item.getYear() + "数据导入失败:";
failureMsg.append(msg).append(e.getMessage());
log.error(msg, e);
}
}
if (failureNum > 0) {
failureMsg.insert(0, "导入失败!共 " + failureNum + " 条数据出现问题,错误如下:");
throw new ServiceException(failureMsg.toString());
} else {
successMsg.insert(0, "数据已全部导入成功!共 " + successNum + " 条:");
}
return successMsg.toString();
} catch (Exception e) {
log.error("数据导入失败", e);
throw new ServiceException("数据导入失败");
}
}
@Override
public void exportExcel(HttpServletResponse response, ModelExportParamDto dto) {
try {
List<ModelSupplyMonitorLaborJoinRate> list = list(ModelSupplyMonitorLaborJoinRate.builder()
.year(dto.getYear())
.build());
ExcelUtil<ModelSupplyMonitorLaborJoinRate> util = new ExcelUtil<>(ModelSupplyMonitorLaborJoinRate.class);
util.exportExcel(response, list, ModelTemplateTypeEnum.MODEL_SUPPLY_MONITOR_LABOR_JOIN_RATE.getDesc());
} catch (Exception e) {
log.error("数据导出失败", e);
throw new ServiceException("数据导出失败");
}
}
}