--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/organmemberrecord/OrganMemberRecordController.java

+package com.zrqx.resource.bg.controller.organmemberrecord;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.constant.resource.ResourceRequestPath;
+import com.zrqx.core.form.resource.bg.organmemberrecord.OrganMemberRecordForm;
+import com.zrqx.core.form.resource.bg.organmemberrecord.QueryOrganMemberRecordForm;
+import com.zrqx.core.model.resource.record.OrganMemberRecord;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.resource.organmemberrecord.PieData;
+import com.zrqx.core.vo.resource.organmemberrecord.PolylineData;
+import com.zrqx.resource.bg.service.organmemberrecord.OrganMemberRecordService;
+import com.zrqx.resource.commons.Redis;
+
+@RestController
+@RequestMapping(ResourceRequestPath.BG + ResourceRequestPath.ORGANMEMBERRECORD)
+@Api(description = "机构用户浏览记录")
+public class OrganMemberRecordController {
+
+	@Autowired
+	private OrganMemberRecordService service;
+	
+	@Autowired
+	private Redis redis;
+	
+	@ApiOperation(value = "机构用户浏览记录" , notes = "机构用户浏览记录")
+	@GetMapping(value = ResourceRequestPath.PAGE)
+	public CallBack<PageInfo<OrganMemberRecord>> page(QueryOrganMemberRecordForm form,PageParam pageParam) {
+		return CallBack.success(service.page(form,pageParam));
+	}
+
+	@ApiOperation(value = "机构用户浏览记录与时间折线数据" , notes = "机构用户浏览记录与时间折线数据")
+	@GetMapping(value = ResourceRequestPath.POLYLINE + ResourceRequestPath.DATA)
+	public CallBack<List<PolylineData>> getPolylineData(OrganMemberRecordForm form) {
+		return CallBack.success(service.getPolylineData(form));
+	}
+	
+	@ApiOperation(value = "机构用户浏览记录与资源类型饼状数据" , notes = "机构用户浏览记录与资源类型饼状数据")
+	@GetMapping(value = ResourceRequestPath.PIE + ResourceRequestPath.DATA)
+	public CallBack<List<PieData>> getPieData(OrganMemberRecordForm form) {
+		return CallBack.success(service.getPieData(form));
+	}
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/organmemberrecord/OrganMemberRecordMapper.java

+package com.zrqx.resource.bg.mapper.organmemberrecord;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.form.resource.bg.organmemberrecord.OrganMemberRecordForm;
+import com.zrqx.core.form.resource.bg.organmemberrecord.QueryOrganMemberRecordForm;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.record.OrganMemberRecord;
+import com.zrqx.core.vo.resource.organmemberrecord.PieData;
+import com.zrqx.core.vo.resource.organmemberrecord.PolylineData;
+
+/**
+ * 浏览记录
+ * @author ycw
+ * @date 2019年2月12日下午2:42:01
+ */
+public interface OrganMemberRecordMapper extends BaseMapper<OrganMemberRecord> {
+
+	@Select("<script>" 
+			+ "select distinct a.id,a.resourceId,a.resourceName,a.resourceType,a.organName,a.organCode,a.memberId,a.memberName,a.createTime "
+			+ "from res_organ_member_record a "
+			+ "where 1=1 "
+			+ "<if test='" + NOTBLANK + "(organCode)'>"  
+		    + "and a.organCode = #{organCode} "
+		    + "</if>"
+		    + "<if test = '" + NOTBLANK + "(beginTime)'>"  
+		    + "and a.createTime &gt;= concat(#{beginTime}, ' 00:00:00' )"
+		    + "</if>" 
+		    + "<if test = '" + NOTBLANK + "(endTime)'>"  
+		    + "and a.createTime &lt;= concat(#{endTime}, ' 23:59:59')"
+		    + "</if>"
+		    + " order by a.createTime desc "
+		    + "</script>")
+	List<OrganMemberRecord> page(QueryOrganMemberRecordForm form);
+
+	/**
+	 * 获取时间与机构用户浏览量关系
+	 * @param form
+	 * @return
+	 */
+	@Select("<script>" 
+			+ "SELECT COUNT(id) AS num ,DATE_FORMAT(CREATETIME, '%Y-%m-%d') AS TIME FROM res_organ_member_record a "
+			+ "where 1=1 "
+			+ "<if test='" + NOTBLANK + "(organCode)'>"  
+		    + "and a.organCode = #{organCode} "
+		    + "</if>"
+		    + "<if test = '" + NOTBLANK + "(time)'>"  
+		    + "and a.createTime &gt;= concat(#{time}, '-00 00:00:00') "
+		    //+ "and a.createTime &lt;= concat(#{time}, '-32 23:59:59') "
+		    + "</if>" 
+		    + "<if test = '" + NOTBLANK + "(time)'>"  
+		    //+ "and a.createTime &gt;= concat(#{time}, '-00 00:00:00') "
+		    + "and a.createTime &lt;= concat(#{time}, '-31 23:59:59') "
+		    + "</if>" 
+			+ "GROUP BY DATE_FORMAT(CREATETIME, '%Y-%m-%d')  "
+			+ "ORDER BY DATE_FORMAT(CREATETIME, '%Y-%m-%d')  "
+		    + "</script>")
+	List<PolylineData> getPolylineData(OrganMemberRecordForm form);
+
+	/**
+	 * 获取资源类型与机构用户浏览量关系
+	 * @param form
+	 * @return
+	 */
+	@Select("<script>" 
+			+ "SELECT COUNT(id) AS num ,resourceType FROM res_organ_member_record a "
+			+ "where 1=1 "
+			+ "<if test='" + NOTBLANK + "(organCode)'>"  
+		    + "and a.organCode = #{organCode} "
+		    + "</if>"
+		    + "<if test = '" + NOTBLANK + "(time)'>"  
+		    + "and a.createTime &gt;= concat(#{time}, '-00 00:00:00') "
+		    //+ "and a.createTime &lt;= concat(#{time}, '-32 23:59:59') "
+		    + "</if>" 
+		    + "<if test = '" + NOTBLANK + "(time)'>"  
+		    //+ "and a.createTime &gt;= concat(#{time}, '-00 00:00:00') "
+		    + "and a.createTime &lt;= concat(#{time}, '-31 23:59:59') "
+		    + "</if>" 
+			+ "GROUP BY resourceType "
+			+ "ORDER BY resourceType "
+		    + "</script>")		
+	List<PieData> getPieData(OrganMemberRecordForm form);
+
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/organmemberrecord/OrganMemberRecordService.java

+package com.zrqx.resource.bg.service.organmemberrecord;
+
+
+import java.util.List;
+
+import com.zrqx.core.form.resource.bg.organmemberrecord.OrganMemberRecordForm;
+import com.zrqx.core.form.resource.bg.organmemberrecord.QueryOrganMemberRecordForm;
+import com.zrqx.core.model.resource.record.OrganMemberRecord;
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.resource.organmemberrecord.PieData;
+import com.zrqx.core.vo.resource.organmemberrecord.PolylineData;
+
+public interface OrganMemberRecordService extends BaseService<OrganMemberRecord, Integer> {
+
+	/**
+	 * 机构用户浏览记录
+	 * @param form
+	 * @param pageParam
+	 * @return
+	 */
+	PageInfo<OrganMemberRecord> page(QueryOrganMemberRecordForm form,PageParam pageParam);
+
+	/**
+	 * 获取浏览记录折线数据
+	 * @param form
+	 * @return
+	 */
+	List<PolylineData> getPolylineData(OrganMemberRecordForm form);
+
+		/**
+	 * 获取浏览记录与资源类型关系数据
+	 * @param form
+	 * @return
+	 */
+	List<PieData> getPieData(OrganMemberRecordForm form);
+
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/organmemberrecord/OrganMemberRecordServiceImpl.java

+package com.zrqx.resource.bg.service.organmemberrecord;
+
+import java.util.List;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import com.zrqx.core.enums.AllResourceTypeEnum;
+import com.zrqx.core.form.resource.bg.organmemberrecord.OrganMemberRecordForm;
+import com.zrqx.core.form.resource.bg.organmemberrecord.QueryOrganMemberRecordForm;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.record.OrganMemberRecord;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.resource.organmemberrecord.PieData;
+import com.zrqx.core.vo.resource.organmemberrecord.PolylineData;
+import com.zrqx.resource.bg.mapper.organmemberrecord.OrganMemberRecordMapper;
+import com.zrqx.resource.commons.Redis;
+
+/**
+ * 浏览记录
+ * @author ycw
+ * @date 2019年2月12日下午2:41:27
+ */
+@Service
+public class OrganMemberRecordServiceImpl extends BaseServiceImpl<OrganMemberRecord, Integer>
+		implements OrganMemberRecordService {
+	
+	@Autowired
+	private OrganMemberRecordMapper mapper;
+	
+	@Autowired
+	private Redis redis;
+	
+	@Override
+	public BaseMapper<OrganMemberRecord> getMapper() {
+		return mapper;
+	}
+
+	/**
+	 * 机构用户浏览记录
+	 */
+	@Override
+	public PageInfo<OrganMemberRecord> page(QueryOrganMemberRecordForm form,PageParam pageParam) {
+		startPage(pageParam);
+		return new PageInfo<OrganMemberRecord>(mapper.page(form));
+	}
+
+	/**
+	 * 获取机构用户浏览记录折线数据
+	 */
+	@Override
+	public List<PolylineData> getPolylineData(OrganMemberRecordForm form) {	
+		return mapper.getPolylineData(form);
+	}
+
+	@Override
+	public List<PieData> getPieData(OrganMemberRecordForm form) {
+		List<PieData> list = mapper.getPieData(form);
+		list.forEach(f ->{
+			f.setResourceTypeName(AllResourceTypeEnum.getName(f.getResourceType()));
+		});
+		return mapper.getPieData(form);
+	}
+	
+}