zkr/shz-dataDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
马宝龙
2026-07-03 12:00:08 +08:00
parent b68322620b
commit bc7de4224c
12 changed files with 633 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/constant/enums/ModelTemplateTypeEnum.java
View File

@@ -14,6 +14,8 @@ import lombok.Getter;
public enum ModelTemplateTypeEnum {
MODEL_WARNING_INDICATOR_DATA("劳动力动态监测系统-就业失业预警指标数据"),
MODEL_SUPPLY_MONITOR_POPULATION("劳动力动态监测系统-劳动力供给预测人口"),
;
private final String desc;
}

106
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/ModelSupplyMonitorPopulationController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.ruoyi.cms.controller;
import com.ruoyi.cms.domain.ModelSupplyMonitorPopulation;
import com.ruoyi.cms.service.ModelSupplyMonitorPopulationService;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.List;
/**
* 劳动力供给人口
*
* @author 马宝龙
* @date 2026/7/3
*/
@RestController
@RequestMapping("/model/supplyMonitorPopulation")
@RequiredArgsConstructor
public class ModelSupplyMonitorPopulationController extends BaseController {
private final ModelSupplyMonitorPopulationService modelSupplyMonitorPopulationService;
/**
* 创建
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
* @return 创建结果
*/
@PostMapping("/create")
public AjaxResult create(@Valid @RequestBody ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
modelSupplyMonitorPopulationService.create(modelSupplyMonitorPopulation);
return AjaxResult.success();
}
/**
* 更新
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
* @return 更新结果
*/
@PutMapping("/update")
public AjaxResult update(@Valid @RequestBody ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
modelSupplyMonitorPopulationService.update(modelSupplyMonitorPopulation);
return AjaxResult.success();
}
/**
* 删除
*
* @param id ID
* @return 删除结果
*/
@DeleteMapping("/delete")
public AjaxResult delete(@RequestParam Long id) {
modelSupplyMonitorPopulationService.delete(id);
return AjaxResult.success();
}
/**
* 清空
*
* @return 清空结果
*/
@DeleteMapping("/clear")
public AjaxResult clear() {
modelSupplyMonitorPopulationService.clear();
return AjaxResult.success();
}
/**
* 查询详情
*
* @param id ID
* @return 劳动力供给人口
*/
@GetMapping("/detail")
public AjaxResult detail(@RequestParam Long id) {
ModelSupplyMonitorPopulation data = modelSupplyMonitorPopulationService.detail(id);
return AjaxResult.success(data);
}
/**
* 查询列表
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
* @return 列表
*/
@PostMapping("/list")
@ResponseBody
public AjaxResult list(@RequestBody ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
List<ModelSupplyMonitorPopulation> list =
modelSupplyMonitorPopulationService.list(modelSupplyMonitorPopulation);
return AjaxResult.success(list);
}
}

52
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ModelSupplyMonitorPopulation.java Normal file
View File

@@ -0,0 +1,52 @@
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;
/**
* 劳动力供给人口
*
* @author 马宝龙
* @date 2026/7/3
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ModelSupplyMonitorPopulation implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long id;
/**
* 年份
*/
@Excel(name = "年份")
private Integer year;
/**
* 年龄
*/
@Excel(name = "年龄")
private Integer age;
/**
* 男性人数
*/
@Excel(name = "男性人数")
private Integer maleCount;
/**
* 女性人数
*/
@Excel(name = "女性人数")
private Integer femaleCount;
/**
* 总人数
*/
private Integer totalCount;
}

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/dto/ModelExportParamDto.java
View File

@@ -29,4 +29,8 @@ public class ModelExportParamDto implements Serializable {
* 指标编码
*/
private String indicatorCode;
/**
* 指标编码
*/
private Integer year;
}

64
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/ModelSupplyMonitorPopulationMapper.java Normal file
View File

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

75
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelSupplyMonitorPopulationService.java Normal file
View File

@@ -0,0 +1,75 @@
package com.ruoyi.cms.service;
import com.ruoyi.cms.domain.ModelSupplyMonitorPopulation;
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 ModelSupplyMonitorPopulationService {
/**
* 创建
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
*/
void create(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation);
/**
* 更新
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
*/
void update(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation);
/**
* 删除
*
* @param id ID
*/
void delete(Long id);
/**
* 清空
*/
void clear();
/**
* 查询详情
*
* @param id ID
* @return 劳动力供给人口
*/
ModelSupplyMonitorPopulation detail(Long id);
/**
* 查询列表
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
* @return 列表
*/
List<ModelSupplyMonitorPopulation> list(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation);
/**
* 导入数据
*
* @param file 文件
* @return 导入结果
*/
String importExcel(MultipartFile file);
/**
* 导出数据
*
* @param response 响应体
* @param dto 导出参数
*/
void exportExcel(HttpServletResponse response, ModelExportParamDto dto);
}

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ModelWarningIndicatorDataService.java
View File

@@ -1,6 +1,5 @@
package com.ruoyi.cms.service;
import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum;
import com.ruoyi.cms.domain.ModelWarningIndicatorData;
import com.ruoyi.cms.domain.dto.ModelExportParamDto;
import org.springframework.web.multipart.MultipartFile;
@@ -53,11 +52,10 @@ public interface ModelWarningIndicatorDataService {
*/
List<ModelWarningIndicatorData> list(ModelWarningIndicatorData modelWarningIndicatorData);
/**
* 导入数据
*
* @param file 文件
* @param file 文件
* @return 导入结果
*/
String importExcel(MultipartFile file);
@@ -66,7 +64,7 @@ public interface ModelWarningIndicatorDataService {
* 导出数据
*
* @param response 响应体
* @param dto 导出参数
* @param dto 导出参数
*/
void exportExcel(HttpServletResponse response, ModelExportParamDto dto);
}

7
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelCommonServiceImpl.java
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.ModelSupplyMonitorPopulationService;
import com.ruoyi.cms.service.ModelWarningIndicatorDataService;
import com.ruoyi.common.exception.ServiceException;
import lombok.RequiredArgsConstructor;
@@ -34,6 +35,7 @@ import java.util.Objects;
public class ModelCommonServiceImpl implements ModelCommonService {
private final ModelWarningIndicatorDataService modelWarningIndicatorDataService;
private final ModelSupplyMonitorPopulationService modelSupplyMonitorPopulationService;
@Override
public void template(HttpServletResponse response,
@@ -79,6 +81,8 @@ public class ModelCommonServiceImpl implements ModelCommonService {
switch (modelTemplateType) {
case MODEL_WARNING_INDICATOR_DATA:
return modelWarningIndicatorDataService.importExcel(file);
case MODEL_SUPPLY_MONITOR_POPULATION:
return modelSupplyMonitorPopulationService.importExcel(file);
default:
throw new ServiceException("模板类型错误");
}
@@ -94,6 +98,9 @@ public class ModelCommonServiceImpl implements ModelCommonService {
case MODEL_WARNING_INDICATOR_DATA:
modelWarningIndicatorDataService.exportExcel(response, dto);
break;
case MODEL_SUPPLY_MONITOR_POPULATION:
modelSupplyMonitorPopulationService.exportExcel(response, dto);
break;
default:
throw new ServiceException("模板类型错误");
}

204
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelSupplyMonitorPopulationServiceImpl.java Normal file
View File

@@ -0,0 +1,204 @@
package com.ruoyi.cms.service.impl;
import com.ruoyi.cms.constant.enums.ModelTemplateTypeEnum;
import com.ruoyi.cms.domain.ModelSupplyMonitorPopulation;
import com.ruoyi.cms.domain.dto.ModelExportParamDto;
import com.ruoyi.cms.mapper.ModelSupplyMonitorPopulationMapper;
import com.ruoyi.cms.service.ModelSupplyMonitorPopulationService;
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 ModelSupplyMonitorPopulationServiceImpl implements ModelSupplyMonitorPopulationService {
private final ModelSupplyMonitorPopulationMapper modelSupplyMonitorPopulationMapper;
private final Validator validator;
@Override
public void create(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
check(modelSupplyMonitorPopulation);
// 查询唯一（按年份+年龄）
Optional<ModelSupplyMonitorPopulation> optional = findUnique(modelSupplyMonitorPopulation);
if (optional.isPresent()) {
// 更新
ModelSupplyMonitorPopulation exists = optional.get();
modelSupplyMonitorPopulation.setId(exists.getId());
modelSupplyMonitorPopulationMapper.update(modelSupplyMonitorPopulation);
} else {
// 新增
modelSupplyMonitorPopulationMapper.insert(modelSupplyMonitorPopulation);
}
}
/**
* 检查
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
*/
void check(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
if (Objects.isNull(modelSupplyMonitorPopulation.getYear())) {
throw new ServiceException("年份不能为空");
}
if (Objects.isNull(modelSupplyMonitorPopulation.getAge())) {
throw new ServiceException("年龄不能为空");
}
if (Objects.isNull(modelSupplyMonitorPopulation.getMaleCount())) {
throw new ServiceException("男性人数不能为空");
}
if (Objects.isNull(modelSupplyMonitorPopulation.getFemaleCount())) {
throw new ServiceException("女性人数不能为空");
}
modelSupplyMonitorPopulation.setTotalCount(modelSupplyMonitorPopulation.getMaleCount()
+ modelSupplyMonitorPopulation.getFemaleCount());
}
@Override
public void update(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
check(modelSupplyMonitorPopulation);
if (Objects.isNull(modelSupplyMonitorPopulation.getId())) {
throw new ServiceException("id不能为空");
}
Optional<ModelSupplyMonitorPopulation> unique = findUnique(modelSupplyMonitorPopulation);
if (!unique.isPresent()) {
modelSupplyMonitorPopulationMapper.update(modelSupplyMonitorPopulation);
return;
}
ModelSupplyMonitorPopulation exists = unique.get();
if (!exists.getId().equals(modelSupplyMonitorPopulation.getId())) {
throw new ServiceException("数据已存在");
}
modelSupplyMonitorPopulationMapper.update(modelSupplyMonitorPopulation);
}
@Override
public void delete(Long id) {
if (Objects.isNull(id)) {
throw new ServiceException("id不能为空");
}
modelSupplyMonitorPopulationMapper.deleteById(id);
}
@Override
public void clear() {
modelSupplyMonitorPopulationMapper.clear();
}
@Override
public ModelSupplyMonitorPopulation detail(Long id) {
if (Objects.isNull(id)) {
throw new ServiceException("id不能为空");
}
return modelSupplyMonitorPopulationMapper.selectById(id);
}
/**
* 查询唯一
*
* @param modelSupplyMonitorPopulation 劳动力供给人口
* @return 劳动力供给人口
*/
private Optional<ModelSupplyMonitorPopulation> findUnique(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
ModelSupplyMonitorPopulation unique =
modelSupplyMonitorPopulationMapper.findUnique(modelSupplyMonitorPopulation);
return Optional.ofNullable(unique);
}
@Override
public List<ModelSupplyMonitorPopulation> list(ModelSupplyMonitorPopulation modelSupplyMonitorPopulation) {
return modelSupplyMonitorPopulationMapper.list(modelSupplyMonitorPopulation);
}
@Override
public String importExcel(MultipartFile file) {
try {
ExcelUtil<ModelSupplyMonitorPopulation> util = new ExcelUtil<>(ModelSupplyMonitorPopulation.class);
List<ModelSupplyMonitorPopulation> list = util.importExcel(file.getInputStream());
ModelSupplyMonitorPopulation exists;
int successNum = 0;
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
for (ModelSupplyMonitorPopulation item : list) {
try {
check(item);
exists = modelSupplyMonitorPopulationMapper.findUnique(item);
if (exists == null) {
BeanValidators.validateWithException(validator, item);
modelSupplyMonitorPopulationMapper.insert(item);
successNum++;
String msg =
"<br/>" + successNum + "、" + "年份：" + item.getYear() + "年龄" + item.getAge() + "数据导入成功。";
successMsg.append(msg);
} else {
item.setId(exists.getId());
BeanValidators.validateWithException(validator, item);
modelSupplyMonitorPopulationMapper.update(item);
successNum++;
String msg =
"<br/>" + successNum + "、" + "年份：" + item.getYear() + "年龄" + item.getAge() + "数据更新成功。";
successMsg.append(msg);
}
} catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "、" + "年份：" + item.getYear() + "年龄" + item.getAge() + "数据导入失败：";
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<ModelSupplyMonitorPopulation> list = list(ModelSupplyMonitorPopulation.builder()
.year(dto.getYear())
.build());
ExcelUtil<ModelSupplyMonitorPopulation> util = new ExcelUtil<>(ModelSupplyMonitorPopulation.class);
util.exportExcel(response, list, ModelTemplateTypeEnum.MODEL_SUPPLY_MONITOR_POPULATION.getDesc());
} catch (Exception e) {
log.error("数据导出失败", e);
throw new ServiceException("数据导出失败");
}
}
}

79
ruoyi-bussiness/src/main/resources/mapper/ModelSupplyMonitorPopulationMapper.xml Normal file
View File

@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cms.mapper.ModelSupplyMonitorPopulationMapper">
<insert id="insert" parameterType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation">
INSERT INTO model_supply_monitor_population (year, age, male_count, female_count, total_count)
VALUES (#{year}, #{age}, #{maleCount}, #{femaleCount}, #{totalCount})
</insert>
<insert id="update" parameterType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation">
UPDATE model_supply_monitor_population
SET year = #{year},
age = #{age},
male_count = #{maleCount},
female_count = #{femaleCount},
total_count = #{totalCount}
WHERE id = #{id}
</insert>
<delete id="deleteById" parameterType="java.lang.Long">
DELETE
FROM model_supply_monitor_population
WHERE id = #{id}
</delete>
<delete id="clear" >
DELETE FROM model_supply_monitor_population
WHERE id IS NOT NULL;
</delete>
<select id="selectById" parameterType="java.lang.Long"
resultType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation">
SELECT id,
year,
age,
male_count AS maleCount,
female_count AS femaleCount,
total_count AS totalCount
FROM model_supply_monitor_population
WHERE id = #{id}
</select>
<select id="findUnique" parameterType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation"
resultType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation">
SELECT id,
year,
age,
male_count AS maleCount,
female_count AS femaleCount,
total_count AS totalCount
FROM model_supply_monitor_population
WHERE year = #{year}
AND age = #{age}
</select>
<select id="list" parameterType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation"
resultType="com.ruoyi.cms.domain.ModelSupplyMonitorPopulation">
SELECT id,
year,
age,
male_count AS maleCount,
female_count AS femaleCount,
total_count AS totalCount
FROM model_supply_monitor_population
<where>
<if test="id != null">
AND id = #{id}
</if>
<if test="year != null">
AND year = #{year}
</if>
<if test="age != null">
AND age = #{age}
</if>
</where>
ORDER BY year DESC, age ASC
</select>
</mapper>

BIN
ruoyi-bussiness/src/main/resources/template/劳动力动态监测系统-劳动力供给预测人口.xlsx Normal file
View File

Binary file not shown.

39
sql/datadashboard/table.sql
View File

@@ -864,4 +864,41 @@ COMMENT
ON COLUMN shz_data_dashboard.model_unemployment_warning_diffusion.sort_order IS '排序';
COMMENT
ON TABLE shz_data_dashboard.model_unemployment_warning_diffusion IS '失业预警扩散指数管理';
ON TABLE shz_data_dashboard.model_unemployment_warning_diffusion IS '失业预警扩散指数管理';
--劳动力供给人口
CREATE TABLE shz_data_dashboard.model_supply_monitor_population
(
id serial PRIMARY KEY,
year integer NOT NULL,
age integer NOT NULL,
male_count integer NOT NULL,
female_count integer NOT NULL,
total_count integer NOT NULL
)
;
ALTER TABLE shz_data_dashboard.model_supply_monitor_population
OWNER TO sysdba;
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.id IS '主键';
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.year IS '年份';
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.age IS '年龄';
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.male_count IS '男性人数';
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.female_count IS '女性人数';
COMMENT
ON COLUMN shz_data_dashboard.model_supply_monitor_population.total_count IS '总人数';
COMMENT
ON TABLE shz_data_dashboard.model_supply_monitor_population IS '劳动力供给人口';