diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java new file mode 100644 index 0000000000..0f8f937a8a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java @@ -0,0 +1,20 @@ +package com.epmet.commons.tools.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.fallback.CommonUserFeignClientFallBackFactory; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:42 下午 + * @DESC + */ +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = CommonUserFeignClientFallBackFactory.class) +public interface CommonUserFeignClient { + @PostMapping("/epmetuser/userbaseinfo/getUserInfo/{userId}") + Result getUserInfo(@PathVariable("userId") String userId); +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java new file mode 100644 index 0000000000..269ee6d985 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java @@ -0,0 +1,24 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:46 下午 + * @DESC + */ +@Slf4j +@Component +public class CommonUserFeignClientFallBackFactory implements FallbackFactory { + private CommonUserFeignClientFallback fallback = new CommonUserFeignClientFallback(); + @Override + public CommonUserFeignClient create(Throwable cause) { + log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); + return fallback; + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java new file mode 100644 index 0000000000..8cd5660484 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import org.springframework.stereotype.Component; + +/** + * 调用政府端权限 + * @Author zqf + * @Description + * @Date 2020/4/24 11:17 + **/ +@Component +public class CommonUserFeignClientFallback implements CommonUserFeignClient { + + @Override + public Result getUserInfo(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserInfo", userId); + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java new file mode 100644 index 0000000000..5b34fcdee7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java @@ -0,0 +1,90 @@ +package com.epmet.commons.tools.redis.common; + +import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.Map; + +/** + * 居民缓存通用类 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Slf4j +@Component +public class CustomerResiUserRedis { + @Resource + private RedisUtils redisUtils; + @Resource + private CommonUserFeignClient commonUserFeignClient; + + private static CustomerResiUserRedis customerResiUserRedis; + private static final String ROLE_MAP_KEY = "roleMap"; + + @PostConstruct + public void init() { + customerResiUserRedis = this; + customerResiUserRedis.redisUtils = this.redisUtils; + customerResiUserRedis.commonUserFeignClient = this.commonUserFeignClient; + } + + /** + * desc: 获取居民缓存 + * + * @param userId + * @return com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache + * @author LiuJanJun + * @date 2021/8/19 10:29 下午 + * @remark 此方法仅用于 获取某个工作人员的信息，不用于获取客户下所有工作人员信息 + */ + public static ResiUserInfoCache getUserBaseInfo(String userId) { + if (StringUtils.isBlank(userId)){ + log.warn("getUserBaseInfo param is blank,userId:{}",userId); + return null; + } + String key = RedisKeys.getResiUserKey(userId); + Map map = customerResiUserRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(map)) { + return ConvertUtils.mapToEntity(map, ResiUserInfoCache.class); + } + + ResiUserInfoCache resultData = reloadStaffCache(userId, key); + if (resultData == null) { + return null; + } + + return resultData; + } + + @Nullable + private static ResiUserInfoCache reloadStaffCache(String userId, String key) { + Result result = customerResiUserRedis.commonUserFeignClient.getUserInfo(userId); + if (result == null || !result.success()) { + throw new RenException("获取居民信息失败"); + } + ResiUserInfoCache resultData = result.getData(); + if (null == resultData) { + log.warn("居民信息为空,userId:{}", userId); + return null; + } + + Map map = BeanUtil.beanToMap(resultData, false, true); + customerResiUserRedis.redisUtils.hMSet(key, map); + return resultData; + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index 1d201149f4..b6d1f518a1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -11,10 +11,14 @@ package com.epmet.commons.tools.security.config; import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver; import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver; import com.epmet.commons.tools.utils.DateUtils; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -27,9 +31,10 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.io.IOException; +import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.List; -import java.util.TimeZone; +import java.util.*; /** * MVC配置 @@ -43,6 +48,7 @@ public class WebMvcConfig implements WebMvcConfigurer { private UserDetailHandlerMethodArgumentResolver userDetailHandlerMethodArgumentResolver; @Autowired private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; + @Override public void addArgumentResolvers(List argumentResolvers) { argumentResolvers.add(loginUserHandlerMethodArgumentResolver); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java new file mode 100644 index 0000000000..36f7d62ab1 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java @@ -0,0 +1,34 @@ +package com.epmet.commons.tools.utils; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class LouDongTreeNodeUtils { + + /** + * 构建树节点 + */ + public static List build(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(T treeNode : treeNodes){ + nodeMap.put(treeNode.getId(), treeNode); + } + + for(T node : nodeMap.values()) { + T parent = nodeMap.get(node.getPid()); + if(parent != null && !(node.getId().equals(parent.getId()))){ + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java new file mode 100644 index 0000000000..e4c77467a8 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java @@ -0,0 +1,48 @@ +package com.epmet.commons.tools.utils; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class LoudongTreeNode implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private String id; + /** + * 上级ID + */ + private String pid; + /** + * 子节点列表 + */ + private List children = new ArrayList<>(); + + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index 21e456a9dd..a0af3da6bf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -1,5 +1,8 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.constant.OrgTypeConstant; import com.epmet.constant.ProjectConstant; import com.epmet.dto.screen.ScreenProjectDataDTO; @@ -126,7 +129,11 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic //上面的initNewScreenProjectData已经赋值了orgName=组织名称 meta.setProjectContent(projectInfo.getBackGround()); meta.setLinkUserId(projectInfo.getCreatedBy()); - meta.setLinkName(projectInfo.getCreatedBy()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(param.getCustomerId(), projectInfo.getCreatedBy()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员："+projectInfo.getCreatedBy()); + } + meta.setLinkName(staffInfo.getRealName()); if (StringUtils.isNotBlank(projectInfo.getLocateDimension())) { meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension())); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 9c53742254..3405c0c019 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -44,9 +44,9 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -83,6 +83,7 @@ public class IcUserDemandRecController implements ResultDataResolver { @Autowired private EpmetUserOpenFeignClient userOpenFeignClient; + /** * 根据服务方类型查询 下拉框 * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； @@ -219,28 +220,33 @@ public class IcUserDemandRecController implements ResultDataResolver { && null != finishResultDTO.getAwardPoint() && finishResultDTO.getAwardPoint() > NumConstant.ZERO && UserDemandConstant.RESOLVED.equals(finishResultDTO.getFinishResult())) { - // 志愿者发放积分 - List actPointEventMsgList = new ArrayList<>(); - BasePointEventMsg actPointEventMsg = new BasePointEventMsg(); - actPointEventMsg.setCustomerId(formDTO.getCustomerId()); - actPointEventMsg.setSourceType(MqConstant.SOURCE_TYPE_DEMAND); - actPointEventMsg.setSourceId(formDTO.getDemandRecId()); - actPointEventMsg.setUserId(finishResultDTO.getServerId()); - actPointEventMsg.setActionFlag(MqConstant.PLUS); - actPointEventMsg.setIsCommon(false); - actPointEventMsg.setRemark(finishResultDTO.getRemark()); - actPointEventMsg.setEventTag(EventEnum.FINISH_USER_DEMAND.getEventTag()); - actPointEventMsg.setEventClass(EventEnum.FINISH_USER_DEMAND.getEventClass()); - actPointEventMsg.setEventName(finishResultDTO.getFirstCategoryName()); - actPointEventMsg.setObjectId(finishResultDTO.getCategoryCode()); - actPointEventMsg.setPoint(finishResultDTO.getAwardPoint()); - actPointEventMsgList.add(actPointEventMsg); - SystemMsgFormDTO sendMsgForm = new SystemMsgFormDTO(); - sendMsgForm.setContent(actPointEventMsgList); - sendMsgForm.setMessageType(SystemMessageType.FINISH_USER_DEMAND); - Result mqResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(sendMsgForm); - if (!mqResult.success()) { - log.error(String.format("demandRecId:%s,给志愿者发放积分失败", formDTO.getDemandRecId())); + Result> userIdRes = userOpenFeignClient.getUserId(finishResultDTO.getServerId()); + if (userIdRes.success() && CollectionUtils.isNotEmpty(userIdRes.getData())) { + userIdRes.getData().forEach(userId -> { + // 志愿者发放积分 + List actPointEventMsgList = new ArrayList<>(); + BasePointEventMsg actPointEventMsg = new BasePointEventMsg(); + actPointEventMsg.setCustomerId(formDTO.getCustomerId()); + actPointEventMsg.setSourceType(MqConstant.SOURCE_TYPE_DEMAND); + actPointEventMsg.setSourceId(formDTO.getDemandRecId()); + actPointEventMsg.setUserId(userId); + actPointEventMsg.setActionFlag(MqConstant.PLUS); + actPointEventMsg.setIsCommon(false); + actPointEventMsg.setRemark(finishResultDTO.getRemark()); + actPointEventMsg.setEventTag(EventEnum.FINISH_USER_DEMAND.getEventTag()); + actPointEventMsg.setEventClass(EventEnum.FINISH_USER_DEMAND.getEventClass()); + actPointEventMsg.setEventName(finishResultDTO.getFirstCategoryName()); + actPointEventMsg.setObjectId(finishResultDTO.getCategoryCode()); + actPointEventMsg.setPoint(finishResultDTO.getAwardPoint()); + actPointEventMsgList.add(actPointEventMsg); + SystemMsgFormDTO sendMsgForm = new SystemMsgFormDTO(); + sendMsgForm.setContent(actPointEventMsgList); + sendMsgForm.setMessageType(SystemMessageType.FINISH_USER_DEMAND); + Result mqResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(sendMsgForm); + if (!mqResult.success()) { + log.error(String.format("demandRecId:%s,给志愿者发放积分失败", formDTO.getDemandRecId())); + } + }); } } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index b5aab903d0..b57b386a8f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -21,11 +21,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; @@ -45,7 +44,6 @@ import com.epmet.dto.form.resi.ResiSendSmsCodeFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.result.ResiUserBaseInfoResultDTO; import com.epmet.dto.result.SendVerificationCodeResultDTO; -import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; @@ -64,8 +62,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.Collator; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -337,43 +335,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl query=new LambdaQueryWrapper<>(); - query.eq(VolunteerInfoEntity::getCustomerId,customerId); - query.likeRight(VolunteerInfoEntity::getPids,pids); - query.select(VolunteerInfoEntity::getUserId); - query.orderByAsc(VolunteerInfoEntity::getCreatedTime); - Set userIds = baseDao.selectObjs(query).stream().map(o->o.toString()).collect(Collectors.toSet()); List resultList = new ArrayList<>(); - if (CollectionUtils.isEmpty(userIds)) { - return resultList; - } - Result> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIds)); - if (userInfoRes.success() && CollectionUtils.isNotEmpty(userInfoRes.getData())) { - Map userMap = userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity())); - for (String userId : userIds) { - if (userMap.containsKey(userId)) { - if (StringUtils.isNoneBlank(userRealName)) { - if (userMap.get(userId).getRealName().contains(userRealName)) { - OptionDTO optionDTO = new OptionDTO(); - optionDTO.setLabel(userMap.get(userId).getRealName().concat("(").concat(userMap.get(userId).getMobile().concat(")"))); - optionDTO.setValue(userId); - resultList.add(optionDTO); - } - } else { - OptionDTO optionDTO = new OptionDTO(); - optionDTO.setLabel(userMap.get(userId).getRealName().concat("(").concat(userMap.get(userId).getMobile().concat(")"))); - optionDTO.setValue(userId); - resultList.add(optionDTO); - } - } - } + IcResiUserDTO icUser = new IcResiUserDTO(); + icUser.setCustomerId(customerId); + icUser.setAgencyId(staffInfo.getAgencyId()); + Result> volunteerRes = epmetUserOpenFeignClient.getVolunteerList(icUser); + if (volunteerRes.success() && CollectionUtils.isNotEmpty(volunteerRes.getData())) { + resultList = ConvertUtils.sourceToTarget(volunteerRes.getData(), OptionDTO.class); + resultList = resultList.stream().sorted((o1, o2) -> + Collator.getInstance(Locale.SIMPLIFIED_CHINESE).compare(o1.getLabel(),o2.getLabel())) + .collect(Collectors.toList()); } return resultList; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 1117174bcc..0c5c86d30d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -163,7 +163,10 @@ AND ACTIVITY_TIME <= #{endTime} - AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} + + AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} + + ORDER BY ACTIVITY_TIME DESC diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java index 4a1376a5fd..a4a2bf1028 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** - * 获取流动人口的数据存入ca_开头的表 + * 获取ruoyi系统数据存入表内 * * @param * @author LZN diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java new file mode 100644 index 0000000000..61bfbc41c6 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 10:44 + **/ +@Data +public class CategorydetailResultDTO implements Serializable { + + /** + *类别ID + */ + private String id; + + /** + *类别名 + */ + private String categoryName; + + /** + *上级类别ID + */ + private String pid; + + /** + *上级类别名 + */ + private String parentCategoryName; + + /** + *创建时间 + */ + private String createdTime; + + /** + *修改时间 + */ + private String updatedTime; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java similarity index 94% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java index dd61db0db7..5a86dff31b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java @@ -12,7 +12,7 @@ import lombok.Data; * @since v1.0.0 2022-06-14 */ @Data -public class PointAditiveCalcDTO implements Serializable { +public class PointAdditiveCalcDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java similarity index 95% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java index b72fe77a08..68c899bed8 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java @@ -13,7 +13,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class PointAditiveRecordDTO implements Serializable { +public class PointAdditiveRecordDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java new file mode 100644 index 0000000000..750bdaf71b --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java @@ -0,0 +1,102 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointAdditiveRuleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + private String applyFlagName; + + /** + * 积分类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + private String pid; + + /** + * 上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0 + */ + private String pids; + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java index 459447f84c..1cd7fc89e5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java @@ -1,8 +1,11 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; +import java.util.List; /** @@ -115,7 +118,7 @@ public class PointApplyDTO implements Serializable { * 昵称 */ private String nickname; - + private String showName; /** * 性别;未知0；男1；女2 */ @@ -141,6 +144,9 @@ public class PointApplyDTO implements Serializable { */ private String remark; + private List annexList; + private Integer pointValue; + /** * 删除标识;0.未删除 1.已删除 */ @@ -159,6 +165,7 @@ public class PointApplyDTO implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date createdTime; /** diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java new file mode 100644 index 0000000000..3602e3a5cb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java @@ -0,0 +1,104 @@ +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-15 + */ +@Data +public class PointRewardDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * 组织ID路径 + */ + private String agencyPids; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 工作人员ID + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 操作类型;积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + + /** + * 备注说明;200字内 + */ + private String statement; + + /** + * 奖扣总分值 + */ + private Integer pointValue; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java new file mode 100644 index 0000000000..d3cac0024d --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java @@ -0,0 +1,69 @@ +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-15 + */ +@Data +public class PointRewardRuleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 奖扣ID + */ + private String rewardId; + + /** + * 规则ID + */ + private String ruleId; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java new file mode 100644 index 0000000000..41aecae242 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 11:12 + **/ +@Data +public class AddcategoryFormDTO implements Serializable { + + /** + *类别名称 + */ + @NotNull(message = "类别名称不可为空") + private String categoryName; + + /** + *上级类别ID + */ + @NotNull(message = "上级类别不可为空") + private String pid; + + private String customerId; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java new file mode 100644 index 0000000000..53dd15ca35 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 11:12 + **/ +@Data +public class AddruleFormDTO implements Serializable { + + /** + *积分规则名称 + */ + @NotNull(message = "积分规则名称不可为空") + private String ruleName; + + /** + *上级类别ID + */ + @NotNull(message = "上级类别不可为空") + private String pid; + + /** + *分值，整数，可以为负数(表示减分) + */ + @NotNull(message = "分值不可为空") + private Integer pointValue; + + /** + *允许申请0，不允许申请1 + */ + @NotNull(message = "申请标记不可为空") + private String applyFlag; + + private String customerId; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java index 6ccb0b2a51..d76f874e4c 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java @@ -29,4 +29,6 @@ public class CommonPageUserFormDTO implements Serializable { @NotBlank(message = "获取不到客户Id" , groups = PageUserGroup.class) private String customerId; + + private String categoryCode; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java new file mode 100644 index 0000000000..b9fd87d5b2 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 16:23 + **/ +@Data +public class List4applyFormDTO implements Serializable { + + /** + *允许申请0，不允许申请1 + */ + private String applyFlag; + + /** + *类别 + */ + @NotNull(message = "类别不可为空") + private String categoryCode; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + /** + *积分奖励point_reward；积分扣罚point_fine + */ + @NotNull(message = "奖罚编码不可为空") + private String businessCode; + + + + private String customerId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java new file mode 100644 index 0000000000..2f3e912649 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 10:10 + **/ +@Data +public class List4treeFormDTO implements Serializable { + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 规则名称 + */ + private String ruleName; + + private String customerId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java new file mode 100644 index 0000000000..ca35444589 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 14:57 + */ +@Data +public class PointApplyPageFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -2274024797424706386L; + /** + * 姓名 + */ + private String name; + /** + * 身份证 + */ + private String idCard; + /** + * 手机号 + */ + private String mobile; + /** + * 申请状态;0已提交；1已驳回；2已通过 + */ + private String status; + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + + private String categoryCode; + + private String agencyId; + private String customerId; + private String userId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java new file mode 100644 index 0000000000..6acae8a5af --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 15:18 + */ +@Data +public class PointAuditFormDTO implements Serializable { + private static final long serialVersionUID = -2470114698294263404L; + private String id; + private String status; + private String remark; + private List ids; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java new file mode 100644 index 0000000000..71cff835cd --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-17 17:48 + **/ +@Data +public class PointModifyFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @NotNull(message = "id不可为空") + private String id; + + private String customerId; + + + /** + * 记录类型;分类:category；规则:rule + */ + @NotNull(message = "类型不可为空") + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + @NotNull(message = "pid不可为空") + private String pid; + + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java new file mode 100644 index 0000000000..f01fe59676 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java @@ -0,0 +1,37 @@ +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; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class RecordRewardFormDTO extends PageFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + @NotNull(message = "业务编码不可为空") + private String businessCode; + + + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java new file mode 100644 index 0000000000..27b112f0f7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class SubmitRewardFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作人员ID + */ + private String staffId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + /** + *规则ID集合 + */ + private List ruleIdList; + + /** + *附件url集合 + */ + private List annexList; + /** + *备注说明 + */ + private String statement; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java new file mode 100644 index 0000000000..0d74a3fdf2 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-17 10:50 + **/ +@Data +public class List4ApplyResultDTO implements Serializable { + + private String id; + + private String name; + +// private String pid; + + private Integer pointValue; + +// private List children = new ArrayList<>(); +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java index 81d70ffd3c..050416dd08 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java @@ -12,10 +12,6 @@ import java.io.Serializable; @Data public class MyTotalPointResultDTO implements Serializable { private static final long serialVersionUID = 15299506166024546L; - /** - * 德育积分moral_education；党建积分party_building；活跃积分active - */ - private String categoryCode; /** * 总积分 */ diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java new file mode 100644 index 0000000000..1f51bc9928 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 9:47 + */ +@Data +public class PointAdditiveRecordDailyDTO implements Serializable { + private static final long serialVersionUID = -239326201168528901L; + /** + * 日期yyyy-MM-dd + */ + private String date; + /** + * 时间hh:mm + */ + private String time; + /** + * 标题 + */ + private String title; + /** + * 积分说明 + */ + private String remark; + /** + * 积分值 + */ + private String point; + /** + * 业务主键 + */ + private String businessId; + /** + * 业务类型 积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject + */ + private String businessCode; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java new file mode 100644 index 0000000000..096b585417 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 9:46 + */ +@Data +public class PointAdditiveRecordResultDTO implements Serializable { + private static final long serialVersionUID = -1498111500078847600L; + /** + * 日期yyyy-MM-dd + */ + private String date; + private List dailyList; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java index 9f8a8786d9..b57d39a273 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java @@ -29,6 +29,10 @@ public interface CommonConstant extends Constant { * 活跃积分 */ String ACTIVE = "active"; + /** + * 活跃积分 + */ + String TOTAL = "total"; /** * 积分申请 */ @@ -45,4 +49,8 @@ public interface CommonConstant extends Constant { * 积分花费 */ String POINT_COST = "point_cost"; + /** + * 驳回积分申请 + */ + String POINT_REJECT = "point_reject"; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java index 5db66d452b..855dcaf599 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java @@ -9,7 +9,7 @@ import java.util.Objects; public enum ApplyStatusEnum { //审核状态 AUDITING("0", "未审核"), - REJECT("1", "未通过"), + REJECT("1", "已驳回"), PASSED("2", "已通过"); private String code; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java new file mode 100644 index 0000000000..8763af0681 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java @@ -0,0 +1,44 @@ +package com.epmet.common.enu; + +/** +* @describe: 积分规则枚举类 +* @author wangtong +* @date 2022/6/15 13:54 +*/ +public enum PointAddRuleEnum { + CATEGORY_TYPE("category", "分类"), + RULE_TYPE("rule", "规则"), + APPLY_ALLOW("0", "允许"), + APPLY_BAN("1", "禁止"), + MORAL_EDUCATION("moral_education", "德育积分"), + POINT_FINE("point_fine", "积分扣罚"), + POINT_REWARD("point_reward", "积分奖励"), + ; + + private String code; + private String desc; + + + PointAddRuleEnum(String code, String name) { + this.code = code; + this.desc = name; + } + + public static PointAddRuleEnum getEnum(String code) { + PointAddRuleEnum[] values = PointAddRuleEnum.values(); + for (PointAddRuleEnum value : values) { + if (code != null && value.getCode().equals(code)) { + return value; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java new file mode 100644 index 0000000000..3f780d3ff9 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -0,0 +1,188 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.CategorydetailResultDTO; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.List4ApplyResultDTO; +import com.epmet.excel.PointAdditiveRuleExcel; +import com.epmet.service.PointAdditiveRuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("additiverule") +public class PointAdditiveRuleController { + + @Autowired + private PointAdditiveRuleService pointAdditiveRuleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointAdditiveRuleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointAdditiveRuleDTO data = pointAdditiveRuleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointAdditiveRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointAdditiveRuleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointAdditiveRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointAdditiveRuleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointAdditiveRuleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointAdditiveRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointAdditiveRuleExcel.class); + } + + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 10:11 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("list4tree") + public Result> list4tree(@LoginUser TokenDto tokenDto, @RequestBody List4treeFormDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.list4tree(dto); + } + + /** + * @describe: 查询下级类别简要信息 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("subcategory/listbrief/{categoryId}") + public Result> listbrief(@PathVariable("categoryId") String categoryId){ + return pointAdditiveRuleService.listbrief(categoryId); + } + + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("categorydetail/{categoryId}") + public Result categorydetail(@PathVariable("categoryId") String categoryId){ + return pointAdditiveRuleService.categorydetail(categoryId); + } + + /** + * @describe: 添加积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("addcategory") + public Result addcategory(@LoginUser TokenDto tokenDto,@RequestBody AddcategoryFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.addcategory(dto); + } + + /** + * @describe: 添加积分规则 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("addrule") + public Result addrule(@LoginUser TokenDto tokenDto,@RequestBody AddruleFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.addrule(dto); + } + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("list4apply") + public Result> list4apply(@LoginUser TokenDto tokenDto, @RequestBody List4applyFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.list4apply(dto); + } + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:36 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("ruledetail/{ruleId}") + public Result ruledetail(@PathVariable("ruleId") String ruleId){ + return pointAdditiveRuleService.ruledetail(ruleId); + } + + /** + * @describe: 修改积分分类/规则 + * @author wangtong + * @date 2022/6/17 17:51 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("modify") + public Result modify(@LoginUser TokenDto tokenDto,@RequestBody PointModifyFormDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.modify(dto); + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java index 4f7ba03a07..19423970b3 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java @@ -12,12 +12,12 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PointApplyDTO; import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; +import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.service.PointApplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * 积分申请 @@ -32,13 +32,15 @@ public class PointApplyController { @Autowired private PointApplyService pointApplyService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = pointApplyService.page(params); + @RequestMapping("listall") + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody PointApplyPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + PageData page = pointApplyService.page(formDTO); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @RequestMapping(value = "detail/{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ PointApplyDTO data = pointApplyService.get(id); return new Result().ok(data); @@ -81,4 +83,12 @@ public class PointApplyController { return new Result(); } + @NoRepeatSubmit + @PostMapping("examine/submit") + public Result audit(@LoginUser TokenDto tokenDto, @RequestBody PointAuditFormDTO formDTO){ + //效验数据 + pointApplyService.audit(tokenDto, formDTO); + return new Result(); + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java new file mode 100644 index 0000000000..4ee6c98f37 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java @@ -0,0 +1,113 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.excel.PointRewardExcel; +import com.epmet.service.PointRewardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("reward") +public class PointRewardController { + + @Autowired + private PointRewardService pointRewardService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointRewardService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointRewardDTO data = pointRewardService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointRewardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointRewardService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointRewardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointRewardService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointRewardService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointRewardService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointRewardExcel.class); + } + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDto, @RequestBody SubmitRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setStaffId(tokenDto.getUserId()); + return pointRewardService.submit(dto); + } + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + @PostMapping("record") + public Result> record(@LoginUser TokenDto tokenDto, @RequestBody RecordRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(pointRewardService.record(dto)); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java new file mode 100644 index 0000000000..9ee5a025e8 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.dto.PointRewardRuleDTO; +import com.epmet.excel.PointRewardRuleExcel; +import com.epmet.service.PointRewardRuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("pointRewardRule") +public class PointRewardRuleController { + + @Autowired + private PointRewardRuleService pointRewardRuleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointRewardRuleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointRewardRuleDTO data = pointRewardRuleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointRewardRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointRewardRuleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointRewardRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointRewardRuleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointRewardRuleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointRewardRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointRewardRuleExcel.class); + } + + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 05b37956d2..885910a843 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -8,10 +8,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.service.PointVerificationLogService; -import com.epmet.service.UserPointActionLogService; -import com.epmet.service.UserPointStatisticalDailyService; -import com.epmet.service.UserPointTotalService; +import com.epmet.service.*; import com.epmet.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +17,7 @@ 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; import java.util.List; /** @@ -39,6 +37,8 @@ public class ResiPointController { private PointVerificationLogService pointVerificationLogService; @Autowired private UserPointActionLogService pointActionLogService; + @Resource + private PointAdditiveRecordService pointAdditiveRecordService; /** * @Description 获取指定居民的积分信息 @@ -233,9 +233,26 @@ public class ResiPointController { } @PostMapping("total") - public Result> totalPoint(@LoginUser TokenDto tokenDto) { - return new Result>().ok(userPointTotalService.totalPoint(tokenDto)); + public Result totalPoint(@LoginUser TokenDto tokenDto, @RequestBody CommonPageUserFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(userPointTotalService.totalPoint(formDTO)); } - + /** + * 德育积分/党建积分的积分记录 + * + * @Param dto + * @Param pageUserParam + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + @PostMapping("additiverecordlist") + public Result> additiveRecords(@LoginUser TokenDto dto, @RequestBody CommonPageUserFormDTO pageUserParam){ + pageUserParam.setCustomerId(dto.getCustomerId()); + pageUserParam.setUserId(dto.getUserId()); + ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); + return new Result>().ok(pointAdditiveRecordService.getRecords(pageUserParam)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java similarity index 63% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java index b5410693e5..ca55b3d103 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.entity.PointAdditiveCalcEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface PointAditiveCalcDao extends BaseDao { +public interface PointAdditiveCalcDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java new file mode 100644 index 0000000000..e1a5638f48 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java @@ -0,0 +1,30 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.PointAdditiveRecordDailyDTO; +import com.epmet.entity.PointAdditiveRecordEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface PointAdditiveRecordDao extends BaseDao { + /** + * 积分记录 + * + * @Param customerId + * @Param categoryCode + * @Param subjectId + * @Return {@link List< PointAdditiveRecordDailyDTO >} + * @Author zhaoqifeng + * @Date 2022/6/15 10:12 + */ + List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java new file mode 100644 index 0000000000..8b39e7d65b --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -0,0 +1,90 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.CategorydetailResultDTO; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.List4applyFormDTO; +import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.dto.result.List4ApplyResultDTO; +import com.epmet.entity.PointAdditiveRuleEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointAdditiveRuleDao extends BaseDao { + + /** + * @describe: 查询下级类别简要信息 + * @author wangtong + * @date 2022/6/15 10:30 + * @params [categoryId] + * @return java.util.List + */ + List selectListbrief(@Param("categoryId") String categoryId); + + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:52 + * @params [categoryId] + * @return com.epmet.dto.CategorydetailResultDTO + */ + CategorydetailResultDTO selectCategorydetail(@Param("categoryId") String categoryId); + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 16:29 + * @params [dto] + * @return java.util.List + */ + List selectList4apply(List4applyFormDTO dto); + + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 16:43 + * @params [dto] + * @return java.util.List + */ + List selectList4tree(List4treeFormDTO dto); + + /** + * @describe: 根据规则查询积分总值 + * @author wangtong + * @date 2022/6/16 10:43 + * @params [dto] + * @return java.lang.Integer + */ + Integer selectPointTotalByIds(SubmitRewardFormDTO dto); + + /** + * @describe: 通过名称查询 + * @author wangtong + * @date 2022/6/17 9:37 + * @params [customerId, categoryName] + * @return com.epmet.entity.PointAdditiveRuleEntity + */ + PointAdditiveRuleEntity selectEntityByName(@Param("id") String id, + @Param("customerId") String customerId, + @Param("categoryName") String categoryName, + @Param("ruleName") String ruleName); + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:40 + * @params [categoryId] + * @return com.epmet.dto.PointAdditiveRuleDTO + */ + PointAdditiveRuleDTO selectRuledetail(@Param("ruleId") String ruleId); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java index 29fd3d8c90..809226c58d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PointApplyDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; import com.epmet.entity.PointApplyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 积分申请 @@ -12,5 +17,24 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointApplyDao extends BaseDao { + + /** + * 获取积分申请详情 + * + * @Param id + * @Return {@link PointApplyDTO} + * @Author zhaoqifeng + * @Date 2022/6/15 14:31 + */ + PointApplyDTO getDetail(@Param("id") String id); + + /** + * 申请列表 + * @Param formDTO + * @Return {@link List< PointApplyDTO>} + * @Author zhaoqifeng + * @Date 2022/6/15 15:01 + */ + List getList(PointApplyPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java new file mode 100644 index 0000000000..6ff72ba2a4 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java @@ -0,0 +1,28 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.entity.PointRewardEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointRewardDao extends BaseDao { + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:29 + * @params [dto] + * @return java.util.List + */ + List selectRewardRecord(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java new file mode 100644 index 0000000000..99f2d046bf --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointRewardRuleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointRewardRuleDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java similarity index 89% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java index 552b9e5dea..53c4939cf8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("point_aditive_calc") -public class PointAditiveCalcEntity extends BaseEpmetEntity { +@TableName("point_additive_calc") +public class PointAdditiveCalcEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java similarity index 92% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java index 1a3ad83056..cc30d1fb85 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("point_aditive_record") -public class PointAditiveRecordEntity extends BaseEpmetEntity { +@TableName("point_additive_record") +public class PointAdditiveRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java new file mode 100644 index 0000000000..fbd1ebbdf5 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java @@ -0,0 +1,69 @@ +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-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_additive_rule") +public class PointAdditiveRuleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + /** + * 积分类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + private String pid; + + /** + * 上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0 + */ + private String pids; + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java new file mode 100644 index 0000000000..b1b1c8dbcf --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java @@ -0,0 +1,74 @@ +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-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_reward") +public class PointRewardEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * 组织ID路径 + */ + private String agencyPids; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 工作人员ID + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 操作类型;积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + + /** + * 备注说明;200字内 + */ + private String statement; + + /** + * 奖扣总分值 + */ + private Integer pointValue; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java new file mode 100644 index 0000000000..d32582f876 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java @@ -0,0 +1,39 @@ +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-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_reward_rule") +public class PointRewardRuleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 奖扣ID + */ + private String rewardId; + + /** + * 规则ID + */ + private String ruleId; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java new file mode 100644 index 0000000000..b87cae4a7e --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java @@ -0,0 +1,66 @@ +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-15 + */ +@Data +public class PointAdditiveRuleExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "记录类型;分类:category；规则:rule") + private String type; + + @Excel(name = "允许申请标记;允许0（type = category时，强制赋值为0），禁止1。") + private String applyFlag; + + @Excel(name = "积分类别编码;德育积分moral_education；党建积分party_building") + private String categoryCode; + + @Excel(name = "积分类别名称;type=category时必填") + private String categoryName; + + @Excel(name = "积分规则名称;type=rule时必填") + private String ruleName; + + @Excel(name = "上级节点ID;上级分类ID，顶级分类的PID为0") + private String pid; + + @Excel(name = "上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0") + private String pids; + + @Excel(name = "分值;正数加分，负数减分；type=rule时必填") + private Integer pointValue; + + @Excel(name = "删除标识;0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java new file mode 100644 index 0000000000..e4b3857ddc --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java @@ -0,0 +1,69 @@ +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-15 + */ +@Data +public class PointRewardExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "组织ID") + private String agencyId; + + @Excel(name = "组织ID路径") + private String agencyPids; + + @Excel(name = "房屋ID") + private String houseId; + + @Excel(name = "房屋名称;完整拼接的名称") + private String houseAllName; + + @Excel(name = "工作人员ID") + private String staffId; + + @Excel(name = "工作人员姓名") + private String staffName; + + @Excel(name = "操作类型;积分奖励point_reward；积分扣罚point_fine") + private String businessCode; + + @Excel(name = "备注说明;200字内") + private String statement; + + @Excel(name = "奖扣总分值") + private Integer pointValue; + + @Excel(name = "删除标识;0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java new file mode 100644 index 0000000000..cf300c2f43 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java @@ -0,0 +1,48 @@ +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-15 + */ +@Data +public class PointRewardRuleExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "奖扣ID") + private String rewardId; + + @Excel(name = "规则ID") + private String ruleId; + + @Excel(name = "删除标识;0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java new file mode 100644 index 0000000000..b8345af3c2 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java @@ -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-15 + */ +@Component +public class PointAdditiveRuleRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java new file mode 100644 index 0000000000..dbf8ec87da --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java @@ -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-15 + */ +@Component +public class PointRewardRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java new file mode 100644 index 0000000000..1742b32ad0 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java @@ -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-15 + */ +@Component +public class PointRewardRuleRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java new file mode 100644 index 0000000000..50d477b844 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java @@ -0,0 +1,89 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.PointAdditiveCalcDTO; +import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.entity.PointRewardEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointAdditiveCalcService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAdditiveCalcDTO + * @author generator + * @date 2022-06-14 + */ + PointAdditiveCalcDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointAdditiveCalcDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointAdditiveCalcDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * @describe: 根据房屋ID和积分类别 插入/修改德育积分 + * @author wangtong + * @date 2022/6/21 14:51 + * @params [insertEntity] + * @return com.epmet.commons.tools.utils.Result + */ + Result insertMoralEducation(PointRewardEntity insertEntity); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRecordService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRecordService.java new file mode 100644 index 0000000000..c4536982dd --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRecordService.java @@ -0,0 +1,101 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.PointAdditiveRecordDTO; +import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.result.PointAdditiveRecordResultDTO; +import com.epmet.entity.PointAdditiveRecordEntity; +import com.epmet.entity.PointRewardEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointAdditiveRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAdditiveRecordDTO + * @author generator + * @date 2022-06-14 + */ + PointAdditiveRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointAdditiveRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointAdditiveRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 获取积分记录 + * + * @Param formDTO + * @Return {@link List< PointAdditiveRecordResultDTO >} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + List getRecords(CommonPageUserFormDTO formDTO); + + /** + * @describe: 插入德育积分记录 + * @author wangtong + * @date 2022/6/21 14:29 + * @params [insertEntity] + * @return com.epmet.commons.tools.utils.Result + */ + Result insertMoralEducation(PointRewardEntity insertEntity); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java new file mode 100644 index 0000000000..4f9995158e --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -0,0 +1,154 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CategorydetailResultDTO; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.List4ApplyResultDTO; +import com.epmet.entity.PointAdditiveRuleEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointAdditiveRuleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAdditiveRuleDTO + * @author generator + * @date 2022-06-15 + */ + PointAdditiveRuleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointAdditiveRuleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointAdditiveRuleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); + + /** + * @describe: 查询下级类别简要信息 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> listbrief(String categoryId); + + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:49 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + Result categorydetail(String categoryId); + + /** + * @describe: 添加积分类别 + * @author wangtong + * @date 2022/6/15 11:14 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result addcategory(AddcategoryFormDTO dto); + + /** + * @describe: 添加积分规则 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + Result addrule(AddruleFormDTO dto); + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> list4apply(List4applyFormDTO dto); + + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 10:11 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result> list4tree(List4treeFormDTO dto); + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:36 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + Result ruledetail(String ruleId); + + /** + * @describe: 修改积分分类/规则 + * @author wangtong + * @date 2022/6/17 17:51 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result modify(PointModifyFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java index f2c7cdb49e..c9aea552f1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import java.util.List; @@ -75,4 +76,13 @@ public interface PointAnnexService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/16 9:27 + * @params [id, dto] + * @return void + */ + void insertBatchPoint(String rewardId, SubmitRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java index 7988b94f26..74160b5099 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java @@ -2,8 +2,11 @@ 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.dto.PointApplyDTO; import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; +import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.entity.PointApplyEntity; import java.util.List; @@ -25,7 +28,7 @@ public interface PointApplyService extends BaseService { * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(PointApplyPageFormDTO formDTO); /** * 默认查询 @@ -85,4 +88,15 @@ public interface PointApplyService extends BaseService { * @Date 2022/6/14 14:14 */ void submit(PointApplyFormDTO formDTO); + + /** + * 审核 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2022/6/15 15:20 + */ + void audit(TokenDto tokenDto, PointAuditFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java new file mode 100644 index 0000000000..4dac4bfd97 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java @@ -0,0 +1,88 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.entity.PointRewardRuleEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointRewardRuleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointRewardRuleDTO + * @author generator + * @date 2022-06-15 + */ + PointRewardRuleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointRewardRuleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointRewardRuleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); + + /** + * @describe: 插入积分奖扣明细 + * @author wangtong + * @date 2022/6/16 9:37 + * @params [id, dto] + * @return void + */ + void insertBatchPointRule(String rewardId, SubmitRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java new file mode 100644 index 0000000000..c83226937f --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java @@ -0,0 +1,99 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.entity.PointRewardEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointRewardService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointRewardDTO + * @author generator + * @date 2022-06-15 + */ + PointRewardDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointRewardDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointRewardDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result submit(SubmitRewardFormDTO dto); + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + PageData record(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java index 07bc0b77e1..43302c3948 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java @@ -18,7 +18,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.MyTotalPointResultDTO; @@ -75,10 +75,10 @@ public interface UserPointTotalService extends BaseService /** * 积分总分 * - * @Param tokenDto + * @Param formDTO * @Return {@link MyTotalPointResultDTO} * @Author zhaoqifeng * @Date 2022/6/14 15:46 */ - List totalPoint(TokenDto tokenDto); + MyTotalPointResultDTO totalPoint(CommonPageUserFormDTO formDTO); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java new file mode 100644 index 0000000000..368c1b5ad7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java @@ -0,0 +1,112 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.enu.PointAddRuleEnum; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveCalcDao; +import com.epmet.dto.PointAdditiveCalcDTO; +import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.entity.PointRewardEntity; +import com.epmet.service.PointAdditiveCalcService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAdditiveCalcServiceImpl extends BaseServiceImpl implements PointAdditiveCalcService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveCalcDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveCalcDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAdditiveCalcDTO get(String id) { + PointAdditiveCalcEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveCalcDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAdditiveCalcDTO dto) { + PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAdditiveCalcDTO dto) { + PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public Result insertMoralEducation(PointRewardEntity rewardEntity) { + PointAdditiveCalcEntity queryData = new PointAdditiveCalcEntity(); + queryData.setSubjectId(rewardEntity.getHouseId()); + queryData.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode()); + QueryWrapper wrapper = new QueryWrapper<>(queryData); + PointAdditiveCalcEntity isExist = baseDao.selectOne(wrapper); + //有则更新，无则插入 + if(null == isExist){ + PointAdditiveCalcEntity entity = new PointAdditiveCalcEntity(); + entity.setCustomerId(rewardEntity.getCustomerId()); + entity.setSubjectId(rewardEntity.getHouseId()); + entity.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode()); + entity.setSpend(0); + entity.setTotal(rewardEntity.getPointValue()); + insert(entity); + }else{ + if(null == isExist.getTotal()){ + isExist.setTotal(rewardEntity.getPointValue()); + }else{ + isExist.setTotal(isExist.getTotal()+rewardEntity.getPointValue()); + } + updateById(isExist); + } + return new Result(); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java new file mode 100644 index 0000000000..1b0bec197c --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java @@ -0,0 +1,169 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.CommonConstant; +import com.epmet.common.enu.PointAddRuleEnum; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveRecordDao; +import com.epmet.dto.PointAdditiveRecordDTO; +import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.result.HomeInfoResultDTO; +import com.epmet.dto.result.PointAdditiveRecordDailyDTO; +import com.epmet.dto.result.PointAdditiveRecordResultDTO; +import com.epmet.entity.PointAdditiveRecordEntity; +import com.epmet.entity.PointRewardEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.service.PointAdditiveRecordService; +import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAdditiveRecordServiceImpl extends BaseServiceImpl implements PointAdditiveRecordService { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveRecordDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAdditiveRecordDTO get(String id) { + PointAdditiveRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 获取积分记录 + * + * @param formDTO 入参 + * @Return {@link List< PointAdditiveRecordResultDTO >} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + @Override + public List getRecords(CommonPageUserFormDTO formDTO) { + List list = new ArrayList<>(); + String subjectId; + //如果申请类型为德育积分，需要获取用户所在房屋 + if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) { + Result result = epmetUserOpenFeignClient.getHomeInfo(); + if (!result.success() || null == result.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民所在家庭信息失败", "获取居民所在家庭信息失败"); + } + if (StringUtils.isBlank(result.getData().getHouseId())) { + return list; + } + subjectId = result.getData().getHouseId(); + } else { + subjectId = formDTO.getUserId(); + } + + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); + + if(CollectionUtils.isNotEmpty(recordList)){ + Map> map = + recordList.stream().collect(Collectors.groupingBy(PointAdditiveRecordDailyDTO::getDate)); + + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); + sortedMap.forEach((key, value) -> { + PointAdditiveRecordResultDTO o = new PointAdditiveRecordResultDTO(); + o.setDate(key); + o.setDailyList(value); + list.add(o); + }); + + } + return list; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result insertMoralEducation(PointRewardEntity rewardEntity) { + PointAdditiveRecordEntity entity = new PointAdditiveRecordEntity(); + entity.setCustomerId(rewardEntity.getCustomerId()); + if(PointAddRuleEnum.POINT_REWARD.getCode().equals(rewardEntity.getBusinessCode())){ + entity.setTitle("德育积分奖励"); + }else if(PointAddRuleEnum.POINT_FINE.getCode().equals(rewardEntity.getBusinessCode())){ + entity.setTitle("德育积分扣罚"); + } + entity.setStatement(rewardEntity.getStatement()); + entity.setPointValue(rewardEntity.getPointValue()); + entity.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode()); + entity.setSubjectId(rewardEntity.getHouseId()); + entity.setBusinessId(rewardEntity.getId()); + entity.setBusinessCode(rewardEntity.getBusinessCode()); + insert(entity); + return new Result(); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java new file mode 100644 index 0000000000..7146f105f1 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -0,0 +1,270 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.enu.PointAddRuleEnum; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveRuleDao; +import com.epmet.dao.PointApplyDao; +import com.epmet.dto.CategorydetailResultDTO; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.List4ApplyResultDTO; +import com.epmet.entity.PointAdditiveRuleEntity; +import com.epmet.entity.PointApplyEntity; +import com.epmet.redis.PointAdditiveRuleRedis; +import com.epmet.service.PointAdditiveRuleService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointAdditiveRuleServiceImpl extends BaseServiceImpl implements PointAdditiveRuleService { + + @Autowired + private PointAdditiveRuleRedis pointAdditiveRuleRedis; + + @Autowired + private PointApplyDao pointApplyDao; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveRuleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveRuleDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAdditiveRuleDTO get(String id) { + PointAdditiveRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveRuleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAdditiveRuleDTO dto) { + PointAdditiveRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRuleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAdditiveRuleDTO dto) { + PointAdditiveRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRuleEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + for(String id : ids){ + PointAdditiveRuleEntity entity = baseDao.selectById(id); + if(null == entity){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息。","未查到相关信息。"); + } + if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(entity.getType())){ + //分类判断是否有下级 + PointAdditiveRuleEntity queryData = new PointAdditiveRuleEntity(); + queryData.setPid(entity.getId()); + QueryWrapper wrapper = new QueryWrapper<>(queryData); + List applyList = baseDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先删除下级的积分规则。","请先删除下级的积分规则。"); + } + }else{ + //判断其规则下面是否有待审核的积分申请，如果有则不允许修改/删除 + PointApplyEntity queryData = new PointApplyEntity(); + queryData.setRuleId(entity.getId()); + queryData.setStatus("0"); + QueryWrapper wrapper = new QueryWrapper<>(queryData); + List applyList = pointApplyDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该规则下有积分申请尚未完成，请处理完成后再执行该操作。","该规则下有积分申请尚未完成，请处理完成后再执行该操作。"); + } + } + } + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public Result> listbrief(String categoryId) { + List result = baseDao.selectListbrief(categoryId); + return new Result>().ok(result); + } + + @Override + public Result categorydetail(String categoryId) { + CategorydetailResultDTO result = baseDao.selectCategorydetail(categoryId); + return new Result().ok(result); + } + + @Override + public Result addcategory(AddcategoryFormDTO dto) { + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),dto.getCategoryName(),null); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode()); + entity.setApplyFlag(PointAddRuleEnum.APPLY_ALLOW.getCode()); + entity.setCategoryName(dto.getCategoryName()); + entity.setPid(dto.getPid()); + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + if(null == parentEntity){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息"); + } + if(StringUtils.isBlank(parentEntity.getPids())){ + entity.setPids(parentEntity.getId()); + }else{ + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + } + entity.setCategoryCode(parentEntity.getCategoryCode()); + } + insert(entity); + return new Result().ok("新增成功！"); + } + + @Override + public Result addrule(AddruleFormDTO dto) { + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(null,dto.getCustomerId(),null,dto.getRuleName()); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setType(PointAddRuleEnum.RULE_TYPE.getCode()); + entity.setRuleName(dto.getRuleName()); + entity.setApplyFlag(dto.getApplyFlag()); + entity.setPointValue(dto.getPointValue()); + entity.setPid(dto.getPid()); + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + if(null == parentEntity){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息"); + } + if(StringUtils.isBlank(parentEntity.getPids())){ + entity.setPids(parentEntity.getId()); + }else{ + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + } + entity.setCategoryCode(parentEntity.getCategoryCode()); + } + insert(entity); + return new Result().ok("新增成功！"); + } + + @Override + public Result> list4apply(List4applyFormDTO dto) { + List list = baseDao.selectList4apply(dto); + return new Result>().ok(list); + } + + + @Override + public Result> list4tree(List4treeFormDTO dto) { + List result = baseDao.selectList4tree(dto); + return new Result>().ok(result); + } + + @Override + public Result ruledetail(String ruleId) { + PointAdditiveRuleDTO result = baseDao.selectRuledetail(ruleId); + return new Result().ok(result); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result modify(PointModifyFormDTO dto) { + PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId()); + if(entity == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息","未查到相关信息"); + } + if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){ + //类别 + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getId(),dto.getCustomerId(),dto.getCategoryName(),null); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + entity.setCategoryName(dto.getCategoryName()); + if(StringUtils.isNotBlank(dto.getApplyFlag())){ + entity.setApplyFlag(dto.getApplyFlag()); + } + }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){ + //规则 + //判断名称重复 + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getId(),dto.getCustomerId(),null,dto.getRuleName()); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + //判断其规则下面是否有待审核的积分申请，如果有则不允许修改/删除 + PointApplyEntity queryData = new PointApplyEntity(); + queryData.setRuleId(entity.getId()); + queryData.setStatus("0"); + QueryWrapper wrapper = new QueryWrapper<>(queryData); + List applyList = pointApplyDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该规则下有积分申请尚未完成，请处理完成后再执行该操作。","该规则下有积分申请尚未完成，请处理完成后再执行该操作。"); + } + + entity.setRuleName(dto.getRuleName()); + entity.setPointValue(dto.getPointValue()); + entity.setApplyFlag(dto.getApplyFlag()); + }else{ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "type类型有误","type类型有误"); + } + + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + if(null == parentEntity){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息"); + } + entity.setPid(dto.getPid()); + if(StringUtils.isBlank(parentEntity.getPids())){ + entity.setPids(parentEntity.getId()); + }else{ + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + } + } + updateById(entity); + return new Result().ok("修改成功！"); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java deleted file mode 100644 index 2b8bc7ed16..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.epmet.service.impl; - -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.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.PointAditiveCalcDao; -import com.epmet.dto.PointAditiveCalcDTO; -import com.epmet.entity.PointAditiveCalcEntity; -import com.epmet.service.PointAditiveCalcService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 附加积分计算 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-06-14 - */ -@Service -public class PointAditiveCalcServiceImpl extends BaseServiceImpl implements PointAditiveCalcService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointAditiveCalcDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public PointAditiveCalcDTO get(String id) { - PointAditiveCalcEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PointAditiveCalcDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(PointAditiveCalcDTO dto) { - PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PointAditiveCalcDTO dto) { - PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java deleted file mode 100644 index 6ca0fb5f22..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.epmet.service.impl; - -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.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.PointAditiveRecordDao; -import com.epmet.dto.PointAditiveRecordDTO; -import com.epmet.entity.PointAditiveRecordEntity; -import com.epmet.service.PointAditiveRecordService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 附加积分记录 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-06-14 - */ -@Service -public class PointAditiveRecordServiceImpl extends BaseServiceImpl implements PointAditiveRecordService { - - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointAditiveRecordDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public PointAditiveRecordDTO get(String id) { - PointAditiveRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java index fdfd83e9fd..d7f0ff9ea7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java @@ -3,15 +3,15 @@ package com.epmet.service.impl; 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.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.PointAnnexDao; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import com.epmet.service.PointAnnexService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,4 +80,21 @@ public class PointAnnexServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointApplyDTO.class); + public PageData page(PointApplyPageFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取工作人员信息失败", "获取工作人员信息失败"); + } + if (StringUtils.isBlank(formDTO.getAgencyId())) { + formDTO.setAgencyId(staffInfo.getAgencyId()); + } + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + //获取居民信息 + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(item.getUserId()); + if (null != userInfo) { + item.setHeadImgUrl(userInfo.getHeadImgUrl()); + item.setGender(GenderEnum.getName(userInfo.getGender())); + item.setShowName(userInfo.getShowName()); + } + //获取网格信息 + //从缓存获取网格信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); + if (null != gridInfo) { + item.setGridName(gridInfo.getGridName()); + } + }); + } + return new PageData<>(list, pageInfo.getTotal()); } @Override @@ -75,8 +117,24 @@ public class PointApplyServiceImpl extends BaseServiceImpl ids = new ArrayList<>(); + if (CollectionUtils.isEmpty(formDTO.getIds())) { + ids.add(formDTO.getId()); + } else { + ids = formDTO.getIds(); + } + ids.forEach(id -> { + //获取积分申请信息 + PointApplyDTO dto = get(id); + if (NumConstant.ZERO_STR.equals(dto.getStatus())) { + //更新审核状态 + PointApplyEntity entity = ConvertUtils.sourceToTarget(formDTO, PointApplyEntity.class); + entity.setId(id); + baseDao.updateById(entity); + + String subjectId; + + if (CommonConstant.MORAL_EDUCATION.equals(dto.getCategoryCode())) { + subjectId = dto.getHouseId(); + } else { + subjectId = dto.getUserId(); + } + //生成积分记录 + PointAdditiveRecordEntity record = new PointAdditiveRecordEntity(); + record.setCustomerId(tokenDto.getCustomerId()); + record.setTitle(dto.getTitle()); + record.setStatement(dto.getStatement()); + if (NumConstant.TWO_STR.equals(formDTO.getStatus())) { + record.setPointValue(dto.getPointValue()); + record.setBusinessCode(CommonConstant.POINT_APPLY); + } else { + record.setPointValue(NumConstant.ZERO); + record.setBusinessCode(CommonConstant.POINT_REJECT); + } + record.setCategoryCode(dto.getCategoryCode()); + record.setSubjectId(subjectId); + record.setBusinessId(dto.getId()); + + pointAdditiveRecordDao.insert(record); + if (NumConstant.TWO_STR.equals(formDTO.getStatus())) { + //重新计算总分 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + PointAdditiveCalcEntity calc = pointAdditiveCalcDao.selectOne(wrapper); + if (null != calc) { + calc.setUpdatedBy(null); + calc.setUpdatedTime(null); + calc.setTotal(calc.getTotal() + dto.getPointValue()); + pointAdditiveCalcDao.updateById(calc); + } else { + calc = new PointAdditiveCalcEntity(); + calc.setCustomerId(tokenDto.getCustomerId()); + calc.setCategoryCode(dto.getCategoryCode()); + calc.setSubjectId(subjectId); + calc.setSpend(NumConstant.ZERO); + calc.setTotal(dto.getPointValue()); + pointAdditiveCalcDao.insert(calc); + } + } + } + }); + + + } + } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java new file mode 100644 index 0000000000..10d54b582c --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java @@ -0,0 +1,100 @@ +package com.epmet.service.impl; + +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointRewardRuleDao; +import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.entity.PointRewardRuleEntity; +import com.epmet.redis.PointRewardRuleRedis; +import com.epmet.service.PointRewardRuleService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointRewardRuleServiceImpl extends BaseServiceImpl implements PointRewardRuleService { + + @Autowired + private PointRewardRuleRedis pointRewardRuleRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointRewardRuleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointRewardRuleDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointRewardRuleDTO get(String id) { + PointRewardRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointRewardRuleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointRewardRuleDTO dto) { + PointRewardRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardRuleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointRewardRuleDTO dto) { + PointRewardRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardRuleEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void insertBatchPointRule(String rewardId, SubmitRewardFormDTO dto) { + dto.getRuleIdList().forEach(ruleId->{ + PointRewardRuleEntity entity = new PointRewardRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setRewardId(rewardId); + entity.setRuleId(ruleId); + insert(entity); + }); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java new file mode 100644 index 0000000000..bd8c2b9307 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java @@ -0,0 +1,155 @@ +package com.epmet.service.impl; + +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.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveRuleDao; +import com.epmet.dao.PointRewardDao; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.entity.PointRewardEntity; +import com.epmet.redis.PointRewardRedis; +import com.epmet.service.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointRewardServiceImpl extends BaseServiceImpl implements PointRewardService { + + @Autowired + private PointRewardRedis pointRewardRedis; + + @Autowired + private PointAnnexService pointAnnexService; + + @Autowired + private PointRewardRuleService pointRewardRuleService; + + @Autowired + private PointAdditiveRuleDao pointAdditiveRuleDao; + + @Autowired + private PointAdditiveRecordService pointAdditiveRecordService; + + @Autowired + private PointAdditiveCalcService pointAdditiveCalcService; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointRewardDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointRewardDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointRewardDTO get(String id) { + PointRewardEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointRewardDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointRewardDTO dto) { + PointRewardEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointRewardDTO dto) { + PointRewardEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result submit(SubmitRewardFormDTO dto) { + HouseInfoCache houseCache = CustomerIcHouseRedis.getHouseInfo(dto.getCustomerId(),dto.getHouseId()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(),dto.getStaffId()); + PointRewardEntity insertEntity = new PointRewardEntity(); + insertEntity.setCustomerId(dto.getCustomerId()); + insertEntity.setAgencyId(staffInfo.getAgencyId()); + insertEntity.setAgencyPids(staffInfo.getAgencyPIds()); + insertEntity.setHouseId(dto.getHouseId()); + insertEntity.setHouseAllName(houseCache.getAllName()); + insertEntity.setStaffId(staffInfo.getStaffId()); + insertEntity.setStaffName(staffInfo.getRealName()); + insertEntity.setBusinessCode(dto.getBusinessCode()); + insertEntity.setStatement(dto.getStatement()); + //根据积分规则去获取分值 + Integer pointSum = pointAdditiveRuleDao.selectPointTotalByIds(dto); + if(null == pointSum){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "积分不可为空","积分不可为空"); + } + insertEntity.setPointValue(pointSum); + insert(insertEntity); + //插入积分奖扣明细 + pointRewardRuleService.insertBatchPointRule(insertEntity.getId(),dto); + //插入积分附件 + pointAnnexService.insertBatchPoint(insertEntity.getId(),dto); + //插入附加积分记录 + pointAdditiveRecordService.insertMoralEducation(insertEntity); + //插入附加积分计算 + pointAdditiveCalcService.insertMoralEducation(insertEntity); + return new Result().ok("提交成功！"); + } + + @Override + public PageData record(RecordRewardFormDTO dto) { + PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); + List list = baseDao.selectRewardRecord(dto); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 4dbda58db2..e9ff35e4bc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -24,15 +24,15 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.PointAditiveCalcDao; +import com.epmet.dao.PointAdditiveCalcDao; import com.epmet.dao.UserPointTotalDao; +import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.entity.PointAdditiveCalcEntity; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.UserPointTotalService; @@ -60,7 +60,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl totalPoint(TokenDto tokenDto) { - List list = new ArrayList(); - //活跃度积分 - MyTotalPointResultDTO active = new MyTotalPointResultDTO(); - active.setCategoryCode(CommonConstant.ACTIVE); - ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(tokenDto.getUserId(), tokenDto.getCustomerId()); - if (null != activeTotal) { - active.setTotal(activeTotal.getAccumulatedPoint()); - active.setUsable(activeTotal.getUsablePoint()); - active.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint()); + public MyTotalPointResultDTO totalPoint(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); + switch (formDTO.getCategoryCode()) { + case CommonConstant.MORAL_EDUCATION: + //德育积分 + resultDTO = getEducationTotal(formDTO); + break; + case CommonConstant.PARTY_BUILDING: + //党建积分 + resultDTO = getPartyTotal(formDTO); + break; + case CommonConstant.ACTIVE: + //活跃度积分 + resultDTO = getActiveTotal(formDTO); + break; + case CommonConstant.TOTAL: + MyTotalPointResultDTO education = getEducationTotal(formDTO); + MyTotalPointResultDTO party = getPartyTotal(formDTO); + MyTotalPointResultDTO active = getActiveTotal(formDTO); + resultDTO.setTotal(education.getTotal() + party.getTotal() + active.getTotal()); + resultDTO.setSpend(education.getSpend() + party.getSpend() + active.getSpend()); + resultDTO.setUsable(education.getUsable() + party.getUsable() + active.getUsable()); + break; + default: + break; } - list.add(active); + + return resultDTO; + } + + /** + * 德育积分 + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getEducationTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); //德育积分 - MyTotalPointResultDTO education = new MyTotalPointResultDTO(); - education.setCategoryCode(CommonConstant.MORAL_EDUCATION); //获取居民绑定的家庭 Result result = epmetUserOpenFeignClient.getHomeInfo(); if (!result.success() || null == result.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民绑定家庭信息失败", "获取居民绑定家庭信息失败"); } if (StringUtils.isNotBlank(result.getData().getHouseId())) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, result.getData().getHouseId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); + PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper); if (null != entity) { - education.setTotal(entity.getTotal()); - education.setSpend(entity.getSpend()); - education.setUsable(entity.getTotal() - entity.getSpend()); + resultDTO.setTotal(entity.getTotal()); + resultDTO.setSpend(entity.getSpend()); + resultDTO.setUsable(entity.getTotal() - entity.getSpend()); } } - list.add(education); + return resultDTO; + } - //党建积分 - MyTotalPointResultDTO party = new MyTotalPointResultDTO(); - party.setCategoryCode(CommonConstant.PARTY_BUILDING); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, tokenDto.getUserId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + /** + * 党建积分 + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getPartyTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, formDTO.getUserId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); + PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper); if (null != entity) { - party.setTotal(entity.getTotal()); - party.setSpend(entity.getSpend()); - party.setUsable(entity.getTotal() - entity.getSpend()); + resultDTO.setTotal(entity.getTotal()); + resultDTO.setSpend(entity.getSpend()); + resultDTO.setUsable(entity.getTotal() - entity.getSpend()); } - list.add(party); + return resultDTO; + } - return list; + /** + * 活跃积分 + * + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getActiveTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); + ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(formDTO.getUserId(), formDTO.getCustomerId()); + if (null != activeTotal) { + resultDTO.setTotal(activeTotal.getAccumulatedPoint()); + resultDTO.setUsable(activeTotal.getUsablePoint()); + resultDTO.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint()); + } + return resultDTO; } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql new file mode 100644 index 0000000000..9e69ec4907 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql @@ -0,0 +1,147 @@ +DROP TABLE IF EXISTS point_additive_rule; +CREATE TABLE point_additive_rule( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + TYPE VARCHAR(32) NOT NULL COMMENT '记录类型;分类:category；规则:rule' , + APPLY_FLAG VARCHAR(1) COMMENT '允许申请标记;允许0（type = category时，强制赋值为0），禁止1。' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别编码;德育积分moral_education；党建积分party_building' , + CATEGORY_NAME VARCHAR(128) COMMENT '积分类别名称;type=category时必填' , + RULE_NAME VARCHAR(512) COMMENT '积分规则名称;type=rule时必填' , + PID VARCHAR(64) COMMENT '上级节点ID;上级分类ID，顶级分类的PID为0' , + PIDS VARCHAR(512) COMMENT '上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0' , + POINT_VALUE INT(10) COMMENT '分值;正数加分，负数减分；type=rule时必填' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分规则'; + +DROP TABLE IF EXISTS point_additive_record; +CREATE TABLE point_additive_record( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + TITLE VARCHAR(512) COMMENT '标题;积分变动标题或业务场景标题' , + STATEMENT VARCHAR(3072) COMMENT '说明;积分变动的说明' , + POINT_VALUE INT(10) COMMENT '分值' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别;德育积分moral_education；党建积分party_building' , + SUBJECT_ID VARCHAR(64) COMMENT '积分主体ID;居民端用户ID或房屋ID' , + BUSINESS_ID VARCHAR(64) COMMENT '业务主键' , + BUSINESS_CODE VARCHAR(32) COMMENT '业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分记录'; + +DROP TABLE IF EXISTS point_additive_calc; +CREATE TABLE point_additive_calc( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别;德育积分moral_education；党建积分party_building' , + SUBJECT_ID VARCHAR(64) COMMENT '积分主体ID;居民端用户ID或房屋ID' , + SPEND INT(10) DEFAULT 0 COMMENT '已用积分;累计已花费' , + TOTAL INT(10) DEFAULT 0 COMMENT '总分;累计积分' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分计算'; + +DROP TABLE IF EXISTS point_apply; +CREATE TABLE `point_apply` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '申请人所属组织ID', + `AGENCY_PIDS` varchar(512) DEFAULT NULL COMMENT '上级组织ID路径', + `GRID_ID` varchar(64) NOT NULL COMMENT '申请人所属网格ID', + `GRID_NAME` varchar(32) DEFAULT NULL COMMENT '申请人所属网格名称', + `CATEGORY_ID` varchar(64) DEFAULT NULL COMMENT '类别ID', + `CATEGORY_NAME` varchar(90) DEFAULT NULL COMMENT '类别名称', + `CATEGORY_CODE` varchar(32) DEFAULT NULL COMMENT '类别编码;德育积分moral_education；党建积分party_building', + `RULE_ID` varchar(64) NOT NULL COMMENT '积分规则ID', + `RULE_NAME` varchar(512) DEFAULT NULL COMMENT '积分规则名称', + `TITLE` varchar(128) DEFAULT NULL COMMENT '申请标题;30字内', + `STATEMENT` varchar(3072) DEFAULT NULL COMMENT '申请内容说明;1000字内', + `STATUS` varchar(1) NOT NULL DEFAULT '0' COMMENT '申请状态;0已提交；1已驳回；2已通过', + `USER_ID` varchar(64) DEFAULT NULL COMMENT '用户ID;申请人ID（居民端用户ID）', + `IC_RESI_USER` varchar(64) DEFAULT NULL COMMENT '居民ID;申请人居民ID（IC_RESI_USER表主键）', + `HOUSE_ID` varchar(64) DEFAULT NULL COMMENT '房屋ID;房屋或家庭ID', + `HOUSE_ALL_NAME` varchar(512) DEFAULT NULL COMMENT '房屋名称;完整拼接的名称', + `HEAD_IMG_URL` varchar(512) DEFAULT NULL COMMENT '头像', + `NICKNAME` varchar(90) DEFAULT NULL COMMENT '昵称', + `GENDER` varchar(1) DEFAULT NULL COMMENT '性别;未知0；男1；女2', + `NAME` varchar(90) DEFAULT NULL COMMENT '姓名', + `ID_CARD` varchar(32) DEFAULT NULL COMMENT '身份证号', + `MOBILE` varchar(32) DEFAULT NULL COMMENT '手机号', + `REMARK` varchar(512) DEFAULT NULL COMMENT '审核备注', + `DEL_FLAG` varchar(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分申请'; + +DROP TABLE IF EXISTS point_reward; +CREATE TABLE point_reward( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + AGENCY_ID VARCHAR(32) NOT NULL COMMENT '组织ID' , + AGENCY_PIDS VARCHAR(512) COMMENT '组织ID路径' , + HOUSE_ID VARCHAR(64) COMMENT '房屋ID' , + HOUSE_ALL_NAME VARCHAR(512) COMMENT '房屋名称;完整拼接的名称' , + STAFF_ID VARCHAR(64) COMMENT '工作人员ID' , + STAFF_NAME VARCHAR(90) COMMENT '工作人员姓名' , + BUSINESS_CODE VARCHAR(32) COMMENT '操作类型;积分奖励point_reward；积分扣罚point_fine' , + STATEMENT VARCHAR(3072) COMMENT '备注说明;200字内' , + POINT_VALUE INT(10) COMMENT '奖扣总分值' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分奖扣'; + +DROP TABLE IF EXISTS point_reward_rule; +CREATE TABLE point_reward_rule( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + REWARD_ID VARCHAR(64) COMMENT '奖扣ID' , + RULE_ID VARCHAR(64) COMMENT '规则ID' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分奖扣明细'; + +DROP TABLE IF EXISTS point_annex; +CREATE TABLE `point_annex` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) DEFAULT NULL COMMENT '业务ID;业务主键，包括积分申请、奖扣等业务', + `BUSINESS_CODE` varchar(32) DEFAULT NULL COMMENT '业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost', + `URL` varchar(512) DEFAULT NULL COMMENT '附件访问地址', + `SORT` int(10) DEFAULT NULL COMMENT '排序', + `DEL_FLAG` varchar(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分相关附件表'; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml new file mode 100644 index 0000000000..dc41cb4988 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml new file mode 100644 index 0000000000..1451688cc2 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml new file mode 100644 index 0000000000..84a26d63e7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml deleted file mode 100644 index 4839dd26fa..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 6daa8936d8..4eff87f9b8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -37,5 +37,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml new file mode 100644 index 0000000000..98f794dcea --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml similarity index 62% rename from epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml rename to epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml index c015362019..e0fb760bd7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml @@ -1,15 +1,13 @@ - + - + - - - - + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index b7a6a6374b..52d258308a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -156,8 +156,8 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { @Override public WxResult getPrivacySetting(String accessToken) { WxResult result = new WxResult<>(); - String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken; - Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}"); + String url = WxMaCodeConstant.GET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken; + Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{\"privacy_ver\":2}"); log.info("getPrivacySetting result:{}", JSON.toJSONString(submitResult)); if (!submitResult.success()) { result.setErrorCode(submitResult.getCode()); @@ -168,7 +168,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { JSONArray jsonArray = jsonObject.getJSONArray(SETTING_LIST); - if (jsonArray.size() == 9){ + if (jsonArray != null || jsonArray.size() == 9){ result.setErrorCode(9999); result.setErrorMsg("用户隐私权限未设置或设置不完整"); return result; @@ -181,7 +181,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { @Override public WxResult setPrivacySetting(String accessToken) { //todo 目前设置9个隐私权限 - String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}\n"; + String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}"; WxResult result = new WxResult<>(); String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken; Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, param); diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 60419614fc..b833fc339b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -623,10 +623,6 @@ public interface GovOrgOpenFeignClient { /** * Desc: 房屋更新 - * <<<<<<< HEAD - * ======= - *

- * >>>>>>> feature/dev_sunjiatan * * @param formDTO * @author zxc @@ -644,6 +640,17 @@ public interface GovOrgOpenFeignClient { @GetMapping("/gov/org/customeragency/subOrgList/{agencyId}") Result> subOrgList(@PathVariable("agencyId") String agencyId); + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:20 + */ + @PostMapping("/gov/org/ichouse/getHouseAgencyInfo") + Result getHouseAgencyInfo(@RequestParam("houseId") String houseId); + /** * @Author sun * @Description 获取当前组织及下级无效组织、网格Id列表 @@ -664,11 +671,11 @@ public interface GovOrgOpenFeignClient { /** + * @return com.epmet.commons.tools.utils.Result * @describe: 工作端-通过房屋编码获取房屋信息 * @author wangtong * @date 2022/6/10 13:27 * @params [dto] - * @return com.epmet.commons.tools.utils.Result */ @PostMapping("/gov/org/house/getHomeInfoByHouseCode") Result getHomeInfoByHouseCode(CommonHouseFormDTO dto); diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 23054533c7..56da609bd2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -422,6 +422,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { } @Override + public Result getHouseAgencyInfo(String houseId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subOrgList",houseId); + } public Result getDelAgencyGridIdList(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getDelAgencyGridIdList", agencyId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index e6f1522353..a4a6a65dd7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.service.IcHouseService; @@ -46,25 +47,25 @@ public class IcHouseController { private IcHouseService icHouseService; @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { IcHouseDTO data = icHouseService.get(id); return new Result().ok(data); } @PostMapping("houseoption") - public Result> getHouseOption(@RequestBody HouseFormDTO formDTO){ + public Result> getHouseOption(@RequestBody HouseFormDTO formDTO) { return new Result>().ok(icHouseService.getHouseOption(formDTO)); } /** - * @Description 查询房屋信息 * @param idCard + * @Description 查询房屋信息 * @author zxc * @date 2021/11/3 3:30 下午 */ @PostMapping("selecthouseinfobyidcard") - public Result> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard,@RequestParam("customerId")String customerId){ - return new Result>().ok(icHouseService.selectHouseInfoByIdCard(idCard,customerId)); + public Result> selectHouseInfoByIdCard(@RequestParam("idCard") String idCard, @RequestParam("customerId") String customerId) { + return new Result>().ok(icHouseService.selectHouseInfoByIdCard(idCard, customerId)); } /** @@ -75,23 +76,38 @@ public class IcHouseController { * @Date 2021/11/5 16:01 */ @PostMapping("houselist") - public Result> getHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseFormDTO formDTO){ + public Result> getHouseList(@LoginUser TokenDto tokenDto, @RequestBody HouseFormDTO formDTO) { return new Result>().ok(icHouseService.getHouseList(tokenDto, formDTO)); } /** * Desc: 根据身份证查询房屋名 + * * @param idCards * @author zxc * @date 2022/4/12 16:42 */ @PostMapping("houses-name") - public Result> getHousesNameByIdCards(@RequestBody List idCards){ + public Result> getHousesNameByIdCards(@RequestBody List idCards) { return new Result>().ok(icHouseService.getHousesNameByIdCards(idCards)); } + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:18 + */ + @PostMapping("getHouseAgencyInfo") + public Result getHouseAgencyInfo(@RequestParam("houseId") String houseId) { + HouseAgencyInfoResultDTO dto = icHouseService.getHouseAgencyInfo(houseId); + return new Result().ok(dto); + } + @GetMapping("getbyhousecode/{houseCode}") - public Result getByHouseCode(@PathVariable("houseCode") String houseCode){ + public Result getByHouseCode(@PathVariable("houseCode") String houseCode) { return new Result().ok(icHouseService.getByHouseCode(houseCode)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 161aad6c4e..7ed2819ea7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.entity.IcHouseEntity; @@ -127,6 +128,16 @@ public interface IcHouseService extends BaseService { */ List getHousesNameByIdCards(List idCards); + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.dto.result.HouseAgencyInfoResultDTO + * @author LZN + * @date 2022/6/22 16:18 + */ + HouseAgencyInfoResultDTO getHouseAgencyInfo(String houseId); + /** * 根据房屋编码查询房屋信息 * @@ -136,4 +147,4 @@ public interface IcHouseService extends BaseService { * @date 2022/6/1/0001 16:21 */ IcHouseDTO getByHouseCode(String houseCode); -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index ef99e35c94..6f92962f4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -22,6 +22,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; @@ -222,7 +223,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl categories = new ArrayList<>(); if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) { for (IcResiCategoryStatsConfigDTO category : categoryList) { @@ -284,6 +285,20 @@ public class IcHouseServiceImpl extends BaseServiceImpl lqw = Wrappers.lambdaQuery(); diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java new file mode 100644 index 0000000000..52bf7b79a6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.dto.ca; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaBmCategoryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 类别ID + */ + private Long categoryId; + + /** + * 名称 + */ + private String categoryName; + + /** + * + */ + private String categoryType; + + /** + * 名称值 + */ + private String categoryValue; + + /** + * 父类别ID + */ + private Long parentCategoryId; + + /** + * 展示顺序 + */ + private Integer categorySort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 删除状态 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 扩展字段1 + */ + private String attribute1; + + /** + * 扩展字段2 + */ + private String attribute2; + + /** + * 扩展字段3 + */ + private String attribute3; + + /** + * 扩展字段4 + */ + private String attribute4; + + /** + * 扩展字段5 + */ + private String attribute5; + + /** + * 扩展字段6 + */ + private Long attribute6; + + /** + * 扩展字段7 + */ + private Long attribute7; + + /** + * 扩展字段8 + */ + private Long attribute8; + + /** + * 扩展字段9 + */ + private Date attribute9; + + /** + * 扩展字段10 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaResidentUserDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaResidentUserDTO.java new file mode 100644 index 0000000000..d117f7f783 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaResidentUserDTO.java @@ -0,0 +1,64 @@ +package com.epmet.opendata.dto.ca; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-22 + */ +@Data +public class CaResidentUserDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 身份证号 + */ + private String idCard; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + + /** + * 绑定的房屋id + */ + private String homeId; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 删除标记，normal + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java new file mode 100644 index 0000000000..abb22af9f7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.dto.ca; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaSysDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 字典ID + */ + private Long dictId; + + /** + * 字典值，例如：sex/F + */ + private String dictValue; + + /** + * 1.字典组名称（性别）或者字典名称（女） + */ + private String dictLabel; + + /** + * 字典值时存入字典的值，字典组时存null + */ + private String dictType; + + /** + * 描述 + */ + private String dictDesc; + + /** + * 排序 + */ + private Integer dictSort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 字典值：normal正常，deleted正常 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 624c9ac5b4..0c43a0ae97 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -7,20 +7,42 @@ package com.epmet.opendata.dto.constant; */ public interface CaWghDataConstant { + int PAGE_LIMIT = 200; String AESKEY = "hriajrutnbghajsd"; String TABLESCHEMA_UNICOM = "unicom"; - - String UNICOM_PINGFANG = "ca_pingfang"; + String TABLESCHEMA_SHARE = "share"; + String UNICOM_PINGFANG = "ca_pingfang"; String UNICOM_LOUDONG = "ca_loudong"; String UNICOM_RESIDENT = "ca_resident"; String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; + String UNICOM_BM_CATEGORY = "ca_bm_category"; + String UNICOM_SYS_DICT = "ca_sys_dict"; + + String SHARE_BASE_GRID = "wgh_base_grid"; + String SHARE_WGH_SUB = "wgh_subdistrict_office"; + String SHARE_BM_GRID = "ca_bm_grid"; + String SHARE_COMMUNITY = "wgh_community"; + String SHARE_WGH_DYWG = "wgh_dywg"; + String SHARE_WGH_JDB = "wgh_jdb"; + String SHARE_WGH_JQZ = "wgh_jqz"; + String SHARE_WGH_JXCS = "wgh_jxcs"; + String SHARE_WGH_JYZ = "wgh_jyz"; + String SHARE_WGH_SJXX = "wgh_sjxxb"; + String SHARE_WGH_SQXX = "wgh_sqxx"; + String SHARE_WGH_SZCGWGH = "wgh_szcgwgh"; + String SHARE_WGH_SZZRWG = "wgh_szzrwg"; + String SHARE_WGH_WHPDW = "wgh_whpdw"; + String SHARE_WGH_YJBMCS = "wgh_yjbmcs"; + String SHARE_WGH_YQHJZ = "wgh_yqhjz"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; + String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; String UNICOM_CONDITION = "unicomCondition"; + String SHARE_CONDITION = "shareCondition"; } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java index 0822a5fcf1..4bc0cec51d 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java @@ -20,6 +20,11 @@ public class CaLoudongFormDTO implements Serializable { */ private String buildingName; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java index f6388581f1..e98bf07580 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java @@ -19,6 +19,11 @@ public class CaPingfangFormDTO implements Serializable { */ private String communityName; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java index e268304026..dab0b4611a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java @@ -19,6 +19,11 @@ public class CaRentalFormtDTO implements Serializable { */ private String houseName; + /** + * 网格id + */ + private String gridId; + /** * 承租人姓名 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java index dc7972f46c..d2303ff5e9 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java @@ -28,4 +28,9 @@ public class CaResidentFormDTO implements Serializable { */ private String telephone; + /** + * 网格id + */ + private String gridId; + } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java index 322c9783b3..664e6f4c2f 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java @@ -25,6 +25,11 @@ public class CaRotatorsFormDTO implements Serializable { */ private String telephone; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GetResidentDetailByIdCardFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GetResidentDetailByIdCardFormDTO.java new file mode 100644 index 0000000000..3af9406944 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GetResidentDetailByIdCardFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.opendata.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class GetResidentDetailByIdCardFormDTO implements Serializable { + + private static final long serialVersionUID = 2717574179375935921L; + + private String idCard; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/SaveCaResidentUserFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/SaveCaResidentUserFormDTO.java new file mode 100644 index 0000000000..a155e5cab3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/SaveCaResidentUserFormDTO.java @@ -0,0 +1,57 @@ +package com.epmet.opendata.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class SaveCaResidentUserFormDTO implements Serializable { + + private static final long serialVersionUID = -182571137927356144L; + + /** + * 身份证号 + */ + private String idCard; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + + /** + * 房屋id + */ + private String homeId; + + /** + * 创建人 + */ + private Long createdBy; + + /** + * 创建时间 + */ + private Date createdDate; + + /** + * 最后修改人 + */ + private Long updatedBy; + + /** + * 最后修改时间 + */ + private Date updatedDate; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer versions; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java index 71f91a0aee..35b101ce32 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java @@ -12,6 +12,12 @@ public class CaLoudongResultDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 2835612060476537433L; + private String gridName; + + private String comName; + + private String streetName; + /** * 楼栋ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java index 21500d78d6..c4f1bfe23e 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java @@ -12,6 +12,12 @@ public class CaPingfangResultDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 3689421598802326474L; + private String gridName; + + private String comName; + + private String streetName; + /** * 楼栋ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java index 9264d24aac..b5c5b0bbd6 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java @@ -10,6 +10,12 @@ public class CaRentalResultDTO implements Serializable { private static final long serialVersionUID = -1721373620271590333L; + private String gridName; + + private String comName; + + private String streetName; + /** * 出租房ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java index 8fac0b7cba..2e32889995 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java @@ -10,6 +10,22 @@ public class CaResidentResultDTO implements Serializable { private static final long serialVersionUID = 3876909002181822355L; + private String gridName; + + private String comName; + + private String streetName; + + /** + * 房屋id + */ + private String homeId; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + /** * 人口ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java index 7736d81e41..04a5895ad8 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java @@ -10,6 +10,12 @@ public class CaRotatorsResultDTO implements Serializable { private static final long serialVersionUID = -5388784241677803257L; + private String gridName; + + private String comName; + + private String streetName; + /** * 主键id */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java new file mode 100644 index 0000000000..37f3799090 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dto.result; + +import com.epmet.commons.tools.utils.LoudongTreeNode; +import com.epmet.commons.tools.utils.TreeNode; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class LouDongCascadeResultDTO extends LoudongTreeNode implements Serializable { + + private static final long serialVersionUID = -359443782589013555L; + + private String label; + + private String value; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java new file mode 100644 index 0000000000..195d499f25 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/ResidentByIdCardResultDTO.java @@ -0,0 +1,187 @@ +package com.epmet.opendata.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ResidentByIdCardResultDTO implements Serializable { + + private static final long serialVersionUID = 3809219691923066512L; + + /** + * 人口性质 + */ + private String residentProperty; + + /** + * 居民分类 + */ + private String residentType; + + /** + * 证件类型 + */ + private String idType; + + /** + * 证件号码（公民身份证号） + */ + private String idCard; + + /** + * 姓名 + */ + private String residentName; + + /** + * 性别 + */ + private String sex; + + /** + * 出生日期 + */ + private Date birthday; + + /** + * 民族 + */ + private String nation; + + /** + * 联系方式 + */ + private String telephone; + + /** + * 户籍省 + */ + private String householdProv; + + /** + * 户籍市 + */ + private String householdCity; + + /** + * 户籍县(区) + */ + private String householdCounty; + + /** + * 户籍镇街 + */ + private String householdTown; + + /** + * 户籍社区/村 + */ + private String householdVillage; + + /** + * 户籍详址 + */ + private String householdAddressDetail; + + /** + * 现住省 + */ + private String curliveProv; + + /** + * 现住市 + */ + private String curliveCity; + + /** + * 现住县(区) + */ + private String curliveCounty; + + /** + * 现住镇街 + */ + private String curliveTown; + + /** + * 现住社区/村 + */ + private String curliveVillage; + + /** + * 现住详址 + */ + private String curliveAddressDetail; + + /** + * 籍贯省 + */ + private String nativeAddressProv; + + /** + * 籍贯市 + */ + private String nativeAddressCity; + + /** + * 籍贯县(区) + */ + private String nativeAddressCounty; + + /** + * 曾用名 + */ + private String formerName; + + /** + * 学历 + */ + private String education; + + /** + * 职业 + */ + private String occupation; + + /** + * 职业类别 + */ + private String occupationType; + + /** + * 服务处所 + */ + private String serviceAddress; + + /** + * 婚姻状况 + */ + private String marriageStatus; + + /** + * 政治面貌 + */ + private String party; + + /** + * 宗教信仰 + */ + private String religious; + + /** + * 有无皈依（已受洗） + */ + private String conversionState; + + /** + * 国籍 + */ + private String nationality; + + /** + * 数据来源 + */ + private String platCode; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java new file mode 100644 index 0000000000..0180f59b47 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java @@ -0,0 +1,64 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BasegridDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String gridName; + + /** + * + */ + private String subDistrictOffice; + + /** + * + */ + private String community; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String gridCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java new file mode 100644 index 0000000000..4c5c9869b4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java @@ -0,0 +1,206 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BmGridDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 网格编码。人工填写，编码规则业务规定，不允许重复。 + */ + private String gridCode; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 行政区划的国标编码 + */ + private String gbCode; + + /** + * 上级网格ID + */ + private Long parentId; + + /** + * 上级网格编码 + */ + private String parentCode; + + /** + * 网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等 + */ + private String gridClassification; + + /** + * 网格层级。网格层级表的层级 +根据【网格层级表】的层级关系动态展示。 +查询【网格层级表】层级 条件：上层级=网格树返回的网格层级 + */ + private String gridLevel; + + /** + * 网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他 + */ + private String gridProperty; + + /** + * 是否最后一级:0否 1是 + */ + private String isEnd; + + /** + * 网格地址 + */ + private String gridAddress; + + /** + * 网格介绍 + */ + private String gridIntroduce; + + /** + * 宣传图片 + */ + private String gridPicture; + + /** + * 地图区域范围 + */ + private String reginScopeDesc; + + /** + * 展示顺序 + */ + private Integer gridSort; + + /** + * 标绘状态 + */ + private String pointStatus; + + /** + * 事件上报中心 + */ + private Long gridEmCenter; + + /** + * 初始日期 + */ + private Date gridBeginTime; + + /** + * 终止日期 + */ + private Date gridEndTime; + + /** + * 面积 + */ + private String gridArea; + + /** + * 是否有效 + */ + private String isValid; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * + */ + private Long updateBy; + + /** + * + */ + private Date updateDate; + + /** + * 删除状态: 字典值：normal正常，删除deleted + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 网格内人口规模 + */ + private String attribute1; + + /** + * 是否成立网格党支部或网格党小组 + */ + private String attribute2; + + /** + * 网格党组织类型 + */ + private String attribute3; + + /** + * 党组织编码 + */ + private String attribute4; + + /** + * 扩展字段 + */ + private String attribute5; + + /** + * 扩展字段 + */ + private Long attribute6; + + /** + * 扩展字段 + */ + private Long attribute7; + + /** + * 扩展字段 + */ + private Long attribute8; + + /** + * 扩展字段 + */ + private Date attribute9; + + /** + * 扩展字段 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java new file mode 100644 index 0000000000..de6db91652 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class CommunityDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityName; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java new file mode 100644 index 0000000000..ccb89c4ca0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java @@ -0,0 +1,44 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class SubdistrictOfficeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java new file mode 100644 index 0000000000..b3dbfaad42 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java @@ -0,0 +1,74 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghDywgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 网格名称 + */ + private String bgname; + + /** + * 所属街镇 + */ + private String street; + + /** + * 所属社区 + */ + private String community; + + /** + * 网格面积 + */ + private Double bgsqua; + + /** + * 初始时间 + */ + private Date ordate; + + /** + * 变更时间 + */ + private Date chdate; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String contacts; + + /** + * 联系电话 + */ + private String telphone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java new file mode 100644 index 0000000000..307df64c6a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJdbDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid1; + + /** + * + */ + private String objectid; + + /** + * 街道名称 + */ + private String mc; + + /** + * 责任人 + */ + private String personInCharge; + + /** + * 联系电话 + */ + private String phone; + + /** + * + */ + private Double shapeLeng; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java new file mode 100644 index 0000000000..26d20c8bbc --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJqzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java new file mode 100644 index 0000000000..2c2b4e0584 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java @@ -0,0 +1,119 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJxcsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid; + + /** + * + */ + private String jsonInfo; + + /** + * + */ + private String creatTime; + + /** + * 所属街道 + */ + private String ssjd; + + /** + * 所属社区 + */ + private String sssq; + + /** + * 道路名 + */ + private String dlm; + + /** + * 门牌号 + */ + private String mph; + + /** + * 名称 + */ + private String name; + + /** + * + */ + private String ztlx; + + /** + * 子类型 + */ + private String type; + + /** + * 统一社会信用代码 + */ + private String xydm; + + /** + * 联系人 + */ + private String lxr; + + /** + * 联系电话 + */ + private String lxdh; + + /** + * + */ + private String userName; + + /** + * 备注 + */ + private String bz; + + /** + * + */ + private String available; + + /** + * + */ + private String id; + + /** + * 编辑人ID + */ + private String userId; + + /** + * 编辑人姓名 + */ + private String updateTim; + + /** + * 插入日期 + */ + private String insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java new file mode 100644 index 0000000000..2d38d831da --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJyzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java new file mode 100644 index 0000000000..3ae1d2aa4e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java @@ -0,0 +1,94 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSjxxbDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid1; + + /** + * + */ + private Double objectid; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事件描述 + */ + private String description; + + /** + * + */ + private String taskid; + + /** + * + */ + private String casesn; + + /** + * 事件地址 + */ + private String address; + + /** + * 事件状态 + */ + private String statusname; + + /** + * + */ + private String infobcname; + + /** + * + */ + private String infoscname; + + /** + * 街道名称 + */ + private String streetname; + + /** + * + */ + private Date discovertime; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java new file mode 100644 index 0000000000..5b859c277a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java @@ -0,0 +1,139 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSqxxDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private Double commuarea; + + /** + * + */ + private String belongto; + + /** + * + */ + private String contacts; + + /** + * + */ + private String telphone; + + /** + * + */ + private Double numberOfGrid; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String commname; + + /** + * + */ + private String jdcjgb; + + /** + * + */ + private String wgz; + + /** + * + */ + private String policeName; + + /** + * + */ + private Double trafficPolicePhone; + + /** + * + */ + private String trafficPoliceCompany; + + /** + * + */ + private String peoPoliceName; + + /** + * + */ + private String peoPolicePhone; + + /** + * + */ + private String policeStation; + + /** + * + */ + private String wgy; + + /** + * + */ + private String jdlxks; + + /** + * + */ + private String ddy; + + /** + * + */ + private String zhzfxm; + + /** + * + */ + private String zhzfdh; + + /** + * + */ + private String zhzfbm; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java new file mode 100644 index 0000000000..54de99914c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzcgwghDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String sssq; + + /** + * + */ + private String ssjd; + + /** + * + */ + private String id; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java new file mode 100644 index 0000000000..e83e9eae4a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzzrwgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * 责任单位 + */ + private String name; + + /** + * 监管人 + */ + private String principal; + + /** + * 联系方式 + */ + private String phone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java new file mode 100644 index 0000000000..40c4c8b154 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java @@ -0,0 +1,134 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghWhpdwDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 安全负责人 + */ + private String person; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String dwmcjc; + + /** + * 主要负责人 + */ + private String principal; + + /** + * 用途 + */ + private String user; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java new file mode 100644 index 0000000000..b217584fa9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYjbmcsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private String grade; + + /** + * 地址 + */ + private String adress; + + /** + * 面积(㎡) + */ + private String area; + + /** + * 容纳人数 + */ + private String rnns; + + /** + * + */ + private String sfbsp; + + /** + * + */ + private String zysbcs; + + /** + * + */ + private String fzr; + + /** + * + */ + private String zgdw; + + /** + * + */ + private String name; + + /** + * + */ + private String fzrtel; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java new file mode 100644 index 0000000000..d070697218 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYqhjzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * 简称 + */ + private String dwmcjc; + + /** + * 所在图层 + */ + private String layer; + + /** + * 所属街道办 + */ + private String ssjdb; + + /** + * 存在问题 + */ + private String problem; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java index 62aa02fd0c..caab7744b4 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/GuardarDatosFeignClient.java @@ -1,14 +1,24 @@ package com.epmet.opendata.feign; import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.feign.impl.GuardarDatosFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; @FeignClient(name = "open-data-worker-server", fallback = GuardarDatosFeignClientFallBack.class) public interface GuardarDatosFeignClient { @PostMapping("/opendata/caTask/guardarDatosTask") Result guardarDatosTask(PreserVationFormDTO dto); + + @PostMapping("/opendata/caResident/getResidentDetailByIdCard") + Result getResidentDetailByIdCard(GetResidentDetailByIdCardFormDTO form); + + @PostMapping("/opendata/caResidentUser/saveCaResidentUser") + Result saveCaResidentUser(@RequestBody SaveCaResidentUserFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java index 4a688e5ae5..b8199a96b9 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java @@ -2,7 +2,10 @@ package com.epmet.opendata.feign.impl; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.feign.GuardarDatosFeignClient; import org.springframework.stereotype.Component; @@ -14,4 +17,14 @@ public class GuardarDatosFeignClientFallBack implements GuardarDatosFeignClient return ModuleUtils.feignConError("open-data-worker", "guardarDatosTask", dto); } + @Override + public Result getResidentDetailByIdCard(GetResidentDetailByIdCardFormDTO form) { + return ModuleUtils.feignConError("open-data-worker", "guardarDatosTask", form); + } + + @Override + public Result saveCaResidentUser(SaveCaResidentUserFormDTO dto) { + return ModuleUtils.feignConError("open-data-worker", "saveCaResidentUser", dto); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java new file mode 100644 index 0000000000..a5a26e65a8 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.excel.CaBmCategoryExcel; +import com.epmet.opendata.service.CaBmCategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("caBmCategory") +public class CaBmCategoryController { + + @Autowired + private CaBmCategoryService caBmCategoryService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = caBmCategoryService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + CaBmCategoryDTO data = caBmCategoryService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CaBmCategoryDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + caBmCategoryService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CaBmCategoryDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + caBmCategoryService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + caBmCategoryService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = caBmCategoryService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaBmCategoryExcel.class); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/2 10:02 + */ + @PostMapping("/preserBmCategoryVation") + public Result getPreserBmCategoryVation(@RequestBody PreserVationFormDTO dto) { + caBmCategoryService.preserBmCategoryVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java index c349b17ae0..1a24078b95 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java @@ -17,6 +17,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.excel.CaLoudongExcel; import com.epmet.opendata.service.CaLoudongService; import org.springframework.beans.factory.annotation.Autowired; @@ -128,4 +129,6 @@ public class CaLoudongController { return new Result(); } + + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java index ac27374d80..8b29c65cf2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java @@ -14,9 +14,12 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.ca.CaResidentDTO; import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; import com.epmet.opendata.dto.form.CaResidentFormDTO; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO; import com.epmet.opendata.dto.result.CaResidentResultDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; +import com.epmet.opendata.entity.CaResidentEntity; import com.epmet.opendata.excel.CaResidentExcel; import com.epmet.opendata.service.CaResidentService; import org.springframework.beans.factory.annotation.Autowired; @@ -127,4 +130,18 @@ public class CaResidentController { caResidentService.preserResidentVation(dto); return new Result(); } + + /** + * 根据idCard查询resident表数据 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/21 17:33 + */ + @PostMapping("getResidentDetailByIdCard") + public Result getResidentDetailByIdCard(@RequestBody CaResidentDetailsFormDTO form) { + ResidentByIdCardResultDTO dto = caResidentService.getResidentDetailByIdCard(form); + return new Result().ok(dto); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentUserController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentUserController.java new file mode 100644 index 0000000000..7cda2a538e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentUserController.java @@ -0,0 +1,88 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.ca.CaResidentUserDTO; +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.excel.CaResidentUserExcel; +import com.epmet.opendata.service.CaResidentUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-22 + */ +@RestController +@RequestMapping("caResidentUser") +public class CaResidentUserController { + + @Autowired + private CaResidentUserService caResidentUserService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = caResidentUserService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CaResidentUserDTO data = caResidentUserService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CaResidentUserDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + caResidentUserService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CaResidentUserDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + caResidentUserService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + caResidentUserService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = caResidentUserService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaResidentUserExcel.class); + } + + @PostMapping("saveCaResidentUser") + public Result saveCaResidentUser(@RequestBody SaveCaResidentUserFormDTO dto){ + caResidentUserService.saveCaResidentUser(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java new file mode 100644 index 0000000000..0964a32a69 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.excel.CaSysDictExcel; +import com.epmet.opendata.service.CaSysDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("caSysDict") +public class CaSysDictController { + + @Autowired + private CaSysDictService caSysDictService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = caSysDictService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + CaSysDictDTO data = caSysDictService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CaSysDictDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + caSysDictService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CaSysDictDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + caSysDictService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + caSysDictService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = caSysDictService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaSysDictExcel.class); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/2 10:02 + */ + @PostMapping("/preserSysdictVation") + public Result getPreserSysdictVation(@RequestBody PreserVationFormDTO dto) { + caSysDictService.preserSysdictVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java new file mode 100644 index 0000000000..d537ae63e9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.excel.WghBaseGridExcel; +import com.epmet.opendata.service.WghBaseGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("basegrid") +public class WghBaseGridController { + + @Autowired + private WghBaseGridService basegridService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = basegridService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + BasegridDTO data = basegridService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody BasegridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + basegridService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody BasegridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + basegridService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + basegridService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = basegridService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghBaseGridExcel.class); + } + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 13:40 + */ + @PostMapping("/preserBaseGridVation") + public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) { + basegridService.preserBaseGridVation(dto); + return new Result(); + } + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java new file mode 100644 index 0000000000..90ff0ca529 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java @@ -0,0 +1,93 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.excel.WghCommunityExcel; +import com.epmet.opendata.service.WghCommunityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("community") +public class WghCommunityController { + + @Autowired + private WghCommunityService communityService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = communityService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + CommunityDTO data = communityService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CommunityDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + communityService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CommunityDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + communityService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + communityService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = communityService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghCommunityExcel.class); + } + + /** + * 调用ruoyi接口存储社区数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:02 + */ + @PostMapping("preserCommunityVation") + public Result getPreserCommunityVation(@RequestBody PreserVationFormDTO dto) { + communityService.getPreserCommunityVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java new file mode 100644 index 0000000000..90f910d9c2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.excel.WghDywgExcel; +import com.epmet.opendata.service.WghDywgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghDywg") +public class WghDywgController { + + @Autowired + private WghDywgService wghDywgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghDywgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghDywgDTO data = wghDywgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghDywgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghDywgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghDywgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghDywgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghDywgService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghDywgService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghDywgExcel.class); + } + + /** + * 调用ruoyi接口获取dywg数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:11 + */ + @PostMapping("preserDywgVation") + public Result getPreserDywgVation(@RequestBody PreserVationFormDTO dto) { + wghDywgService.getPreserDywgVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java new file mode 100644 index 0000000000..643bf049ca --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.excel.WghJdbExcel; +import com.epmet.opendata.service.WghJdbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJdb") +public class WghJdbController { + + @Autowired + private WghJdbService wghJdbService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = wghJdbService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + WghJdbDTO data = wghJdbService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJdbDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJdbService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJdbDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJdbService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJdbService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJdbService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJdbExcel.class); + } + + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:31 + */ + @PostMapping("/preserWghJdbVation") + public Result getPreserWghJdbVation(@RequestBody PreserVationFormDTO dto) { + wghJdbService.getPreserWghJdbVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java new file mode 100644 index 0000000000..bb38ffc0ca --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java @@ -0,0 +1,97 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.excel.WghJqzExcel; +import com.epmet.opendata.service.WghJqzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJqz") +public class WghJqzController { + + @Autowired + private WghJqzService wghJqzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJqzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJqzDTO data = wghJqzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJqzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJqzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJqzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJqzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJqzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJqzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJqzExcel.class); + } + + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:39 + */ + @PostMapping("/preserWghjqzVation") + public Result getPreserWghjqzVation(@RequestBody PreserVationFormDTO dto) { + wghJqzService.getPreserWghjqzVation(dto); + return new Result(); + } + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java new file mode 100644 index 0000000000..c392595534 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.excel.WghJxcsExcel; +import com.epmet.opendata.service.WghJxcsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJxcs") +public class WghJxcsController { + + @Autowired + private WghJxcsService wghJxcsService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJxcsService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJxcsDTO data = wghJxcsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJxcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJxcsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJxcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJxcsService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJxcsService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJxcsService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJxcsExcel.class); + } + + /** + * 调用ruoyi接口存储wgh_jxcs数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:46 + */ + @PostMapping("/preserWghJxcsVation") + public Result getPreserWghJxcsVation(@RequestBody PreserVationFormDTO dto) { + wghJxcsService.preserWghJxcsVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java new file mode 100644 index 0000000000..2cb21796ad --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.excel.WghJyzExcel; +import com.epmet.opendata.service.WghJyzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJyz") +public class WghJyzController { + + @Autowired + private WghJyzService wghJyzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJyzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJyzDTO data = wghJyzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJyzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJyzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJyzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJyzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJyzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJyzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJyzExcel.class); + } + + /** + * 调用ruoyi接口获取wgh_jyz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:52 + */ + @PostMapping("/preserWghJyzVation") + public Result getPreserWghJyzVation(@RequestBody PreserVationFormDTO dto) { + wghJyzService.getPreserWghJyzVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java new file mode 100644 index 0000000000..4d3a6cd04b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.excel.WghSjxxbExcel; +import com.epmet.opendata.service.WghSjxxbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSjxxb") +public class WghSjxxbController { + + @Autowired + private WghSjxxbService wghSjxxbService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSjxxbService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSjxxbDTO data = wghSjxxbService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSjxxbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSjxxbService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSjxxbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSjxxbService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSjxxbService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSjxxbService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxbExcel.class); + } + + /** + * 调用ruoyi接口获取wgh_sjxx数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:01 + */ + @PostMapping("/preserSjxxVation") + public Result getPreserSjxxVation(@RequestBody PreserVationFormDTO dto) { + wghSjxxbService.getPreserSjxxVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java new file mode 100644 index 0000000000..1c36726db0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.excel.WghSqxxExcel; +import com.epmet.opendata.service.WghSqxxService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSqxx") +public class WghSqxxController { + + @Autowired + private WghSqxxService wghSqxxService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSqxxService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSqxxDTO data = wghSqxxService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSqxxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSqxxService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSqxxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSqxxService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSqxxService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSqxxService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSqxxExcel.class); + } + + /** + * 调用ruoyi接口获取wgh_sqxx数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:08 + */ + @PostMapping("/preserWghSqxxVation") + public Result getPreserWghSqxxVation(@RequestBody PreserVationFormDTO dto) { + wghSqxxService.getPreserWghSqxxVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java new file mode 100644 index 0000000000..1deed4b024 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java @@ -0,0 +1,98 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; + +import com.epmet.opendata.excel.WghSubdistrictOfficeExcel; +import com.epmet.opendata.service.WghSubdistrictOfficeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("subdistrictOffice") +public class WghSubdistrictOfficeController { + + @Autowired + private WghSubdistrictOfficeService subdistrictOfficeService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = subdistrictOfficeService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + SubdistrictOfficeDTO data = subdistrictOfficeService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody SubdistrictOfficeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + subdistrictOfficeService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody SubdistrictOfficeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + subdistrictOfficeService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + subdistrictOfficeService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = subdistrictOfficeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSubdistrictOfficeExcel.class); + } + + /** + * 调用ruoyi接口 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 17:36 + */ + @PostMapping("/preserSubVation") + public Result getpreserSubVation(@RequestBody PreserVationFormDTO dto) { + subdistrictOfficeService.getpreserSubVation(dto); + return new Result(); + } + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java new file mode 100644 index 0000000000..c678c9a7fd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.excel.WghSzcgwghExcel; +import com.epmet.opendata.service.WghSzcgwghService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSzcgwgh") +public class WghSzcgwghController { + + @Autowired + private WghSzcgwghService wghSzcgwghService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSzcgwghService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSzcgwghDTO data = wghSzcgwghService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSzcgwghDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSzcgwghService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSzcgwghDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSzcgwghService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSzcgwghService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSzcgwghService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSzcgwghExcel.class); + } + + /** + * 调用ruoyi系统获取wgh_szcgwgh数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:19 + */ + @PostMapping("/preserWghSzcgwghVation") + public Result getPreserWghSzcgwghVation(@RequestBody PreserVationFormDTO dto) { + wghSzcgwghService.getPreserWghSzcgwghVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java new file mode 100644 index 0000000000..d2f5316399 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.excel.WghSzzrwgExcel; +import com.epmet.opendata.service.WghSzzrwgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSzzrwg") +public class WghSzzrwgController { + + @Autowired + private WghSzzrwgService wghSzzrwgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSzzrwgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSzzrwgDTO data = wghSzzrwgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSzzrwgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSzzrwgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSzzrwgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSzzrwgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSzzrwgService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSzzrwgService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSzzrwgExcel.class); + } + + /** + * 调用ruoyi接口获取wgh_szzrwg数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:26 + */ + @PostMapping("/preserWghSzzrwgVation") + public Result getPreserWghSzzrwgVation(@RequestBody PreserVationFormDTO dto) { + wghSzzrwgService.getPreserWghSzzrwgVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java new file mode 100644 index 0000000000..9381038398 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.excel.WghWhpdwExcel; +import com.epmet.opendata.service.WghWhpdwService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghWhpdw") +public class WghWhpdwController { + + @Autowired + private WghWhpdwService wghWhpdwService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghWhpdwService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghWhpdwDTO data = wghWhpdwService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghWhpdwDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghWhpdwService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghWhpdwDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghWhpdwService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghWhpdwService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghWhpdwService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghWhpdwExcel.class); + } + + /** + * 调用ruoyi系统获取wgh_whpdw数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:33 + */ + @PostMapping("/preserWhpdwVation") + public Result getPreserWhpdwVation(@RequestBody PreserVationFormDTO dto) { + wghWhpdwService.getPreserWhpdwVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java new file mode 100644 index 0000000000..3a6764c36c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java @@ -0,0 +1,95 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.excel.WghYjbmcsExcel; +import com.epmet.opendata.service.WghYjbmcsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghYjbmcs") +public class WghYjbmcsController { + + @Autowired + private WghYjbmcsService wghYjbmcsService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = wghYjbmcsService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + WghYjbmcsDTO data = wghYjbmcsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghYjbmcsDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghYjbmcsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghYjbmcsDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghYjbmcsService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghYjbmcsService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghYjbmcsService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghYjbmcsExcel.class); + } + + /** + * 调用ruoyi系统获取wgh_yjbmcs数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:39 + */ + @PostMapping("/preserWghYjbmcsVation") + public Result getPreserWghYjbmcsVation(@RequestBody PreserVationFormDTO dto) { + wghYjbmcsService.getPreserWghYjbmcsVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java new file mode 100644 index 0000000000..972710d611 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java @@ -0,0 +1,94 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.service.WghYqhjzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.epmet.opendata.dto.wgh.WghYqhjzDTO; +import javax.servlet.http.HttpServletResponse; +import com.epmet.opendata.excel.WghYqhjzExcel; +import java.util.List; +import java.util.Map; + + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghYqhjz") +public class WghYqhjzController { + + @Autowired + private WghYqhjzService wghYqhjzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghYqhjzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghYqhjzDTO data = wghYqhjzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghYqhjzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghYqhjzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghYqhjzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghYqhjzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghYqhjzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghYqhjzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghYqhjzExcel.class); + } + + /** + * 调用ruoyi系统获取wgh_yqhjz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:46 + */ + @PostMapping("/preserWghYqhjzVation") + public Result getPreserWghYqhjzVation(@RequestBody PreserVationFormDTO dto) { + wghYqhjzService.getPreserWghYqhjzVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java new file mode 100644 index 0000000000..52217e64f3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java @@ -0,0 +1,112 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +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.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; + + +import com.epmet.opendata.excel.caBmGridExcel; +import com.epmet.opendata.service.caBmGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("bmGrid") +public class caBmGridController { + + @Autowired + private caBmGridService bmGridService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = bmGridService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + BmGridDTO data = bmGridService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + bmGridService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + bmGridService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + bmGridService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = bmGridService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, caBmGridExcel.class); + } + + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 14:16 + */ + @PostMapping("preserBmGridVation") + public Result getpreserBmGridVation(@RequestBody PreserVationFormDTO dto) { + bmGridService.getPreserBmGridVation(dto); + return new Result(); + } + + /** + * 获取级联菜单 + * + * @param + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/15 14:01 + */ + @PostMapping("getCascadeMenu") + public Result getCascadeMenu(){ + List dto = bmGridService.getCascadeMenu(); + return new Result().ok(dto); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java new file mode 100644 index 0000000000..b09ea46440 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.CaBmCategoryEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface CaBmCategoryDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java index d5d87db881..cb923fdc9a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java @@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +33,8 @@ public interface CaLoudongDao extends BaseDao { * @date 2022/5/31 18:57 */ List getPage(@Param("communityName") String communityName, - @Param("buildingName") String buildingName); + @Param("buildingName") String buildingName, + @Param("gridId") String gridId); /** * 楼栋基本信息详情 @@ -43,4 +45,7 @@ public interface CaLoudongDao extends BaseDao { CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId); int deleteAll(); + + } + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java index ad48accf01..28675c6bb2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java @@ -23,7 +23,8 @@ public interface CaPingfangDao extends BaseDao { * @return */ List getPage(@Param("buildingName") String buildingName, - @Param("communityName") String communityName); + @Param("communityName") String communityName, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java index 67ecfe2cbd..4b1460a9ea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java @@ -28,7 +28,8 @@ public interface CaRentalDao extends BaseDao { */ List getPage(@Param("residentName") String residentName, @Param("houseName") String houseName, - @Param("renterName") String renterName); + @Param("renterName") String renterName, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java index 5c83b1e4d0..2558268345 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java @@ -2,8 +2,11 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO; import com.epmet.opendata.dto.result.CaResidentResultDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.entity.CaResidentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,7 +30,8 @@ public interface CaResidentDao extends BaseDao { */ List getPage(@Param("residentName") String residentName, @Param("idCard") String idCard, - @Param("telephone") String telephone); + @Param("telephone") String telephone, + @Param("gridId") String gridId); int deleteAll(); @@ -38,4 +42,6 @@ public interface CaResidentDao extends BaseDao { * @return */ CaResidentDetailsResultDTO getResidentDetails(@Param("idCard") String idCard); + + ResidentByIdCardResultDTO getResidentDetailByIdCard(@Param("form") CaResidentDetailsFormDTO form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentUserDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentUserDao.java new file mode 100644 index 0000000000..a80b654b82 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentUserDao.java @@ -0,0 +1,21 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.entity.CaResidentUserEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-22 + */ +@Mapper +public interface CaResidentUserDao extends BaseDao { + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java index 8a8787171d..ade7309eaa 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java @@ -28,7 +28,8 @@ public interface CaRotatorsDao extends BaseDao { */ List getPage(@Param("rotatorsName") String rotatorsName, @Param("idCard") String idCard, - @Param("telephone") String telephone); + @Param("telephone") String telephone, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java new file mode 100644 index 0000000000..b761ce29fc --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.CaSysDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface CaSysDictDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java similarity index 50% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java index cf95a4367c..c48f75c03f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java @@ -1,16 +1,17 @@ -package com.epmet.dao; +package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.PointAditiveRecordEntity; + +import com.epmet.opendata.entity.WghBaseGridEntity; import org.apache.ibatis.annotations.Mapper; /** - * 附加积分记录 + * * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ @Mapper -public interface PointAditiveRecordDao extends BaseDao { - -} \ No newline at end of file +public interface WghBaseGridDao extends BaseDao { + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java new file mode 100644 index 0000000000..624403d977 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java @@ -0,0 +1,19 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + + +import com.epmet.opendata.entity.WghCommunityEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghCommunityDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java new file mode 100644 index 0000000000..341db87c61 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghDywgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghDywgDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java new file mode 100644 index 0000000000..4806bdcf0d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghJdbEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJdbDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java new file mode 100644 index 0000000000..52881f0543 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJqzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJqzDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java new file mode 100644 index 0000000000..afbda65ea1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJxcsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJxcsDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java new file mode 100644 index 0000000000..01fcc12a97 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJyzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJyzDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java new file mode 100644 index 0000000000..d2806b93fe --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghSjxxbEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSjxxbDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java new file mode 100644 index 0000000000..8a75f69fde --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghSqxxEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSqxxDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java new file mode 100644 index 0000000000..0b58b480d1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java @@ -0,0 +1,19 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + + +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSubdistrictOfficeDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java new file mode 100644 index 0000000000..66d2c0197c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghSzcgwghEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSzcgwghDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java new file mode 100644 index 0000000000..f3d34fee32 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghSzzrwgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSzzrwgDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java new file mode 100644 index 0000000000..cffef5c3f0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghWhpdwEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghWhpdwDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java new file mode 100644 index 0000000000..1bc32540b1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghYjbmcsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghYjbmcsDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java new file mode 100644 index 0000000000..a8984a2aa7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghYqhjzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghYqhjzDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java new file mode 100644 index 0000000000..1f76dd0d28 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java @@ -0,0 +1,24 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + + +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; +import com.epmet.opendata.entity.caBmGridEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface caBmGridDao extends BaseDao { + + int deleteAll(); + + List getCascadeMenu(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java new file mode 100644 index 0000000000..bb2ecfb8ee --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java @@ -0,0 +1,134 @@ +package com.epmet.opendata.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-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_bm_category") +public class CaBmCategoryEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 类别ID + */ + private Long categoryId; + + /** + * 名称 + */ + private String categoryName; + + /** + * + */ + private String categoryType; + + /** + * 名称值 + */ + private String categoryValue; + + /** + * 父类别ID + */ + private Long parentCategoryId; + + /** + * 展示顺序 + */ + private Integer categorySort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 删除状态 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 扩展字段1 + */ + private String attribute1; + + /** + * 扩展字段2 + */ + private String attribute2; + + /** + * 扩展字段3 + */ + private String attribute3; + + /** + * 扩展字段4 + */ + private String attribute4; + + /** + * 扩展字段5 + */ + private String attribute5; + + /** + * 扩展字段6 + */ + private Long attribute6; + + /** + * 扩展字段7 + */ + private Long attribute7; + + /** + * 扩展字段8 + */ + private Long attribute8; + + /** + * 扩展字段9 + */ + private Date attribute9; + + /** + * 扩展字段10 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentEntity.java index a65dcc6574..34b3f93d8e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentEntity.java @@ -21,16 +21,6 @@ public class CaResidentEntity { private static final long serialVersionUID = 1L; - /** - * 人口ID - */ - private Long residentId; - - /** - * homeId - */ - private String homeId; - /** * 对应的ic_resi_user主表Id */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentUserEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentUserEntity.java new file mode 100644 index 0000000000..566d3f046f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentUserEntity.java @@ -0,0 +1,42 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEntity; +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-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_resident_user") +public class CaResidentUserEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 身份证号 + */ + private String idCard; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + + /** + * 绑定的房屋id + */ + private String homeId; + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java new file mode 100644 index 0000000000..0d9f7145b1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.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-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_sys_dict") +public class CaSysDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 字典ID + */ + private Long dictId; + + /** + * 字典值，例如：sex/F + */ + private String dictValue; + + /** + * 1.字典组名称（性别）或者字典名称（女） + */ + private String dictLabel; + + /** + * 字典值时存入字典的值，字典组时存null + */ + private String dictType; + + /** + * 描述 + */ + private String dictDesc; + + /** + * 排序 + */ + private Integer dictSort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 字典值：normal正常，deleted正常 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java new file mode 100644 index 0000000000..0a4d1ff91c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java @@ -0,0 +1,69 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_base_grid") +public class WghBaseGridEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String gridName; + + /** + * + */ + private String subDistrictOffice; + + /** + * + */ + private String community; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String gridCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java new file mode 100644 index 0000000000..cafd34e05c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java @@ -0,0 +1,59 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_community") +public class WghCommunityEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityName; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java new file mode 100644 index 0000000000..9c47bdd298 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_dywg") +public class WghDywgEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 网格名称 + */ + private String bgname; + + /** + * 所属街镇 + */ + private String street; + + /** + * 所属社区 + */ + private String community; + + /** + * 网格面积 + */ + private Double bgsqua; + + /** + * 初始时间 + */ + private Date ordate; + + /** + * 变更时间 + */ + private Date chdate; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String contacts; + + /** + * 联系电话 + */ + private String telphone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java new file mode 100644 index 0000000000..b02d41dd5c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java @@ -0,0 +1,59 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jdb") +public class WghJdbEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid_1; + + /** + * + */ + private String objectid; + + /** + * 街道名称 + */ + private String mc; + + /** + * 责任人 + */ + private String personInCharge; + + /** + * 联系电话 + */ + private String phone; + + /** + * + */ + private Double shapeLeng; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java new file mode 100644 index 0000000000..eecfe7048a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jqz") +public class WghJqzEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java new file mode 100644 index 0000000000..53ad3a48e3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java @@ -0,0 +1,119 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jxcs") +public class WghJxcsEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid; + + /** + * + */ + private String jsonInfo; + + /** + * + */ + private String creatTime; + + /** + * 所属街道 + */ + private String ssjd; + + /** + * 所属社区 + */ + private String sssq; + + /** + * 道路名 + */ + private String dlm; + + /** + * 门牌号 + */ + private String mph; + + /** + * 名称 + */ + private String name; + + /** + * + */ + private String ztlx; + + /** + * 子类型 + */ + private String type; + + /** + * 统一社会信用代码 + */ + private String xydm; + + /** + * 联系人 + */ + private String lxr; + + /** + * 联系电话 + */ + private String lxdh; + + /** + * + */ + private String userName; + + /** + * 备注 + */ + private String bz; + + /** + * + */ + private String available; + + /** + * 编辑人ID + */ + private String userId; + + /** + * 编辑人姓名 + */ + private String updateTim; + + /** + * 插入日期 + */ + private String insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java new file mode 100644 index 0000000000..9468201318 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jyz") +public class WghJyzEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java new file mode 100644 index 0000000000..2e443c2205 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java @@ -0,0 +1,99 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_sjxxb") +public class WghSjxxbEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid_1; + + /** + * + */ + private Double objectid; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事件描述 + */ + private String description; + + /** + * + */ + private String taskid; + + /** + * + */ + private String casesn; + + /** + * 事件地址 + */ + private String address; + + /** + * 事件状态 + */ + private String statusname; + + /** + * + */ + private String infobcname; + + /** + * + */ + private String infoscname; + + /** + * 街道名称 + */ + private String streetname; + + /** + * + */ + private Date discovertime; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java new file mode 100644 index 0000000000..3ef9574bb9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java @@ -0,0 +1,144 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_sqxx") +public class WghSqxxEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private Double commuarea; + + /** + * + */ + private String belongto; + + /** + * + */ + private String contacts; + + /** + * + */ + private String telphone; + + /** + * + */ + private Double numberOfGrid; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String commname; + + /** + * + */ + private String jdcjgb; + + /** + * + */ + private String wgz; + + /** + * + */ + private String policeName; + + /** + * + */ + private Double trafficPolicePhone; + + /** + * + */ + private String trafficPoliceCompany; + + /** + * + */ + private String peoPoliceName; + + /** + * + */ + private String peoPolicePhone; + + /** + * + */ + private String policeStation; + + /** + * + */ + private String wgy; + + /** + * + */ + private String jdlxks; + + /** + * + */ + private String ddy; + + /** + * + */ + private String zhzfxm; + + /** + * + */ + private String zhzfdh; + + /** + * + */ + private String zhzfbm; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java new file mode 100644 index 0000000000..fa133bc1fb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_subdistrict_office") +public class WghSubdistrictOfficeEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java new file mode 100644 index 0000000000..35c3e95f8f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_szcgwgh") +public class WghSzcgwghEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String sssq; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java new file mode 100644 index 0000000000..697b37f90f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_szzrwg") +public class WghSzzrwgEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * 责任单位 + */ + private String name; + + /** + * 监管人 + */ + private String principal; + + /** + * 联系方式 + */ + private String phone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java new file mode 100644 index 0000000000..760057255a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java @@ -0,0 +1,139 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_whpdw") +public class WghWhpdwEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 安全负责人 + */ + private String person; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String dwmcjc; + + /** + * 主要负责人 + */ + private String principal; + + /** + * 用途 + */ + private String user; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java new file mode 100644 index 0000000000..6f4f0d7a74 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java @@ -0,0 +1,89 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_yjbmcs") +public class WghYjbmcsEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private String grade; + + /** + * 地址 + */ + private String adress; + + /** + * 面积(㎡) + */ + private String area; + + /** + * 容纳人数 + */ + private String rnns; + + /** + * + */ + private String sfbsp; + + /** + * + */ + private String zysbcs; + + /** + * + */ + private String fzr; + + /** + * + */ + private String zgdw; + + /** + * + */ + private String name; + + /** + * + */ + private String fzrtel; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java new file mode 100644 index 0000000000..909e33fd59 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_yqhjz") +public class WghYqhjzEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * 简称 + */ + private String dwmcjc; + + /** + * 所在图层 + */ + private String layer; + + /** + * 所属街道办 + */ + private String ssjdb; + + /** + * 存在问题 + */ + private String problem; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java new file mode 100644 index 0000000000..f287d88494 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java @@ -0,0 +1,211 @@ +package com.epmet.opendata.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-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_bm_grid") +public class caBmGridEntity { + + private static final long serialVersionUID = 1L; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 网格编码。人工填写，编码规则业务规定，不允许重复。 + */ + private String gridCode; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 行政区划的国标编码 + */ + private String gbCode; + + /** + * 上级网格ID + */ + private Long parentId; + + /** + * 上级网格编码 + */ + private String parentCode; + + /** + * 网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等 + */ + private String gridClassification; + + /** + * 网格层级。网格层级表的层级 +根据【网格层级表】的层级关系动态展示。 +查询【网格层级表】层级 条件：上层级=网格树返回的网格层级 + */ + private String gridLevel; + + /** + * 网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他 + */ + private String gridProperty; + + /** + * 是否最后一级:0否 1是 + */ + private String isEnd; + + /** + * 网格地址 + */ + private String gridAddress; + + /** + * 网格介绍 + */ + private String gridIntroduce; + + /** + * 宣传图片 + */ + private String gridPicture; + + /** + * 地图区域范围 + */ + private String reginScopeDesc; + + /** + * 展示顺序 + */ + private Integer gridSort; + + /** + * 标绘状态 + */ + private String pointStatus; + + /** + * 事件上报中心 + */ + private Long gridEmCenter; + + /** + * 初始日期 + */ + private Date gridBeginTime; + + /** + * 终止日期 + */ + private Date gridEndTime; + + /** + * 面积 + */ + private String gridArea; + + /** + * 是否有效 + */ + private String isValid; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * + */ + private Long updateBy; + + /** + * + */ + private Date updateDate; + + /** + * 删除状态: 字典值：normal正常，删除deleted + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 网格内人口规模 + */ + private String attribute1; + + /** + * 是否成立网格党支部或网格党小组 + */ + private String attribute2; + + /** + * 网格党组织类型 + */ + private String attribute3; + + /** + * 党组织编码 + */ + private String attribute4; + + /** + * 扩展字段 + */ + private String attribute5; + + /** + * 扩展字段 + */ + private Long attribute6; + + /** + * 扩展字段 + */ + private Long attribute7; + + /** + * 扩展字段 + */ + private Long attribute8; + + /** + * 扩展字段 + */ + private Date attribute9; + + /** + * 扩展字段 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java new file mode 100644 index 0000000000..460df80eeb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.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-16 + */ +@Data +public class CaBmCategoryExcel { + + @Excel(name = "类别ID") + private Long categoryId; + + @Excel(name = "名称") + private String categoryName; + + @Excel(name = "") + private String categoryType; + + @Excel(name = "名称值") + private String categoryValue; + + @Excel(name = "父类别ID") + private Long parentCategoryId; + + @Excel(name = "展示顺序") + private Integer categorySort; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "最后修改人") + private Long updateBy; + + @Excel(name = "最后修改时间") + private Date updateDate; + + @Excel(name = "删除状态") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + @Excel(name = "扩展字段1") + private String attribute1; + + @Excel(name = "扩展字段2") + private String attribute2; + + @Excel(name = "扩展字段3") + private String attribute3; + + @Excel(name = "扩展字段4") + private String attribute4; + + @Excel(name = "扩展字段5") + private String attribute5; + + @Excel(name = "扩展字段6") + private Long attribute6; + + @Excel(name = "扩展字段7") + private Long attribute7; + + @Excel(name = "扩展字段8") + private Long attribute8; + + @Excel(name = "扩展字段9") + private Date attribute9; + + @Excel(name = "扩展字段10") + private Date attribute10; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaResidentUserExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaResidentUserExcel.java new file mode 100644 index 0000000000..d20ef54f7e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaResidentUserExcel.java @@ -0,0 +1,45 @@ +package com.epmet.opendata.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-22 + */ +@Data +public class CaResidentUserExcel { + + @Excel(name = "身份证号") + private String idCard; + + @Excel(name = "ic_resi_user表id") + private String icResiUserId; + + @Excel(name = "绑定的房屋id") + private String homeId; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "最后修改人") + private Long updateBy; + + @Excel(name = "最后修改时间") + private Date updateDate; + + @Excel(name = "删除标记，normal") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java new file mode 100644 index 0000000000..4e3b42a2da --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.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-16 + */ +@Data +public class CaSysDictExcel { + + @Excel(name = "字典ID") + private Long dictId; + + @Excel(name = "字典值，例如：sex/F") + private String dictValue; + + @Excel(name = "1.字典组名称（性别）或者字典名称（女）") + private String dictLabel; + + @Excel(name = "字典值时存入字典的值，字典组时存null") + private String dictType; + + @Excel(name = "描述") + private String dictDesc; + + @Excel(name = "排序") + private Integer dictSort; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "最后修改人") + private Long updateBy; + + @Excel(name = "最后修改时间") + private Date updateDate; + + @Excel(name = "字典值：normal正常，deleted正常") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java new file mode 100644 index 0000000000..e1370f23d0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java @@ -0,0 +1,45 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghBaseGridExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String gridName; + + @Excel(name = "") + private String subDistrictOffice; + + @Excel(name = "") + private String community; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String gridCode; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java new file mode 100644 index 0000000000..243c77c0d3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java @@ -0,0 +1,39 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghCommunityExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String streetName; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String communityName; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java new file mode 100644 index 0000000000..0c8300cdb0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java @@ -0,0 +1,51 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghDywgExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "网格名称") + private String bgname; + + @Excel(name = "所属街镇") + private String street; + + @Excel(name = "所属社区") + private String community; + + @Excel(name = "网格面积") + private Double bgsqua; + + @Excel(name = "初始时间") + private Date ordate; + + @Excel(name = "变更时间") + private Date chdate; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String contacts; + + @Excel(name = "联系电话") + private String telphone; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java new file mode 100644 index 0000000000..e2bc316ac2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java @@ -0,0 +1,39 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghJdbExcel { + + @Excel(name = "") + private String objectid1; + + @Excel(name = "") + private String objectid; + + @Excel(name = "街道名称") + private String mc; + + @Excel(name = "责任人") + private String personInCharge; + + @Excel(name = "联系电话") + private String 联系电话; + + @Excel(name = "") + private Double shapeLeng; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java new file mode 100644 index 0000000000..c8f469aaef --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghJqzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "等级") + private String level; + + @Excel(name = "性质") + private String nature; + + @Excel(name = "备注") + private String remarks; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java new file mode 100644 index 0000000000..0c2bd157cf --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghJxcsExcel { + + @Excel(name = "") + private String objectid; + + @Excel(name = "") + private String jsonInfo; + + @Excel(name = "") + private String creatTime; + + @Excel(name = "所属街道") + private String ssjd; + + @Excel(name = "所属社区") + private String sssq; + + @Excel(name = "道路名") + private String dlm; + + @Excel(name = "门牌号") + private String mph; + + @Excel(name = "名称") + private String name; + + @Excel(name = "") + private String ztlx; + + @Excel(name = "子类型") + private String type; + + @Excel(name = "统一社会信用代码") + private String xydm; + + @Excel(name = "联系人") + private String lxr; + + @Excel(name = "联系电话") + private String lxdh; + + @Excel(name = "") + private String userName; + + @Excel(name = "备注") + private String bz; + + @Excel(name = "") + private String available; + + @Excel(name = "") + private String id; + + @Excel(name = "编辑人ID") + private String userId; + + @Excel(name = "编辑人姓名") + private String updateTim; + + @Excel(name = "插入日期") + private String insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java new file mode 100644 index 0000000000..e8bdf9e000 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghJyzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "等级") + private String level; + + @Excel(name = "性质") + private String nature; + + @Excel(name = "备注") + private String remarks; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java new file mode 100644 index 0000000000..eb861aa4ae --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java @@ -0,0 +1,63 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghSjxxbExcel { + + @Excel(name = "") + private Integer objectid1; + + @Excel(name = "") + private Double objectid; + + @Excel(name = "事件来源") + private String infosourcename; + + @Excel(name = "事件类别") + private String infotypename; + + @Excel(name = "社区名称") + private String communityname; + + @Excel(name = "事件描述") + private String description; + + @Excel(name = "") + private String taskid; + + @Excel(name = "") + private String casesn; + + @Excel(name = "事件地址") + private String address; + + @Excel(name = "事件状态") + private String statusname; + + @Excel(name = "") + private String infobcname; + + @Excel(name = "") + private String infoscname; + + @Excel(name = "街道名称") + private String streetname; + + @Excel(name = "") + private Date discovertime; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java new file mode 100644 index 0000000000..4d308f8d41 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghSqxxExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "") + private Double commuarea; + + @Excel(name = "") + private String belongto; + + @Excel(name = "") + private String contacts; + + @Excel(name = "") + private String telphone; + + @Excel(name = "") + private Double numberOfGrid; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String commname; + + @Excel(name = "") + private String jdcjgb; + + @Excel(name = "") + private String wgz; + + @Excel(name = "") + private String policeName; + + @Excel(name = "") + private Double trafficPolicePhone; + + @Excel(name = "") + private String trafficPoliceCompany; + + @Excel(name = "") + private String peoPoliceName; + + @Excel(name = "") + private String peoPolicePhone; + + @Excel(name = "") + private String policeStation; + + @Excel(name = "") + private String wgy; + + @Excel(name = "") + private String jdlxks; + + @Excel(name = "") + private String ddy; + + @Excel(name = "") + private String zhzfxm; + + @Excel(name = "") + private String zhzfdh; + + @Excel(name = "") + private String zhzfbm; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java new file mode 100644 index 0000000000..f33f6df6ea --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java @@ -0,0 +1,33 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghSubdistrictOfficeExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String streetName; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java new file mode 100644 index 0000000000..e00b617c39 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java @@ -0,0 +1,36 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghSzcgwghExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String sssq; + + @Excel(name = "") + private String ssjd; + + @Excel(name = "") + private String id; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java new file mode 100644 index 0000000000..9b59f93a96 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java @@ -0,0 +1,36 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghSzzrwgExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "备注") + private String note; + + @Excel(name = "责任单位") + private String name; + + @Excel(name = "监管人") + private String principal; + + @Excel(name = "联系方式") + private String phone; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java new file mode 100644 index 0000000000..94a9e37250 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghWhpdwExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "安全负责人") + private String person; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "等级") + private String grade; + + @Excel(name = "性质") + private String natrue; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "主要负责人") + private String principal; + + @Excel(name = "用途") + private String user; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java new file mode 100644 index 0000000000..b180b13932 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java @@ -0,0 +1,57 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghYjbmcsExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "") + private String grade; + + @Excel(name = "地址") + private String adress; + + @Excel(name = "面积(㎡)") + private String area; + + @Excel(name = "容纳人数") + private String rnns; + + @Excel(name = "") + private String sfbsp; + + @Excel(name = "") + private String zysbcs; + + @Excel(name = "") + private String fzr; + + @Excel(name = "") + private String zgdw; + + @Excel(name = "") + private String name; + + @Excel(name = "") + private String fzrtel; + + @Excel(name = "") + private String ssjd; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java new file mode 100644 index 0000000000..c6bfaa9307 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class WghYqhjzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "等级") + private String grade; + + @Excel(name = "性质") + private String natrue; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "备注") + private String note; + + @Excel(name = "简称") + private String dwmcjc; + + @Excel(name = "所在图层") + private String layer; + + @Excel(name = "所属街道办") + private String ssjdb; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java new file mode 100644 index 0000000000..21ee4853dd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.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-14 + */ +@Data +public class caBmGridExcel { + + @Excel(name = "网格ID") + private Long gridId; + + @Excel(name = "网格编码。人工填写，编码规则业务规定，不允许重复。") + private String gridCode; + + @Excel(name = "网格名称") + private String gridName; + + @Excel(name = "行政区划的国标编码") + private String gbCode; + + @Excel(name = "上级网格ID") + private Long parentId; + + @Excel(name = "上级网格编码") + private String parentCode; + + @Excel(name = "网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等") + private String gridClassification; + + @Excel(name = "网格层级。网格层级表的层级 根据【网格层级表】的层级关系动态展示。 查询【网格层级表】层级 条件：上层级=网格树返回的网格层级") + private String gridLevel; + + @Excel(name = "网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他") + private String gridProperty; + + @Excel(name = "是否最后一级:0否 1是") + private String isEnd; + + @Excel(name = "网格地址") + private String gridAddress; + + @Excel(name = "网格介绍") + private String gridIntroduce; + + @Excel(name = "宣传图片") + private String gridPicture; + + @Excel(name = "地图区域范围") + private String reginScopeDesc; + + @Excel(name = "展示顺序") + private Integer gridSort; + + @Excel(name = "标绘状态") + private String pointStatus; + + @Excel(name = "事件上报中心") + private Long gridEmCenter; + + @Excel(name = "初始日期") + private Date gridBeginTime; + + @Excel(name = "终止日期") + private Date gridEndTime; + + @Excel(name = "面积") + private String gridArea; + + @Excel(name = "是否有效") + private String isValid; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "") + private Long updateBy; + + @Excel(name = "") + private Date updateDate; + + @Excel(name = "删除状态: 字典值：normal正常，删除deleted") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + @Excel(name = "网格内人口规模") + private String attribute1; + + @Excel(name = "是否成立网格党支部或网格党小组") + private String attribute2; + + @Excel(name = "网格党组织类型") + private String attribute3; + + @Excel(name = "党组织编码") + private String attribute4; + + @Excel(name = "扩展字段") + private String attribute5; + + @Excel(name = "扩展字段") + private Long attribute6; + + @Excel(name = "扩展字段") + private Long attribute7; + + @Excel(name = "扩展字段") + private Long attribute8; + + @Excel(name = "扩展字段") + private Date attribute9; + + @Excel(name = "扩展字段") + private Date attribute10; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java new file mode 100644 index 0000000000..26ac2a5600 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class BasegridRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java new file mode 100644 index 0000000000..29e6df66c3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class BmGridRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java new file mode 100644 index 0000000000..c561019f41 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-16 + */ +@Component +public class CaBmCategoryRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaResidentUserRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaResidentUserRedis.java new file mode 100644 index 0000000000..17145e5f5f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaResidentUserRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-22 + */ +@Component +public class CaResidentUserRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java new file mode 100644 index 0000000000..3857e1803d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-16 + */ +@Component +public class CaSysDictRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java new file mode 100644 index 0000000000..201fa90d44 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class CommunityRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java new file mode 100644 index 0000000000..11e7458396 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class SubdistrictOfficeRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java new file mode 100644 index 0000000000..7ae8d82888 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghDywgRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java new file mode 100644 index 0000000000..7eb624a467 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghJdbRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java new file mode 100644 index 0000000000..2c05f982dd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghJqzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java new file mode 100644 index 0000000000..4463866cd3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghJxcsRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java new file mode 100644 index 0000000000..6d477dd45c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghJyzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java new file mode 100644 index 0000000000..f52724484b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghSjxxbRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java new file mode 100644 index 0000000000..ae6c063db3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghSqxxRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java new file mode 100644 index 0000000000..3ad17f710a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghSzcgwghRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java new file mode 100644 index 0000000000..d3bf717cb2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghSzzrwgRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java new file mode 100644 index 0000000000..91d21285f1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghWhpdwRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java new file mode 100644 index 0000000000..cbe2fb69d5 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghYjbmcsRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java new file mode 100644 index 0000000000..4143ec72df --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.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-14 + */ +@Component +public class WghYqhjzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java new file mode 100644 index 0000000000..5f0ff8d3eb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaBmCategoryEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface CaBmCategoryService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CaBmCategoryDTO + * @author generator + * @date 2022-06-16 + */ + CaBmCategoryDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(CaBmCategoryDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(CaBmCategoryDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:38 + */ + void preserBmCategoryVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java index 19a067ebe6..10e5a08aa4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java @@ -9,6 +9,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; @@ -107,4 +108,6 @@ public interface CaLoudongService extends BaseService { * @param dto */ void preserLouDongVation(PreserVationFormDTO dto); -} \ No newline at end of file + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java index 0f1406b524..a28a87ed6b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java @@ -5,12 +5,13 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.ca.CaResidentDTO; import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; import com.epmet.opendata.dto.form.CaResidentFormDTO; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO; import com.epmet.opendata.dto.result.CaResidentResultDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.entity.CaResidentEntity; - import java.util.List; import java.util.Map; @@ -104,4 +105,14 @@ public interface CaResidentService extends BaseService { * @return */ CaResidentDetailsResultDTO getResidentDetails(CaResidentDetailsFormDTO dto); -} \ No newline at end of file + + /** + * 根据idCard查询resident表数据 + * + * @param form + * @return com.epmet.opendata.dto.result.ResidentByIdCardResultDTO + * @author LZN + * @date 2022/6/21 17:33 + */ + ResidentByIdCardResultDTO getResidentDetailByIdCard(CaResidentDetailsFormDTO form); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentUserService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentUserService.java new file mode 100644 index 0000000000..00795d3387 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentUserService.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.ca.CaResidentUserDTO; +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.entity.CaResidentUserEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-22 + */ +public interface CaResidentUserService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-22 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-22 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CaResidentUserDTO + * @author generator + * @date 2022-06-22 + */ + CaResidentUserDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-22 + */ + void save(CaResidentUserDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-22 + */ + void update(CaResidentUserDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-22 + */ + void delete(String[] ids); + + void saveCaResidentUser(SaveCaResidentUserFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java new file mode 100644 index 0000000000..f2c0cebb5f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaSysDictEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface CaSysDictService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CaSysDictDTO + * @author generator + * @date 2022-06-16 + */ + CaSysDictDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(CaSysDictDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(CaSysDictDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:52 + */ + void preserSysdictVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java new file mode 100644 index 0000000000..6c2cff2cf2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java @@ -0,0 +1,88 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.entity.WghBaseGridEntity; + + +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghBaseGridService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return BasegridDTO + * @author generator + * @date 2022-06-14 + */ + BasegridDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(BasegridDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(BasegridDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 13:40 + */ + void preserBaseGridVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java new file mode 100644 index 0000000000..a53ffb8a6a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java @@ -0,0 +1,88 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.entity.WghCommunityEntity; + + +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghCommunityService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CommunityDTO + * @author generator + * @date 2022-06-14 + */ + CommunityDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(CommunityDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(CommunityDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储社区数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:03 + */ + void getPreserCommunityVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java new file mode 100644 index 0000000000..8f13184379 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java @@ -0,0 +1,89 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.entity.WghDywgEntity; + +import java.util.List; +import java.util.Map; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghDywgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghDywgDTO + * @author generator + * @date 2022-06-14 + */ + WghDywgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghDywgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghDywgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口获取dywg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:11 + */ + void getPreserDywgVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java new file mode 100644 index 0000000000..ab9e62fc86 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.entity.WghJdbEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJdbService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJdbDTO + * @author generator + * @date 2022-06-14 + */ + WghJdbDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJdbDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJdbDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:31 + */ + void getPreserWghJdbVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java new file mode 100644 index 0000000000..9ad0ee26d6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.WghJqzEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJqzService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJqzDTO + * @author generator + * @date 2022-06-14 + */ + WghJqzDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJqzDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJqzDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + void getPreserWghjqzVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java new file mode 100644 index 0000000000..de8df4334d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.entity.WghJxcsEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJxcsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJxcsDTO + * @author generator + * @date 2022-06-14 + */ + WghJxcsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJxcsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJxcsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储wgh_jxcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:46 + */ + void preserWghJxcsVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java similarity index 55% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java index 6b87e5cefc..77778a6262 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java @@ -1,50 +1,51 @@ -package com.epmet.service; +package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.PointAditiveCalcDTO; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.entity.WghJyzEntity; import java.util.List; import java.util.Map; /** - * 附加积分计算 + * 加油站 * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface PointAditiveCalcService extends BaseService { +public interface WghJyzService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return PointAditiveCalcDTO + * @return WghJyzDTO * @author generator * @date 2022-06-14 */ - PointAditiveCalcDTO get(String id); + WghJyzDTO get(String id); /** * 默认保存 @@ -54,7 +55,7 @@ public interface PointAditiveCalcService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSjxxbDTO + * @author generator + * @date 2022-06-14 + */ + WghSjxxbDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSjxxbDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSjxxbDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_sjxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:02 + */ + void getPreserSjxxVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java new file mode 100644 index 0000000000..93a9a297b4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.entity.WghSqxxEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSqxxService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSqxxDTO + * @author generator + * @date 2022-06-14 + */ + WghSqxxDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSqxxDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSqxxDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_sqxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:08 + */ + void getPreserWghSqxxVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java similarity index 56% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java index 857d5b797d..f378b09109 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java @@ -1,50 +1,51 @@ -package com.epmet.service; +package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.PointAditiveRecordDTO; -import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; import java.util.List; import java.util.Map; /** - * 附加积分记录 + * * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface PointAditiveRecordService extends BaseService { +public interface WghSubdistrictOfficeService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return PointAditiveRecordDTO + * @return SubdistrictOfficeDTO * @author generator * @date 2022-06-14 */ - PointAditiveRecordDTO get(String id); + SubdistrictOfficeDTO get(String id); /** * 默认保存 @@ -54,7 +55,7 @@ public interface PointAditiveRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSzcgwghDTO + * @author generator + * @date 2022-06-14 + */ + WghSzcgwghDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSzcgwghDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSzcgwghDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_szcgwgh数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:20 + */ + void getPreserWghSzcgwghVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java new file mode 100644 index 0000000000..17048d584d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.entity.WghSzzrwgEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSzzrwgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSzzrwgDTO + * @author generator + * @date 2022-06-14 + */ + WghSzzrwgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSzzrwgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSzzrwgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_szzrwg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:27 + */ + void getPreserWghSzzrwgVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java new file mode 100644 index 0000000000..16214aeb9f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.entity.WghWhpdwEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghWhpdwService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghWhpdwDTO + * @author generator + * @date 2022-06-14 + */ + WghWhpdwDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghWhpdwDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghWhpdwDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_whpdw数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:34 + */ + void getPreserWhpdwVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java new file mode 100644 index 0000000000..03cbb10b49 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.entity.WghYjbmcsEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghYjbmcsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghYjbmcsDTO + * @author generator + * @date 2022-06-14 + */ + WghYjbmcsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghYjbmcsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghYjbmcsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_yjbmcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:39 + */ + void getPreserWghYjbmcsVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java new file mode 100644 index 0000000000..129c917617 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java @@ -0,0 +1,89 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.WghYqhjzEntity; +import com.epmet.opendata.dto.wgh.WghYqhjzDTO; + +import java.util.List; +import java.util.Map; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghYqhjzService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghYqhjzDTO + * @author generator + * @date 2022-06-14 + */ + WghYqhjzDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghYqhjzDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghYqhjzDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_yqhjz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:46 + */ + void getPreserWghYqhjzVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java new file mode 100644 index 0000000000..5f763e4433 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java @@ -0,0 +1,101 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; +import com.epmet.opendata.entity.caBmGridEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface caBmGridService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return BmGridDTO + * @author generator + * @date 2022-06-14 + */ + BmGridDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(BmGridDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(BmGridDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 14:17 + */ + void getPreserBmGridVation(PreserVationFormDTO dto); + + /** + * 获取级联菜单 + * + * @param + * @return java.util.List + * @author LZN + * @date 2022/6/17 13:32 + */ + List getCascadeMenu(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java new file mode 100644 index 0000000000..6bc74d2e1b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.CaBmCategoryDao; +import com.epmet.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaBmCategoryEntity; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.redis.CaBmCategoryRedis; +import com.epmet.opendata.service.CaBmCategoryService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class CaBmCategoryServiceImpl extends BaseServiceImpl implements CaBmCategoryService { + + @Autowired + private CaBmCategoryRedis caBmCategoryRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaBmCategoryDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaBmCategoryDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CaBmCategoryDTO get(String id) { + CaBmCategoryEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CaBmCategoryDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CaBmCategoryDTO dto) { + CaBmCategoryEntity entity = ConvertUtils.sourceToTarget(dto, CaBmCategoryEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CaBmCategoryDTO dto) { + CaBmCategoryEntity entity = ConvertUtils.sourceToTarget(dto, CaBmCategoryEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:38 + */ + @Override + public void preserBmCategoryVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.UNICOM_BM_CATEGORY); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("category_id,parent_category_id,create_date,update_date"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listCategory(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + private int listCategory(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.UNICOM_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java new file mode 100644 index 0000000000..42528e3a4a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java @@ -0,0 +1,188 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.LouDongTreeNodeUtils; +import com.epmet.commons.tools.utils.Result; + +import com.epmet.opendata.dao.caBmGridDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; + +import com.epmet.opendata.entity.caBmGridEntity; +import com.epmet.opendata.redis.BmGridRedis; + +import com.epmet.opendata.service.caBmGridService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class CaBmGridServiceImpl extends BaseServiceImpl implements caBmGridService { + + @Autowired + private BmGridRedis bmGridRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, BmGridDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public BmGridDTO get(String id) { + caBmGridEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, BmGridDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(BmGridDTO dto) { + caBmGridEntity entity = ConvertUtils.sourceToTarget(dto, caBmGridEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(BmGridDTO dto) { + caBmGridEntity entity = ConvertUtils.sourceToTarget(dto, caBmGridEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 14:17 + */ + @Override + public void getPreserBmGridVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.SHARE_BM_GRID); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("grid_id"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listBmGrid(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + /** + * 获取级联菜单 + * + * @param + * @return java.util.List + * @author LZN + * @date 2022/6/15 14:01 + */ + @Override + public List getCascadeMenu() { + List list = baseDao.getCascadeMenu(); + return LouDongTreeNodeUtils.build(list); + } + + private int listBmGrid(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.UNICOM_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()),ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + private int total; + private List list; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index a5e55fa6c6..40e440d48e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java @@ -7,9 +7,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.HttpClientManager; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.opendata.dao.CaLoudongDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -18,6 +16,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.redis.CaLoudongRedis; import com.epmet.opendata.service.CaLoudongService; @@ -106,7 +105,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl getPage(CaLoudongFormDTO dto) { PageHelper.startPage(dto.getPage(), dto.getLimit()); - List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName()); + List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName(),dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -138,7 +137,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG); @@ -163,6 +162,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName()); + List result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName(),dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -117,7 +117,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java index 7104457494..44dffcc7ee 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java @@ -104,7 +104,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getResidentName(), dto.getHouseName(), - dto.getRenterName()); + dto.getRenterName(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -123,7 +124,7 @@ public class CaRentalServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_RENTAL); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java index 8a6648b5fc..6477389d46 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java @@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject; 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.annotation.LoginUser; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; @@ -17,9 +19,11 @@ import com.epmet.opendata.dto.ca.CaResidentDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; import com.epmet.opendata.dto.form.CaResidentFormDTO; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO; import com.epmet.opendata.dto.result.CaResidentResultDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.entity.CaResidentEntity; import com.epmet.opendata.redis.CaResidentRedis; import com.epmet.opendata.service.CaResidentService; @@ -107,7 +111,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getResidentName(), dto.getIdCard(), - dto.getTelephone()); + dto.getTelephone(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -125,7 +130,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT); @@ -154,6 +159,20 @@ public class CaResidentServiceImpl extends BaseServiceImpl implements CaResidentUserService { + + @Autowired + private CaResidentUserRedis caResidentUserRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaResidentUserDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaResidentUserDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CaResidentUserDTO get(String id) { + CaResidentUserEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CaResidentUserDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CaResidentUserDTO dto) { + CaResidentUserEntity entity = ConvertUtils.sourceToTarget(dto, CaResidentUserEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CaResidentUserDTO dto) { + CaResidentUserEntity entity = ConvertUtils.sourceToTarget(dto, CaResidentUserEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void saveCaResidentUser(SaveCaResidentUserFormDTO dto) { + CaResidentUserEntity entity = ConvertUtils.sourceToTarget(dto,CaResidentUserEntity.class); + insert(entity); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java index 1007be5e6c..2d76b56fc0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java @@ -107,7 +107,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getRotatorsName(), dto.getIdCard(), - dto.getTelephone()); + dto.getTelephone(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -125,7 +126,7 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java new file mode 100644 index 0000000000..2f11f830f0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java @@ -0,0 +1,171 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.CaSysDictDao; +import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.CaSysDictEntity; +import com.epmet.opendata.redis.CaSysDictRedis; +import com.epmet.opendata.service.CaSysDictService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class CaSysDictServiceImpl extends BaseServiceImpl implements CaSysDictService { + + @Autowired + private CaSysDictRedis caSysDictRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaSysDictDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaSysDictDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CaSysDictDTO get(String id) { + CaSysDictEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CaSysDictDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CaSysDictDTO dto) { + CaSysDictEntity entity = ConvertUtils.sourceToTarget(dto, CaSysDictEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CaSysDictDTO dto) { + CaSysDictEntity entity = ConvertUtils.sourceToTarget(dto, CaSysDictEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:52 + */ + @Override + public void preserSysdictVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.UNICOM_SYS_DICT); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("dict_id,,create_date,update_date"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSysDict(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listSysDict(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.UNICOM_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index b8e1f0b669..8937858883 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -3,10 +3,13 @@ package com.epmet.opendata.service.impl; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.service.*; +import lombok.extern.slf4j.Slf4j; +import net.bytebuddy.asm.Advice; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +@Slf4j @Service public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @@ -25,32 +28,130 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private CaRotatorsService rotatorsService; + @Autowired + private WghBaseGridService basegridService; + + @Autowired + private caBmGridService bmGridService; + + @Autowired + private WghCommunityService communityService; + + @Autowired + private WghDywgService wghDywgService; + + @Autowired + private WghJdbService wghJdbService; + + @Autowired + private WghJqzService wghJqzService; + + @Autowired + private WghJxcsService wghJxcsService; + + @Autowired + private WghJyzService wghJyzService; + + @Autowired + private WghSjxxbService wghSjxxbService; + + @Autowired + private WghSqxxService wghSqxxService; + + @Autowired + private WghSzcgwghService wghSzcgwghService; + + @Autowired + private WghSzzrwgService wghSzzrwgService; + + @Autowired + private WghWhpdwService wghWhpdwService; + + @Autowired + private WghYjbmcsService wghYjbmcsService; + + @Autowired + private WghYqhjzService wghYqhjzService; + + @Autowired + private CaSysDictService caSysDictService; + + @Autowired + private CaBmCategoryService caBmCategoryService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { - if (StringUtils.isBlank(dto.getTableName())) { - caLoudongService.preserLouDongVation(dto); - pingfangService.preserPingFangVation(dto); - rentalService.preserRentalVation(dto); - residentService.preserResidentVation(dto); - rotatorsService.preserRotatorsVation(dto); - } - - switch (dto.getTableName()) { - case CaWghDataConstant.UNICOM_LOUDONG: - caLoudongService.preserLouDongVation(dto); - break; - case CaWghDataConstant.UNICOM_PINGFANG: - pingfangService.preserPingFangVation(dto); - break; - case CaWghDataConstant.UNICOM_RESIDENT: - residentService.preserResidentVation(dto); - break; - case CaWghDataConstant.UNICOM_RENTAL: - rentalService.preserRentalVation(dto); - break; - case CaWghDataConstant.UNICOM_ROTATORS: - rotatorsService.preserRotatorsVation(dto); - break; + if (StringUtils.isNotBlank(dto.getTableName())) { + switch (dto.getTableName()) { + case CaWghDataConstant.UNICOM_LOUDONG: + caLoudongService.preserLouDongVation(dto); + break; + case CaWghDataConstant.UNICOM_PINGFANG: + pingfangService.preserPingFangVation(dto); + break; + case CaWghDataConstant.UNICOM_RESIDENT: + residentService.preserResidentVation(dto); + break; + case CaWghDataConstant.UNICOM_RENTAL: + rentalService.preserRentalVation(dto); + break; + case CaWghDataConstant.UNICOM_ROTATORS: + rotatorsService.preserRotatorsVation(dto); + break; + case CaWghDataConstant.SHARE_BASE_GRID: + basegridService.preserBaseGridVation(dto); + break; + case CaWghDataConstant.SHARE_BM_GRID: + bmGridService.getPreserBmGridVation(dto); + break; + case CaWghDataConstant.SHARE_COMMUNITY: + communityService.getPreserCommunityVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_DYWG: + wghDywgService.getPreserDywgVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JDB: + wghJdbService.getPreserWghJdbVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JQZ: + wghJqzService.getPreserWghjqzVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JXCS: + wghJxcsService.preserWghJxcsVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JYZ: + wghJyzService.getPreserWghJyzVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_SJXX: + wghSjxxbService.getPreserSjxxVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_SQXX: + wghSqxxService.getPreserWghSqxxVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_SZCGWGH: + wghSzcgwghService.getPreserWghSzcgwghVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_SZZRWG: + wghSzzrwgService.getPreserWghSzzrwgVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_WHPDW: + wghWhpdwService.getPreserWhpdwVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_YJBMCS: + wghYjbmcsService.getPreserWghYjbmcsVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_YQHJZ: + wghYqhjzService.getPreserWghYqhjzVation(dto); + break; + case CaWghDataConstant.UNICOM_BM_CATEGORY: + caBmCategoryService.preserBmCategoryVation(dto); + break; + case CaWghDataConstant.UNICOM_SYS_DICT: + caSysDictService.preserSysdictVation(dto); + break; + } + } else{ + throw new Error("没传名字"); } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java new file mode 100644 index 0000000000..9aaf2ae706 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java @@ -0,0 +1,167 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghBaseGridDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.entity.WghBaseGridEntity; +import com.epmet.opendata.redis.BasegridRedis; +import com.epmet.opendata.service.WghBaseGridService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghBaseGridServiceImpl extends BaseServiceImpl implements WghBaseGridService { + + @Autowired + private BasegridRedis basegridRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, BasegridDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, BasegridDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public BasegridDTO get(String id) { + WghBaseGridEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, BasegridDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(BasegridDTO dto) { + WghBaseGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBaseGridEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(BasegridDTO dto) { + WghBaseGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBaseGridEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 13:41 + */ + @Override + public void preserBaseGridVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID); + + dto.setWhereCase("1=1"); + dto.setOrderBy("网格编码"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listBaseGrid(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + + } + } + + private int listBaseGrid(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + private int total; + private List list; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java new file mode 100644 index 0000000000..05a77768f8 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java @@ -0,0 +1,169 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghCommunityDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.entity.WghCommunityEntity; +import com.epmet.opendata.redis.CommunityRedis; + +import com.epmet.opendata.service.WghCommunityService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghCommunityServiceImpl extends BaseServiceImpl implements WghCommunityService { + + @Autowired + private CommunityRedis communityRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CommunityDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CommunityDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CommunityDTO get(String id) { + WghCommunityEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CommunityDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CommunityDTO dto) { + WghCommunityEntity entity = ConvertUtils.sourceToTarget(dto, WghCommunityEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CommunityDTO dto) { + WghCommunityEntity entity = ConvertUtils.sourceToTarget(dto, WghCommunityEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储社区数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:03 + */ + @Override + public void getPreserCommunityVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_COMMUNITY); + + dto.setWhereCase("1=1"); + dto.setOrderBy("社区编码"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listCommunity(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listCommunity(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java new file mode 100644 index 0000000000..3f98dd5c40 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java @@ -0,0 +1,171 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghDywgDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghDywgEntity; +import com.epmet.opendata.redis.WghDywgRedis; +import com.epmet.opendata.service.WghDywgService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghDywgServiceImpl extends BaseServiceImpl implements WghDywgService { + + @Autowired + private WghDywgRedis wghDywgRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghDywgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghDywgDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghDywgDTO get(String id) { + WghDywgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghDywgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghDywgDTO dto) { + WghDywgEntity entity = ConvertUtils.sourceToTarget(dto, WghDywgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghDywgDTO dto) { + WghDywgEntity entity = ConvertUtils.sourceToTarget(dto, WghDywgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取dywg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:12 + */ + @Override + public void getPreserDywgVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_DYWG); + + dto.setWhereCase("1=1"); + dto.setOrderBy("ORDATE"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listDywg(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listDywg(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java new file mode 100644 index 0000000000..cb164432b0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java @@ -0,0 +1,171 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghJdbDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghJdbEntity; +import com.epmet.opendata.redis.WghJdbRedis; +import com.epmet.opendata.service.WghJdbService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJdbServiceImpl extends BaseServiceImpl implements WghJdbService { + + @Autowired + private WghJdbRedis wghJdbRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJdbDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJdbDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJdbDTO get(String id) { + WghJdbEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJdbDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJdbDTO dto) { + WghJdbEntity entity = ConvertUtils.sourceToTarget(dto, WghJdbEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJdbDTO dto) { + WghJdbEntity entity = ConvertUtils.sourceToTarget(dto, WghJdbEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:31 + */ + @Override + public void getPreserWghJdbVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JDB); + + dto.setWhereCase("1=1"); + dto.setOrderBy("insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJdb(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listWghJdb(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java new file mode 100644 index 0000000000..1023edffa7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java @@ -0,0 +1,171 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghJqzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghJqzEntity; +import com.epmet.opendata.redis.WghJqzRedis; +import com.epmet.opendata.service.WghJqzService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJqzServiceImpl extends BaseServiceImpl implements WghJqzService { + + @Autowired + private WghJqzRedis wghJqzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJqzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJqzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJqzDTO get(String id) { + WghJqzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJqzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJqzDTO dto) { + WghJqzEntity entity = ConvertUtils.sourceToTarget(dto, WghJqzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJqzDTO dto) { + WghJqzEntity entity = ConvertUtils.sourceToTarget(dto, WghJqzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + @Override + public void getPreserWghjqzVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJqz(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listWghJqz(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java new file mode 100644 index 0000000000..0e202ffa6b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghJxcsDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghJxcsEntity; +import com.epmet.opendata.redis.WghJxcsRedis; +import com.epmet.opendata.service.WghJxcsService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJxcsServiceImpl extends BaseServiceImpl implements WghJxcsService { + + @Autowired + private WghJxcsRedis wghJxcsRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJxcsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJxcsDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJxcsDTO get(String id) { + WghJxcsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJxcsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJxcsDTO dto) { + WghJxcsEntity entity = ConvertUtils.sourceToTarget(dto, WghJxcsEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJxcsDTO dto) { + WghJxcsEntity entity = ConvertUtils.sourceToTarget(dto, WghJxcsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储wgh_jxcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:46 + */ + @Override + public void preserWghJxcsVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JXCS); + + dto.setWhereCase("1=1"); + dto.setOrderBy("USER_ID,ID"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJxcs(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghJxcs(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java new file mode 100644 index 0000000000..f159e690de --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghJyzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghJyzEntity; +import com.epmet.opendata.redis.WghJyzRedis; +import com.epmet.opendata.service.WghJyzService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJyzServiceImpl extends BaseServiceImpl implements WghJyzService { + + @Autowired + private WghJyzRedis wghJyzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJyzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJyzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJyzDTO get(String id) { + WghJyzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJyzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJyzDTO dto) { + WghJyzEntity entity = ConvertUtils.sourceToTarget(dto, WghJyzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJyzDTO dto) { + WghJyzEntity entity = ConvertUtils.sourceToTarget(dto, WghJyzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取wgh_jyz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:53 + */ + @Override + public void getPreserWghJyzVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JYZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,等级,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java new file mode 100644 index 0000000000..ad2dee773b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSjxxbDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSjxxbEntity; +import com.epmet.opendata.redis.WghSjxxbRedis; +import com.epmet.opendata.service.WghSjxxbService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSjxxbServiceImpl extends BaseServiceImpl implements WghSjxxbService { + + @Autowired + private WghSjxxbRedis wghSjxxbRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSjxxbDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSjxxbDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSjxxbDTO get(String id) { + WghSjxxbEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSjxxbDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSjxxbDTO dto) { + WghSjxxbEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxbEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSjxxbDTO dto) { + WghSjxxbEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxbEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取wgh_sjxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:02 + */ + @Override + public void getPreserSjxxVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXX); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,OBJECTID_1,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java new file mode 100644 index 0000000000..e804f85a5c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSqxxDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSqxxEntity; +import com.epmet.opendata.redis.WghSqxxRedis; +import com.epmet.opendata.service.WghSqxxService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSqxxServiceImpl extends BaseServiceImpl implements WghSqxxService { + + @Autowired + private WghSqxxRedis wghSqxxRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSqxxDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSqxxDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSqxxDTO get(String id) { + WghSqxxEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSqxxDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSqxxDTO dto) { + WghSqxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSqxxEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSqxxDTO dto) { + WghSqxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSqxxEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取wgh_sqxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:08 + */ + @Override + public void getPreserWghSqxxVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SQXX); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,街道编码,社区编码,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghSqxx(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghSqxx(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java new file mode 100644 index 0000000000..6c60f83523 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java @@ -0,0 +1,165 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSubdistrictOfficeDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; +import com.epmet.opendata.redis.SubdistrictOfficeRedis; +import com.epmet.opendata.service.WghSubdistrictOfficeService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl implements WghSubdistrictOfficeService { + + @Autowired + private SubdistrictOfficeRedis subdistrictOfficeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, SubdistrictOfficeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public SubdistrictOfficeDTO get(String id) { + WghSubdistrictOfficeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(SubdistrictOfficeDTO dto) { + WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SubdistrictOfficeDTO dto) { + WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void getpreserSubVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SUB); + + dto.setWhereCase("1=1"); + dto.setOrderBy("街道代码"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSub(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listSub(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java new file mode 100644 index 0000000000..e8b1a8d19c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSzcgwghDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSzcgwghEntity; +import com.epmet.opendata.redis.WghSzcgwghRedis; +import com.epmet.opendata.service.WghSzcgwghService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSzcgwghServiceImpl extends BaseServiceImpl implements WghSzcgwghService { + + @Autowired + private WghSzcgwghRedis wghSzcgwghRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSzcgwghDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSzcgwghDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSzcgwghDTO get(String id) { + WghSzcgwghEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSzcgwghDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSzcgwghDTO dto) { + WghSzcgwghEntity entity = ConvertUtils.sourceToTarget(dto, WghSzcgwghEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSzcgwghDTO dto) { + WghSzcgwghEntity entity = ConvertUtils.sourceToTarget(dto, WghSzcgwghEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi系统获取wgh_szcgwgh数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:20 + */ + @Override + public void getPreserWghSzcgwghVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SZCGWGH); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,ID,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghSzcgWgh(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghSzcgWgh(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java new file mode 100644 index 0000000000..6a34e91255 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java @@ -0,0 +1,175 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSzzrwgDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSzzrwgEntity; +import com.epmet.opendata.redis.WghSzzrwgRedis; +import com.epmet.opendata.service.WghSzzrwgService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSzzrwgServiceImpl extends BaseServiceImpl implements WghSzzrwgService { + + @Autowired + private WghSzzrwgRedis wghSzzrwgRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSzzrwgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSzzrwgDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSzzrwgDTO get(String id) { + WghSzzrwgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSzzrwgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSzzrwgDTO dto) { + WghSzzrwgEntity entity = ConvertUtils.sourceToTarget(dto, WghSzzrwgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSzzrwgDTO dto) { + WghSzzrwgEntity entity = ConvertUtils.sourceToTarget(dto, WghSzzrwgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口获取wgh_szzrwg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:27 + */ + @Override + public void getPreserWghSzzrwgVation(PreserVationFormDTO dto) { + + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SZZRWG); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSzzrwg(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listSzzrwg(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java new file mode 100644 index 0000000000..c62f8689f4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghWhpdwDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghWhpdwEntity; +import com.epmet.opendata.redis.WghWhpdwRedis; +import com.epmet.opendata.service.WghWhpdwService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghWhpdwServiceImpl extends BaseServiceImpl implements WghWhpdwService { + + @Autowired + private WghWhpdwRedis wghWhpdwRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghWhpdwDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghWhpdwDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghWhpdwDTO get(String id) { + WghWhpdwEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghWhpdwDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghWhpdwDTO dto) { + WghWhpdwEntity entity = ConvertUtils.sourceToTarget(dto, WghWhpdwEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghWhpdwDTO dto) { + WghWhpdwEntity entity = ConvertUtils.sourceToTarget(dto, WghWhpdwEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi系统获取wgh_whpdw数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:34 + */ + @Override + public void getPreserWhpdwVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_WHPDW); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,XH,GRADE,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghWhpdw(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghWhpdw(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java new file mode 100644 index 0000000000..550822bf20 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghYjbmcsDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghYjbmcsEntity; +import com.epmet.opendata.redis.WghYjbmcsRedis; +import com.epmet.opendata.service.WghYjbmcsService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghYjbmcsServiceImpl extends BaseServiceImpl implements WghYjbmcsService { + + @Autowired + private WghYjbmcsRedis wghYjbmcsRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghYjbmcsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghYjbmcsDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghYjbmcsDTO get(String id) { + WghYjbmcsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghYjbmcsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghYjbmcsDTO dto) { + WghYjbmcsEntity entity = ConvertUtils.sourceToTarget(dto, WghYjbmcsEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghYjbmcsDTO dto) { + WghYjbmcsEntity entity = ConvertUtils.sourceToTarget(dto, WghYjbmcsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi系统获取wgh_yjbmcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:39 + */ + @Override + public void getPreserWghYjbmcsVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_YJBMCS); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,INSERT_TIME"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java new file mode 100644 index 0000000000..a32a484816 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghYqhjzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghYqhjzEntity; +import com.epmet.opendata.redis.WghYqhjzRedis; +import com.epmet.opendata.service.WghYqhjzService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.epmet.opendata.dto.wgh.WghYqhjzDTO; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghYqhjzServiceImpl extends BaseServiceImpl implements WghYqhjzService { + + @Autowired + private WghYqhjzRedis wghYqhjzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghYqhjzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghYqhjzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghYqhjzDTO get(String id) { + WghYqhjzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghYqhjzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghYqhjzDTO dto) { + WghYqhjzEntity entity = ConvertUtils.sourceToTarget(dto, WghYqhjzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghYqhjzDTO dto) { + WghYqhjzEntity entity = ConvertUtils.sourceToTarget(dto, WghYqhjzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi系统获取wgh_yqhjz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:46 + */ + @Override + public void getPreserWghYqhjzVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_YQHJZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,XH,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghYqhjz(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghYqhjz(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql new file mode 100644 index 0000000000..93ea003731 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ca_resident_user` ADD INDEX ID_CARD (`id_card` ); +ALTER TABLE `ca_resident_user` ADD INDEX DEL_FLAG (`DEL_FLAG` ) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql new file mode 100644 index 0000000000..5c200e78f6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql @@ -0,0 +1,35 @@ +DROP INDEX DEL_FLAG ON `ca_resident_user`; + +DROP VIEW IF EXISTS `view_grid_comm_street_ca`; +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street_ca` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path`, +`bbo`.`business_org_id` AS `business_org_id` +FROM + ((( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) + LEFT JOIN `business_bind_org` `bbo` ON ((( + concat( `g4`.`grid_id` ) = `bbo`.`third_org_id` + ) + AND ( `bbo`.`business_code` = 'ca' ) + AND ( `bbo`.`DEL_FLAG` = '0' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql new file mode 100644 index 0000000000..c8fb0c832d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql @@ -0,0 +1,358 @@ +DROP TABLE IF EXISTS `ca_bm_grid`; +CREATE TABLE `ca_bm_grid` ( + `grid_id` bigint(20) NOT NULL COMMENT '网格ID', + `grid_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格编码。人工填写，编码规则业务规定，不允许重复。', + `grid_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格名称', + `gb_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '行政区划的国标编码', + `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上级网格ID', + `parent_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '上级网格编码', + `grid_classification` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等', + `grid_level` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格层级。网格层级表的层级\n根据【网格层级表】的层级关系动态展示。\n查询【网格层级表】层级 条件：上层级=网格树返回的网格层级', + `grid_property` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他', + `is_end` char(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '是否最后一级:0否 1是', + `grid_address` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格地址', + `grid_introduce` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格介绍', + `grid_picture` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '宣传图片', + `regin_scope_desc` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '地图区域范围', + `grid_sort` int(10) NULL DEFAULT NULL COMMENT '展示顺序', + `point_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '标绘状态', + `grid_em_center` bigint(10) NULL DEFAULT NULL COMMENT '事件上报中心', + `grid_begin_time` datetime(0) NULL DEFAULT NULL COMMENT '初始日期', + `grid_end_time` datetime(0) NULL DEFAULT NULL COMMENT '终止日期', + `grid_area` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '面积', + `is_valid` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '是否有效', + `create_by` bigint(20) NOT NULL COMMENT '创建人', + `create_date` datetime(0) NOT NULL COMMENT '创建时间', + `update_by` bigint(20) NOT NULL, + `update_date` datetime(0) NOT NULL, + `delete_flag` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'normal' COMMENT '删除状态: 字典值：normal正常，删除deleted', + `versions` int(10) NULL DEFAULT 1 COMMENT '乐观锁', + `attribute1` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格内人口规模', + `attribute2` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '是否成立网格党支部或网格党小组', + `attribute3` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格党组织类型', + `attribute4` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '党组织编码', + `attribute5` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '扩展字段', + `attribute6` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute7` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute8` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute9` datetime(0) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute10` datetime(0) NULL DEFAULT NULL COMMENT '扩展字段', + PRIMARY KEY (`grid_id`) USING BTREE, + INDEX `SELECT_PARENT`(`parent_id`) USING BTREE, + INDEX `idx_grid_grid_id`(`grid_id`) USING BTREE, + INDEX `idx_grid_grid_sort`(`grid_sort`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_base_grid +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_base_grid`; +CREATE TABLE `wgh_base_grid` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `grid_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `sub_district_office` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `grid_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_community +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_community`; +CREATE TABLE `wgh_community` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `street_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_dywg +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_dywg`; +CREATE TABLE `wgh_dywg` ( + `OBJECTID` int(11) NOT NULL, + `BGNAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格名称', + `STREET` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属街镇', + `COMMUNITY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属社区', + `BGSQUA` double NULL DEFAULT NULL COMMENT '网格面积', + `ORDATE` datetime(0) NULL DEFAULT NULL COMMENT '初始时间', + `CHDATE` datetime(0) NULL DEFAULT NULL COMMENT '变更时间', + `NOTE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `CONTACTS` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `TELPHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '单元网格' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_jdb +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jdb`; +CREATE TABLE `wgh_jdb` ( + `OBJECTID_1` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `OBJECTID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `MC` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道名称', + `person_in_charge` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任人', + `phone` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `SHAPE_LENG` double NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '街道办' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_jqz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jqz`; +CREATE TABLE `wgh_jqz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `nature` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `LAYER` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `AMOUNT` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `YJCS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加气站信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_jxcs +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jxcs`; +CREATE TABLE `wgh_jxcs` ( + `OBJECTID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `JSON_INFO` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `CREAT_TIME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `SSJD` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属街道', + `SSSQ` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属社区', + `DLM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '道路名', + `MPH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '门牌号', + `NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', + `ZTLX` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型', + `XYDM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码', + `LXR` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人', + `LXDH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `USER_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `BZ` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', + `AVAILABLE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `USER_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编辑人ID', + `UPDATE_TIM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编辑人姓名', + `INSERT_TIME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '九小场所信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_jyz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jyz`; +CREATE TABLE `wgh_jyz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `nature` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `LAYER` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `AMOUNT` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `YJCS` varchar(260) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加油站' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_sjxxb +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_sjxxb`; +CREATE TABLE `wgh_sjxxb` ( + `OBJECTID_1` int(11) NULL DEFAULT NULL, + `OBJECTID` double NULL DEFAULT NULL, + `INFOSOURCENAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件来源', + `INFOTYPENAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件类别', + `COMMUNITYNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '社区名称', + `DESCRIPTION` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件描述', + `TASKID` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CASESN` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ADDRESS` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件地址', + `STATUSNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件状态', + `INFOBCNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `INFOSCNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `STREETNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道名称', + `DISCOVERTIME` datetime(0) NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '事件信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_sqxx +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_sqxx`; +CREATE TABLE `wgh_sqxx` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `COMMUAREA` double NULL DEFAULT NULL, + `BELONGTO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CONTACTS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `TELPHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `number_of_grid` double NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `COMMNAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `JDCJGB` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `WGZ` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `police_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `traffic_police_phone` double NULL DEFAULT NULL, + `traffic_police_company` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `peo_police_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `peo_police_phone` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `police_station` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `WGY` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `JDLXKS` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `DDY` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFXM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFDH` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFBM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_subdistrict_office +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_subdistrict_office`; +CREATE TABLE `wgh_subdistrict_office` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `street_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_szcgwgh +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_szcgwgh`; +CREATE TABLE `wgh_szcgwgh` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `NOTE` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `SSSQ` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJD` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ID` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数字城管网格化信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_szzrwg +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_szzrwg`; +CREATE TABLE `wgh_szzrwg` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `NOTE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任单位', + `PRINCIPAL` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监管人', + `PHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系方式', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '市政责任网格信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_whpdw +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_whpdw`; +CREATE TABLE `wgh_whpdw` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PERSON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '安全负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `GRADE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `YJCS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要负责人', + `USER` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用途', + `LAYER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` timestamp(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '危化品单位信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_yjbmcs +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_yjbmcs`; +CREATE TABLE `wgh_yjbmcs` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `GRADE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ADRESS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', + `AREA` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '面积(㎡)', + `RNNS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '容纳人数', + `SFBSP` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZYSBCS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `FZR` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZGDW` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `FZRTEL` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJD` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `INSERT_TIME` timestamp(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应急避难场所信息' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for wgh_yqhjz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_yqhjz`; +CREATE TABLE `wgh_yqhjz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `TYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `GRADE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `YJCS` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '简称', + `LAYER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在图层', + `SSJDB` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属街道办', + `PROBLEM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `insert_time` timestamp(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '油气合建站信息' ROW_FORMAT = Dynamic; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql new file mode 100644 index 0000000000..51ee2dd094 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql @@ -0,0 +1,26 @@ +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path` +FROM + (( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.6__create_dict_category.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.6__create_dict_category.sql new file mode 100644 index 0000000000..b0e8a1b542 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.6__create_dict_category.sql @@ -0,0 +1,47 @@ +DROP TABLE IF EXISTS `ca_bm_category`; +CREATE TABLE `ca_bm_category` ( + `category_id` bigint(20) NOT NULL COMMENT '类别ID', + `category_name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '名称', + `category_type` varchar(100) COLLATE utf8_bin DEFAULT NULL, + `category_value` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '名称值', + `parent_category_id` bigint(20) DEFAULT NULL COMMENT '父类别ID', + `category_sort` int(11) DEFAULT NULL COMMENT '展示顺序', + `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` bigint(20) DEFAULT NULL COMMENT '最后修改人', + `update_date` datetime DEFAULT NULL COMMENT '最后修改时间', + `delete_flag` varchar(10) COLLATE utf8_bin DEFAULT 'normal' COMMENT '删除状态', + `versions` int(11) DEFAULT '1' COMMENT '乐观锁', + `attribute1` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段1', + `attribute2` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段2', + `attribute3` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段3', + `attribute4` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段4', + `attribute5` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段5', + `attribute6` bigint(20) DEFAULT NULL COMMENT '扩展字段6', + `attribute7` bigint(20) DEFAULT NULL COMMENT '扩展字段7', + `attribute8` bigint(20) DEFAULT NULL COMMENT '扩展字段8', + `attribute9` datetime DEFAULT NULL COMMENT '扩展字段9', + `attribute10` datetime DEFAULT NULL COMMENT '扩展字段10', + PRIMARY KEY (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多级类型信息表'; + +DROP TABLE IF EXISTS `ca_sys_dict`; +CREATE TABLE `ca_sys_dict` ( + `dict_id` bigint(20) NOT NULL COMMENT '字典ID', + `dict_value` varchar(50) COLLATE utf8_bin NOT NULL COMMENT '字典值，例如：sex/F', + `dict_label` varchar(50) COLLATE utf8_bin NOT NULL COMMENT '1.字典组名称（性别）或者字典名称（女）', + `dict_type` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '字典值时存入字典的值，字典组时存null', + `dict_desc` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '描述', + `dict_sort` int(10) DEFAULT NULL COMMENT '排序', + `create_by` bigint(20) NOT NULL COMMENT '创建人', + `create_date` datetime NOT NULL COMMENT '创建时间', + `update_by` bigint(20) NOT NULL COMMENT '最后修改人', + `update_date` datetime NOT NULL COMMENT '最后修改时间', + `delete_flag` varchar(10) COLLATE utf8_bin NOT NULL DEFAULT 'normal' COMMENT '字典值：normal正常，deleted正常', + `versions` int(10) DEFAULT '1' COMMENT '乐观锁', + PRIMARY KEY (`dict_id`) USING BTREE, + KEY `idx_dicttype` (`dict_type`) USING BTREE, + KEY `idx_delflag` (`delete_flag`) USING BTREE, + KEY `idx_dictvalue` (`dict_value`) USING BTREE, + KEY `PK_INDEX_VLUE` (`dict_value`,`dict_type`,`delete_flag`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='字典信息表，字典值和字典组均存入此表'; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.7__drop_home_id_and_ic_resi_user.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.7__drop_home_id_and_ic_resi_user.sql new file mode 100644 index 0000000000..a830b88c7e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.7__drop_home_id_and_ic_resi_user.sql @@ -0,0 +1,3 @@ +ALTER TABLE `epmet_open_data`.`ca_resident` +DROP COLUMN `home_id`, +DROP COLUMN `ic_resi_user`; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql new file mode 100644 index 0000000000..8fa7fbec46 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.8__update_view_create_table.sql @@ -0,0 +1,52 @@ +DROP TABLE IF EXISTS `business_bind_org`; +CREATE TABLE `business_bind_org` ( + `ID` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '客户Id', + `business_org_id` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '本系统业务机构ID', + `business_code` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '综治ca；网格化wgh', + `third_org_id` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '第三方机构ID', + `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL DEFAULT '1' COMMENT '乐观锁', + `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `idx_grid_grid_id` (`third_org_id`(8)) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + + +DROP VIEW IF EXISTS `view_grid_comm_street`; + +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street_ca` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path`, +`bbo`.`business_org_id` AS `business_org_id` +FROM + ((( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) + LEFT JOIN `business_bind_org` `bbo` ON ((( + `g4`.`grid_id` = `bbo`.`business_org_id` + ) + AND ( `bbo`.`business_code` = 'ca' ) + AND ( `bbo`.`DEL_FLAG` = '0' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.9__create_ca_resident_user_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.9__create_ca_resident_user_table.sql new file mode 100644 index 0000000000..83328c08be --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.9__create_ca_resident_user_table.sql @@ -0,0 +1,14 @@ +DROP TABLE IF EXISTS `ca_resident_user`; +CREATE TABLE `ca_resident_user` ( + `id` varchar(64) NOT NULL, + `id_card` varchar(64) DEFAULT NULL COMMENT '身份证号', + `ic_resi_user_id` varchar(255) DEFAULT NULL COMMENT 'ic_resi_user表id', + `home_id` varchar(200) DEFAULT NULL COMMENT '绑定的房屋id', + `created_by` varchar(64) DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `updated_by` varchar(64) DEFAULT NULL COMMENT '最后修改人', + `updated_time` datetime DEFAULT NULL COMMENT '最后修改时间', + `del_flag` varchar(1) DEFAULT NULL COMMENT '删除标记，normal', + `revision` int(11) DEFAULT '1' COMMENT '乐观锁', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml new file mode 100644 index 0000000000..01d9da165c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from ca_bm_category + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index a29a8929a0..8d91b0b087 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -56,45 +56,52 @@ + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 99c8195b49..4fa522780d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -53,45 +53,52 @@ SELECT - rental_id, - grid_id, - house_id, - house_name, - house_address, - house_use, - house_area, - id_type, - id_card, - resident_name, - telephone, - curlive_address, - rent_use, - trouble_type, - renter_id, - renter_card_number, - renter_card_type, - renter_name, - renter_phone, - longitude, - latitude, - point_status, - plat_code + ca.rental_id, + ca.grid_id, + ca.house_id, + ca.house_name, + ca.house_address, + ca.house_use, + ca.house_area, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.telephone, + ca.curlive_address, + ca.rent_use, + ca.trouble_type, + ca.renter_id, + ca.renter_card_number, + ca.renter_card_type, + ca.renter_name, + ca.renter_phone, + ca.longitude, + ca.latitude, + ca.point_status, + ca.plat_code, + vs.grid_name, + vs.community_name as comName, + vs.street_name FROM - ca_rental + ca_rental as ca + left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND resident_name like '%${residentName}%' + AND ca.resident_name like '%${residentName}%' - AND house_name like '%${houseName}%' + AND ca.house_name like '%${houseName}%' - AND renter_name like '%${renterName}%' + AND ca.renter_name like '%${renterName}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,rental_id,id_card desc + order by ca.grid_id,ca.rental_id,ca.id_card desc SELECT - resident_id, - grid_id, + ca.resident_id, + ca.grid_id, + ca.resident_property, + ca.resident_type, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.sex, + ca.birthday, + ca.nation, + ca.telephone, + ca.household_prov, + ca.household_city, + ca.household_county, + ca.household_town, + ca.household_village, + ca.household_address_detail, + ca.curlive_prov, + ca.curlive_city, + ca.curlive_county, + ca.curlive_town, + ca.curlive_village, + ca.curlive_address_detail, + ca.native_address_prov, + ca.native_address_city, + ca.native_address_county, + ca.former_name, + ca.education, + ca.occupation, + ca.occupation_type, + ca.service_address, + ca.marriage_status, + ca.party, + ca.religious, + ca.conversion_state, + ca.nationality, + ca.plat_code, + vs.grid_name, + vs.community_name as comName, + vs.street_name, + cau.home_id, + cau.ic_resi_user_id + FROM + ca_resident as ca + left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + left join ca_resident_user as cau on cau.id_card = ca.id_card and del_flag = '0' + + ca.delete_flag = 'normal' + + AND ca.resident_name like '%${residentName}%' + + + AND ca.id_card like '%${idCard}%' + + + AND ca.telephone like '%${telephone}%' + + + AND vs.grid_id_path like '%${gridId}%' + + + order by ca.grid_id,ca.resident_id,ca.id_card desc + + + - diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentUserDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentUserDao.xml new file mode 100644 index 0000000000..4cbc139aa5 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentUserDao.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml index 77146469c5..593b137b9a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml @@ -66,59 +66,66 @@ + SELECT + ca.grid_id as id, + ca.grid_id as value, + ca.grid_name as label, + ca.parent_id as pid + FROM + ca_bm_grid ca + WHERE + ca.grid_level IN ('level2','level3','level4') + + + + diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 4d0a000b8a..386fffd4d5 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable { * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 */ private boolean supportAdd; + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 22f83887ba..a6940e9499 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -76,7 +76,12 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { * 手机号：mobile; 身份证：id_card；只能输入数字:num */ private String validType; - + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql new file mode 100644 index 0000000000..cdf0174eab --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -0,0 +1,2 @@ +alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index b58666f21c..20974d2afa 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -85,7 +85,8 @@ IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, b.QUERY_TYPE, - b.FUN_TYPE + b.FUN_TYPE, + b.MULTI_SELECT as multiSelect FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java index 701ce482aa..026c402318 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java @@ -114,4 +114,4 @@ public interface IcPartyMemberPointService extends BaseService getExport(PartyMemberPointListFormDTO form, TokenDto tokenDto); -} \ No newline at end of file +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java new file mode 100644 index 0000000000..767dcf1231 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class BindHomeFormDTO implements Serializable { + + private static final long serialVersionUID = -6084569462551209768L; + + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空") + private String idCard; + + /** + * 房屋id + */ + @NotBlank(message = "房屋id不能为空") + private String homeId; + + /** + * 用户id + */ + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index decce16f25..99957503cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -24,6 +24,10 @@ public class CollectListFormDTO extends PageFormDTO { */ private String startDate; private String endDate; + /** + * 户籍所在地 + */ + private String domicilePlace; private String userId; private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 12aff48466..7e7cb6e846 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -49,11 +49,26 @@ public class IcResiCollectMemFormDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + /** + * 备注 + */ + private String remark; + /** * 社区居民信息登记-查询返参用 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java index 9778cb6a17..75bc3b1c69 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java @@ -86,9 +86,9 @@ public class ResiCollectFormDTO implements Serializable { private String address; /** - * 1自有0租住 + * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住 2：闲置 3：未售出 */ - @NotBlank(message = "房子属于自有还是租住？", groups = {InternalShowGroup.class}) + @NotBlank(message = "房子状态不能为空", groups = {InternalShowGroup.class}) private String houseType; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java index b98e4489bd..04a34bb814 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java @@ -31,8 +31,9 @@ public class CollectListExcelResultDTO implements Serializable { /** * 房屋类型，1:自有, 0:租住 + * 房屋状态1：出租 0：自住 2：闲置 3：未售出 */ - @Excel(name = "房屋类型",replace = { "自有_1", "租住_0"}, width = 30, needMerge = true) + @Excel(name = "房屋状态",replace = { "出租_1", "自住_0","闲置_2","未售出_3"}, width = 30, needMerge = true) private String houseType; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 34efe5d146..85208ba924 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -56,4 +56,10 @@ public class CollectListMemberExcelResultDTO implements Serializable { */ @Excel(name = "单位或学校", width = 60) private String workPlace; + + /** + * 备注 + */ + @Excel(name = "备注", width = 60) + private String remark; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index f4bd2a1886..0fcaa480d4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -38,6 +39,8 @@ public class CollectListResultDTO implements Serializable { */ private Integer totalResi; + private String domicilePlace; + private List list; @@ -73,10 +76,24 @@ public class CollectListResultDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + /** + * 备注 + */ + private String remark; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 2071c9f904..90b0359881 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; @@ -809,4 +810,10 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/myHome/homeInfo") Result getHomeInfo(); + + @PostMapping("/epmetuser/icresiuser/getVolunteerList") + Result> getVolunteerList(@RequestBody IcResiUserDTO formDTO); + + @PostMapping("/epmetuser/icresiuser/getUserId/{icUserId}") + Result> getUserId(@PathVariable("icUserId") String icUserId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 23554e16d4..55083de3a2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -1,6 +1,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; @@ -600,4 +601,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeInfo"); } + @Override + public Result> getVolunteerList(IcResiUserDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getVolunteerList", formDTO); + } + + @Override + public Result> getUserId(String icUserId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserId", icUserId); + } + } diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 144cbbe283..094aab1cc8 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -140,6 +140,12 @@ common-service-client 2.0.0 + + com.epmet + open-data-worker-client + 2.0.0 + compile + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index ed4f055713..b166ceca92 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -53,6 +53,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.PartyMemberAgeExportExcel; import com.epmet.excel.PartyMemberEducationExportExcel; @@ -226,14 +227,15 @@ public class IcResiUserController implements ResultDataResolver { /** * desc:发送 志愿者变动消息 + * * @param customerId * @param resiUserId */ private void sendVolunteerMsg(String customerId, String resiUserId) { //发送志愿者人员消息变动 boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId)); - if (!flag){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"发送志愿者变动消息失败","发送志愿者变动消息失败"); + if (!flag) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "发送志愿者变动消息失败", "发送志愿者变动消息失败"); } } @@ -261,13 +263,13 @@ public class IcResiUserController implements ResultDataResolver { */ @NoRepeatSubmit @PostMapping("changeIcResiUserBelongTo") - Result changeIcResiUserBelongTo(@LoginUser TokenDto tokenDto, @RequestBody IcUserBelongToChangedFormDTO formDTO){ + Result changeIcResiUserBelongTo(@LoginUser TokenDto tokenDto, @RequestBody IcUserBelongToChangedFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO); - List changedUserIds = icResiUserService.changeIcResiUserBelongTo(tokenDto,formDTO); + List changedUserIds = icResiUserService.changeIcResiUserBelongTo(tokenDto, formDTO); //推送MQ事件 - if (CollectionUtils.isNotEmpty(changedUserIds)){ - changedUserIds.forEach(resiUserId->editResiMq(tokenDto.getCustomerId(), resiUserId)); + if (CollectionUtils.isNotEmpty(changedUserIds)) { + changedUserIds.forEach(resiUserId -> editResiMq(tokenDto.getCustomerId(), resiUserId)); } return new Result().ok(true); @@ -497,7 +499,7 @@ public class IcResiUserController implements ResultDataResolver { * @return void * @author LiuJanJun * @date 2021/11/19 4:24 下午 - * @remark:分页批量导出 oss目录在 各个环境对应的前缀文件夹/file-template/resi-template/客户ID.xlsx, + * @remark:分页批量导出 oss目录在 各个环境对应的前缀文件夹/file-template/resi-template/客户ID.xlsx, * 如果某个客户需要更新模版 则替换掉上面的模版文件；然后 更新缓存里的值或者删除也行 再导出就会下载新的模版了 */ @NoRepeatSubmit @@ -506,22 +508,23 @@ public class IcResiUserController implements ResultDataResolver { try { //获取导出配置 String aDefault = tokenDto.getCustomerId().concat(StrConstant.UNDER_LINE).concat("default"); - if (pageFormDTO.getTemplateId().equals(aDefault)){ + if (pageFormDTO.getTemplateId().equals(aDefault)) { log.info("通过原来的模板下载,tokenDto:{}", JSON.toJSONString(tokenDto)); - this.exportExcelByEasyExcel(tokenDto,pageFormDTO.getSearchForm(),response); - }else{ - icResiUserExportService.exportIcResiUser(tokenDto,pageFormDTO,response); + this.exportExcelByEasyExcel(tokenDto, pageFormDTO.getSearchForm(), response); + } else { + icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, response); } } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); response.setHeader("content-type", "application/json; charset=UTF-8"); PrintWriter printWriter = response.getWriter(); - Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); printWriter.write(JSON.toJSONString(result)); printWriter.close(); } } + /** * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null * @@ -725,7 +728,7 @@ public class IcResiUserController implements ResultDataResolver { * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列 */ @PostMapping("demandusers") - public Result> queryDemandUsers(@LoginUser TokenDto tokenDto,@RequestBody DemandUserFormDTO formDTO) { + public Result> queryDemandUsers(@LoginUser TokenDto tokenDto, @RequestBody DemandUserFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, DemandUserFormDTO.InternalGroup.class); @@ -992,8 +995,8 @@ public class IcResiUserController implements ResultDataResolver { * @date 2022/1/17 4:25 下午 */ @PostMapping("personwarn/rightlist") - @MaskResponse(fieldNames = "mobile", fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE }) - public Result personWarnRightList(@RequestBody PersonWarnRightListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + @MaskResponse(fieldNames = "mobile", fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result personWarnRightList(@RequestBody PersonWarnRightListFormDTO formDTO, @LoginUser TokenDto tokenDto) { ValidatorUtils.validateEntity(formDTO, PersonWarnRightListFormDTO.PersonWarnRightListForm.class); return new Result().ok(icResiUserService.personWarnRightList(formDTO, tokenDto)); } @@ -1048,6 +1051,7 @@ public class IcResiUserController implements ResultDataResolver { /** * 根据房屋id,查询居民信息表中-家庭信息-本人 的居民。如果有多个，返回最近一个 + * * @param homeId * @param loginUser * @return @@ -1074,6 +1078,7 @@ public class IcResiUserController implements ResultDataResolver { /** * desc:条件获取房屋内的居民 按房屋分组 + * * @param formDTO * @return */ @@ -1084,6 +1089,7 @@ public class IcResiUserController implements ResultDataResolver { /** * 使用身份证号查询家属信息 + * * @param idCard * @return */ @@ -1095,6 +1101,7 @@ public class IcResiUserController implements ResultDataResolver { /** * 身份证号查询居民信息 + * * @param idCard * @return */ @@ -1148,8 +1155,25 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.getUserByIdCard(formDTO)); } + /** + * 绑定房屋 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:29 + */ + @PostMapping("/bindHome") + public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) { + ValidatorUtils.validateEntity(form); + form.setCustomerId(tokenDto.getCustomerId()); + icResiUserService.bindHome(form); + return new Result(); + } + /** * 根据身份证获取居民角色（目前只有是否是志愿者） + * * @Param tokenDto * @Param formDTO * @Return {@link Result} @@ -1161,4 +1185,30 @@ public class IcResiUserController implements ResultDataResolver { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(icResiUserService.getUserRoleByIdCard(formDTO)); } + + /** + * 获取组织下的志愿者 + * + * @Param formDTO + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/16 15:22 + */ + @PostMapping("getVolunteerList") + public Result> getVolunteerList(@RequestBody IcResiUserDTO formDTO) { + return new Result>().ok(icResiUserService.getVolunteerList(formDTO.getCustomerId(), formDTO.getAgencyId())); + } + + /** + * 获取居民信息对应的居民用户ID + * + * @Param icUserId + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/16 15:40 + */ + @PostMapping("getUserId/{icUserId}") + public Result> getUserId(@PathVariable("icUserId") String icUserId) { + return new Result>().ok(icResiUserService.getUserId(icUserId)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index adc98f7a08..a60efed8cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -19,6 +19,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -215,5 +216,10 @@ public class UserBaseInfoController { public Result resiRelationInfo(@RequestParam("userId")String userId){ return new Result().ok(userBaseInfoService.resiRelationInfo(userId)); } + + @PostMapping("getUserInfo/{userId}") + public Result getUserInfo(@PathVariable("userId") String userId){ + return new Result().ok(userBaseInfoService.getUserInfo(userId)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index f877b1e50b..725a456b46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -127,7 +127,9 @@ public interface CustomerStaffDao extends BaseDao { * @Author sun * @Description 根据staffId集合查询工作人员基础信息 **/ - List selectStaffByIds(@Param("staffIdList") List staffIdList); + List selectStaffByIds(@Param("staffIdList") List staffIdList, + @Param("enableFlag") String enableFlag); + /** * @param staffId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index 547ef63ca8..db8eb3db7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -34,6 +34,8 @@ public interface IcResiCollectDao extends BaseDao { */ List getCollectList(CollectListFormDTO formDTO); + List selectMemberList(@Param("id") String id, @Param("domicilePlace") String domicilePlace); + /** * 我上次提交的主表记录 * @param customerId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f145fadd97..1fca7a2582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -341,6 +341,37 @@ public interface IcResiUserDao extends BaseDao { */ List getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId); + /** + * 统计数据 + * + * @param idCard + * @param customerId + * @return int + * @author LZN + * @date 2022/6/23 9:47 + */ + int selectCountByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); + + /** + * 根据身份证号修改数据 + * + * @param entity + * @return void + * @author LZN + * @date 2022/6/23 9:47 + */ + void updateIcResiUserByIdCard(@Param("entity") IcResiUserEntity entity); + + /** + * 根据身份证号查询id + * + * @param customerId + * @param idCard + * @return + */ + String seletIdByIdCard(@Param("customerId") String customerId, @Param("idCard") String idCard); + + /** * @return com.epmet.dto.IcResiUserConfirmDTO * @describe: 查询家庭成员信息 @@ -363,11 +394,11 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @describe: 通过身份证号查询实体类 - * @author wangtong - * @date 2022/6/13 17:32 - * @params [idCard, customerId] - * @return com.epmet.entity.IcResiUserEntity - */ - IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + * @return com.epmet.entity.IcResiUserEntity + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java index 8b6a20d87b..3b4b8ac3e0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -69,7 +69,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity { private String address; /** - * 1自由0租住 + * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住 2：闲置 3：未售出 */ private String houseType; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index b93190e5c5..583663a1a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -58,8 +58,23 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ private String workPlace; + + /** + * 备注 + */ + private String remark; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index f4ca90f1c6..92b38e3f9a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -378,6 +379,16 @@ public interface IcResiUserService extends BaseService { */ IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO); + /** + * 绑定房屋 + * + * @param form + * @return void + * @author LZN + * @date 2022/6/22 16:30 + */ + void bindHome(BindHomeFormDTO form); + /** * 根据身份证获取居民角色（目前只有是否是志愿者） * @@ -407,11 +418,32 @@ public interface IcResiUserService extends BaseService { Result editMember(IcResiUserConfirmSubmitDTO dto); /** - * @describe: 工作端-新增家庭成员 - * @author wangtong - * @date 2022/6/10 13:32 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 工作端-新增家庭成员 + * @author wangtong + * @date 2022/6/10 13:32 + * @params [dto] + */ Result addWorkMember(IcResiUserConfirmSubmitDTO dto); + + /** + * 获取组织下志愿者列表 + * + * @Param customerId 客户 + * @Param agencyId 组织 + * @Return {@link List} + * @Author zhaoqifeng + * @Date 2022/6/16 14:58 + */ + List getVolunteerList(String customerId, String agencyId); + + /** + * 获取居民信息对应的居民用户ID + * + * @Param icResiUserId + * @Return {@link String} + * @Author zhaoqifeng + * @Date 2022/6/16 15:30 + */ + List getUserId(String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 01bac74fc2..f66453c243 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -19,6 +19,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.UserBaseInfoDTO; @@ -203,4 +204,13 @@ public interface UserBaseInfoService extends BaseService { * @date 2021/12/30 3:12 下午 */ RegisterRelationDTO resiRelationInfo(String userId); + + /** + * 获取用户缓存信息 + * @Param userId + * @Return {@link UserBaseInfoResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/15 16:09 + */ + ResiUserInfoCache getUserInfo(String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 3b836920e9..024d3aed37 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.constant.*; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -505,7 +502,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList) { //1:批量查询人员基本信息 - List staffList = baseDao.selectStaffByIds(staffIdList); + List staffList = baseDao.selectStaffByIds(staffIdList, null); //2:批量查询人员拥有的所有角色信息 List roleList = staffRoleDao.selectStaffRoleList(staffIdList); CustomerStaffListResultDTO list = new CustomerStaffListResultDTO(); @@ -640,7 +637,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl>().ok(listResultDTO); } + @Override public Result selectStaffBasicInfo(String userId, String customerId) { StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId); @@ -777,6 +774,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList()); staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - List list = baseDao.selectStaffByIds(staffIdList); + List list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //4.封装数据并返回 resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 9adc982681..1ce1560050 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -56,9 +56,14 @@ import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; +import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; +import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; +import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; +import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; +import com.epmet.opendata.feign.GuardarDatosFeignClient; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.github.pagehelper.Page; @@ -79,9 +84,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.sql.Date; + import java.sql.Timestamp; import java.text.NumberFormat; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -138,9 +144,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl NumConstant.ZERO ) { + if (str.length() > NumConstant.ZERO) { String errorMsg = String.format("新增居民信息,必要字段值为空,%s值为空", str); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } @@ -207,7 +217,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); - Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); boolean isDyzxh = false; //判断是否是党员中心户 if (formMap.containsKey("ic_party_member")) { @@ -325,13 +335,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : d.getList()) { - partyMemberDTO.setRdsj(hash.get("RDSJ")); - partyMemberDTO.setSszb(hash.get("SSZB")); - partyMemberDTO.setIsLd(hash.get("IS_LD")); - partyMemberDTO.setLdzh(hash.get("LDZH")); - partyMemberDTO.setPartyZw(hash.get("PARTY_ZW")); - partyMemberDTO.setIsTx(hash.get("IS_TX")); - partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH")); + partyMemberDTO.setRdsj(hash.get("RDSJ")); + partyMemberDTO.setSszb(hash.get("SSZB")); + partyMemberDTO.setIsLd(hash.get("IS_LD")); + partyMemberDTO.setLdzh(hash.get("LDZH")); + partyMemberDTO.setPartyZw(hash.get("PARTY_ZW")); + partyMemberDTO.setIsTx(hash.get("IS_TX")); + partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH")); } } if ("ic_volunteer".equals(d.getTableName())) { @@ -348,7 +358,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(); com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO(); - Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); + Map>> formMap = formDTO.stream().collect(Collectors.toMap(IcResiUserFormDTO::getTableName, IcResiUserFormDTO::getList)); boolean isDyzxh = false; //判断是否是党员中心户 if (formMap.containsKey("ic_party_member")) { @@ -497,7 +507,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> pageResiMap(IcResiUserPageFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - String staffOrgPath; - if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { - staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); - } else { - staffOrgPath = staffInfoCacheResult.getAgencyId(); - } // 查询列表展示项，如果没有，直接返回 CustomerFormQueryDTO queryDTO1 = new CustomerFormQueryDTO(); @@ -764,7 +767,37 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultColumns = resultColumnRes.getData(); // 查询结果列对应的表: Set resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet()); + List queryAgencyIdList = formDTO.getConditions().stream() + .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()) + && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO))) + .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList()); + //添加数据权限 + String staffOrgPath; + String agencyId; + //如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据 + if (queryAgencyIdList.isEmpty()){ + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + agencyId = staffInfoCacheResult.getAgencyId(); + if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { + staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); + } else { + staffOrgPath = staffInfoCacheResult.getAgencyId(); + } + } else { + formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO)); + if (agencyInfo == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败"); + } + agencyId = agencyInfo.getId(); + staffOrgPath = agencyInfo.getPids(); + if (StringUtils.isBlank(staffOrgPath)){ + staffOrgPath = agencyId; + }else{ + staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId(); + } + } // 查询列表展示项需要用到哪些子表 Result> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1); List subTables = subTablesRes.getData(); @@ -777,20 +810,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl finalSubTables =new ArrayList<>(); + List finalSubTables = new ArrayList<>(); //groupBy用到的表 - Set groupByTables=new HashSet<>(); - subTables.forEach(subTable->{ - if(tables.contains(subTable.getTableName())){ + Set groupByTables = new HashSet<>(); + subTables.forEach(subTable -> { + if (tables.contains(subTable.getTableName())) { finalSubTables.add(subTable.getJoinTableSql()); - if(subTable.getSupportAdd()){ + if (subTable.getSupportAdd()) { groupByTables.add(subTable.getTableName()); } } }); - PageInfo> pageInfo=new PageInfo<>(); - if (null == formDTO.getIsPage()||formDTO.getIsPage()) { + PageInfo> pageInfo = new PageInfo<>(); + if (null == formDTO.getIsPage() || formDTO.getIsPage()) { //分页 String finalStaffOrgPath = staffOrgPath; pageInfo = PageHelper.startPage(formDTO.getPageNo(), @@ -799,19 +832,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> list=baseDao.selectListResiMap(formDTO.getCustomerId(), + } else { + List> list = baseDao.selectListResiMap(formDTO.getCustomerId(), formDTO.getFormCode(), formDTO.getConditions(), resultColumns, finalSubTables, - staffInfoCacheResult.getAgencyId(), + agencyId, staffOrgPath,null, formDTO.getKeyword(), groupByTables); - pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size()); + pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size()); pageInfo.setList(list); } @@ -909,8 +942,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl nameList=new HashSet<>(); - for(String codePath:demandCodePath){ + Set nameList = new HashSet<>(); + for (String codePath : demandCodePath) { if (StringUtils.isNotBlank(codePath) && codePath.contains(StrConstant.COMMA)) { String[] codeAtt = codePath.split(StrConstant.COMMA); String code = codeAtt[codeAtt.length - 1]; @@ -972,51 +1005,52 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dynamicQuery(String customerId, - String formCode, - String resultTableName, - List conditions, - String currentStaffAgencyId, - String staffOrgPath){ + public List> dynamicQuery(String customerId, + String formCode, + String resultTableName, + List conditions, + String currentStaffAgencyId, + String staffOrgPath) { // List finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions); - Map> map=getFinalSubables(customerId, formCode, resultTableName, conditions, null); - return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"), null, currentStaffAgencyId,staffOrgPath,map.get("groupByTables")); + Map> map = getFinalSubables(customerId, formCode, resultTableName, conditions, null); + return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), null, currentStaffAgencyId, staffOrgPath, map.get("groupByTables")); } @NotNull - public Map> getFinalSubables(String customerId, String formCode, String resultTableName, List conditions, List exportNeedTableList) { - Map> map=new HashMap<>(); - CustomerFormQueryDTO queryDTO=new CustomerFormQueryDTO(); + public Map> getFinalSubables(String customerId, String formCode, String resultTableName, List conditions, List exportNeedTableList) { + Map> map = new HashMap<>(); + CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO(); queryDTO.setCustomerId(customerId); queryDTO.setFormCode(formCode); //所有的子表 - Result> subTablesRes=operCustomizeOpenFeignClient.querySubTables(queryDTO); + Result> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO); - List subTables =subTablesRes.getData(); + List subTables = subTablesRes.getData(); // log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true)); //关联哪些子表：查询条件用到的表名+查询的列对应的表 并集去重 Set tables = conditions.stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet()); tables.add(resultTableName); - if (CollectionUtils.isNotEmpty(exportNeedTableList)){ + if (CollectionUtils.isNotEmpty(exportNeedTableList)) { tables.addAll(exportNeedTableList); } // log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true)); //最终关联的子表对应的sql： - List finalSubTables =new ArrayList<>(); + List finalSubTables = new ArrayList<>(); //groupBy用到的表 - Set groupByTables=new HashSet<>(); - subTables.forEach(subTable->{ - if(tables.contains(subTable.getTableName())){ + Set groupByTables = new HashSet<>(); + subTables.forEach(subTable -> { + if (tables.contains(subTable.getTableName())) { finalSubTables.add(subTable.getJoinTableSql()); - if(subTable.getSupportAdd()){ + if (subTable.getSupportAdd()) { groupByTables.add(subTable.getTableName()); } } }); - map.put("finalSubTables",finalSubTables); + map.put("finalSubTables", finalSubTables); map.put("groupByTables", new ArrayList<>(groupByTables)); return map; } + /** * @param formDTO * @Description 查询个人数据 @@ -1104,6 +1138,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl result = pageInfo.getList(); if (CollectionUtils.isEmpty(result)) { return new PageData<>(new ArrayList<>(), pageInfo.getTotal()); @@ -1578,13 +1613,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl homeIds = list.stream().filter(m -> StringUtils.isNotBlank(m.getIdCard())).map(m -> m.getHomeId()).distinct().collect(Collectors.toSet()); - if (CollectionUtils.isNotEmpty(homeIds)){ + if (CollectionUtils.isNotEmpty(homeIds)) { Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId()); - if (!houseInfoRes.success()){ + if (!houseInfoRes.success()) { throw new EpmetException("查询居民所属房屋失败..."); } - if (CollectionUtils.isNotEmpty(houseInfoRes.getData())){ - list.forEach(l -> houseInfoRes.getData().stream().filter( h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); + if (CollectionUtils.isNotEmpty(houseInfoRes.getData())) { + list.forEach(l -> houseInfoRes.getData().stream().filter(h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName()))); } } PageInfo pageInfo = new PageInfo<>(list); @@ -1771,7 +1806,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } List list = baseDao.getPartyMemberAgeList(formDTO.getOrgType(), formDTO.getOrgId(), formDTO.getCode()); - return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); + return new PageData<>(list, null == list ? NumConstant.ZERO : list.size()); } /** @@ -1846,7 +1881,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, null == list?NumConstant.ZERO:list.size()); + return new PageData<>(list, null == list ? NumConstant.ZERO : list.size()); } @@ -2025,7 +2060,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(IcResiUserEntity::getCustomerId, customerId) .eq(IcResiUserEntity::getHomeId, homeId) - .eq(IcResiUserEntity::getYhzgx,RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) .select( IcResiUserEntity::getId, IcResiUserEntity::getName @@ -2076,17 +2111,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) { //如果是组织 且非顶级组织 则利用pids 查询 本级及下级 - if (StringUtils.isNotBlank(formDTO.getAgencyId())){ + if (StringUtils.isNotBlank(formDTO.getAgencyId())) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); - if (agencyInfo == null){ - log.warn("getResiUserGroupHomeId agencyId:{} is not exist",formDTO.getAgencyId()); + if (agencyInfo == null) { + log.warn("getResiUserGroupHomeId agencyId:{} is not exist", formDTO.getAgencyId()); return null; } if (!NumConstant.ZERO_STR.equals(agencyInfo.getPid())) { @@ -2096,35 +2127,35 @@ public class IcResiUserServiceImpl extends BaseServiceImpl listPage = PageHelper - .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) - .doSelectPage(()->baseDao.getResiUserGroupHomeId(formDTO)); + .startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPage(() -> baseDao.getResiUserGroupHomeId(formDTO)); List dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode()); - Map> dictResult = new HashMap<>(); - dictTypeList.forEach(dict->{ + Map> dictResult = new HashMap<>(); + dictTypeList.forEach(dict -> { Result> mapResult = epmetAdminOpenFeignClient.dictMap(dict); - if (mapResult!=null && mapResult.success()){ - dictResult.put(dict,mapResult.getData()); + if (mapResult != null && mapResult.success()) { + dictResult.put(dict, mapResult.getData()); } }); //婚姻状况 - Map hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK"); + Map hyzkMap = getOptionMap(formDTO.getCustomerId(), "HYZK"); //遍历数据 转换为中文 - listPage.getResult().forEach(e->{ - e.getHouseMemberList().parallelStream().forEach(o->{ - if (StringUtils.isNotBlank(o.getIsParty())){ - o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty())?StrConstant.NO:StrConstant.YES); + listPage.getResult().forEach(e -> { + e.getHouseMemberList().parallelStream().forEach(o -> { + if (StringUtils.isNotBlank(o.getIsParty())) { + o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty()) ? StrConstant.NO : StrConstant.YES); } - if (StringUtils.isNotBlank(o.getGender())){ + if (StringUtils.isNotBlank(o.getGender())) { o.setGender(GenderEnum.getName(o.getGender())); } - if (StringUtils.isNotBlank(o.getIsTenant())){ - o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant())?StrConstant.NO:StrConstant.YES); + if (StringUtils.isNotBlank(o.getIsTenant())) { + o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant()) ? StrConstant.NO : StrConstant.YES); } - if (StringUtils.isNotBlank(o.getIsFloating())){ - o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating())?StrConstant.NO:StrConstant.YES); + if (StringUtils.isNotBlank(o.getIsFloating())) { + o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating()) ? StrConstant.NO : StrConstant.YES); } Map mzMap = dictResult.get(DictTypeEnum.NATION.getCode()); Map whcdMap = dictResult.get(DictTypeEnum.EDUCATION.getCode()); @@ -2150,8 +2181,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl changeIcResiUserBelongTo(TokenDto tokenDto, IcUserBelongToChangedFormDTO formDTO) { - List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(),formDTO.getSourceGridId()); - if (CollectionUtils.isEmpty(resiUserIdList)){ + List resiUserIdList = baseDao.listUserIds(formDTO.getCustomerId(), formDTO.getSourceGridId()); + if (CollectionUtils.isEmpty(resiUserIdList)) { return null; } List icResiUserFormDTOS = new ArrayList<>(); @@ -2165,9 +2196,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl{ + resiUserIdList.forEach(userId -> { map.put(FieldConstant.ID, userId); - this.edit(tokenDto,icResiUserFormDTOS); + this.edit(tokenDto, icResiUserFormDTOS); }); return resiUserIdList; @@ -2190,7 +2221,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2022/6/16 14:58 + */ + @Override + public List getVolunteerList(String customerId, String agencyId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, customerId); + wrapper.and(wq -> wq.eq(IcResiUserEntity::getAgencyId, agencyId).or().like(IcResiUserEntity::getPids, agencyId)); + wrapper.eq(IcResiUserEntity::getIsVolunteer, NumConstant.ONE_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + OptionDataResultDTO dto = new OptionDataResultDTO(); + dto.setValue(item.getId()); + if (StringUtils.isNotBlank(item.getMobile())) { + dto.setLabel(item.getName().concat("(").concat(item.getMobile().concat(")"))); + } else { + dto.setLabel(item.getName()); + } + return dto; + }).collect(Collectors.toList()); + } + + /** + * 获取居民信息对应的居民用户ID + * + * @param icResiUserId + * @Param icResiUserId + * @Return {@link String} + * @Author zhaoqifeng + * @Date 2022/6/16 15:30 + */ + @Override + public List getUserId(String icResiUserId) { + IcResiUserEntity entity = baseDao.selectById(icResiUserId); + if (null == entity) { + return null; + } + //根据身份证获取小程序端居民信息 + LambdaQueryWrapper baseInfoWrapper = new LambdaQueryWrapper<>(); + baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, entity.getCustomerId()); + baseInfoWrapper.eq(UserBaseInfoEntity::getIdNum, entity.getIdCard()); + List baseInfoList = userBaseInfoDao.selectList(baseInfoWrapper); + if (CollectionUtils.isEmpty(baseInfoList)) { + return null; + } + return baseInfoList.stream().map(UserBaseInfoEntity::getUserId).collect(Collectors.toList()); + } + /** * 根据身份证获取居民角色（目前只有是否是志愿者） * @@ -2532,20 +2623,97 @@ public class IcResiUserServiceImpl extends BaseServiceImpl result = guardarDatosFeignClient.getResidentDetailByIdCard(dto); + ResidentByIdCardResultDTO residentDetailByIdCard = result.getData(); + if(!result.success() || residentDetailByIdCard == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息失败", "获取居民信息失败"); + } + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), form.getHomeId()); + if(houseInfo == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败"); + } + // 将人的信息放入ic_resi_user对象中 + IcResiUserEntity entity = new IcResiUserEntity(); + entity.setCustomerId(form.getCustomerId()); + // 进行日期转换 + if(residentDetailByIdCard.getBirthday() == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败"); + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String birthday = sdf.format(residentDetailByIdCard.getBirthday()); + + if (StringUtils.isNotBlank(residentDetailByIdCard.getIdCard()) + && StringUtils.isNotBlank(residentDetailByIdCard.getResidentName()) + && StringUtils.isNotBlank(residentDetailByIdCard.getTelephone()) + && StringUtils.isNotBlank(birthday)) { + entity.setIdCard(residentDetailByIdCard.getIdCard()); + entity.setName(residentDetailByIdCard.getResidentName()); + entity.setMobile(residentDetailByIdCard.getTelephone()); + entity.setBirthday(birthday); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息不完整", "居民信息不完整"); + } + // 将房屋的信息放入ic_resi_user对象中 + if (StringUtils.isNotBlank(houseInfo.getHomeId()) + && StringUtils.isNotBlank(houseInfo.getNeighborHoodId()) + && StringUtils.isNotBlank(houseInfo.getBuildingId()) + && StringUtils.isNotBlank(houseInfo.getBuildingUnitId())) { + entity.setHomeId(houseInfo.getHomeId()); + entity.setVillageId(houseInfo.getNeighborHoodId()); + entity.setBuildId(houseInfo.getBuildingId()); + entity.setUnitId(houseInfo.getBuildingUnitId()); + entity.setAgencyId(houseInfo.getAgencyId()); + // 根据homeId获取gridId和pids + Result resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); + HouseAgencyInfoResultDTO data = resultDTOResult.getData(); + entity.setGridId(data.getGridId()); + entity.setPids(data.getPids() + ":" + data.getAgencyId()); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整"); + } + SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO(); + saveForm.setHomeId(form.getHomeId()); + saveForm.setIdCard(form.getIdCard()); + if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) { + String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); + baseDao.updateIcResiUserByIdCard(entity); + saveForm.setIcResiUserId(id); + } else { + baseDao.insert(entity); + String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); + saveForm.setIcResiUserId(id); + } + guardarDatosFeignClient.saveCaResidentUser(saveForm); + } + /** * desc:根据字段值获取 options + * * @param customerId * @param columnName * @return */ - private Map getOptionMap(String customerId,String columnName) { + private Map getOptionMap(String customerId, String columnName) { IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); optionsForm.setCustomerId(customerId); optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); optionsForm.setColumnName(columnName); Result> listResult = operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm); - if (!listResult.success()){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取item失败,"+listResult.getInternalMsg()); + if (!listResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取item失败," + listResult.getInternalMsg()); } return listResult.getData().stream() .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1)); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index a808b172e7..f36dffda3f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -81,6 +81,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId()); userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); } + if (null == userBadge){ + return new ArrayList<>(); + } List redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class); List userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO); if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ @@ -116,6 +119,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List selectOperList(UserOperListFormDTO userOperListFormDTO) { List userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId()); Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId()); + if (null == userBadge){ + return new ArrayList<>(); + } List userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class); // 没有任何记录 if (CollectionUtils.isEmpty(userAuthBadgeList)){ @@ -402,11 +408,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { public void reloadCustomerBadge(String customerId){ userBadgeRedis.delCustomerBadge(customerId); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId); - if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ - throw new RenException("客户徽章缓存初始化未查到数据"); + if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){ + userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } userBadgeRedis.batchClearUserBadgeCache(customerId); - userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 898a7735d2..5970d78788 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.*; @@ -504,4 +505,18 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl + and ENABLE_FLAG = #{enableFlag} + user_id = #{userId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index ebfe3767fd..d2ca4339c1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -16,16 +16,19 @@ - + + - select m.`NAME` AS memberName, m.ID_NUM AS memberIdNum, @@ -52,10 +58,16 @@ m.HE_SUAN_COUNT AS heSuanCount, m.YMJZ AS ymjz, m.DOMICILE_PLACE as domicilePlace, - m.WORK_PLACE as workPlace + m.DOMICILE_PLACE_CODE as domicilePlaceCode, + m.DOMICILE_PLACE_CODE_PATH as domicilePlaceCodePath, + m.WORK_PLACE as workPlace, + m.REMARK as remark from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id} + + AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml index b9bc9300dd..13db077a3c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -14,7 +14,10 @@ m.HE_SUAN_COUNT, m.YMJZ, m.DOMICILE_PLACE, - m.WORK_PLACE + m.WORK_PLACE, + m.DOMICILE_PLACE_CODE, + m.DOMICILE_PLACE_CODE_PATH, + m.REMARK FROM ic_resi_member m WHERE diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 81f3c65f49..46a101db60 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -90,8 +90,7 @@ AND ${resultTableName}.ID IS NOT NULL - and ic_resi_user.customer_id=#{customerId} - and (ic_resi_user.AGENCY_ID =#{currentStaffAgencyId} or ic_resi_user.pids like concat(#{staffOrgPath},'%')) + and ic_resi_user.pids like concat(#{staffOrgPath},'%') @@ -128,6 +127,16 @@ ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + + + + + and ${subCondition.tableName}.${colValue} ='1' + + + + @@ -219,6 +228,24 @@ update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId} + + update + ic_resi_user + set + name = #{entity.name}, + mobile = #{entity.mobile}, + birthday = #{entity.birthday}, + home_id = #{entity.homeId}, + village_id = #{entity.villageId}, + build_id = #{entity.buildId}, + unit_id = #{entity.unitId}, + pids = #{entity.pids}, + grid_id = #{entity.gridId}, + updated_time = now() + where + id_card = #{entity.idCard} + AND customer_id = #{entity.customerId} + + + + +