luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整统计的结果

dev
zhangyuan 3 years ago
parent
0397fc16e0
commit
3727208391
7 changed files with 74 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyUserHouseDailyDao.java
  2. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java
  3. 27
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java
  4. 32
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
  5. 34
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
  6. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
  7. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactAgencyUserHouseDailyDao.java
View File

@ -20,7 +20,7 @@ public interface FactAgencyUserHouseDailyDao extends BaseDao<FactAgencyUserHouse
List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
FactUserHouseResultDTO getTotal(Map<String, Object> params);
List<FactUserHouseResultDTO> getTotal(Map<String, Object> params);
void deleteByDateId(FactUserHouseFormDTO formDTO);
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactGridUserHouseDailyDao.java
View File

@ -20,7 +20,7 @@ public interface FactGridUserHouseDailyDao extends BaseDao<FactGridUserHouseDail
List<FactUserHouseResultDTO> listPage(Map<String, Object> params);
FactUserHouseResultDTO getTotal(Map<String, Object> params);
List<FactUserHouseResultDTO> getTotal(Map<String, Object> params);
List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO);

27
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactAgencyUserHouseDailyServiceImpl.java
View File

@ -3,12 +3,12 @@ package com.epmet.service.stats.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.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.stats.FactAgencyUserHouseDailyDao;
import com.epmet.dto.ChangeDeathDTO;
import com.epmet.dto.stats.FactAgencyUserHouseDailyDTO;
import com.epmet.dto.stats.form.FactUserHouseFormDTO;
import com.epmet.dto.stats.result.FactUserHouseResultDTO;
@ -46,7 +46,22 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
@Override
public FactUserHouseResultDTO getTotal(Map<String, Object> params) {
params.put("customerId", loginUserUtil.getLoginUserCustomerId());
return baseDao.getTotal(params);
List<FactUserHouseResultDTO> list = baseDao.getTotal(params);
if (list.size() == NumConstant.ZERO) {
return null;
} else if (list.size() == NumConstant.ONE) {
return list.get(0);
} else {
FactUserHouseResultDTO first = list.get(0);
FactUserHouseResultDTO last = list.get(list.size() - 1);
FactUserHouseResultDTO dto = last;
dto.setHouseIncr(last.getHouseIncr() - first.getHouseIncr());
dto.setHouseModify(last.getHouseModify() - first.getHouseModify());
dto.setUserIncr(last.getUserIncr() - first.getUserIncr());
dto.setUserModify(last.getUserModify() - first.getUserModify());
return dto;
}
}
@Override
@ -56,8 +71,8 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
return ConvertUtils.sourceToTarget(entityList, FactAgencyUserHouseDailyDTO.class);
}
private QueryWrapper<FactAgencyUserHouseDailyEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<FactAgencyUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<FactAgencyUserHouseDailyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -93,7 +108,7 @@ public class FactAgencyUserHouseDailyServiceImpl extends BaseServiceImpl<FactAge
}
@Override
public void deleteByDateId(FactUserHouseFormDTO formDTO){
public void deleteByDateId(FactUserHouseFormDTO formDTO) {
baseDao.deleteByDateId(formDTO);
}

32
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGridUserHouseDailyServiceImpl.java
View File

@ -3,10 +3,11 @@ package com.epmet.service.stats.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.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.stats.FactGridUserHouseDailyDao;
import com.epmet.dto.stats.FactGridUserHouseDailyDTO;
import com.epmet.dto.stats.form.FactUserHouseFormDTO;
@ -45,7 +46,22 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
@Override
public FactUserHouseResultDTO getTotal(Map<String, Object> params) {
params.put("customerId", loginUserUtil.getLoginUserCustomerId());
return baseDao.getTotal(params);
List<FactUserHouseResultDTO> list = baseDao.getTotal(params);
if (list.size() == NumConstant.ZERO) {
return null;
} else if (list.size() == NumConstant.ONE) {
return list.get(0);
} else {
FactUserHouseResultDTO first = list.get(0);
FactUserHouseResultDTO last = list.get(list.size() - 1);
FactUserHouseResultDTO dto = last;
dto.setHouseIncr(last.getHouseIncr() - first.getHouseIncr());
dto.setHouseModify(last.getHouseModify() - first.getHouseModify());
dto.setUserIncr(last.getUserIncr() - first.getUserIncr());
dto.setUserModify(last.getUserModify() - first.getUserModify());
return dto;
}
}
@Override
@ -55,10 +71,10 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
return ConvertUtils.sourceToTarget(entityList, FactGridUserHouseDailyDTO.class);
}
private QueryWrapper<FactGridUserHouseDailyEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
String dateId = (String)params.get("dateId");
String customerId = (String)params.get("customerId");
private QueryWrapper<FactGridUserHouseDailyEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
String dateId = (String) params.get("dateId");
String customerId = (String) params.get("customerId");
QueryWrapper<FactGridUserHouseDailyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -96,12 +112,12 @@ public class FactGridUserHouseDailyServiceImpl extends BaseServiceImpl<FactGridU
}
@Override
public void deleteByDateId(FactUserHouseFormDTO formDTO){
public void deleteByDateId(FactUserHouseFormDTO formDTO) {
baseDao.deleteByDateId(formDTO);
}
@Override
public List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO){
public List<FactUserHouseResultDTO> statAgency(FactUserHouseFormDTO formDTO) {
return baseDao.statAgency(formDTO);
}

34
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactUserHouseServiceImpl.java
View File

@ -73,41 +73,13 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
FactUserHouseResultDTO dto = null;
if (params.containsKey("startTime") && params.containsKey("endTime")) {
if (StringUtils.isNotBlank(params.get("startTime").toString()) && StringUtils.isNotBlank(params.get("endTime").toString())) {
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoStart = factGridUserHouseDailyService.getTotal(params);
params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoEnd = factGridUserHouseDailyService.getTotal(params);
dto = dtoEnd;
dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
} else {
params.put("dateId", params.get("startTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoStart = factAgencyUserHouseDailyService.getTotal(params);
params.put("dateId", params.get("endTime").toString().replaceAll("-", ""));
FactUserHouseResultDTO dtoEnd = factAgencyUserHouseDailyService.getTotal(params);
dto = dtoEnd;
dto.setHouseIncr(dtoEnd.getHouseIncr() - dtoStart.getHouseIncr());
dto.setHouseModify(dtoEnd.getHouseModify() - dtoStart.getHouseModify());
dto.setUserIncr(dtoEnd.getUserIncr() - dtoStart.getUserIncr());
dto.setUserModify(dtoEnd.getUserModify() - dtoStart.getUserModify());
}
}
params.put("dateId", StringUtils.EMPTY);
} else {
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
dto = factGridUserHouseDailyService.getTotal(params);
} else {
dto = factAgencyUserHouseDailyService.getTotal(params);
}
}
}
} else {
params.put("dateId", DateUtils.getBeforeNDay(NumConstant.ONE));
}
if (params.containsKey("level")) {
if (OrgLevelEnum.GRID.getCode().equals(params.get("level").toString())) {
dto = factGridUserHouseDailyService.getTotal(params);
@ -115,8 +87,6 @@ public class FactUserHouseServiceImpl implements FactUserHouseService {
dto = factAgencyUserHouseDailyService.getTotal(params);
}
}
}
return dto;
}

10
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyUserHouseDailyDao.xml
View File

@ -114,6 +114,16 @@
<if test="dateId != null and dateId != ''">
AND a.DATE_ID = #{dateId}
</if>
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
</if>
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT( a.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
</if>
GROUP BY
a.DATE_ID
ORDER BY
a.DATE_ID ASC
</select>
<delete id="deleteByDateId">

10
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridUserHouseDailyDao.xml
View File

@ -104,6 +104,16 @@
<if test="dateId != null and dateId != ''">
AND d.DATE_ID = #{dateId}
</if>
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) >= DATE_FORMAT( #{startTime}, '%Y-%m-%d' )
</if>
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT( d.DATE_ID, '%Y-%m-%d' ) &lt;= DATE_FORMAT( #{endTime}, '%Y-%m-%d' )
</if>
GROUP BY
d.DATE_ID
ORDER BY
d.DATE_ID ASC
</select>
<select id="statAgency" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">

Write Preview
Loading…
Cancel
Save