lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通过行政区划下载excel新增

master
徐杰盟 2024-05-29 15:13:59 +08:00
parent 584e8c42b7
commit b16d5f4738
5 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/data.sql
View File

@ -21,3 +21,8 @@ insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION
('超级管理员','18891233883','1','巡视员')
,('政区管理员','18891233883','2','巡视员')
,('普通用户','18891233883','3','巡视员');
alter table "FXKH_TXL"."AB_INFO" add column("ADCD" VARCHAR(50));
comment on column "FXKH_TXL"."AB_INFO"."ADCD" is '行政区划';

12
src/main/java/com/whdc/controller/AddressBookController.java
View File

@ -5,7 +5,11 @@ import cn.dev33.satoken.stp.StpUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.whdc.exception.MyException;
import com.whdc.model.dto.AddressBootDto;
import com.whdc.model.entity.*;
import com.whdc.model.dto.UserRoleDto;
import com.whdc.model.entity.AbUdR;
import com.whdc.model.entity.AddressBook;
import com.whdc.model.entity.Organization;
import com.whdc.model.entity.User;
import com.whdc.model.enums.Role;
import com.whdc.model.enums.VersionsType;
import com.whdc.model.group.Insert;
@ -31,7 +35,9 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import static com.whdc.model.MyConstant.REDIS_KEY;
@ -296,7 +302,7 @@ public class AddressBookController {
@ApiOperation(value = "修改权限")
@PostMapping(value = "updateRole")
public ResultJson updateRole(@RequestBody @Validated(Update.class) User model) {
public ResultJson updateRole(@RequestBody @Validated(Update.class) UserRoleDto model) {
Integer loginId = Integer.valueOf(String.valueOf(StpUtil.getLoginId()));
User user = userService.getRole(loginId);

29
src/main/java/com/whdc/controller/WarningController.java
View File

@ -294,9 +294,6 @@ public class WarningController {
List<WarningData.Warning> warnList = Lists.newArrayList();
for (WarningData datum : data) {
WarningHistoryListVo vo = new WarningHistoryListVo();
vo.setWarnSignalType("全部");
for (WarningData.TypeList typeList : datum.getTypeList()) {
warnList.addAll(typeList.getWarnList());
}
@ -314,10 +311,10 @@ public class WarningController {
warnMap.forEach((k, v) -> {
WarningHistoryListVo vo = new WarningHistoryListVo();
vo.setEffectArea(k.split("气象")[0]);
vo.setWarnSignalType("全部");
vo.setWarnSignalType("暴雨");
List<WarningHistoryListVo> typeList = Lists.newArrayList();
// List<WarningHistoryListVo> typeList = Lists.newArrayList();
// 类型 只要暴雨
Map<String, List<WarningData.Warning>> types = v.stream()
@ -328,8 +325,8 @@ public class WarningController {
// Set<String> warnSignalType = Sets.newHashSet("雷电", "暴雨", "大风", "冰雹", "雷雨大风");
types.forEach((kt, vt) -> {
WarningHistoryListVo voType = new WarningHistoryListVo();
voType.setWarnSignalType(kt);
// WarningHistoryListVo voType = new WarningHistoryListVo();
// voType.setWarnSignalType(kt);
// warnSignalType.remove(kt);
// 等级分组
Map<String, Long> levels = vt.stream()
@ -338,27 +335,27 @@ public class WarningController {
levels.forEach((k1, v1) -> {
switch (k1) {
case "红色":
voType.setRedCount(v1.intValue());
// voType.setRedCount(v1.intValue());
vo.setRedCount(v1.intValue() + vo.getRedCount());
break;
case "橙色":
voType.setOraCount(v1.intValue());
// voType.setOraCount(v1.intValue());
vo.setOraCount(v1.intValue() + vo.getOraCount());
break;
case "黄色":
voType.setYelCount(v1.intValue());
// voType.setYelCount(v1.intValue());
vo.setYelCount(v1.intValue() + vo.getYelCount());
break;
case "蓝色":
voType.setBluCount(v1.intValue());
// voType.setBluCount(v1.intValue());
vo.setBluCount(v1.intValue() + vo.getBluCount());
break;
default:
throw new MyException("当前预警等级不存在: " + k1);
}
});
voType.setSumCount(vt.size());
typeList.add(voType);
// voType.setSumCount(vt.size());
// typeList.add(voType);
});
@ -369,8 +366,8 @@ public class WarningController {
// typeList.add(voType);
// });
vo.setChild(typeList);
vo.setSumCount(v.size());
// vo.setChild(typeList);
vo.setSumCount(vo.getRedCount() + vo.getOraCount() + vo .getYelCount() + vo.getBluCount());
voList.add(vo);
});
@ -391,7 +388,7 @@ public class WarningController {
private List<WarningHistoryListVo> setAll(List<WarningHistoryListVo> vos) {
if (CollectionUtils.isNotEmpty(vos)) {
WarningHistoryListVo vo = new WarningHistoryListVo();
vo.setWarnSignalType("全部");
vo.setWarnSignalType("暴雨");
vo.setEffectArea("总计");
int oraSum = vos.stream().mapToInt(WarningHistoryListVo::getOraCount).sum();
vo.setOraCount(oraSum);

30
src/main/java/com/whdc/model/dto/UserRoleDto.java Normal file
View File

@ -0,0 +1,30 @@
package com.whdc.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.whdc.model.group.Update;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
/**
* Description:
* Created by XuSan on 2024/5/29.
*
* @author XuSan
* @version 1.0
*/
@Data
public class UserRoleDto {
@ApiModelProperty(value = "0:普通管理员,1:政区管理员,99:系统管理员")
@NotEmpty(message = "权限不能为空", groups = { Update.class})
private String role;
@TableField("AB_ID")
@ApiModelProperty(value = "通讯录id")
@NotEmpty(message = "通讯录id不能为空", groups = { Update.class})
private Integer abId;
}

6
src/main/java/com/whdc/model/entity/Versions.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.whdc.model.group.Insert;
import com.whdc.model.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -16,7 +15,6 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@ -54,6 +52,10 @@ public class Versions extends Model<Versions> implements Serializable {
@ApiModelProperty(value = "版本号")
private Integer version;
@TableField("ADCD")
@ApiModelProperty(value = "行政区划")
private String adcd;
@TableField("CREATE_ID")
@ApiModelProperty(value = "新增人id")
private String createId;