diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java index 3a29fb0afc..08f51a1e5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java @@ -66,6 +66,11 @@ public class IcPointNucleicMonitoringDTO implements Serializable { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java index 896d1195fc..12d9cf0db4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java @@ -77,6 +77,11 @@ public class MapInfoResultDTO implements Serializable { */ private String latitude; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java index b6f3edb0a7..c5c6ca64c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -43,7 +43,17 @@ public class IcPointAppController { return icPointAppService.getMapInfoByPointType(formDTO); } - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @PostMapping("enableOrDisabled/{id}") + public Result enableOrDisabled(@PathVariable("id") String id){ + icPointAppService.enableOrDisabled(id); + return new Result(); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index eae4085362..908cf46e44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -49,4 +49,12 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getMapInfoList(MapInfoFormDTO formDTO); + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(@Param("id") String id); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java index 4a05b5d850..e9e54456cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java @@ -1,13 +1,10 @@ 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; - /** * 核酸监测点 * @@ -66,6 +63,11 @@ public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java index 6d6f7626d9..f626bc4e01 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java @@ -1,18 +1,10 @@ package com.epmet.service; -import com.epmet.commons.mybatis.service.BaseService; -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.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.entity.IcPointNucleicMonitoringEntity; -import org.springframework.web.bind.annotation.RequestBody; -import java.io.InputStream; import java.util.List; -import java.util.Map; /** * 地图信息 @@ -29,5 +21,11 @@ public interface IcPointAppService { */ Result> getMapInfoByPointType(MapInfoFormDTO formDTO); - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index 70d92655a5..3d862dd627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -105,4 +105,12 @@ public interface IcPointNucleicMonitoringService extends BaseService getMapInfoList(MapInfoFormDTO formDTO); + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java index 7927aea977..16d73ed457 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java @@ -1,58 +1,17 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -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.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constants.ImportTaskConstants; -import com.epmet.dao.IcPointVaccinesInoculationDao; -import com.epmet.dto.IcPointVaccinesInoculationDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcPointVaccinesInoculationEntity; -import com.epmet.excel.IcPointVaccinesInoculationImportExcel; -import com.epmet.excel.error.PointVaccinesInoculationErrorModel; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.feign.OssFeignClient; -import com.epmet.redis.IcPointVaccinesInoculationRedis; import com.epmet.service.IcPointAppService; import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcPointVaccinesInoculationService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; /** * 地图信息 @@ -85,4 +44,15 @@ public class IcPointAppServiceImpl implements IcPointAppService { } return new Result>().ok(mapInfoResultDTO); } + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @Override + public void enableOrDisabled(String id) { + icPointNucleicMonitoringService.enableOrDisabled(id); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index cb2b516b13..df2214249c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -16,7 +16,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,10 +27,8 @@ import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.excel.IcPointNucleicMonitoringImportExcel; -import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel; import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; @@ -373,5 +370,17 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl + + + update ic_point_nucleic_monitoring + set UPDATED_TIME = now(), + ENABLE_FLAG = case when ENABLE_FLAG = 'enable' then 'disabled' else 'enable' end + where id = #{id} + +