Browse Source

1.新增:机关单位维度初始化

dev_shibei_match
wxz 5 years ago
parent
commit
193560dcd6
  1. 10
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
  2. 8
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DatePatternConstant.java
  3. 66
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/StatsSubject.java
  4. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java
  5. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
  6. 35
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/LastExecRecordDao.java
  7. 51
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java
  8. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java
  9. 38
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
  10. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
  11. 25
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
  12. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java
  13. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java
  14. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/LastExecRecordService.java
  15. 24
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java
  16. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java
  17. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
  18. 45
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java
  19. 14
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
  20. 25
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/LastExecRecordDao.xml
  21. 1
      epmet-module/pom.xml

10
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@ -234,6 +234,16 @@ public class DateUtils {
return dateTime.getWeekOfWeekyear(); return dateTime.getWeekOfWeekyear();
} }
/**
* 按照格式进行时间取整
* @param targetDate
* @param pattern
* @return
*/
public static Date integrate(Date targetDate, String pattern) {
return DateUtils.parse(DateUtils.format(targetDate, pattern), pattern);
}
public static void main(String[] args) { public static void main(String[] args) {
//int weekOfYear = getWeekOfYear(new Date()); //int weekOfYear = getWeekOfYear(new Date());

8
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DatePatternConstant.java

@ -1,8 +0,0 @@
package com.epmet.constant;
/**
* 日期格式常量
*/
public interface DatePatternConstant {
}

66
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/StatsSubject.java

@ -0,0 +1,66 @@
package com.epmet.constant;
public interface StatsSubject {
String DIM_AGENCY = "dim_agency";
String DIM_CUSTOMER = "dim_customer";
String DIM_DATE = "dim_date";
String DIM_DEPARTMENT = "dim_department";
String DIM_GRID = "dim_grid";
String DIM_MONTH = "dim_month";
String DIM_QUARTER = "dim_quarter";
String DIM_TOPIC_STATUS = "dim_topic_status";
String DIM_WEEK = "dim_week";
String DIM_YEAR = "dim_year";
String FACT_AGENCY_PROJECT_DAILY = "fact_agency_project_daily";
String FACT_AGENCY_PROJECT_MONTHLY = "fact_agency_project_monthly";
String FACT_ARTICLE_PUBLISHED_AGENCY_DAILY = "fact_article_published_agency_daily";
String FACT_ARTICLE_PUBLISHED_DEPARTMENT_DAILY = "fact_article_published_department_daily";
String FACT_ARTICLE_PUBLISHED_GRID_DAILY = "fact_article_published_grid_daily";
String FACT_GRID_PROJECT_DAILY = "fact_grid_project_daily";
String FACT_GRID_PROJECT_MONTHLY = "fact_grid_project_monthly";
String FACT_GROUP_AGENCY_DAILY = "fact_group_agency_daily";
String FACT_GROUP_AGENCY_MONTHLY = "fact_group_agency_monthly";
String FACT_GROUP_GRID_DAILY = "fact_group_grid_daily";
String FACT_ISSUE_AGENCY_DAILY = "fact_issue_agency_daily";
String FACT_ISSUE_AGENCY_MONTHLY = "fact_issue_agency_monthly";
String FACT_ISSUE_GRID_DAILY = "fact_issue_grid_daily";
String FACT_ISSUE_GRID_MONTHLY = "fact_issue_grid_monthly";
String FACT_PARTICIPATION_USER_AGENCY_DAILY = "fact_participation_user_agency_daily";
String FACT_PARTICIPATION_USER_AGENCY_MONTHLY = "fact_participation_user_agency_monthly";
String FACT_PARTICIPATION_USER_GRID_DAILY = "fact_participation_user_grid_daily";
String FACT_PARTICIPATION_USER_GRID_MONTHLY = "fact_participation_user_grid_monthly";
String FACT_REG_USER_AGENCY_DAILY = "fact_reg_user_agency_daily";
String FACT_REG_USER_AGENCY_MONTHLY = "fact_reg_user_agency_monthly";
String FACT_REG_USER_GRID_DAILY = "fact_reg_user_grid_daily";
String FACT_REG_USER_GRID_MONTHLY = "fact_reg_user_grid_monthly";
String FACT_TAG_USED_AGENCY_DAILY = "fact_tag_used_agency_daily";
String FACT_TAG_USED_AGENCY_MONTHLY = "fact_tag_used_agency_monthly";
String FACT_TAG_USED_AGENCY_QUARTERLY = "fact_tag_used_agency_quarterly";
String FACT_TAG_USED_AGENCY_YEARLY = "fact_tag_used_agency_yearly";
String FACT_TAG_USED_DEPARTMENT_DAILY = "fact_tag_used_department_daily";
String FACT_TAG_USED_DEPARTMENT_MONTHLY = "fact_tag_used_department_monthly";
String FACT_TAG_USED_DEPARTMENT_QUARTERLY = "fact_tag_used_department_quarterly";
String FACT_TAG_USED_DEPARTMENT_YEARLY = "fact_tag_used_department_yearly";
String FACT_TAG_USED_GRID_DAILY = "fact_tag_used_grid_daily";
String FACT_TAG_USED_GRID_MONTHLY = "fact_tag_used_grid_monthly";
String FACT_TAG_USED_GRID_QUARTERLY = "fact_tag_used_grid_quarterly";
String FACT_TAG_USED_GRID_YEARLY = "fact_tag_used_grid_yearly";
String FACT_TAG_VIEWED_AGENCY_DAILY = "fact_tag_viewed_agency_daily";
String FACT_TAG_VIEWED_AGENCY_MONTHLY = "fact_tag_viewed_agency_monthly";
String FACT_TAG_VIEWED_AGENCY_QUARTERLY = "fact_tag_viewed_agency_quarterly";
String FACT_TAG_VIEWED_AGENCY_YEARLY = "fact_tag_viewed_agency_yearly";
String FACT_TAG_VIEWED_GRID_DAILY = "fact_tag_viewed_grid_daily";
String FACT_TAG_VIEWED_GRID_MONTHLY = "fact_tag_viewed_grid_monthly";
String FACT_TAG_VIEWED_GRID_QUARTERLY = "fact_tag_viewed_grid_quarterly";
String FACT_TAG_VIEWED_GRID_YEARLY = "fact_tag_viewed_grid_yearly";
String FACT_TOPIC_ISSUE_AGENCY_DAILY = "fact_topic_issue_agency_daily";
String FACT_TOPIC_ISSUE_AGENCY_MONTHLY = "fact_topic_issue_agency_monthly";
String FACT_TOPIC_ISSUE_GRID_DAILY = "fact_topic_issue_grid_daily";
String FACT_TOPIC_ISSUE_GRID_MONTHLY = "fact_topic_issue_grid_monthly";
String FACT_TOPIC_STATUS_AGENCY_DAILY = "fact_topic_status_agency_daily";
String FACT_TOPIC_STATUS_AGENCY_MONTHLY = "fact_topic_status_agency_monthly";
String FACT_TOPIC_STATUS_GRID_DAILY = "fact_topic_status_grid_daily";
String FACT_TOPIC_TOTAL_AGENCY_DAILY = "fact_topic_total_agency_daily";
String FACT_TOPIC_TOTAL_GRID_DAILY = "fact_topic_total_grid_daily";
String LAST_EXEC_RECORD = "last_exec_record";
}

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java

@ -3,6 +3,7 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.service.StatsDimService; import com.epmet.service.StatsDimService;
import com.epmet.service.stats.DimDateService; import com.epmet.service.stats.DimDateService;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -38,4 +39,14 @@ public class DimController {
return new Result(); return new Result();
} }
/**
* 初始化机关单位维度
* @return
*/
@PostMapping("/agency/init")
public Result intiAgencyDim() {
statsDimService.initAgencyDim();
return new Result();
}
} }

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java

@ -3,7 +3,9 @@ package com.epmet.dao.org;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.org.CustomerAgencyEntity; import com.epmet.entity.org.CustomerAgencyEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List; import java.util.List;
@Mapper @Mapper
@ -11,4 +13,7 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
List<CustomerAgencyEntity> listAllEntities(); List<CustomerAgencyEntity> listAllEntities();
List<CustomerAgencyEntity> listAgenciesByCreateTime(
@Param("statsStartTime") Date statsStartTime,
@Param("statsEndTime") Date statsEndTime);
} }

35
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/LastExecRecordDao.java

@ -0,0 +1,35 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dao.stats;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.stats.LastExecRecordEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 最后一次执行记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-06-17
*/
@Mapper
public interface LastExecRecordDao extends BaseDao<LastExecRecordEntity> {
LastExecRecordEntity getLastExecRecord(@Param("statsSubject") String statsSubject);
}

51
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/LastExecRecordEntity.java

@ -0,0 +1,51 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.entity.stats;
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 2020-06-17
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("last_exec_record")
public class LastExecRecordEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 执行主体即每一个统计表
*/
private String subject;
/**
* 最后一次执行时间
*/
private Date execTime;
}

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java

@ -4,4 +4,5 @@ public interface StatsDimService {
void initGridDim(); void initGridDim();
void initAgencyDim();
} }

38
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@ -1,11 +1,18 @@
package com.epmet.service.impl; package com.epmet.service.impl;
import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.constant.StatsSubject;
import com.epmet.dao.stats.LastExecRecordDao;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.entity.org.CustomerGridEntity; import com.epmet.entity.org.CustomerGridEntity;
import com.epmet.entity.stats.DimGridEntity; import com.epmet.entity.stats.DimGridEntity;
import com.epmet.entity.stats.LastExecRecordEntity;
import com.epmet.service.StatsDimService; import com.epmet.service.StatsDimService;
import com.epmet.service.org.CustomerAgencyService;
import com.epmet.service.org.CustomerGridService; import com.epmet.service.org.CustomerGridService;
import com.epmet.service.stats.DimAgencyService;
import com.epmet.service.stats.DimGridService; import com.epmet.service.stats.DimGridService;
import com.epmet.service.stats.LastExecRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -19,9 +26,18 @@ public class StatsDimServiceImpl implements StatsDimService {
@Autowired @Autowired
private DimGridService dimGridService; private DimGridService dimGridService;
@Autowired
private DimAgencyService dimAgencyService;
@Autowired @Autowired
private CustomerGridService customerGridService; private CustomerGridService customerGridService;
@Autowired
private LastExecRecordService lastExecRecordService;
@Autowired
private CustomerAgencyService customerAgencyService;
@Override @Override
public void initGridDim() { public void initGridDim() {
DimGridEntity lastCreatedGridDim = dimGridService.getLastCreatedGridDim(); DimGridEntity lastCreatedGridDim = dimGridService.getLastCreatedGridDim();
@ -65,4 +81,26 @@ public class StatsDimServiceImpl implements StatsDimService {
return dimGrid; return dimGrid;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
/**
* 初始化机关单位维度
*/
@Override
public void initAgencyDim() {
LastExecRecordEntity lastExecRecord = lastExecRecordService.getLastExecRecord(StatsSubject.DIM_AGENCY);
if (lastExecRecord == null) {
lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_AGENCY);
}
Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD);
Date statsStartTime = null;
if (lastExecRecord.getExecTime() != null) {
statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD);
}
List<CustomerAgencyEntity> agencies = customerAgencyService.listAgenciesByCreateTime(statsStartTime, statsEndTime);
dimAgencyService.addAgencyDims(agencies);
lastExecRecord.setExecTime(new Date());
lastExecRecordService.updateById(lastExecRecord);
}
} }

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java

@ -0,0 +1,10 @@
package com.epmet.service.org;
import com.epmet.entity.org.CustomerAgencyEntity;
import java.util.Date;
import java.util.List;
public interface CustomerAgencyService {
List<CustomerAgencyEntity> listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime);
}

25
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

@ -0,0 +1,25 @@
package com.epmet.service.org.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.org.StatsCustomerAgencyDao;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.service.org.CustomerAgencyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service
@DataSource(DataSourceConstant.GOV_ORG)
public class CustomerAgencyServiceImpl implements CustomerAgencyService {
@Autowired
private StatsCustomerAgencyDao customerAgencyDao;
@Override
public List<CustomerAgencyEntity> listAgenciesByCreateTime(Date statsStartTime, Date statsEndTime) {
return customerAgencyDao.listAgenciesByCreateTime(statsStartTime, statsEndTime);
}
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimAgencyService.java

@ -20,6 +20,7 @@ package com.epmet.service.stats;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.stats.DimAgencyDTO; import com.epmet.dto.stats.DimAgencyDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.entity.stats.DimAgencyEntity; import com.epmet.entity.stats.DimAgencyEntity;
import java.util.List; import java.util.List;
@ -100,4 +101,6 @@ public interface DimAgencyService extends BaseService<DimAgencyEntity> {
* @Description 根据客户Id查询机关维度列表数据 * @Description 根据客户Id查询机关维度列表数据
**/ **/
List<DimAgencyDTO> getDimAgencyList(DimAgencyDTO dto); List<DimAgencyDTO> getDimAgencyList(DimAgencyDTO dto);
void addAgencyDims(List<CustomerAgencyEntity> agencies);
} }

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java

@ -20,6 +20,7 @@ package com.epmet.service.stats;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.stats.DimGridDTO; import com.epmet.dto.stats.DimGridDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.entity.org.CustomerGridEntity; import com.epmet.entity.org.CustomerGridEntity;
import com.epmet.entity.stats.DimGridEntity; import com.epmet.entity.stats.DimGridEntity;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/LastExecRecordService.java

@ -0,0 +1,10 @@
package com.epmet.service.stats;
import com.epmet.entity.stats.LastExecRecordEntity;
public interface LastExecRecordService {
LastExecRecordEntity getLastExecRecord(String statsSubject);
LastExecRecordEntity createLastExecRecord(String statsSubject);
void updateById(LastExecRecordEntity lastExecRecord);
}

24
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java

@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.stats.DimAgencyDao; import com.epmet.dao.stats.DimAgencyDao;
import com.epmet.dto.stats.DimAgencyDTO; import com.epmet.dto.stats.DimAgencyDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.entity.stats.DimAgencyEntity; import com.epmet.entity.stats.DimAgencyEntity;
import com.epmet.service.stats.DimAgencyService; import com.epmet.service.stats.DimAgencyService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -33,6 +34,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -108,4 +110,26 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
return baseDao.selectDimAgencyList(dto); return baseDao.selectDimAgencyList(dto);
} }
@Transactional
@Override
public void addAgencyDims(List<CustomerAgencyEntity> agencies) {
Date now = new Date();
for (CustomerAgencyEntity agency : agencies) {
DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
dimAgencyEntity.setAgencyName(agency.getOrganizationName());
dimAgencyEntity.setAllParentName(agency.getAllParentName());
dimAgencyEntity.setCustomerId(agency.getCustomerId());
dimAgencyEntity.setLevel(agency.getLevel());
dimAgencyEntity.setPid(agency.getPid());
dimAgencyEntity.setPids(agency.getPid());
dimAgencyEntity.setCreatedBy("APP_USER");
dimAgencyEntity.setUpdatedBy("APP_USER");
dimAgencyEntity.setCreatedTime(now);
dimAgencyEntity.setUpdatedTime(now);
dimAgencyEntity.setRevision(0);
dimAgencyEntity.setDelFlag("0");
baseDao.insert(dimAgencyEntity);
}
}
} }

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDateServiceImpl.java

@ -24,17 +24,14 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.constant.DatePatternConstant;
import com.epmet.dao.stats.DimDateDao; import com.epmet.dao.stats.DimDateDao;
import com.epmet.dto.stats.DimDateDTO; import com.epmet.dto.stats.DimDateDTO;
import com.epmet.entity.stats.DimDateEntity; import com.epmet.entity.stats.DimDateEntity;
import com.epmet.service.stats.DimDateService; import com.epmet.service.stats.DimDateService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@ -25,6 +25,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.stats.DimGridDao; import com.epmet.dao.stats.DimGridDao;
import com.epmet.dto.stats.DimGridDTO; import com.epmet.dto.stats.DimGridDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.entity.stats.DimAgencyEntity;
import com.epmet.entity.stats.DimGridEntity; import com.epmet.entity.stats.DimGridEntity;
import com.epmet.service.stats.DimGridService; import com.epmet.service.stats.DimGridService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -32,6 +34,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -108,6 +111,4 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
baseDao.insert(gridDim); baseDao.insert(gridDim);
} }
} }
} }

45
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java

@ -0,0 +1,45 @@
package com.epmet.service.stats.impl;
import com.epmet.dao.stats.LastExecRecordDao;
import com.epmet.entity.stats.LastExecRecordEntity;
import com.epmet.service.stats.LastExecRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service
public class LastExecRecordServiceImpl implements LastExecRecordService {
@Autowired
private LastExecRecordDao lastExecRecordDao;
public LastExecRecordEntity getLastExecRecord(String statsSubject) {
return lastExecRecordDao.getLastExecRecord(statsSubject);
}
/**
* 创建末次执行记录
* @param statsSubject
* @return
*/
@Override
public LastExecRecordEntity createLastExecRecord(String statsSubject) {
Date now = new Date();
LastExecRecordEntity entity = new LastExecRecordEntity();
entity.setExecTime(now);
entity.setSubject(statsSubject);
entity.setCreatedBy("APP_USER");
entity.setUpdatedBy("APP_USER");
entity.setCreatedTime(now);
entity.setUpdatedTime(now);
entity.setDelFlag("0");
entity.setRevision(0);
lastExecRecordDao.insert(entity);
return entity;
}
@Override
public void updateById(LastExecRecordEntity lastExecRecord) {
lastExecRecordDao.updateById(lastExecRecord);
}
}

14
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@ -10,4 +10,18 @@
<select id="listAllEntities" resultType="com.epmet.entity.org.CustomerAgencyEntity"> <select id="listAllEntities" resultType="com.epmet.entity.org.CustomerAgencyEntity">
select * from customer_agency select * from customer_agency
</select> </select>
<select id="listAgenciesByCreateTime" resultType="com.epmet.entity.org.CustomerAgencyEntity">
SELECT *
FROM customer_agency
<where>
DEL_FLAG = 0
<if test="statsStartTime != null">
AND CREATED_TIME >= #{statsStartTime}
</if>
<if test="statsEndTime != null">
AND CREATED_TIME &lt; #{statsEndTime}
</if>
</where>
</select>
</mapper> </mapper>

25
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/LastExecRecordDao.xml

@ -0,0 +1,25 @@
<?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.stats.LastExecRecordDao">
<resultMap type="com.epmet.entity.stats.LastExecRecordEntity" id="lastExecRecordMap">
<result property="id" column="ID"/>
<result property="subject" column="SUBJECT"/>
<result property="execTime" column="EXEC_TIME"/>
<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>
<select id="getLastExecRecord" resultType="com.epmet.entity.stats.LastExecRecordEntity">
SELECT *
FROM last_exec_record
WHERE SUBJECT = #{statsSubject}
</select>
</mapper>

1
epmet-module/pom.xml

@ -39,7 +39,6 @@
<module>resi-voice</module> <module>resi-voice</module>
<module>data-statistical</module> <module>data-statistical</module>
<module>data-report</module> <module>data-report</module>
<module>data-report</module>
</modules> </modules>
</project> </project>

Loading…
Cancel
Save