wangxianzhang 3 years ago
parent
commit
c2d09d10b5
  1. 103
      epmet-cloud-generator/src/main/resources/template/index.vue.vm
  2. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java
  3. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java
  4. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
  5. 8
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java
  6. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
  7. 11
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
  8. 3
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
  9. 6
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
  10. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml
  11. 9
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml
  12. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml
  13. 4
      epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml
  14. 184
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java
  15. 14
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java
  16. 24
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java
  17. 14
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java
  18. 30
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java
  19. 80
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java
  20. 82
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.java
  21. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java
  22. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java
  23. 154
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java
  24. 117
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java
  25. 30
      epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.java
  26. 53
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java
  27. 78
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java
  28. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
  29. 32
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
  30. 87
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
  31. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java
  32. 56
      epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql
  33. 88
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
  34. 43
      epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml
  35. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

103
epmet-cloud-generator/src/main/resources/template/index.vue.vm

@ -1,52 +1,52 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-${moduleName}__${pathName}}">
<div class="mod-${moduleName}__${pathName}} resi-container">
<el-card ref="searchCard" class="search-card">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.${pk.attrname}" placeholder="${pk.attrname}" clearable></el-input>
<el-input size="small" v-model="dataForm.${pk.attrname}" placeholder="${pk.attrname}" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" type="primary" size="small" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button class="diy-button--add" type="danger" size="small" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</div>
<el-table v-loading="dataListLoading" class="resi-table" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%" :height="tableHeight">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
#foreach($column in $columns)
<el-table-column prop="${column.attrname}" label="${column.comments}" header-align="center" align="center"></el-table-column>
#end
#foreach($column in $columns)
<el-table-column prop="${column.attrname}" label="${column.comments}" header-align="center" align="center"></el-table-column>
#end
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('${moduleName}:${pathName}:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('${moduleName}:${pathName}:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</el-card>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './'
export default {
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './${pathName}-add-or-update'
import { mapGetters } from 'vuex'
export default {
mixins: [mixinViewModule],
data () {
return {
@ -56,13 +56,52 @@
deleteURL: '/${moduleName}/${pathName}',
deleteIsBatch: true
},
dataForm: {;
dataForm: {
${pk.attrname}: ''
}
}
},
components: {
AddOrUpdate
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
const h = this.clientHeight - 360 + this.iframeHeight;
const _h = this.clientHeight - 360;
return this.$store.state.inIframe ? h : _h;
},
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
}
.search-card {
.el-card__body {
padding: 20px 20px 0 20px;
}
}
.resi-row-btn {
margin-bottom: 13px;
.upload-btn {
display: inline-block;
margin: 0 10px;
}
}
</style>

6
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java

@ -6,7 +6,6 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.distributedlock.DistributedLock;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.SpringContextUtils;
@ -106,12 +105,9 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent
SpringContextUtils.getBean(GridInfoPingyinService.class).exractGrid(extractFormDto);
}
} catch (RenException e) {
// 如果是我们手动抛出的异常,说明在业务可控范围内。目前不需要MQ重试
logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
} catch (Exception e) {
// 不是我们自己抛出的异常,可以让MQ重试
logger.error("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
logger.warn("【开放数据事件监听器】-组织信息变更-同步信息到中间库失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
throw e;
} finally {
distributedLock.unLock(lock);

6
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@ -9,7 +9,6 @@ import com.epmet.commons.tools.distributedlock.DistributedLock;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.SpringContextUtils;
@ -109,12 +108,9 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败!");
}
} catch (RenException e) {
// 如果是我们手动抛出的异常,说明在业务可控范围内。目前不需要MQ重试
logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
} catch (Exception e) {
// 不是我们自己抛出的异常,可以让MQ重试
logger.error("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
logger.warn("【开放数据事件监听器】-巡查记录信息变更-失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
throw e;
} finally {
distributedLock.unLock(lock);

6
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java

@ -5,7 +5,6 @@ import com.epmet.commons.rocketmq.constants.MQUserPropertys;
import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
import com.epmet.commons.tools.distributedlock.DistributedLock;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -77,12 +76,9 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur
30L, 30L, TimeUnit.SECONDS);
//SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(formDTO);
SpringContextUtils.getBean(EventreportPingyinService.class).getEventInfo(formDTO);
} catch (RenException e) {
// 如果是我们手动抛出的异常,说明在业务可控范围内。目前不需要MQ重试
logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
} catch (Exception e) {
// 不是我们自己抛出的异常,可以让MQ重试
logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
logger.warn("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
throw e;
} finally {
distributedLock.unLock(lock);

8
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java

@ -6,12 +6,10 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.distributedlock.DistributedLock;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
import com.epmet.opendata.service.ExUserService;
import com.epmet.opendata.service.GridstaffInfoPingyinService;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@ -22,7 +20,6 @@ import org.redisson.api.RLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@ -90,12 +87,9 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre
SpringContextUtils.getBean(ExUserService.class).getStaffBaseInfo(dto);*/
dto.setStaffIdList(obj.getStaffIdList());
SpringContextUtils.getBean(GridstaffInfoPingyinService.class).getStaffBaseInfo(dto);
} catch (RenException e) {
// 如果是我们手动抛出的异常,说明在业务可控范围内。目前不需要MQ重试
logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
} catch (Exception e) {
// 不是我们自己抛出的异常,可以让MQ重试
logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
logger.warn("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
throw e;
} finally {
distributedLock.unLock(lock);

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java

@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -135,7 +134,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
entity.setLng(item.getLng());
entity.setLat(item.getLat());
entity.setIsDel("N");
entity.setUpdateTime(new Date());
entity.setUpdateTime(null);
//业务不包含 一级分类里 如果是03 矛盾纠纷 则涉及人数写2(目前业务不支持 所以应产品需求 填2)
if ("03".equals(item.getParentEventCategory())) {

11
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java

@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -187,7 +186,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
entity.setGridName(ag.getGridName());
entity.setGridLevel("07");
entity.setIsDel("N");
entity.setUpdateTime(new Date());
entity.setUpdateTime(null);
if (ag.getLatitude().length() > 10) {
entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10)));
} else {
@ -256,7 +255,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
if (StringUtils.isNotBlank(formDTO.getOldCode()) && !formDTO.getOldCode().equals(entity.getGridCode())){
GridInfoPingyinEntity gridInfoEntity = new GridInfoPingyinEntity();
gridInfoEntity.setGridCode(entity.getGridCode());
gridInfoEntity.setUpdateTime(new Date());
gridInfoEntity.setUpdateTime(null);
LambdaUpdateWrapper<GridInfoPingyinEntity> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(GridInfoPingyinEntity::getGridCode,formDTO.getOldCode());
int update = baseDao.update(gridInfoEntity, updateWrapper);
@ -265,7 +264,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
GridstaffInfoPingyinEntity staffInfo = new GridstaffInfoPingyinEntity();
staffInfo.setGridCode(entity.getGridCode());
staffInfo.setUpdateTime(new Date());
staffInfo.setUpdateTime(null);
LambdaUpdateWrapper<GridstaffInfoPingyinEntity> staffInfoWrapper = new LambdaUpdateWrapper<>();
staffInfoWrapper.eq(GridstaffInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@ -274,7 +273,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
GridstaffWorkInfoPingyinEntity workInfo = new GridstaffWorkInfoPingyinEntity();
workInfo.setGridCode(entity.getGridCode());
workInfo.setUpdateTime(new Date());
workInfo.setUpdateTime(null);
LambdaUpdateWrapper<GridstaffWorkInfoPingyinEntity> workInfoWrapper = new LambdaUpdateWrapper<>();
workInfoWrapper.eq(GridstaffWorkInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@ -283,7 +282,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
EventreportPingyinEntity eventEntity = new EventreportPingyinEntity();
eventEntity.setGridCode(entity.getGridCode());
eventEntity.setUpdateTime(new Date());
eventEntity.setUpdateTime(null);
LambdaUpdateWrapper<EventreportPingyinEntity> eventWrapper = new LambdaUpdateWrapper<>();
eventWrapper.eq(EventreportPingyinEntity::getGridCode,formDTO.getOldCode());

3
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@ -26,7 +26,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -138,7 +137,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId());
log.info(String.format("网格工作人员信息同步,当前操作人员信息,姓名:%s staffId:%s", entity.getNickName(), entity.getGridUserId()));
if (null != gs) {
entity.setUpdateTime(new Date());
entity.setUpdateTime(null);
baseDao.edit(entity);
} else {
insert(entity);

6
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java

@ -73,6 +73,10 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
}
data.forEach(d -> {
if (StringUtils.isBlank(d.getGridId())){
log.warn("data is null string:{}",JSON.toJSONString(d));
return;
}
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(d.getGridId());
if (null == gridInfo) {
log.warn("未查询到网格信息:" + d.getGridId());
@ -131,7 +135,7 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
entity.setWorkResult(NumConstant.ONE == record.getIsNormal() ? "Y" : "N");
entity.setWorkType(record.getWorkTypeSecondCode());
entity.setRecoredInsertTime(record.getCreatedTime());
entity.setUpdateTime(record.getUpdatedTime());
entity.setUpdateTime(null);
entity.setId(null);
entity.setIsDel("N");
return entity;

4
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml

@ -40,8 +40,8 @@
<result property="recoredInsertTime" column="recored_insert_time"/>
</resultMap>
<delete id="deleteAllData">
DELETE FROM eventreport_pingyin
update eventreport_pingyin SET is_del = 'Y'
</delete>
</mapper>
</mapper>

9
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml

@ -4,12 +4,12 @@
<mapper namespace="com.epmet.opendata.dao.GridInfoPingyinDao">
<delete id="deleteAllAgencyData">
delete from grid_info_pingyin where grid_level !='07'
update grid_info_pingyin set is_del = 'Y' where grid_level !='07'
</delete>
<delete id="deleteAllGridData">
delete from grid_info_pingyin where grid_level ='07'
update grid_info_pingyin set is_del = 'Y' where grid_level ='07'
</delete>
<select id="selectByGridCode" parameterType="java.lang.String" resultType="com.epmet.opendata.entity.GridInfoPingyinEntity">
@ -22,13 +22,12 @@
set grid_name = #{gridName},
grid_level = #{gridLevel},
lng = #{lng},
lat = #{lat},
update_time = now()
lat = #{lat}
where grid_code = #{gridCode} and is_del = 'N'
</update>
<update id="deleteByCode">
update grid_info_pingyin set is_del = 'Y',update_time = now()
update grid_info_pingyin set is_del = 'Y'
where grid_code = #{gridCode}
</update>
</mapper>

4
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml

@ -16,7 +16,7 @@
</update>
<delete id="del">
delete from gridstaff_info_pingyin
UPDATE gridstaff_info_pingyin set IS_LEAVE = 'Y'
</delete>
<select id="selectByCodeAndStaffId" resultType="com.epmet.opendata.entity.GridstaffInfoPingyinEntity">
@ -35,4 +35,4 @@
LIMIT 1
</select>
</mapper>
</mapper>

4
epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml

@ -19,8 +19,8 @@
<result property="recoredInsertTime" column="recored_insert_time"/>
</resultMap>
<delete id="delAllGridStaffWorkInfoPY">
delete from gridstaff_work_info_pingyin LIMIT 1000
update gridstaff_work_info_pingyin SET is_del = 'Y' LIMIT 1000
</delete>
</mapper>
</mapper>

184
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccinePrarmeterDTO.java

@ -0,0 +1,184 @@
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-08-22
*/
@Data
public class IcVaccinePrarmeterDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 网格ID
*/
private String gridId;
/**
* 网格名称
*/
private String gridName;
/**
* 组织Id
*/
private String agencyId;
/**
* 组织的pids
*/
private String pids;
/**
* 所属小区ID
*/
private String villageId;
/**
* 所属小区名称
*/
private String villageName;
/**
* 所属楼宇Id
*/
private String buildId;
/**
* 所属楼宇名称
*/
private String buildName;
/**
* 单元id
*/
private String unitId;
/**
* 单元名
*/
private String unitName;
/**
* 所属家庭Id
*/
private String homeId;
/**
* 房间名
*/
private String homeName;
/**
* 户口性质0户籍 1外来
*/
private String householdType;
/**
* 姓名
*/
private String name;
/**
* 联系电话
*/
private String mobile;
/**
* 身份证号
*/
private String idCard;
/**
* 是否接种0否1是
*/
private String isVaccination;
/**
* 第一次接种时间
*/
private String firstVacTime;
/**
* 第一次接种地点
*/
private String firstVacSite;
/**
* 第二次接种时间
*/
private String secondVacTime;
/**
* 第二次接种地点
*/
private String secondVacSite;
/**
* 第三次接种时间
*/
private String thirdVacTime;
/**
* 第三次接种地点
*/
private String thirdVacSite;
/**
* 原因禁忌症/拒绝接种/其他原因
*/
private String reason;
/**
* 备注
*/
private String note;
/**
* 删除标识 0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

14
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java

@ -23,4 +23,18 @@ public class VisitListFormDTO extends PageFormDTO {
private String orgId;
private String idCard;
private String name;
private String villageId;
private String buildId;
private String unitId;
private String homeId;
private String mobile;
}

24
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* 租客表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-26
*/
@Data
public class VisitVisitorChartFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 时间
*/
private String date;
}

14
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java

@ -0,0 +1,14 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
@Data
public class VisitorInfoFormDTO implements Serializable {
private String userId;
private String customerId;
}

30
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 租客表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-07-26
*/
@Data
public class VisitVisitorChartResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 时间
*/
private String hour;
/**
* 数量
*/
private String num;
}

80
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java

@ -1,7 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.MaskResponse;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -14,10 +13,8 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcResiCollectVisitorDTO;
import com.epmet.dto.SaveCollectVisitorFormDTO;
import com.epmet.dto.form.CollectDetailFormDTO;
import com.epmet.dto.form.CollectListFormDTO;
import com.epmet.dto.form.VisitListFormDTO;
import com.epmet.dto.result.CollectListResultDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.VisitVisitorChartResultDTO;
import com.epmet.excel.IcResiCollectVisitorExcel;
import com.epmet.service.IcResiCollectVisitorService;
import org.springframework.beans.factory.annotation.Autowired;
@ -42,7 +39,7 @@ public class IcResiCollectVisitorController {
private IcResiCollectVisitorService icResiCollectVisitorService;
@RequestMapping("page")
public Result<PageData<IcResiCollectVisitorDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<IcResiCollectVisitorDTO>> page(@RequestParam Map<String, Object> params) {
// PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.page(params);
PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.getPhrasePage(params);
return new Result<PageData<IcResiCollectVisitorDTO>>().ok(page);
@ -52,6 +49,7 @@ public class IcResiCollectVisitorController {
/**
* Desc: 访客记录列表
*
* @param formDTO
* @param tokenDto
* @author wgf
@ -60,22 +58,22 @@ public class IcResiCollectVisitorController {
@PostMapping("list")
// @MaskResponse(fieldNames = { "memberIdNum", "memberMobile" },
// fieldsMaskType = { MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE })
public Result<PageData<IcResiCollectVisitorDTO>> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto){
ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class);
public Result<PageData<IcResiCollectVisitorDTO>> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto) {
ValidatorUtils.validateEntity(formDTO, CollectListFormDTO.CollectListForm.class);
formDTO.setUserId(tokenDto.getUserId());
formDTO.setCustomerId(tokenDto.getCustomerId());
return new Result<PageData<IcResiCollectVisitorDTO>>().ok(icResiCollectVisitorService.getVisitorList(formDTO));
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcResiCollectVisitorDTO> get(@PathVariable("id") String id){
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<IcResiCollectVisitorDTO> get(@PathVariable("id") String id) {
IcResiCollectVisitorDTO data = icResiCollectVisitorService.get(id);
return new Result<IcResiCollectVisitorDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody IcResiCollectVisitorDTO dto){
public Result save(@RequestBody IcResiCollectVisitorDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icResiCollectVisitorService.save(dto);
@ -84,7 +82,7 @@ public class IcResiCollectVisitorController {
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody IcResiCollectVisitorDTO dto){
public Result update(@RequestBody IcResiCollectVisitorDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icResiCollectVisitorService.update(dto);
@ -92,7 +90,7 @@ public class IcResiCollectVisitorController {
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
icResiCollectVisitorService.delete(ids);
@ -106,32 +104,62 @@ public class IcResiCollectVisitorController {
}
/**
* @describe: 保存访客信息
* @author wangtong
* @date 2022/8/3 10:33
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
* @return com.epmet.commons.tools.utils.Result
* @describe: 保存访客信息
* @author wangtong
* @date 2022/8/3 10:33
* @params [dto]
*/
@NoRepeatSubmit
@PostMapping("saveInfo")
public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){
public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto);
return icResiCollectVisitorService.saveInfo(dto);
}
/**
* @describe: 访客信息详情
* @author wangtong
* @date 2022/8/3 15:41
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
* @return com.epmet.commons.tools.utils.Result
* @describe: 访客信息详情
* @author wangtong
* @date 2022/8/3 15:41
* @params [dto]
*/
@PostMapping("getVisitorDetail")
public Result getVisitorDetail(@RequestBody CollectDetailFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return icResiCollectVisitorService.getVisitorDetail(dto);
}
/**
* 登陆访客用户信息
*
* @param tokenDto
* @param dto
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/8/19 15:24
*/
@PostMapping("visitorinfo")
public Result getVisitorInfo(@LoginUser TokenDto tokenDto, @RequestBody VisitorInfoFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return icResiCollectVisitorService.getVisitorInfo(tokenDto, dto);
}
/**
* 访客折线图
*
* @param dto
* @return com.epmet.commons.tools.utils.Result<java.util.List<VisitVisitorChartResultDTO>>
* @author zhy
* @date 2022/8/22 9:56
*/
@NoRepeatSubmit
@PostMapping("chart/traffic")
public Result<List<VisitVisitorChartResultDTO>> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
return new Result<List<VisitVisitorChartResultDTO>>().ok(icResiCollectVisitorService.getTraffic(dto));
}
}

82
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccinePrarmeterController.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.IcVaccinePrarmeterDTO;
import com.epmet.excel.IcVaccinePrarmeterExcel;
import com.epmet.service.IcVaccinePrarmeterService;
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-08-22
*/
@RestController
@RequestMapping("icVaccinePrarmeter")
public class IcVaccinePrarmeterController {
@Autowired
private IcVaccinePrarmeterService icVaccinePrarmeterService;
@RequestMapping("page")
public Result<PageData<IcVaccinePrarmeterDTO>> page(@RequestParam Map<String, Object> params){
PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.page(params);
return new Result<PageData<IcVaccinePrarmeterDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcVaccinePrarmeterDTO> get(@PathVariable("id") String id){
IcVaccinePrarmeterDTO data = icVaccinePrarmeterService.get(id);
return new Result<IcVaccinePrarmeterDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody IcVaccinePrarmeterDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icVaccinePrarmeterService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PutMapping("update")
public Result update(@RequestBody IcVaccinePrarmeterDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icVaccinePrarmeterService.update(dto);
return new Result();
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
icVaccinePrarmeterService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<IcVaccinePrarmeterDTO> list = icVaccinePrarmeterService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class);
}
}

27
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java

@ -2,9 +2,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IcResiCollectVisitorDTO;
import com.epmet.dto.form.CollectListFormDTO;
import com.epmet.dto.form.VisitListFormDTO;
import com.epmet.dto.result.CollectListResultDTO;
import com.epmet.dto.form.VisitVisitorChartFormDTO;
import com.epmet.dto.form.VisitorInfoFormDTO;
import com.epmet.dto.result.VisitVisitorChartResultDTO;
import com.epmet.entity.IcResiCollectVisitorEntity;
import org.apache.ibatis.annotations.Mapper;
@ -22,6 +23,7 @@ public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEnt
/**
* 条件查询
*
* @param params
* @return
*/
@ -29,10 +31,31 @@ public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEnt
/**
* Desc: 查询访客信息
*
* @param formDTO
* @author wgf
* @date 2022/8/5 8:41
*/
List<IcResiCollectVisitorDTO> getCollectList(VisitListFormDTO formDTO);
/**
* 最新一条访客信息
*
* @param formDTO
* @return com.epmet.entity.IcResiCollectVisitorEntity
* @author zhy
* @date 2022/8/19 15:33
*/
IcResiCollectVisitorEntity getLastInfo(VisitorInfoFormDTO formDTO);
/**
* 人流量
*
* @param dto
* @return void
* @author generator
* @date 2022-07-26
*/
List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto);
}

16
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java

@ -0,0 +1,16 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcVaccinePrarmeterEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 新冠病毒疫苗接种人员信息台账
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-08-22
*/
@Mapper
public interface IcVaccinePrarmeterDao extends BaseDao<IcVaccinePrarmeterEntity> {
}

154
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccinePrarmeterEntity.java

@ -0,0 +1,154 @@
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-08-22
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ic_vaccine_prarmeter")
public class IcVaccinePrarmeterEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 网格ID
*/
private String gridId;
/**
* 网格名称
*/
private String gridName;
/**
* 组织Id
*/
private String agencyId;
/**
* 组织的pids
*/
private String pids;
/**
* 所属小区ID
*/
private String villageId;
/**
* 所属小区名称
*/
private String villageName;
/**
* 所属楼宇Id
*/
private String buildId;
/**
* 所属楼宇名称
*/
private String buildName;
/**
* 单元id
*/
private String unitId;
/**
* 单元名
*/
private String unitName;
/**
* 所属家庭Id
*/
private String homeId;
/**
* 房间名
*/
private String homeName;
/**
* 户口性质0户籍 1外来
*/
private String householdType;
/**
* 姓名
*/
private String name;
/**
* 联系电话
*/
private String mobile;
/**
* 身份证号
*/
private String idCard;
/**
* 是否接种0否1是
*/
private String isVaccination;
/**
* 第一次接种时间
*/
private String firstVacTime;
/**
* 第一次接种地点
*/
private String firstVacSite;
/**
* 第二次接种时间
*/
private String secondVacTime;
/**
* 第二次接种地点
*/
private String secondVacSite;
/**
* 第三次接种时间
*/
private String thirdVacTime;
/**
* 第三次接种地点
*/
private String thirdVacSite;
/**
* 原因禁忌症/拒绝接种/其他原因
*/
private String reason;
/**
* 备注
*/
private String note;
}

117
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java

@ -0,0 +1,117 @@
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-08-22
*/
@Data
public class IcVaccinePrarmeterExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "客户Id customer.id")
private String customerId;
@Excel(name = "网格ID")
private String gridId;
@Excel(name = "网格名称")
private String gridName;
@Excel(name = "组织Id")
private String agencyId;
@Excel(name = "组织的pids")
private String pids;
@Excel(name = "所属小区ID;")
private String villageId;
@Excel(name = "所属小区名称")
private String villageName;
@Excel(name = "所属楼宇Id")
private String buildId;
@Excel(name = "所属楼宇名称")
private String buildName;
@Excel(name = "单元id")
private String unitId;
@Excel(name = "单元名")
private String unitName;
@Excel(name = "所属家庭Id")
private String homeId;
@Excel(name = "房间名")
private String homeName;
@Excel(name = "户口性质:0户籍 1外来")
private String householdType;
@Excel(name = "姓名")
private String name;
@Excel(name = "联系电话")
private String mobile;
@Excel(name = "身份证号")
private String idCard;
@Excel(name = "是否接种:0否1是")
private String isVaccination;
@Excel(name = "第一次接种时间")
private String firstVacTime;
@Excel(name = "第一次接种地点")
private String firstVacSite;
@Excel(name = "第二次接种时间")
private String secondVacTime;
@Excel(name = "第二次接种地点")
private String secondVacSite;
@Excel(name = "第三次接种时间")
private String thirdVacTime;
@Excel(name = "第三次接种地点")
private String thirdVacSite;
@Excel(name = "原因:禁忌症/拒绝接种/其他原因")
private String reason;
@Excel(name = "备注")
private String note;
@Excel(name = "删除标识 0.未删除 1.已删除")
private Integer 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;
}

30
epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.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-08-22
*/
@Component
public class IcVaccinePrarmeterRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

53
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java

@ -2,13 +2,15 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcResiCollectVisitorDTO;
import com.epmet.dto.SaveCollectVisitorFormDTO;
import com.epmet.dto.form.CollectDetailFormDTO;
import com.epmet.dto.form.CollectListFormDTO;
import com.epmet.dto.form.VisitListFormDTO;
import com.epmet.dto.result.CollectListResultDTO;
import com.epmet.dto.form.VisitVisitorChartFormDTO;
import com.epmet.dto.form.VisitorInfoFormDTO;
import com.epmet.dto.result.VisitVisitorChartResultDTO;
import com.epmet.entity.IcResiCollectVisitorEntity;
import java.util.List;
@ -34,6 +36,7 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
/**
* 分页条件查询
*
* @param params
* @return
*/
@ -92,20 +95,42 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
void delete(String[] ids);
/**
* @describe: 保存访客信息
* @author wangtong
* @date 2022/8/3 10:44
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
* @return com.epmet.commons.tools.utils.Result
* @describe: 保存访客信息
* @author wangtong
* @date 2022/8/3 10:44
* @params [dto]
*/
Result saveInfo(SaveCollectVisitorFormDTO dto);
/**
* @describe: 访客信息详情
* @author wangtong
* @date 2022/8/3 15:43
* @params [dto]
* @return com.epmet.commons.tools.utils.Result
*/
* @return com.epmet.commons.tools.utils.Result
* @describe: 访客信息详情
* @author wangtong
* @date 2022/8/3 15:43
* @params [dto]
*/
Result getVisitorDetail(CollectDetailFormDTO dto);
/**
* 登陆访客用户信息
*
* @param tokenDto
* @param dto
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/8/19 15:24
*/
Result getVisitorInfo(TokenDto tokenDto, VisitorInfoFormDTO dto);
/**
* 人流量
*
* @param dto
* @return void
* @author generator
* @date 2022-07-26
*/
List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto);
}

78
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccinePrarmeterService.java

@ -0,0 +1,78 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IcVaccinePrarmeterDTO;
import com.epmet.entity.IcVaccinePrarmeterEntity;
import java.util.List;
import java.util.Map;
/**
* 新冠病毒疫苗接种人员信息台账
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-08-22
*/
public interface IcVaccinePrarmeterService extends BaseService<IcVaccinePrarmeterEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<IcVaccinePrarmeterDTO>
* @author generator
* @date 2022-08-22
*/
PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<IcVaccinePrarmeterDTO>
* @author generator
* @date 2022-08-22
*/
List<IcVaccinePrarmeterDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return IcVaccinePrarmeterDTO
* @author generator
* @date 2022-08-22
*/
IcVaccinePrarmeterDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2022-08-22
*/
void save(IcVaccinePrarmeterDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2022-08-22
*/
void update(IcVaccinePrarmeterDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2022-08-22
*/
void delete(String[] ids);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@ -178,7 +178,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
}
});
} else {
IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
IcResiCollectEntity collectInfo = baseDao.selectById(formDTO.getId());
//更新主表
baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);

32
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java

@ -8,17 +8,16 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcResiCollectVisitorDao;
import com.epmet.dto.IcNeighborHoodDTO;
import com.epmet.dto.IcResiCollectVisitorDTO;
import com.epmet.dto.SaveCollectVisitorFormDTO;
import com.epmet.dto.form.CollectDetailFormDTO;
import com.epmet.dto.form.CollectListFormDTO;
import com.epmet.dto.form.VisitListFormDTO;
import com.epmet.dto.form.VisitVisitorFormDTO;
import com.epmet.dto.result.CollectListResultDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.VisitVisitorChartResultDTO;
import com.epmet.entity.IcResiCollectVisitorEntity;
import com.epmet.redis.IcResiCollectVisitorRedis;
import com.epmet.service.IcResiCollectVisitorService;
@ -30,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -50,6 +50,9 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
@Autowired
private IcResiCollectServiceImpl icResiCollectServiceImpl;
@Autowired
private LoginUserUtil loginUserUtil;
@Autowired
private DhDeviceUtil dhDeviceUtil;
@ -70,6 +73,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
*/
@Override
public PageData<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params) {
params.put("customerId", loginUserUtil.getLoginUserCustomerId());
IPage<IcResiCollectVisitorDTO> page = getPage(params);
List<IcResiCollectVisitorDTO> list = baseDao.getPhrasePage(params);
return new PageData<>(list, page.getTotal());
@ -159,6 +163,7 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
visitor.setMobile(dto.getMobile());
visitor.setName(dto.getName());
visitor.setIdCard(dto.getIdCard());
visitor.setFaceImg(dto.getFaceImg());
dhDeviceUtil.sendAuth(visitor);
}
@ -171,4 +176,21 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
return new Result().ok(entity);
}
@Override
public Result getVisitorInfo(TokenDto tokenDto, VisitorInfoFormDTO dto) {
dto.setUserId(tokenDto.getUserId());
dto.setCustomerId(tokenDto.getCustomerId());
IcResiCollectVisitorEntity entity = baseDao.getLastInfo(dto);
return new Result().ok(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto) {
if (StringUtils.isBlank(dto.getDate())) {
dto.setDate(LocalDate.now().toString());
}
return baseDao.getTraffic(dto);
}
}

87
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java

@ -0,0 +1,87 @@
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.IcVaccinePrarmeterDao;
import com.epmet.dto.IcVaccinePrarmeterDTO;
import com.epmet.entity.IcVaccinePrarmeterEntity;
import com.epmet.redis.IcVaccinePrarmeterRedis;
import com.epmet.service.IcVaccinePrarmeterService;
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-08-22
*/
@Service
public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrarmeterDao, IcVaccinePrarmeterEntity> implements IcVaccinePrarmeterService {
@Autowired
private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis;
@Override
public PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params) {
IPage<IcVaccinePrarmeterEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, IcVaccinePrarmeterDTO.class);
}
@Override
public List<IcVaccinePrarmeterDTO> list(Map<String, Object> params) {
List<IcVaccinePrarmeterEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, IcVaccinePrarmeterDTO.class);
}
private QueryWrapper<IcVaccinePrarmeterEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<IcVaccinePrarmeterEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public IcVaccinePrarmeterDTO get(String id) {
IcVaccinePrarmeterEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, IcVaccinePrarmeterDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IcVaccinePrarmeterDTO dto) {
IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IcVaccinePrarmeterDTO dto) {
IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/util/dh/DhDeviceUtil.java

@ -706,8 +706,8 @@ public class DhDeviceUtil {
cardFormDTO.setCardType("0");
cardFormDTO.setCategory("0");
cardFormDTO.setCardStatus("ACTIVE");
cardFormDTO.setStartDate(LocalDate.now().toString());
cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString());
cardFormDTO.setStartDate(LocalDate.now().minusDays(1L).toString());
cardFormDTO.setEndDate(LocalDate.now().plusDays(1L).toString());
String pwd;
try {
pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456");
@ -816,7 +816,7 @@ public class DhDeviceUtil {
DataInputStream dataInputStream = new DataInputStream(url.openStream());
byte[] originBytes = toByteArray(dataInputStream);
fileBytes = compressPicCycle(originBytes, 100L, 0.1);
fileBytes = compressPicCycle(originBytes, 100L, 0.3);
} catch (IOException e) {
logger.error("图片上传异常", e);
throw new RenException("图片上传异常");

56
epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.66__chart_hour.sql

@ -0,0 +1,56 @@
/*
Navicat Premium Data Transfer
Source Server : epmet_cloud_dev_user
Source Server Type : MySQL
Source Server Version : 50726
Source Host : 192.168.1.140:3306
Source Schema : epmet_user
Target Server Type : MySQL
Target Server Version : 50726
File Encoding : 65001
Date: 22/08/2022 13:31:44
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for pli_chart_hour
-- ----------------------------
DROP TABLE IF EXISTS `pli_chart_hour`;
CREATE TABLE `pli_chart_hour` (
`hour` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '图表日期链表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of pli_chart_hour
-- ----------------------------
INSERT INTO `pli_chart_hour` VALUES ('01');
INSERT INTO `pli_chart_hour` VALUES ('02');
INSERT INTO `pli_chart_hour` VALUES ('03');
INSERT INTO `pli_chart_hour` VALUES ('04');
INSERT INTO `pli_chart_hour` VALUES ('05');
INSERT INTO `pli_chart_hour` VALUES ('06');
INSERT INTO `pli_chart_hour` VALUES ('07');
INSERT INTO `pli_chart_hour` VALUES ('08');
INSERT INTO `pli_chart_hour` VALUES ('09');
INSERT INTO `pli_chart_hour` VALUES ('10');
INSERT INTO `pli_chart_hour` VALUES ('11');
INSERT INTO `pli_chart_hour` VALUES ('12');
INSERT INTO `pli_chart_hour` VALUES ('13');
INSERT INTO `pli_chart_hour` VALUES ('14');
INSERT INTO `pli_chart_hour` VALUES ('15');
INSERT INTO `pli_chart_hour` VALUES ('16');
INSERT INTO `pli_chart_hour` VALUES ('17');
INSERT INTO `pli_chart_hour` VALUES ('18');
INSERT INTO `pli_chart_hour` VALUES ('19');
INSERT INTO `pli_chart_hour` VALUES ('20');
INSERT INTO `pli_chart_hour` VALUES ('21');
INSERT INTO `pli_chart_hour` VALUES ('22');
INSERT INTO `pli_chart_hour` VALUES ('23');
INSERT INTO `pli_chart_hour` VALUES ('00');
SET FOREIGN_KEY_CHECKS = 1;

88
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml

@ -60,8 +60,33 @@
UPDATED_TIME
from ic_resi_collect_visitor
where DEL_FLAG = '0'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
AND CUSTOMER_ID = #{customerId}
<if test="idCard != null and idCard != ''">
AND ID_CARD = #{idCard}
</if>
<if test="name != null and name != ''">
AND NAME = #{name}
</if>
<if test="mobile != null and mobile != ''">
AND MOBILE = #{mobile}
</if>
<if test="villageId != null and villageId != ''">
AND VILLAGE_ID = #{villageId}
</if>
<if test="buildId != null and buildId != ''">
AND BUILD_ID = #{buildId}
</if>
<if test="unitId != null and unitId != ''">
AND UNIT_ID = #{unitId}
</if>
<if test="homeId != null and homeId != ''">
AND HOME_ID = #{homeId}
</if>
<if test="startTime != null and startTime != ''">
AND CREATED_TIME >= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND CREATED_TIME &lt;= #{endTime}
</if>
order by CREATED_TIME desc
</select>
@ -95,14 +120,65 @@
UPDATED_TIME
from ic_resi_collect_visitor
where DEL_FLAG = '0'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
AND CUSTOMER_ID = #{customerId}
<if test="idCard != null and idCard != ''">
AND ID_CARD = #{idCard}
</if>
<if test="name != null and name != ''">
AND NAME = #{name}
</if>
<if test="mobile != null and mobile != ''">
AND MOBILE = #{mobile}
</if>
<if test="villageId != null and villageId != ''">
AND VILLAGE_ID = #{villageId}
</if>
<if test='orgId != null and orgId != "" '>
AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
<if test="buildId != null and buildId != ''">
AND BUILD_ID = #{buildId}
</if>
<if test="unitId != null and unitId != ''">
AND UNIT_ID = #{unitId}
</if>
<if test="homeId != null and homeId != ''">
AND HOME_ID = #{homeId}
</if>
<if test="startTime != null and startTime != ''">
AND CREATED_TIME >= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND CREATED_TIME &lt;= #{endTime}
</if>
order by CREATED_TIME desc
</select>
<select id="getLastInfo" resultType="com.epmet.entity.IcResiCollectVisitorEntity">
SELECT
NAME,
MOBILE,
ID_CARD,
FACE_IMG
FROM
ic_resi_collect_visitor
WHERE
DEL_FLAG = '0'
AND CREATED_BY = #{userId}
AND CUSTOMER_ID = #{customerId}
ORDER BY
CREATED_TIME DESC
LIMIT 1
</select>
<select id="getTraffic" resultType="com.epmet.dto.result.VisitVisitorChartResultDTO">
SELECT
CONCAT( h.`hour`, ':00' ) AS HOUR,
COUNT( v.id ) AS num
FROM
pli_chart_hour h
LEFT JOIN ic_resi_collect_visitor v ON h.`hour` = DATE_FORMAT( v.CREATED_TIME, '%H' )
AND DATE_FORMAT( v.CREATED_TIME, '%Y-%m-%d' ) = #{date}
GROUP BY
h.`hour`;
</select>
</mapper>

43
epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IcVaccinePrarmeterDao">
<resultMap type="com.epmet.entity.IcVaccinePrarmeterEntity" id="icVaccinePrarmeterMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="gridName" column="GRID_NAME"/>
<result property="agencyId" column="AGENCY_ID"/>
<result property="pids" column="PIDS"/>
<result property="villageId" column="VILLAGE_ID"/>
<result property="villageName" column="VILLAGE_NAME"/>
<result property="buildId" column="BUILD_ID"/>
<result property="buildName" column="BUILD_NAME"/>
<result property="unitId" column="UNIT_ID"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="homeId" column="HOME_ID"/>
<result property="homeName" column="HOME_NAME"/>
<result property="householdType" column="HOUSEHOLD_TYPE"/>
<result property="name" column="NAME"/>
<result property="mobile" column="MOBILE"/>
<result property="idCard" column="ID_CARD"/>
<result property="isVaccination" column="IS_VACCINATION"/>
<result property="firstVacTime" column="FIRST_VAC_TIME"/>
<result property="firstVacSite" column="FIRST_VAC_SITE"/>
<result property="secondVacTime" column="SECOND_VAC_TIME"/>
<result property="secondVacSite" column="SECOND_VAC_SITE"/>
<result property="thirdVacTime" column="THIRD_VAC_TIME"/>
<result property="thirdVacSite" column="THIRD_VAC_SITE"/>
<result property="reason" column="REASON"/>
<result property="note" column="NOTE"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
</mapper>

2
epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@ -35,7 +35,7 @@
IFNULL(resi.ID,"") AS resiId,
IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
IFNULL(relation.GRID_ID,"") AS gridId,
IFNULL(resi.id_num,'')AS idNum
IFNULL(wechat.id_num,'')AS idNum
FROM
USER user
LEFT JOIN

Loading…
Cancel
Save