wangxianzhang
3 years ago
157 changed files with 5084 additions and 300 deletions
@ -0,0 +1,30 @@ |
|||
|
|||
-- 相成的 |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017193115787265', 'dangerAreaLevel', '风险地区级别', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:42:39'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017335055228929', 1587017193115787265, '低风险', '0', '0', '', 0, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:13'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017381859467265', 1587017193115787265, '中风险', '1', '0', '', 1, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:24'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1587017428642734082', 1587017193115787265, '高风险', '2', '0', '', 2, 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2022-10-31 17:43:35'); |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
-- 字典表新增数据【自己的】 |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
|
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000001', '2100000000000000001', '飞机', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000002', '2100000000000000001', '动车', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000003', '2100000000000000001', '火车', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000004', '2100000000000000001', '自驾', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5100000000000000005', '2100000000000000001', '其他', '5', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000001', '2100000000000000002', '高风险', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000004', '2100000000000000004', '县内', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); |
|||
@ -0,0 +1,10 @@ |
|||
ALTER TABLE `ic_party_member` |
|||
ADD COLUMN `RDSSZZB` varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`, |
|||
ADD COLUMN `ZZGXZRSQSJ` varchar(64) NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`, |
|||
ADD COLUMN `IS_QCJ` char(2) NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`; |
|||
|
|||
|
|||
UPDATE ic_party_member |
|||
SET IS_QCJ = '0' |
|||
WHERE |
|||
IS_QCJ IS NULL; |
|||
@ -0,0 +1 @@ |
|||
alter table ic_party_org MODIFY COLUMN `PARTY_ORG_NAME` varchar(128) NOT NULL COMMENT '组织名称'; |
|||
Binary file not shown.
@ -0,0 +1,96 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
import com.epmet.commons.tools.validator.group.AddGroup; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
|
|||
/** |
|||
* 疫情风险地区 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-10-31 |
|||
*/ |
|||
@Data |
|||
public class IcDangerAreaDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* ID |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 风险等级 |
|||
*/ |
|||
// @NotBlank(message = "dangerLevel不能为空",groups = {AddGroup.class})
|
|||
private String dangerLevel; |
|||
|
|||
/** |
|||
* 省 |
|||
*/ |
|||
// @NotBlank(message = "province不能为空",groups = {AddGroup.class})
|
|||
private String province; |
|||
|
|||
/** |
|||
* 市 |
|||
*/ |
|||
// @NotBlank(message = "city不能为空",groups = {AddGroup.class})
|
|||
private String city; |
|||
|
|||
/** |
|||
* 区 |
|||
*/ |
|||
// @NotBlank(message = "district不能为空",groups = {AddGroup.class})
|
|||
private String district; |
|||
|
|||
/** |
|||
* 省-市-区 |
|||
*/ |
|||
@NotBlank(message = "allName不能为空",groups = {AddGroup.class}) |
|||
private String allName; |
|||
|
|||
private String allNameCode; |
|||
|
|||
/** |
|||
* |
|||
*/ |
|||
private Integer delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/11 15:05 |
|||
*/ |
|||
@Data |
|||
public class YTVaccineListDTO implements Serializable { |
|||
private static final long serialVersionUID = -5583350277850076659L; |
|||
|
|||
private String idCard; |
|||
|
|||
/** |
|||
* 接种时间 |
|||
*/ |
|||
private String inoculateDate; |
|||
|
|||
/** |
|||
* 接种地点 |
|||
*/ |
|||
private String lastStationName; |
|||
|
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/5/10 10:02 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class BirthRecordListFormDTO extends PageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5077167613040462646L; |
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
private String staffId; |
|||
|
|||
/** |
|||
* 组织Id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
private String gridId; |
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String villageId; |
|||
/** |
|||
* 楼栋ID |
|||
*/ |
|||
private String buildId; |
|||
/** |
|||
* 单元ID |
|||
*/ |
|||
private String unitId; |
|||
/** |
|||
* 房屋ID |
|||
*/ |
|||
private String homeId; |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 手机 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String gender; |
|||
/** |
|||
* 出生日开始 |
|||
*/ |
|||
private String startTime; |
|||
/** |
|||
* 出生日期结束 |
|||
*/ |
|||
private String endTime; |
|||
/** |
|||
* 是否福利 |
|||
*/ |
|||
private String isWelfare; |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/10/31 16:59 |
|||
*/ |
|||
@Data |
|||
public class DangerAreaListFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 8868052895161162655L; |
|||
|
|||
private String name; |
|||
private String dangerLevel; |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 15:58 |
|||
*/ |
|||
@Data |
|||
public class EmphasisTripDetailFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 4725053371888196275L; |
|||
|
|||
public interface EmphasisTripDetailForm{} |
|||
|
|||
@NotBlank(message = "id不能为空",groups = {EmphasisTripDetailForm.class}) |
|||
private String id; |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 15:39 |
|||
*/ |
|||
@Data |
|||
public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 5850717233738956442L; |
|||
|
|||
private String code; |
|||
private String name; |
|||
|
|||
private String dangerLevel; |
|||
|
|||
private String staffId; |
|||
private String customerId; |
|||
|
|||
private String agencyId; |
|||
|
|||
/** |
|||
* ic_trip_report_record.id |
|||
*/ |
|||
private String id; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 16:08 |
|||
*/ |
|||
@Data |
|||
public class EmphasisTripPieDetailFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 8822391154779579664L; |
|||
|
|||
public interface EmphasisTripPieDetailForm{} |
|||
|
|||
// @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class})
|
|||
private String code; |
|||
private String name; |
|||
|
|||
private String customerId; |
|||
|
|||
private String staffId; |
|||
|
|||
private String agencyId; |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wgf |
|||
* @dscription |
|||
*/ |
|||
@Data |
|||
public class OnlyIdFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -5220529162950147825L; |
|||
/** |
|||
* 主键 |
|||
*/ |
|||
@NotBlank(message = "主键不能为空") |
|||
private String id; |
|||
|
|||
} |
|||
@ -0,0 +1,92 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 15:38 |
|||
*/ |
|||
@Data |
|||
public class EmphasisTripListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -1646171374911115465L; |
|||
|
|||
private String id; |
|||
private String agencyId; |
|||
private String name; |
|||
private String mobile; |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 来源地 |
|||
*/ |
|||
private String sourceAddress; |
|||
private String sourceDetailAddress; |
|||
|
|||
/** |
|||
* 来曹事由 |
|||
*/ |
|||
private String describeContent; |
|||
|
|||
/** |
|||
* 核酸检测结果 |
|||
*/ |
|||
private String natOutcome; |
|||
private String natOutComeName; |
|||
|
|||
/** |
|||
* 7天旅居史 |
|||
*/ |
|||
private String sojournHistory; |
|||
private String sojournHistoryName; |
|||
|
|||
/** |
|||
* 隔离状态 |
|||
*/ |
|||
private String isolateType; |
|||
private String isolateTypeName; |
|||
|
|||
/** |
|||
* 来曹时间 |
|||
*/ |
|||
private String arriveDate; |
|||
|
|||
/** |
|||
* 离开时间 |
|||
*/ |
|||
private String leaveDate; |
|||
|
|||
/** |
|||
* 现居地 |
|||
*/ |
|||
private String presentAddress; |
|||
|
|||
/** |
|||
* 详细地址 |
|||
*/ |
|||
private String detailAddress; |
|||
|
|||
private String remark; |
|||
|
|||
/** |
|||
* 返回方式 |
|||
*/ |
|||
private String trafficTypeName; |
|||
|
|||
/** |
|||
* 疫苗接种针次 |
|||
*/ |
|||
private Integer vaccineNum; |
|||
|
|||
/** |
|||
* 交通方式 |
|||
*/ |
|||
private String trafficType; |
|||
|
|||
/** |
|||
* 其他返回方式，交通方式为其他时此列需要有值 |
|||
*/ |
|||
private String trafficTypeExplain; |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 16:06 |
|||
*/ |
|||
@Data |
|||
public class EmphasisTripPieDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -7654816048391073022L; |
|||
|
|||
private String dangerLevelName; |
|||
private String dangerLevel; |
|||
private Integer total = NumConstant.ZERO; |
|||
} |
|||
@ -0,0 +1,222 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.alibaba.excel.EasyExcel; |
|||
import com.alibaba.excel.ExcelWriter; |
|||
import com.alibaba.excel.write.metadata.WriteSheet; |
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.aop.NoRepeatSubmit; |
|||
import com.epmet.commons.tools.constant.AppClientConstant; |
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.EpmetException; |
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.*; |
|||
import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; |
|||
import com.epmet.commons.tools.feign.*; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.commons.tools.validator.group.AddGroup; |
|||
import com.epmet.commons.tools.validator.group.UpdateGroup; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import com.epmet.constants.ImportTaskConstants; |
|||
import com.epmet.dto.IcDangerAreaDTO; |
|||
import com.epmet.dto.form.DangerAreaListFormDTO; |
|||
import com.epmet.dto.form.ImportTaskCommonFormDTO; |
|||
import com.epmet.dto.result.ImportTaskCommonResultDTO; |
|||
import com.epmet.dto.result.NatListCommonExcelResultDTO; |
|||
import com.epmet.dto.result.NatListResultDTO; |
|||
import com.epmet.enums.DangerLevelEnum; |
|||
import com.epmet.excel.IcDangerAreaResultExcel; |
|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; |
|||
import com.epmet.service.IcDangerAreaService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.collections4.CollectionUtils; |
|||
import org.apache.commons.io.IOUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpHeaders; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import org.springframework.web.multipart.MultipartFile; |
|||
|
|||
import javax.servlet.ServletOutputStream; |
|||
import javax.servlet.http.HttpServletResponse; |
|||
import java.io.FileOutputStream; |
|||
import java.io.IOException; |
|||
import java.io.InputStream; |
|||
import java.net.URLEncoder; |
|||
import java.nio.file.Path; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.UUID; |
|||
|
|||
|
|||
/** |
|||
* 疫情风险地区 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-10-31 |
|||
*/ |
|||
@RestController |
|||
@Slf4j |
|||
@RequestMapping("icDangerArea") |
|||
public class IcDangerAreaController implements ResultDataResolver{ |
|||
|
|||
@Autowired |
|||
private IcDangerAreaService icDangerAreaService; |
|||
@Autowired |
|||
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; |
|||
|
|||
@RequestMapping("page") |
|||
public Result<PageData<IcDangerAreaDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<IcDangerAreaDTO> page = icDangerAreaService.page(params); |
|||
return new Result<PageData<IcDangerAreaDTO>>().ok(page); |
|||
} |
|||
|
|||
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) |
|||
public Result<IcDangerAreaDTO> get(@PathVariable("id") String id){ |
|||
IcDangerAreaDTO data = icDangerAreaService.get(id); |
|||
return new Result<IcDangerAreaDTO>().ok(data); |
|||
} |
|||
|
|||
/** |
|||
* @Description 新增 |
|||
* @param dto |
|||
* @param tokenDto |
|||
* @Author zxc |
|||
* @Date 2022/11/1 09:09 |
|||
*/ |
|||
@NoRepeatSubmit |
|||
@PostMapping("add") |
|||
public Result save(@RequestBody IcDangerAreaDTO dto, @LoginUser TokenDto tokenDto){ |
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
dto.setCustomerId(tokenDto.getCustomerId()); |
|||
icDangerAreaService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PostMapping("update") |
|||
public Result update(@RequestBody IcDangerAreaDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
icDangerAreaService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@PostMapping("delete") |
|||
public Result delete(@RequestBody List<String> ids,@LoginUser TokenDto tokenDto){ |
|||
icDangerAreaService.delete(ids,tokenDto.getUserId()); |
|||
return new Result(); |
|||
} |
|||
|
|||
@RequestMapping("list") |
|||
public Result<PageData<IcDangerAreaDTO>> list(@RequestBody DangerAreaListFormDTO formDTO,@LoginUser TokenDto tokenDto){ |
|||
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
return new Result<PageData<IcDangerAreaDTO>>().ok(icDangerAreaService.list(formDTO)); |
|||
} |
|||
|
|||
@RequestMapping("export") |
|||
public void export(@LoginUser TokenDto tokenDto,@RequestBody DangerAreaListFormDTO formDTO,HttpServletResponse response){ |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
ExcelWriter excelWriter = null; |
|||
int pageNo = NumConstant.ONE; |
|||
formDTO.setPageSize(NumConstant.ONE_THOUSAND); |
|||
try { |
|||
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("风险地区", response), IcDangerAreaResultExcel.class).build(); |
|||
WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); |
|||
Integer size; |
|||
do { |
|||
PageData<IcDangerAreaDTO> list = icDangerAreaService.list(formDTO); |
|||
List<IcDangerAreaDTO> data = list.getList(); |
|||
if (CollectionUtils.isNotEmpty(data)){ |
|||
data.forEach(d -> { |
|||
d.setDangerLevel(DangerLevelEnum.getNameByCode(d.getDangerLevel())); |
|||
}); |
|||
} |
|||
excelWriter.write(ConvertUtils.sourceToTarget(data,IcDangerAreaResultExcel.class), writeSheet); |
|||
formDTO.setPageNo(pageNo++); |
|||
size = data.size(); |
|||
} while (size == NumConstant.ONE_THOUSAND); |
|||
}catch (Exception e){ |
|||
log.error("export exception", e); |
|||
}finally { |
|||
if (excelWriter != null) { |
|||
excelWriter.finish(); |
|||
} |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* @Description 模板下载 |
|||
* @param response |
|||
* @Author zxc |
|||
* @Date 2022/11/1 09:52 |
|||
*/ |
|||
@PostMapping("downloadTemplate") |
|||
public void downloadTemplate(HttpServletResponse response) throws IOException{ |
|||
response.setCharacterEncoding("UTF-8"); |
|||
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); |
|||
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); |
|||
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("风险地区导入模板", "UTF-8") + ".xlsx"); |
|||
InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_danger_area_template.xlsx"); |
|||
try { |
|||
ServletOutputStream os = response.getOutputStream(); |
|||
IOUtils.copy(is, os); |
|||
} finally { |
|||
if (is != null) { |
|||
is.close(); |
|||
} |
|||
} |
|||
} |
|||
|
|||
@PostMapping("import") |
|||
public Result importExcel(@LoginUser TokenDto tokenDto, @RequestPart("file") MultipartFile file) { |
|||
String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); |
|||
// 1.暂存文件
|
|||
String originalFilename = file.getOriginalFilename(); |
|||
String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); |
|||
Path fileSavePath; |
|||
try { |
|||
Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_danger_area", "import"); |
|||
fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); |
|||
} catch (IOException e) { |
|||
String errorMsg = ExceptionUtils.getErrorStackTrace(e); |
|||
log.error("【风险地区】创建临时存储文件失败:{}", errorMsg); |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); |
|||
} |
|||
|
|||
InputStream is = null; |
|||
FileOutputStream os = null; |
|||
|
|||
try { |
|||
is = file.getInputStream(); |
|||
os = new FileOutputStream(fileSavePath.toString()); |
|||
IOUtils.copy(is, os); |
|||
} catch (Exception e) { |
|||
log.error("method exception", e); |
|||
} finally { |
|||
org.apache.poi.util.IOUtils.closeQuietly(is); |
|||
org.apache.poi.util.IOUtils.closeQuietly(os); |
|||
} |
|||
|
|||
// 2.生成导入任务记录
|
|||
ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); |
|||
importTaskForm.setOperatorId(userId); |
|||
importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_DANGER_AREA); |
|||
importTaskForm.setOriginFileName(originalFilename); |
|||
|
|||
ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm), |
|||
ServiceConstant.EPMET_COMMON_SERVICE, |
|||
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), |
|||
"excel导入风险地区错误", |
|||
"风险地区导入失败"); |
|||
|
|||
// 3.执行导入
|
|||
icDangerAreaService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); |
|||
return new Result(); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.entity.IcDangerAreaEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
/** |
|||
* 疫情风险地区 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-10-31 |
|||
*/ |
|||
@Mapper |
|||
public interface IcDangerAreaDao extends BaseDao<IcDangerAreaEntity> { |
|||
|
|||
Integer delAllDangerArea(@Param("customerId")String customerId); |
|||
|
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.epmet.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
|
|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 疫情风险地区 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-10-31 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("ic_danger_area") |
|||
public class IcDangerAreaEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 风险等级 |
|||
*/ |
|||
private String dangerLevel; |
|||
|
|||
/** |
|||
* 省 |
|||
*/ |
|||
private String province; |
|||
|
|||
/** |
|||
* 市 |
|||
*/ |
|||
private String city; |
|||
|
|||
/** |
|||
* 区 |
|||
*/ |
|||
private String district; |
|||
|
|||
/** |
|||
* 省-市-区 |
|||
*/ |
|||
private String allName; |
|||
|
|||
private String allNameCode; |
|||
|
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
package com.epmet.enums; |
|||
|
|||
/** |
|||
* desc:数据同步配置枚举 对应data_sync_config中的DATA_CODE |
|||
* @author Administrator |
|||
*/ |
|||
|
|||
public enum DangerLevelEnum { |
|||
|
|||
LOW("0", "低风险"), |
|||
MIDDLE("1", "中风险"), |
|||
HIGH("2", "高风险"), |
|||
OTHER("3", "无风险"), |
|||
|
|||
; |
|||
|
|||
private final String code; |
|||
private final String name; |
|||
|
|||
|
|||
|
|||
DangerLevelEnum(String code, String name) { |
|||
this.code = code; |
|||
this.name = name; |
|||
} |
|||
|
|||
public static DangerLevelEnum getEnum(String code) { |
|||
DangerLevelEnum[] values = DangerLevelEnum.values(); |
|||
for (DangerLevelEnum value : values) { |
|||
if (value.getCode().equals(code)) { |
|||
return value; |
|||
} |
|||
} |
|||
return DangerLevelEnum.OTHER; |
|||
} |
|||
|
|||
public static String getNameByCode(String code) { |
|||
DangerLevelEnum[] values = DangerLevelEnum.values(); |
|||
for (DangerLevelEnum value : values) { |
|||
if (value.getCode().equals(code)) { |
|||
return value.getName(); |
|||
} |
|||
} |
|||
return DangerLevelEnum.OTHER.getName(); |
|||
} |
|||
|
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 11:18 |
|||
*/ |
|||
@Data |
|||
public class IcDangerAreaImportExcel { |
|||
|
|||
@NotBlank(message = "风险地区为必填项") |
|||
@ExcelProperty("风险地区") |
|||
private String allName; |
|||
|
|||
@NotBlank(message = "风险等级为必填项") |
|||
@ExcelProperty("风险等级") |
|||
private String dangerLevel; |
|||
|
|||
@Data |
|||
public static class IcDangerAreaError{ |
|||
@ColumnWidth(30) |
|||
@ExcelProperty(value = "风险地区") |
|||
private String name; |
|||
|
|||
@ColumnWidth(20) |
|||
@ExcelProperty(value = "风险等级") |
|||
private String dangerLevel; |
|||
|
|||
@ColumnWidth(40) |
|||
@ExcelProperty(value = "错误信息") |
|||
private String errorInfo; |
|||
} |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/11/1 10:26 |
|||
*/ |
|||
@Data |
|||
public class IcDangerAreaResultExcel { |
|||
|
|||
@ColumnWidth(40) |
|||
@ExcelProperty(value = "风险地区") |
|||
private String allName; |
|||
|
|||
@ColumnWidth(20) |
|||
@ExcelProperty(value = "风险等级") |
|||
private String dangerLevel; |
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue