31 changed files with 822 additions and 69 deletions
@ -0,0 +1,67 @@ |
|||
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/3/29 14:17 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 3610567618492110219L; |
|||
private String id; |
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
private String agencyId; |
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
private String gridId; |
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String neighborId; |
|||
/** |
|||
* 楼栋ID |
|||
*/ |
|||
private String buildingId; |
|||
/** |
|||
* 单元ID |
|||
*/ |
|||
private String unitId; |
|||
/** |
|||
* 房屋ID |
|||
*/ |
|||
private String houseId; |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 手机 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
/** |
|||
* 疫苗接种次数 |
|||
*/ |
|||
private Integer vaccineCount; |
|||
/** |
|||
* 核酸检测次数 |
|||
*/ |
|||
private Integer natCount; |
|||
} |
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
@Data |
|||
public class PageTripReportFormDTO extends PageFormDTO implements Serializable { |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 来源地区编码 |
|||
*/ |
|||
private String sourceAddressCode; |
|||
|
|||
/** |
|||
* 来到本地时间 |
|||
*/ |
|||
private Date startDate; |
|||
private Date endDate; |
|||
|
|||
/** |
|||
* token里设置 |
|||
*/ |
|||
private String customerId; |
|||
private String userId; |
|||
|
|||
/** |
|||
* 工作人员所属组织id |
|||
*/ |
|||
private String agencyId; |
|||
} |
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 16:19 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class EpidemicPreventionInfoDTO implements Serializable { |
|||
private static final long serialVersionUID = -1845197091484928L; |
|||
private List<NatListDTO> natList; |
|||
private List<VaccineListDTO> vaccineList; |
|||
private List<TripListDTO> tripList; |
|||
} |
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 14:22 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class EpidemicPreventionResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -1901847880985531089L; |
|||
private String id; |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 所属网格 |
|||
*/ |
|||
private String gridId; |
|||
private String gridName; |
|||
/** |
|||
* 所属家庭 |
|||
*/ |
|||
private String homeId; |
|||
private String houseName; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 身份证 |
|||
*/ |
|||
private String idCard; |
|||
/** |
|||
* 疫苗接种次数 |
|||
*/ |
|||
private Integer vaccineCount; |
|||
/** |
|||
* 核酸检测次数 |
|||
*/ |
|||
private Integer natCount; |
|||
} |
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 16:19 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class NatListDTO implements Serializable { |
|||
private static final long serialVersionUID = 6294272007213038642L; |
|||
private String testTime; |
|||
private String address; |
|||
private String result; |
|||
} |
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 16:22 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class TripListDTO implements Serializable { |
|||
private String fromRegion; |
|||
private String arrivalTime; |
|||
private String leaveTime; |
|||
private String noticeTime; |
|||
private String remark; |
|||
} |
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 16:20 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class VaccineListDTO implements Serializable { |
|||
private static final long serialVersionUID = 182173953023413061L; |
|||
private String vaccinateTime; |
|||
private String manufactor; |
|||
private String address; |
|||
} |
@ -0,0 +1,86 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.form.EpidemicPreventionFormDTO; |
|||
import com.epmet.dto.result.EpidemicPreventionInfoDTO; |
|||
import com.epmet.dto.result.EpidemicPreventionResultDTO; |
|||
import com.epmet.service.IcResiUserService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
|
|||
/** |
|||
* 用户基础信息 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-10-26 |
|||
*/ |
|||
@Slf4j |
|||
@RestController |
|||
@RequestMapping("epidemicPrevention") |
|||
public class IcEpidemicPreventionController{ |
|||
|
|||
@Resource |
|||
private IcResiUserService icResiUserService; |
|||
|
|||
|
|||
/** |
|||
* 居民防疫信息查询 |
|||
* @Param tokenDto |
|||
* @Param formDTO |
|||
* @Return {@link Result< PageData<EpidemicPreventionResultDTO>>} |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 14:25 |
|||
*/ |
|||
@PostMapping("page") |
|||
public Result<PageData<EpidemicPreventionResultDTO>> search(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
PageData<EpidemicPreventionResultDTO> result = icResiUserService.epidemicPreventionList(formDTO); |
|||
return new Result<PageData<EpidemicPreventionResultDTO>>().ok(result); |
|||
} |
|||
|
|||
/** |
|||
* 居民防疫信息详情 |
|||
* @Param formDTO |
|||
* @Return {@link Result< EpidemicPreventionResultDTO>} |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/29 16:13 |
|||
*/ |
|||
@PostMapping("detail") |
|||
public Result<EpidemicPreventionResultDTO> detail(@RequestBody EpidemicPreventionFormDTO formDTO) { |
|||
EpidemicPreventionResultDTO result = icResiUserService.getEpidemicPreventionDetail(formDTO); |
|||
return new Result<EpidemicPreventionResultDTO>().ok(result); |
|||
} |
|||
|
|||
@PostMapping("info") |
|||
public Result<EpidemicPreventionInfoDTO> info(@RequestBody EpidemicPreventionFormDTO formDTO) { |
|||
EpidemicPreventionInfoDTO result = icResiUserService.getEpidemicPreventionInfo(formDTO); |
|||
return new Result<EpidemicPreventionInfoDTO>().ok(result); |
|||
} |
|||
|
|||
} |
Loading…
Reference in new issue