Browse Source
Conflicts: epmet-admin/epmet-admin-server/pom.xml epmet-module/data-statistical/data-statistical-server/pom.xml epmet-module/epmet-heart/epmet-heart-server/pom.xml epmet-module/epmet-message/epmet-message-server/pom.xml epmet-module/epmet-point/epmet-point-server/pom.xml epmet-module/gov-issue/gov-issue-server/pom.xml epmet-module/gov-org/gov-org-server/pom.xml epmet-module/open-data-worker/open-data-worker-server/pom.xml epmet-module/oper-customize/oper-customize-server/pom.xml epmet-module/resi-group/resi-group-server/pom.xml epmet-user/epmet-user-server/pom.xmlfeature/teamB_zz_wgh
wangxianzhang
4 years ago
119 changed files with 4283 additions and 405 deletions
@ -0,0 +1,60 @@ |
|||
package com.epmet.commons.rocketmq.messages; |
|||
|
|||
import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* user库党员信息同步到partymember库的mq消息 |
|||
*/ |
|||
@Data |
|||
public class PartymemberSyncMQMsg extends MqBaseFormDTO { |
|||
|
|||
/** |
|||
* 党员列表，允许一次传输多个党员信息 |
|||
*/ |
|||
private List<PartyMemberSyncForm> partymemberList = new ArrayList<>(); |
|||
|
|||
@Data |
|||
public static class PartyMemberSyncForm { |
|||
|
|||
private String customerId; |
|||
private String agencyId; |
|||
private String agencyPids; |
|||
private String icResiUser; |
|||
private String name; |
|||
private String idCard; |
|||
private String mobile; |
|||
private String address; |
|||
private String rdsj; |
|||
private String sszb; |
|||
/** |
|||
* 是否流动党员 |
|||
*/ |
|||
private String isLd; |
|||
|
|||
/** |
|||
* 流动党员活动证号 |
|||
*/ |
|||
private String ldzh; |
|||
/** |
|||
* 职务 |
|||
*/ |
|||
private String partyZw; |
|||
/** |
|||
* 是否退休 |
|||
*/ |
|||
private String isTx; |
|||
/** |
|||
* 是否党员中心户 |
|||
*/ |
|||
private String isDyzxh; |
|||
/** |
|||
* 志愿者类型,逗号隔开 |
|||
*/ |
|||
private String volunteerCategory; |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
|
|||
<!-- |
|||
Base logback configuration provided for compatibility with Spring Boot 1.1 |
|||
从spring/logging包复制过来的，主要是屏蔽了/tmp/spring.log文件的生成(与我们自定义的重复，且不会滚动更新)。其他服务都改用引用此文件。 |
|||
--> |
|||
|
|||
<included> |
|||
<include resource="org/springframework/boot/logging/logback/defaults.xml" /> |
|||
<!--<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>--> |
|||
<include resource="org/springframework/boot/logging/logback/console-appender.xml" /> |
|||
<include resource="org/springframework/boot/logging/logback/file-appender.xml" /> |
|||
<root level="INFO"> |
|||
<appender-ref ref="CONSOLE" /> |
|||
<appender-ref ref="FILE" /> |
|||
</root> |
|||
</included> |
|||
@ -0,0 +1,41 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 社区所属组织基本信息 |
|||
* @Author wgf |
|||
* @Date 2020/4/26 22:35 |
|||
*/ |
|||
@Data |
|||
public class CommunityInfoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 4360690752084258055L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 社区组织ID |
|||
*/ |
|||
private String deptId; |
|||
|
|||
/** |
|||
* 社区名称 |
|||
*/ |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 网格的上级组织 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 网格的所有上级组织 |
|||
*/ |
|||
private String pids; |
|||
} |
|||
|
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
|
|||
import com.epmet.commons.tools.utils.NodeTree; |
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
@Data |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class OrgListTreeResultDTO extends NodeTree implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -1993037593855768962L; |
|||
|
|||
/** |
|||
* 父id |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 名字 |
|||
*/ |
|||
private String label; |
|||
|
|||
/** |
|||
* 值 |
|||
*/ |
|||
private String value; |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.mq; |
|||
|
|||
import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; |
|||
import com.epmet.commons.rocketmq.constants.TopicConstants; |
|||
import com.epmet.commons.rocketmq.register.MQAbstractRegister; |
|||
import com.epmet.commons.rocketmq.register.MQConsumerProperties; |
|||
import com.epmet.mq.listener.ResiPartyMemberSyncListener; |
|||
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
public class RocketMQConsumerRegister extends MQAbstractRegister { |
|||
|
|||
@Override |
|||
public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { |
|||
register(consumerProperties, ConsomerGroupConstants.CREATE_RESI_PARTYMEMBER_SYNC_GROUP, MessageModel.CLUSTERING, |
|||
TopicConstants.PARTYMEMBER_RESI, "*", new ResiPartyMemberSyncListener()); |
|||
} |
|||
} |
|||
@ -0,0 +1,106 @@ |
|||
package com.epmet.mq.listener; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.rocketmq.constants.MQUserPropertys; |
|||
import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg; |
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.commons.tools.exception.RenException; |
|||
import com.epmet.commons.tools.redis.RedisKeys; |
|||
import com.epmet.commons.tools.redis.RedisUtils; |
|||
import com.epmet.commons.tools.utils.ConvertUtils; |
|||
import com.epmet.commons.tools.utils.SpringContextUtils; |
|||
import com.epmet.modules.partymember.service.IcPartyMemberService; |
|||
import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; |
|||
import org.apache.commons.collections4.CollectionUtils; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; |
|||
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; |
|||
import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; |
|||
import org.apache.rocketmq.common.message.MessageExt; |
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wxz |
|||
* @Description 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。 |
|||
|
|||
* @return |
|||
* @date 2021.06.07 16:12 |
|||
*/ |
|||
public class ResiPartyMemberSyncListener implements MessageListenerConcurrently { |
|||
|
|||
private Logger logger = LoggerFactory.getLogger(getClass()); |
|||
|
|||
private RedisUtils redisUtils; |
|||
|
|||
@Override |
|||
public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) { |
|||
|
|||
if (redisUtils == null) { |
|||
redisUtils = SpringContextUtils.getBean(RedisUtils.class); |
|||
} |
|||
|
|||
try { |
|||
msgs.forEach(msg -> consumeMessage(msg)); |
|||
} catch (Exception e) { |
|||
logger.error(ExceptionUtils.getErrorStackTrace(e)); |
|||
return ConsumeConcurrentlyStatus.RECONSUME_LATER; |
|||
} |
|||
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; |
|||
} |
|||
|
|||
/** |
|||
* 逐条消费 |
|||
* @param messageExt |
|||
*/ |
|||
private void consumeMessage(MessageExt messageExt) { |
|||
//String tags = messageExt.getTags();
|
|||
String msg = new String(messageExt.getBody()); |
|||
String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); |
|||
logger.info("居民-党员信息同步监听器-收到消息内容:{}", msg); |
|||
PartymemberSyncMQMsg msgObj = JSON.parseObject(msg, PartymemberSyncMQMsg.class); |
|||
|
|||
List<PartymemberSyncMQMsg.PartyMemberSyncForm> partymemberList = msgObj.getPartymemberList(); |
|||
if (CollectionUtils.isEmpty(partymemberList)) { |
|||
return; |
|||
} |
|||
partymemberList.stream().forEach(p -> { |
|||
IcPartyMemberDTO icPartyMemberDTO = ConvertUtils.sourceToTarget(p, IcPartyMemberDTO.class); |
|||
try { |
|||
SpringContextUtils.getBean(IcPartyMemberService.class).icPartyMemberSync(icPartyMemberDTO); |
|||
} catch (RenException e) { |
|||
// 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
|
|||
logger.error("【居民-党员信息同步】同步失败，居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e)); |
|||
} catch (Exception e) { |
|||
// 不是我们自己抛出的异常，可以让MQ重试
|
|||
logger.error("【居民-党员信息同步】同步失败居民id:{},错误信息:{}", p.getIcResiUser(), ExceptionUtils.getErrorStackTrace(e)); |
|||
throw e; |
|||
} |
|||
}); |
|||
|
|||
if (StringUtils.isNotBlank(pendingMsgLabel)) { |
|||
try { |
|||
removePendingMqMsgCache(pendingMsgLabel); |
|||
} catch (Exception e) { |
|||
logger.error("【居民-党员信息同步】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); |
|||
} |
|||
} |
|||
|
|||
logger.info("【居民-党员信息同步】处理完成，条数:{}", partymemberList.size()); |
|||
} |
|||
|
|||
/** |
|||
* @description |
|||
* |
|||
* @param pendingMsgLabel |
|||
* @return |
|||
* @author wxz |
|||
* @date 2021.10.14 16:32:32 |
|||
*/ |
|||
private void removePendingMqMsgCache(String pendingMsgLabel) { |
|||
String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); |
|||
Boolean rst = redisUtils.delete(key); |
|||
} |
|||
} |
|||
@ -0,0 +1,109 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointNucleicMonitoringDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* ID |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 所属组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 核酸监测点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 服务时间 |
|||
*/ |
|||
private String serveTime; |
|||
|
|||
/** |
|||
* 咨询电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 监测点地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* |
|||
*/ |
|||
private Integer delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,134 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointVaccinesInoculationDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* ID |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 所属组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 疫苗接种点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 接种日期 |
|||
*/ |
|||
private String inoculationDate; |
|||
|
|||
/** |
|||
* 接种上午开始时间 |
|||
*/ |
|||
private String moStartTime; |
|||
|
|||
/** |
|||
* 接种上午结束时间 |
|||
*/ |
|||
private String moEndTime; |
|||
|
|||
/** |
|||
* 接种下午开始时间 |
|||
*/ |
|||
private String afStartTime; |
|||
|
|||
/** |
|||
* 接种下午结束时间 |
|||
*/ |
|||
private String afEndTime; |
|||
|
|||
/** |
|||
* 暂无疫苗（1：是；2：否） |
|||
*/ |
|||
private String noAvailableVaccines; |
|||
|
|||
/** |
|||
* 咨询电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 接种点地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* |
|||
*/ |
|||
private Integer delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,51 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 获取地图信息入参 |
|||
* |
|||
* @author wgf |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class MapInfoFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 地点类型（1：核酸检测点； 2：疫苗接种点） |
|||
*/ |
|||
@NotBlank(message = "地点类型不能为空") |
|||
private String type; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
@NotBlank(message = "经度不能为空") |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
@NotBlank(message = "纬度不能为空") |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 地点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 所属部门 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class OrgInfoPointFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 所属组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/3/28 10:30 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PointHSYMFormDTO extends PageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -498378993902522370L; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 地点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* user所属组织ID |
|||
*/ |
|||
private String orgId; |
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotEmpty; |
|||
import javax.validation.constraints.Size; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author wgf |
|||
* @Date 2022/3/28 14:14 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class SendPointNoticeFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 4800907725063604885L; |
|||
private String customerId; |
|||
private String staffId; |
|||
/** |
|||
* 用户列表 |
|||
*/ |
|||
private List<UserListBean> userList; |
|||
/** |
|||
* 通知渠道通知渠道 0小程序通知，1短信通知 |
|||
*/ |
|||
@NotEmpty(message = "请选择通知渠道", groups = CustomerClientShowGroup.class) |
|||
private List<String> channel; |
|||
/** |
|||
* 通知来源 0 行程上报，1 疫苗接种，2 核酸检测,3核酸检测点，4疫苗接种点 |
|||
*/ |
|||
@NotEmpty(message = "通知来源不能为空", groups = CustomerClientShowGroup.class) |
|||
private String origin; |
|||
/** |
|||
* 通知内容 |
|||
*/ |
|||
@Size(min = 1, max = 500, message = "通知内容不超过500字", groups = CustomerClientShowGroup.class) |
|||
private String content; |
|||
/** |
|||
* 组织名 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
@NoArgsConstructor |
|||
@Data |
|||
public static class UserListBean { |
|||
/** |
|||
* 用户ID |
|||
*/ |
|||
private String userId; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
} |
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 获取地图信息返参 |
|||
* |
|||
* @author wgf |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class MapInfoResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 时间随机数标识 |
|||
*/ |
|||
private Integer markerId; |
|||
|
|||
/** |
|||
* 疫苗接种点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 距离当前位置千米数 |
|||
*/ |
|||
private String km; |
|||
|
|||
/** |
|||
* 暂无疫苗（1：是；2：否） |
|||
*/ |
|||
private String noAvailableVaccines; |
|||
|
|||
/** |
|||
* 距离（1：1公里以内；3：3公里以内；5：5公里以内；99：5公里以外） |
|||
*/ |
|||
private String kmNum; |
|||
|
|||
/** |
|||
* 日期 |
|||
*/ |
|||
private String date; |
|||
|
|||
/** |
|||
* 上午时间 |
|||
*/ |
|||
private String moTime; |
|||
|
|||
/** |
|||
* 下午时间 |
|||
*/ |
|||
private String afTime; |
|||
|
|||
/** |
|||
* 电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotEmpty; |
|||
import javax.validation.constraints.Size; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author wgf |
|||
* @Date 2022/3/28 14:14 |
|||
*/ |
|||
@Data |
|||
public class SendPointNoticeResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 4800907725063604885L; |
|||
|
|||
|
|||
/** |
|||
* 用户ID |
|||
*/ |
|||
private String userId; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.commons.tools.validator.group.AddGroup; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import com.epmet.dto.form.MapInfoFormDTO; |
|||
import com.epmet.dto.result.MapInfoResultDTO; |
|||
import com.epmet.service.IcPointAppService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("appPoint") |
|||
@Slf4j |
|||
public class IcPointAppController { |
|||
|
|||
@Autowired |
|||
private IcPointAppService icPointAppService; |
|||
|
|||
/** |
|||
* 根据地点类型获取地图数据 |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
@PostMapping("getMapInfoByPointType") |
|||
public Result<List<MapInfoResultDTO>> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){ |
|||
// 效验数据
|
|||
ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
|
|||
return icPointAppService.getMapInfoByPointType(formDTO); |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,197 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; |
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.aop.NoRepeatSubmit; |
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import com.epmet.commons.tools.exception.EpmetException; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.ExcelPoiUtils; |
|||
import com.epmet.commons.tools.utils.ExcelUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.AssertUtils; |
|||
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.dao.IcPointNucleicMonitoringDao; |
|||
import com.epmet.dto.IcPointNucleicMonitoringDTO; |
|||
import com.epmet.dto.form.ImportTaskCommonFormDTO; |
|||
import com.epmet.dto.form.PointHSYMFormDTO; |
|||
import com.epmet.dto.form.VaccinationListFormDTO; |
|||
import com.epmet.dto.result.CommunityInfoResultDTO; |
|||
import com.epmet.dto.result.ImportTaskCommonResultDTO; |
|||
import com.epmet.excel.IcPointNucleicMonitoringExcel; |
|||
import com.epmet.excel.NatExportExcel; |
|||
import com.epmet.excel.VaccinationExportExcel; |
|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; |
|||
import com.epmet.feign.GovOrgFeignClient; |
|||
import com.epmet.service.IcPointNucleicMonitoringService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.io.FilenameUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import org.springframework.web.multipart.MultipartFile; |
|||
|
|||
import javax.servlet.http.HttpServletResponse; |
|||
import java.io.InputStream; |
|||
import java.util.HashMap; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("icPointNucleicMonitoring") |
|||
@Slf4j |
|||
public class IcPointNucleicMonitoringController { |
|||
|
|||
@Autowired |
|||
private IcPointNucleicMonitoringService icPointNucleicMonitoringService; |
|||
|
|||
@Autowired |
|||
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; |
|||
|
|||
@Autowired |
|||
private GovOrgFeignClient govOrgFeignClient; |
|||
|
|||
@Autowired |
|||
private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao; |
|||
|
|||
@RequestMapping("page") |
|||
public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){ |
|||
// PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.page(params);
|
|||
params.put("customerId",tokenDto.getCustomerId()); |
|||
PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.getPhrasePage(params); |
|||
return new Result<PageData<IcPointNucleicMonitoringDTO>>().ok(page); |
|||
} |
|||
|
|||
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) |
|||
public Result<IcPointNucleicMonitoringDTO> get(@PathVariable("id") String id){ |
|||
IcPointNucleicMonitoringDTO data = icPointNucleicMonitoringService.get(id); |
|||
return new Result<IcPointNucleicMonitoringDTO>().ok(data); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PostMapping |
|||
public Result save(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
dto.setCustomerId(tokenDto.getCustomerId()); |
|||
icPointNucleicMonitoringService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PutMapping |
|||
public Result update(@RequestBody IcPointNucleicMonitoringDTO dto, @LoginUser TokenDto tokenDto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
dto.setCustomerId(tokenDto.getCustomerId()); |
|||
icPointNucleicMonitoringService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@PostMapping("delete") |
|||
public Result delete(@RequestBody String[] ids){ |
|||
//效验数据
|
|||
AssertUtils.isArrayEmpty(ids, "id"); |
|||
icPointNucleicMonitoringService.delete(ids); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("export") |
|||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePage(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); |
|||
} |
|||
|
|||
/** |
|||
* Desc: 【核酸检测点】导出 |
|||
* @param response |
|||
* @param formDTO |
|||
* @param tokenDto |
|||
* @author wgf |
|||
* @date 2022/6/24 13:57 |
|||
*/ |
|||
@PostMapping("point-export") |
|||
public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { |
|||
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); |
|||
List<IcPointNucleicMonitoringDTO> list = icPointNucleicMonitoringDao.getPhrasePageByDTO(formDTO); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcPointNucleicMonitoringExcel.class); |
|||
|
|||
} |
|||
|
|||
/** |
|||
* 获取【发送通知】按钮显示隐藏状态 |
|||
* @param tokenDto |
|||
* @return |
|||
*/ |
|||
@PostMapping("getShowType") |
|||
public Result getShowType(@LoginUser TokenDto tokenDto){ |
|||
return govOrgFeignClient.getCommunityInfoByUserId(tokenDto.getUserId()); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* Desc: 【核酸检测点】导入 |
|||
* @param |
|||
* @author wgf |
|||
* @date 2022/6/21 13:40 |
|||
*/ |
|||
@PostMapping("pointImport") |
|||
public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ |
|||
if (file.isEmpty()) { |
|||
throw new EpmetException("请上传文件"); |
|||
} |
|||
// 校验文件类型
|
|||
String extension = FilenameUtils.getExtension(file.getOriginalFilename()); |
|||
if (!"xls".equals(extension) && !"xlsx".equals(extension)) { |
|||
throw new EpmetException("文件类型不匹配"); |
|||
} |
|||
|
|||
ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); |
|||
importTaskForm.setOriginFileName(file.getOriginalFilename()); |
|||
importTaskForm.setOperatorId(tokenDto.getUserId()); |
|||
importTaskForm.setBizType(ImportTaskConstants.IC_POINT_NUCLEIC_MONITORING); |
|||
Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm); |
|||
if (!result.success()) { |
|||
throw new EpmetException(9999,"存在进行中的导入"); |
|||
} |
|||
InputStream inputStream = null; |
|||
try { |
|||
inputStream = file.getInputStream(); |
|||
}catch (Exception e){ |
|||
ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); |
|||
input.setOperatorId(tokenDto.getUserId()); |
|||
input.setTaskId(result.getData().getTaskId()); |
|||
input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); |
|||
commonServiceOpenFeignClient.finishImportTask(input); |
|||
log.error("读取文件失败"); |
|||
} |
|||
icPointNucleicMonitoringService.importFile(tokenDto,inputStream,result.getData().getTaskId()); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 导出模板 |
|||
* @param response |
|||
* @throws Exception |
|||
*/ |
|||
@PostMapping("exporttemplate") |
|||
public void exportTemplate( HttpServletResponse response) throws Exception { |
|||
TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_nucleic_monitoring.xlsx"); |
|||
ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"核酸检测点录入表",response); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,179 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import cn.afterturn.easypoi.excel.entity.TemplateExportParams; |
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.aop.NoRepeatSubmit; |
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import com.epmet.commons.tools.exception.EpmetException; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.ExcelPoiUtils; |
|||
import com.epmet.commons.tools.utils.ExcelUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.AssertUtils; |
|||
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.dao.IcPointVaccinesInoculationDao; |
|||
import com.epmet.dto.IcPointNucleicMonitoringDTO; |
|||
import com.epmet.dto.IcPointVaccinesInoculationDTO; |
|||
import com.epmet.dto.form.ImportTaskCommonFormDTO; |
|||
import com.epmet.dto.form.PointHSYMFormDTO; |
|||
import com.epmet.dto.result.ImportTaskCommonResultDTO; |
|||
import com.epmet.excel.IcPointNucleicMonitoringExcel; |
|||
import com.epmet.excel.IcPointVaccinesInoculationExcel; |
|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; |
|||
import com.epmet.service.IcPointVaccinesInoculationService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.io.FilenameUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import org.springframework.web.multipart.MultipartFile; |
|||
|
|||
import javax.servlet.http.HttpServletResponse; |
|||
import java.io.InputStream; |
|||
import java.util.HashMap; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("icPointVaccinesInoculation") |
|||
@Slf4j |
|||
public class IcPointVaccinesInoculationController { |
|||
|
|||
@Autowired |
|||
private IcPointVaccinesInoculationService icPointVaccinesInoculationService; |
|||
|
|||
@Autowired |
|||
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; |
|||
|
|||
@Autowired |
|||
private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao; |
|||
|
|||
@RequestMapping("page") |
|||
public Result<PageData<IcPointVaccinesInoculationDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){ |
|||
// PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.page(params);
|
|||
params.put("customerId",tokenDto.getCustomerId()); |
|||
PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.getPhrasePage(params); |
|||
return new Result<PageData<IcPointVaccinesInoculationDTO>>().ok(page); |
|||
} |
|||
|
|||
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) |
|||
public Result<IcPointVaccinesInoculationDTO> get(@PathVariable("id") String id){ |
|||
IcPointVaccinesInoculationDTO data = icPointVaccinesInoculationService.get(id); |
|||
return new Result<IcPointVaccinesInoculationDTO>().ok(data); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PostMapping() |
|||
public Result save(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
dto.setCustomerId(tokenDto.getCustomerId()); |
|||
icPointVaccinesInoculationService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PutMapping() |
|||
public Result update(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|||
dto.setCustomerId(tokenDto.getCustomerId()); |
|||
icPointVaccinesInoculationService.update(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@PostMapping("delete") |
|||
public Result delete(@RequestBody String[] ids){ |
|||
//效验数据
|
|||
AssertUtils.isArrayEmpty(ids, "id"); |
|||
icPointVaccinesInoculationService.delete(ids); |
|||
return new Result(); |
|||
} |
|||
|
|||
@GetMapping("export") |
|||
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<IcPointVaccinesInoculationDTO> list = icPointVaccinesInoculationService.list(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); |
|||
} |
|||
|
|||
/** |
|||
* Desc: 【疫苗接种点】导出 |
|||
* @param response |
|||
* @param formDTO |
|||
* @param tokenDto |
|||
* @author wgf |
|||
* @date 2022/6/24 13:57 |
|||
*/ |
|||
@PostMapping("point-export") |
|||
public void vaccinationExport(HttpServletResponse response, @RequestBody PointHSYMFormDTO formDTO, @LoginUser TokenDto tokenDto) throws Exception { |
|||
ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); |
|||
List<IcPointVaccinesInoculationDTO> list = icPointVaccinesInoculationDao.getPhrasePageByDTO(formDTO); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcPointVaccinesInoculationExcel.class); |
|||
|
|||
} |
|||
|
|||
/** |
|||
* Desc: 【疫苗接种点】导入 |
|||
* @param |
|||
* @author wgf |
|||
* @date 2022/6/21 13:40 |
|||
*/ |
|||
@PostMapping("pointImport") |
|||
public Result pointImport(@LoginUser TokenDto tokenDto, @RequestParam("file") MultipartFile file){ |
|||
if (file.isEmpty()) { |
|||
throw new EpmetException("请上传文件"); |
|||
} |
|||
// 校验文件类型
|
|||
String extension = FilenameUtils.getExtension(file.getOriginalFilename()); |
|||
if (!"xls".equals(extension) && !"xlsx".equals(extension)) { |
|||
throw new EpmetException("文件类型不匹配"); |
|||
} |
|||
|
|||
ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO(); |
|||
importTaskForm.setOriginFileName(file.getOriginalFilename()); |
|||
importTaskForm.setOperatorId(tokenDto.getUserId()); |
|||
importTaskForm.setBizType(ImportTaskConstants.IC_POINT_VACCINES_INOCULATION); |
|||
Result<ImportTaskCommonResultDTO> result = commonServiceOpenFeignClient.createImportTask(importTaskForm); |
|||
if (!result.success()) { |
|||
throw new EpmetException(9999,"存在进行中的导入"); |
|||
} |
|||
InputStream inputStream = null; |
|||
try { |
|||
inputStream = file.getInputStream(); |
|||
}catch (Exception e){ |
|||
ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); |
|||
input.setOperatorId(tokenDto.getUserId()); |
|||
input.setTaskId(result.getData().getTaskId()); |
|||
input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); |
|||
commonServiceOpenFeignClient.finishImportTask(input); |
|||
log.error("读取文件失败"); |
|||
} |
|||
icPointVaccinesInoculationService.importFile(tokenDto,inputStream,result.getData().getTaskId()); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 导出模板 |
|||
* @param response |
|||
* @throws Exception |
|||
*/ |
|||
@PostMapping("exporttemplate") |
|||
public void exportTemplate( HttpServletResponse response) throws Exception { |
|||
TemplateExportParams templatePath = new TemplateExportParams("excel/ic_point_vaccines_inoculation.xlsx"); |
|||
ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"疫苗接种点录入表",response); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.IcPointNucleicMonitoringDTO; |
|||
import com.epmet.dto.form.MapInfoFormDTO; |
|||
import com.epmet.dto.form.PointHSYMFormDTO; |
|||
import com.epmet.dto.result.MapInfoResultDTO; |
|||
import com.epmet.entity.IcPointNucleicMonitoringEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Mapper |
|||
public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonitoringEntity> { |
|||
|
|||
/** |
|||
* 获取所有地点名称 |
|||
* @return |
|||
*/ |
|||
List<String> getAllAddressName(@Param("customerId") String customerId); |
|||
List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* @param params |
|||
* @return |
|||
*/ |
|||
List<IcPointNucleicMonitoringDTO> getPhrasePage(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
List<IcPointNucleicMonitoringDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO); |
|||
|
|||
/** |
|||
* 获取地图信息 |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.IcPointVaccinesInoculationDTO; |
|||
import com.epmet.dto.form.MapInfoFormDTO; |
|||
import com.epmet.dto.form.PointHSYMFormDTO; |
|||
import com.epmet.dto.result.MapInfoResultDTO; |
|||
import com.epmet.entity.IcPointVaccinesInoculationEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Mapper |
|||
public interface IcPointVaccinesInoculationDao extends BaseDao<IcPointVaccinesInoculationEntity> { |
|||
|
|||
/** |
|||
* 获取所有地点名称 |
|||
* @return |
|||
*/ |
|||
List<String> getAllAddressName(@Param("customerId") String customerId); |
|||
List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* @param params |
|||
* @return |
|||
*/ |
|||
List<IcPointVaccinesInoculationDTO> getPhrasePage(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 条件查询 |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
List<IcPointVaccinesInoculationDTO> getPhrasePageByDTO(PointHSYMFormDTO formDTO); |
|||
|
|||
/** |
|||
* 获取地图信息 |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
List<MapInfoResultDTO> getMapInfoList(MapInfoFormDTO formDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,79 @@ |
|||
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-06-20 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("ic_point_nucleic_monitoring") |
|||
public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 所属组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 核酸监测点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 服务时间 |
|||
*/ |
|||
private String serveTime; |
|||
|
|||
/** |
|||
* 咨询电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 监测点地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
} |
|||
@ -0,0 +1,104 @@ |
|||
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-06-20 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("ic_point_vaccines_inoculation") |
|||
public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 所属组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 疫苗接种点名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 接种日期 |
|||
*/ |
|||
private String inoculationDate; |
|||
|
|||
/** |
|||
* 接种上午开始时间 |
|||
*/ |
|||
private String moStartTime; |
|||
|
|||
/** |
|||
* 接种上午结束时间 |
|||
*/ |
|||
private String moEndTime; |
|||
|
|||
/** |
|||
* 接种下午开始时间 |
|||
*/ |
|||
private String afStartTime; |
|||
|
|||
/** |
|||
* 接种下午结束时间 |
|||
*/ |
|||
private String afEndTime; |
|||
|
|||
/** |
|||
* 暂无疫苗（1：是；2：否） |
|||
*/ |
|||
private String noAvailableVaccines; |
|||
|
|||
/** |
|||
* 咨询电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 接种点地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointNucleicMonitoringExcel { |
|||
|
|||
@Excel(name = "所属组织名称") |
|||
private String orgName; |
|||
|
|||
@Excel(name = "核酸监测点名称") |
|||
private String name; |
|||
|
|||
@Excel(name = "服务时间") |
|||
private String serveTime; |
|||
|
|||
@Excel(name = "咨询电话") |
|||
private String mobile; |
|||
|
|||
@Excel(name = "监测点地址") |
|||
private String address; |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,58 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointNucleicMonitoringImportExcel { |
|||
|
|||
@Excel(name = "所属组织名称") |
|||
private String orgName; |
|||
|
|||
@Excel(name = "核酸监测点名称") |
|||
private String name; |
|||
|
|||
@Excel(name = "服务时间") |
|||
private String serveTime; |
|||
|
|||
@Excel(name = "咨询电话") |
|||
private String mobile; |
|||
|
|||
@Excel(name = "监测点地址") |
|||
private String address; |
|||
|
|||
@ExcelIgnore |
|||
private Boolean addStatus = false; |
|||
|
|||
@ExcelIgnore |
|||
private Integer num; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
@ExcelIgnore |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
@ExcelIgnore |
|||
private String pid; |
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
@ExcelIgnore |
|||
private String pids; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointVaccinesInoculationExcel { |
|||
|
|||
@Excel(name = "疫苗接种点名称") |
|||
private String name; |
|||
|
|||
@Excel(name = "接种日期") |
|||
private String inoculationDate; |
|||
|
|||
@Excel(name = "接种上午开始时间") |
|||
private String moStartTime; |
|||
|
|||
@Excel(name = "接种上午结束时间") |
|||
private String moEndTime; |
|||
|
|||
@Excel(name = "接种下午开始时间") |
|||
private String afStartTime; |
|||
|
|||
@Excel(name = "接种下午结束时间") |
|||
private String afEndTime; |
|||
|
|||
@Excel(name = "暂无疫苗", replace = {"是_1","否_2"}) |
|||
private String noAvailableVaccines; |
|||
|
|||
@Excel(name = "咨询电话") |
|||
private String mobile; |
|||
|
|||
@Excel(name = "接种点地址") |
|||
private String address; |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Data |
|||
public class IcPointVaccinesInoculationImportExcel { |
|||
|
|||
// @Excel(name = "所属组织名称")
|
|||
// private String orgName;
|
|||
|
|||
@Excel(name = "疫苗接种点名称") |
|||
private String name; |
|||
|
|||
@Excel(name = "接种日期") |
|||
private String inoculationDate; |
|||
|
|||
@Excel(name = "接种上午开始时间") |
|||
private String moStartTime; |
|||
|
|||
@Excel(name = "接种上午结束时间") |
|||
private String moEndTime; |
|||
|
|||
@Excel(name = "接种下午开始时间") |
|||
private String afStartTime; |
|||
|
|||
@Excel(name = "接种下午结束时间") |
|||
private String afEndTime; |
|||
|
|||
@Excel(name = "暂无疫苗", replace = {"是_1","否_2"}) |
|||
private String noAvailableVaccines; |
|||
|
|||
@Excel(name = "咨询电话") |
|||
private String mobile; |
|||
|
|||
@Excel(name = "接种点地址") |
|||
private String address; |
|||
|
|||
@ExcelIgnore |
|||
private Boolean addStatus = false; |
|||
|
|||
@ExcelIgnore |
|||
private Integer num; |
|||
|
|||
/** |
|||
* 所属组织ID |
|||
*/ |
|||
// @ExcelIgnore
|
|||
// private String orgId;
|
|||
|
|||
/** |
|||
* 组织ID上级 |
|||
*/ |
|||
// @ExcelIgnore
|
|||
// private String pid;
|
|||
|
|||
/** |
|||
* 组织ID所有上级 |
|||
*/ |
|||
// @ExcelIgnore
|
|||
// private String pids;
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.excel.error; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author wgf |
|||
* @DateTime 2022/6/21 16:57 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PointNucleicMonitoringErrorModel { |
|||
|
|||
@Excel(name = "行号",width = 10) |
|||
private Integer num; |
|||
|
|||
@Excel(name = "所属组织名称",width = 30) |
|||
private String orgName; |
|||
|
|||
@Excel(name = "核酸监测点名称",width = 30) |
|||
private String name; |
|||
|
|||
@Excel(name = "服务时间",width = 20) |
|||
private String serveTime; |
|||
|
|||
@Excel(name = "电话",width = 30) |
|||
private String mobile; |
|||
|
|||
@Excel(name = "监测点地址",width = 40) |
|||
private String address; |
|||
|
|||
@Excel(name = "错误信息", width = 200) |
|||
private String errorMsg; |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.excel.error; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author wgf |
|||
* @DateTime 2022/6/21 16:57 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PointVaccinesInoculationErrorModel { |
|||
|
|||
@Excel(name = "行号",width = 10) |
|||
private Integer num; |
|||
|
|||
// @Excel(name = "所属组织名称",width = 30)
|
|||
// private String orgName;
|
|||
|
|||
@Excel(name = "核酸监测点名称",width = 30) |
|||
private String name; |
|||
|
|||
@Excel(name = "接种日期",width = 30) |
|||
private String inoculationDate; |
|||
|
|||
@Excel(name = "接种上午开始时间",width = 30) |
|||
private String moStartTime; |
|||
|
|||
@Excel(name = "接种上午结束时间",width = 30) |
|||
private String moEndTime; |
|||
|
|||
@Excel(name = "接种下午开始时间",width = 30) |
|||
private String afStartTime; |
|||
|
|||
@Excel(name = "接种下午结束时间",width = 30) |
|||
private String afEndTime; |
|||
|
|||
@Excel(name = "暂无疫苗",width = 20, replace = {"否_1","是_2"}) |
|||
private String noAvailableVaccines; |
|||
|
|||
@Excel(name = "电话",width = 30) |
|||
private String mobile; |
|||
|
|||
@Excel(name = "监测点地址",width = 40) |
|||
private String address; |
|||
|
|||
@Excel(name = "错误信息", width = 200) |
|||
private String errorMsg; |
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.redis; |
|||
|
|||
import com.epmet.commons.tools.redis.RedisUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* 核酸监测点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Component |
|||
public class IcPointNucleicMonitoringRedis { |
|||
@Autowired |
|||
private RedisUtils redisUtils; |
|||
|
|||
public void delete(Object[] ids) { |
|||
|
|||
} |
|||
|
|||
public void set(){ |
|||
|
|||
} |
|||
|
|||
public String get(String id){ |
|||
return null; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.redis; |
|||
|
|||
import com.epmet.commons.tools.redis.RedisUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* 疫苗接种点 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-06-20 |
|||
*/ |
|||
@Component |
|||
public class IcPointVaccinesInoculationRedis { |
|||
@Autowired |
|||
private RedisUtils redisUtils; |
|||
|
|||
public void delete(Object[] ids) { |
|||
|
|||
} |
|||
|
|||
public void set(){ |
|||
|
|||
} |
|||
|
|||
public String get(String id){ |
|||
return null; |
|||
} |
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue