forked from luyan/epmet-cloud-lingshan
Browse Source
Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatService.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.javamaster
wangxianzhang
4 years ago
29 changed files with 744 additions and 201 deletions
@ -0,0 +1,57 @@ |
|||
package com.epmet.commons.tools.enums; |
|||
|
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
*/ |
|||
public enum ChannelEnum { |
|||
//通知渠道 0小程序通知，1短信通知
|
|||
APP("0", "小程序通知"), |
|||
MESSAGE("1", "短信通知"), |
|||
ALL("2", "小程序通知,短信通知"); |
|||
private String code; |
|||
private String name; |
|||
|
|||
|
|||
ChannelEnum(String code, String name) { |
|||
this.code = code; |
|||
this.name = name; |
|||
} |
|||
|
|||
public static String getName(String code) { |
|||
ChannelEnum[] houseTypeEnums = values(); |
|||
for (ChannelEnum houseTypeEnum : houseTypeEnums) { |
|||
if (houseTypeEnum.getCode() == code) { |
|||
return houseTypeEnum.getName(); |
|||
} |
|||
} |
|||
return EpmetErrorCode.SERVER_ERROR.getMsg(); |
|||
} |
|||
|
|||
public static String getCode(String name) { |
|||
ChannelEnum[] houseTypeEnums = values(); |
|||
for (ChannelEnum houseTypeEnum : houseTypeEnums) { |
|||
if (houseTypeEnum.getName().equals(name)) { |
|||
return houseTypeEnum.getCode(); |
|||
} |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public void setCode(String code) { |
|||
this.code = code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public void setName(String name) { |
|||
this.name = name; |
|||
} |
|||
} |
|||
@ -1,27 +0,0 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/3/28 13:47 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class CancelAttentionFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2252387281427013057L; |
|||
|
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 关注类型，核酸检测：2，疫苗接种：1 |
|||
*/ |
|||
private Integer attentionType ; |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.Valid; |
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/3/28 16:48 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class CancelAttentionPackageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2198470055930997870L; |
|||
|
|||
public interface CancelAttentionPackageForm{} |
|||
|
|||
|
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
@NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class) |
|||
private List<String> idCards; |
|||
|
|||
/** |
|||
* 关注类型，核酸检测：2，疫苗接种：1 |
|||
*/ |
|||
@NotNull(message = "attentionType不能为空",groups = CancelAttentionPackageForm.class) |
|||
private Integer attentionType ; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/28 16:13 |
|||
*/ |
|||
@Data |
|||
public class IcNoticeFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 7392894573654015338L; |
|||
private String customerId; |
|||
@NotBlank(message = "身份证号不能为空", groups = DefaultGroup.class) |
|||
private String idCard; |
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/28 14:14 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class SendNoticeFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 4800907725063604885L; |
|||
private String customerId; |
|||
/** |
|||
* 用户列表 |
|||
*/ |
|||
@NotNull(message = "用户列表不能为空", groups = DefaultGroup.class) |
|||
private List<UserListBean> userList; |
|||
/** |
|||
* 通知渠道通知渠道 0小程序通知，1短信通知 |
|||
*/ |
|||
@NotNull(message = "通知渠道不能为空", groups = DefaultGroup.class) |
|||
private List<String> channel; |
|||
/** |
|||
* 通知来源 0 行程上报，1 疫苗接种，2 核酸检测 |
|||
*/ |
|||
@NotNull(message = "通知来源不能为空", groups = DefaultGroup.class) |
|||
private String origin; |
|||
/** |
|||
* 通知内容 |
|||
*/ |
|||
@NotNull(message = "通知内容不能为空", groups = DefaultGroup.class) |
|||
private String content; |
|||
/** |
|||
* 组织名 |
|||
*/ |
|||
@NotNull(message = "组织名不能为空", groups = DefaultGroup.class) |
|||
private String orgName; |
|||
|
|||
@NoArgsConstructor |
|||
@Data |
|||
public static class UserListBean { |
|||
/** |
|||
* 用户ID |
|||
*/ |
|||
private String userId; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
} |
|||
} |
|||
@ -1,76 +1,88 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelIgnore; |
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import com.alibaba.excel.annotation.write.style.HeadStyle; |
|||
import com.alibaba.excel.enums.poi.FillPatternTypeEnum; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 核酸检测-我的上报记录 |
|||
* @Author sun |
|||
*/ |
|||
@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) |
|||
@Data |
|||
public class NatListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
//总条数
|
|||
private Integer total; |
|||
List<NatListDTO> list = new ArrayList<>(); |
|||
/** |
|||
* 核酸记录Id |
|||
*/ |
|||
@ExcelIgnore |
|||
private String icNatId; |
|||
/** |
|||
* 组织Id |
|||
*/ |
|||
@ExcelIgnore |
|||
private String agencyId; |
|||
/** |
|||
* 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 |
|||
*/ |
|||
@ExcelIgnore |
|||
private String userId; |
|||
/** |
|||
* 居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other |
|||
*/ |
|||
@ExcelIgnore |
|||
private String userType; |
|||
|
|||
@Data |
|||
public static class NatListDTO { |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
@ColumnWidth(20) |
|||
@ExcelProperty("姓名") |
|||
private String name; |
|||
|
|||
/** |
|||
* 核酸记录Id |
|||
*/ |
|||
private String icNatId; |
|||
/** |
|||
* 组织Id |
|||
*/ |
|||
private String agencyId; |
|||
/** |
|||
* 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 |
|||
*/ |
|||
private String userId; |
|||
/** |
|||
* 居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other |
|||
*/ |
|||
private String userType; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
@ColumnWidth(20) |
|||
@ExcelProperty("手机号") |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
@ColumnWidth(25) |
|||
@ExcelProperty("身份证号") |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 检测时间,yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
@ColumnWidth(25) |
|||
@ExcelProperty("检测时间") |
|||
private Date natTime; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
/** |
|||
* 检测结果 |
|||
*/ |
|||
@ColumnWidth(20) |
|||
@ExcelProperty("检测结果") |
|||
private String natResult; |
|||
|
|||
/** |
|||
* 检测时间,yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private Date natTime; |
|||
/** |
|||
* 检测地点 |
|||
*/ |
|||
@ColumnWidth(30) |
|||
@ExcelProperty("检测地点") |
|||
private String natAddress; |
|||
|
|||
/** |
|||
* 检测结果 |
|||
*/ |
|||
private String natResult; |
|||
|
|||
/** |
|||
* 检测地点 |
|||
*/ |
|||
private String natAddress; |
|||
|
|||
} |
|||
|
|||
} |
|||
|
|||
Binary file not shown.
Loading…
Reference in new issue