Browse Source

大屏数据采集 接口,入参增加:allParentIds

master
zhangyongzhangyong 5 years ago
parent
commit
afe39de165
  1. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
  2. 6
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
  3. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
  4. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
  5. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
  6. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java
  7. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
  8. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
  9. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java
  10. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java
  11. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
  12. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
  13. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
  14. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
  15. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java

@ -48,4 +48,9 @@ public class CustomerGridFormDTO implements Serializable {
* 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

6
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java

@ -94,9 +94,13 @@ public class DifficultyDataFormDTO implements Serializable {
*/ */
private Integer eventHandledCount; private Integer eventHandledCount;
/** /**
* 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java

@ -121,4 +121,9 @@ public class EventDataFormDTO implements Serializable {
* 数据更新至: yyyy|yyyMM|yyyyMMdd 8.21增加字段 * 数据更新至: yyyy|yyyMM|yyyyMMdd 8.21增加字段
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java

@ -79,4 +79,9 @@ public class OrgRankDataFormDTO implements Serializable {
* 满意率最大值100保留小数点后四位 * 满意率最大值100保留小数点后四位
*/ */
private BigDecimal satisfactionRatio; private BigDecimal satisfactionRatio;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@ -73,4 +73,9 @@ public class PartyUserRankDataFormDTO implements Serializable {
* *
*/ */
private String name; private String name;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenCustomerGridEntity.java

@ -78,4 +78,8 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java

@ -127,4 +127,8 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java

@ -144,4 +144,8 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenOrgRankDataEntity.java

@ -109,4 +109,8 @@ public class ScreenOrgRankDataEntity extends BaseEpmetEntity {
*/ */
private BigDecimal satisfactionRatio; private BigDecimal satisfactionRatio;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyUserRankDataEntity.java

@ -98,4 +98,8 @@ public class ScreenPartyUserRankDataEntity extends BaseEpmetEntity {
*/ */
private String dataEndTime; private String dataEndTime;
/**
* 所有上级ID用英文逗号分开(8.26新增)
*/
private String allParentIds;
} }

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@ -29,7 +29,8 @@
CREATED_TIME, CREATED_TIME,
UPDATED_BY, UPDATED_BY,
UPDATED_TIME, UPDATED_TIME,
DATA_END_TIME DATA_END_TIME,
ALL_PARENT_IDS
) values ) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
@ -47,7 +48,8 @@
now(), now(),
'APP_USER', 'APP_USER',
now(), now(),
#{item.dataEndTime} #{item.dataEndTime},
#{item.allParentIds}
) )
</foreach> </foreach>
</insert> </insert>

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@ -35,7 +35,8 @@
UPDATED_BY, UPDATED_BY,
UPDATED_TIME, UPDATED_TIME,
LATEST_OPERATE_DESC, LATEST_OPERATE_DESC,
DATA_END_TIME DATA_END_TIME,
ALL_PARENT_IDS
) values ) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
@ -63,7 +64,8 @@
'APP_USER', 'APP_USER',
now(), now(),
#{item.latestOperateDesc}, #{item.latestOperateDesc},
#{item.dataEndTime} #{item.dataEndTime},
#{item.allParentIds}
) )
</foreach> </foreach>
</insert> </insert>

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@ -38,7 +38,8 @@
EVENT_STATUS_CODE, EVENT_STATUS_CODE,
EVENT_STATUS_DESC, EVENT_STATUS_DESC,
LATEST_OPERATE_DESC, LATEST_OPERATE_DESC,
DATA_END_TIME DATA_END_TIME,
ALL_PARENT_IDS
) values ) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
@ -69,7 +70,8 @@
#{item.eventStatusCode}, #{item.eventStatusCode},
#{item.eventStatusDesc}, #{item.eventStatusDesc},
#{item.latestOperateDesc}, #{item.latestOperateDesc},
#{item.dataEndTime} #{item.dataEndTime},
#{item.allParentIds}
) )
</foreach> </foreach>
</insert> </insert>

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@ -35,7 +35,8 @@
CREATED_BY, CREATED_BY,
CREATED_TIME, CREATED_TIME,
UPDATED_BY, UPDATED_BY,
UPDATED_TIME UPDATED_TIME,
ALL_PARENT_IDS
) values ) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
@ -59,7 +60,8 @@
'APP_USER', 'APP_USER',
now(), now(),
'APP_USER', 'APP_USER',
now() now(),
#{item.allParentIds}
) )
</foreach> </foreach>
</insert> </insert>

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@ -29,7 +29,8 @@
CREATED_TIME, CREATED_TIME,
UPDATED_BY, UPDATED_BY,
UPDATED_TIME, UPDATED_TIME,
DATA_END_TIME DATA_END_TIME,
ALL_PARENT_IDS
) values ) values
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
@ -51,7 +52,8 @@
now(), now(),
'APP_USER', 'APP_USER',
now(), now(),
#{item.dataEndTime} #{item.dataEndTime},
#{item.allParentIds}
) )
</foreach> </foreach>
</insert> </insert>

Loading…
Cancel
Save