Skip to content

H
haoban-manage3.0
Commit c89ece39 by 黄芝文
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !76
parents b837e5a5 a5f266ed
Showing with 75 additions and 5 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MaidianLogApiService.java
package com.gic.haoban.manage.api.service;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.MaidianLogDTO;
import java.util.List;
public interface MaidianLogApiService {
void insert(MaidianLogDTO maidianLogDTO);
public Page<MaidianLogDTO> queryList(String hbversion, BasePageInfo pageInfo);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaidianLogMapper.java
package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.api.dto.MaidianLogDTO;
import com.gic.haoban.manage.service.entity.TabHaobanMaidianLog;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabHaobanMaidianLogMapper {
int deleteByPrimaryKey(Integer maidianId);
......@@ -14,4 +18,6 @@ public interface TabHaobanMaidianLogMapper {
int updateByPrimaryKeySelective(TabHaobanMaidianLog record);
int updateByPrimaryKey(TabHaobanMaidianLog record);
public List<TabHaobanMaidianLog> queryList(@Param("hbversion") String hbversion);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MaidianLogService.java
package com.gic.haoban.manage.service.service;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.MaidianLogDTO;
import java.util.List;
public interface MaidianLogService {
void insert(MaidianLogDTO maidianLogDTO);
public Page<MaidianLogDTO> queryList(String hbversion, BasePageInfo pageInfo);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaidianLogServiceImpl.java
package com.gic.haoban.manage.service.service.impl;
import java.util.Date;
import java.util.List;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.PageUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -25,4 +31,12 @@ public class MaidianLogServiceImpl implements MaidianLogService{
}
@Override
public com.gic.api.base.commons.Page<MaidianLogDTO> queryList(String hbversion, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo);
List<TabHaobanMaidianLog> logList = mapper.queryList(hbversion);
com.gic.api.base.commons.Page<MaidianLogDTO> page = PageUtil.changePageHelperToCurrentPage(new PageInfo<TabHaobanMaidianLog>(logList), MaidianLogDTO.class);
return page;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaidianLogApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -7,6 +9,8 @@ import com.gic.haoban.manage.api.dto.MaidianLogDTO;
import com.gic.haoban.manage.api.service.MaidianLogApiService;
import com.gic.haoban.manage.service.service.MaidianLogService;
import java.util.List;
@Service
public class MaidianLogApiServiceImpl implements MaidianLogApiService {
......@@ -18,4 +22,9 @@ public class MaidianLogApiServiceImpl implements MaidianLogApiService {
maidianLogService.insert(maidianLogDTO);
}
@Override
public Page<MaidianLogDTO> queryList(String hbversion, BasePageInfo pageInfo) {
Page<MaidianLogDTO> page = maidianLogService.queryList(hbversion, pageInfo);
return page;
}
}
haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianLogMapper.xml
......@@ -33,7 +33,7 @@
<sql id="Base_Column_List" >
maidian_id, staff_id, wx_enterprise_id, phone_number, device_date, options, event,
url, context, scene, platform, model, brand, hbversion, system, sdk_version, version,
system_info, stay_time, create_time, update_time,track_sign,store_id,,store_status,clerk_code,clerk_id,enterprise_id
system_info, stay_time, create_time, update_time,track_sign,store_id,store_status,clerk_code,clerk_id,enterprise_id
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
......@@ -305,4 +305,13 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
where maidian_id = #{maidianId,jdbcType=INTEGER}
</update>
<select id="queryList" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_maidian_log
where hbversion = #{hbversion}
and event ='onError' and platform!='devtools' group by options order by device_date desc
</select>
</mapper>
\ No newline at end of file
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDataController.java
......@@ -123,8 +123,13 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, list);
}
for(HaobanLoginInfoDTO dto : resultList){
dto.setAvgVisitTime((double)dto.getStayTime()/dto.getLoginClerkCnt()+"");
dto.setAvgLoginTimes(dto.getLoginClerkTimes()/dto.getLoginClerkCnt()+"");
if(dto.getLoginClerkCnt() == 0){
dto.setAvgVisitTime("0");
dto.setAvgLoginTimes("0");
}else{
dto.setAvgVisitTime((double)dto.getStayTime()/dto.getLoginClerkCnt()+"");
dto.setAvgLoginTimes(dto.getLoginClerkTimes()/dto.getLoginClerkCnt()+"");
}
}
if(CollectionUtil.isEmpty(resultList)){
resultList = new ArrayList<>();
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java
package com.gic.haoban.manage.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.MaidianLogDTO;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.MaidianLogApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
......@@ -11,6 +15,7 @@ import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -52,6 +57,9 @@ public class TestController extends WebBaseController {
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private MaidianLogApiService maidianLogApiService;
@RequestMapping("/send-message-test")
public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {
QywxXcxSendMessageDTO messageDTO = EntityUtil.changeEntityByOrika(QywxXcxSendMessageDTO.class, qo);
......@@ -126,4 +134,10 @@ public class TestController extends WebBaseController {
}
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("/maidian-log")
public HaobanResponse maidian(String hbversion, BasePageInfo pageInfo) {
Page<MaidianLogDTO> page = maidianLogApiService.queryList(hbversion, pageInfo);
return resultResponse(HaoBanErrCode.ERR_1,page);
}
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
......@@ -60,8 +60,7 @@
<dubbo:reference interface="com.gic.wechat.token.api.service.QywxTokenManageService" id="qywxTokenManageService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService"
id="dealSyncOperationApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.DealSyncOperationApiService" id="dealSyncOperationApiService"/>
<dubbo:reference id="quartzService" interface="com.gic.quartz.api.service.QuartzService" timeout="10000"/>
<dubbo:reference id="testApiService" interface="com.gic.haoban.manage.api.service.TestApiService" timeout="10000"/>
......@@ -70,5 +69,7 @@
<dubbo:reference interface="com.gic.cloud.web.service.api.service.CloudStoreGroupService" id="cloudStoreGroupService" timeout="10000" retries="0" />
<dubbo:reference id="maidianDataService" interface="com.gic.cloud.data.api.service.MaidianDataService" timeout="10000" retries="0" check="false"/>
<dubbo:reference id="maidianLogApiService" interface="com.gic.haoban.manage.api.service.MaidianLogApiService" timeout="10000" retries="0" check="false"/>
</beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment