柱状图，点击曲线，查看街道

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java

@@ -1,10 +1,12 @@
 package com.epmet.dto.form.yt;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -14,9 +16,14 @@ import java.util.Date;
  */
 @Data
 public class CommunityLoginFormDTO extends PageFormDTO {
+    public interface StreetTotalShowGroup extends CustomerClientShowGroup {
+    }
+
+
     /**
      * 所选择的组织id
      */
+    @NotBlank(message = "请选择区县",groups = StreetTotalShowGroup.class)
     private String orgId;
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java

@@ -16,6 +16,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.yt.CommunityLoginFormDTO;
 import com.epmet.dto.form.yt.CountActivityFormDTO;
 import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO;
@@ -154,6 +155,21 @@ public class StaffLoginLogController {
                 formDTO.getPageNo(), formDTO.getPageSize()));
     }
 
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("streetTotal")
+    public Result<PageData<CommunityLoginResultDTO>> streetTotal(@RequestBody CommunityLoginFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,CommunityLoginFormDTO.StreetTotalShowGroup.class);
+        return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.streetTotal(formDTO.getOrgId(),
+                formDTO.getStartDate(),
+                formDTO.getEndDate(),
+                formDTO.getPageNo(), formDTO.getPageSize()));
+    }
+
     /***
      * 获取当前agencyid下 下级组织活跃情况
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java

@@ -81,4 +81,6 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
     Integer selectLoginTotalByPath(@Param("orgIdPath") String orgIdPath,
                                    @Param("startDate") Date startDate,
                                    @Param("endDate") Date endDate);
+
+    List<CommunityLoginResultDTO> selectStreetTotal(@Param("orgId") String orgId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java

@@ -84,6 +84,12 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
      */
     PageData<CommunityLoginResultDTO> streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize);
 
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @return
+     */
+    PageData<CommunityLoginResultDTO> streetTotal(String orgId, Date startDate, Date endDate, Integer pageNo, Integer pageSize);
     /***
      * 获取登陆情况
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -261,13 +261,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         agencyWrapper.eq(CustomerAgencyEntity::getPid,orgId).orderByAsc(CustomerAgencyEntity::getCreatedTime);
         List<CustomerAgencyEntity> subAgencyList=customerAgencyDao.selectList(agencyWrapper);
         List<CommunityLoginResultDTO> list=new ArrayList<>();
+        //横坐标展示所有组织
         for(CustomerAgencyEntity agencyEntity:subAgencyList){
             CommunityLoginResultDTO resultDTO=new CommunityLoginResultDTO();
             resultDTO.setAgencyId(agencyEntity.getId());
             resultDTO.setAgencyName(agencyEntity.getOrganizationName());
             resultDTO.setAgencyLevel(agencyEntity.getLevel());
             String orgIdPath=PidUtils.convertPid2OrgIdPath(agencyEntity.getId(),agencyEntity.getPids());
-            //查询本组织及下级
+            //查询本组织及下级登录次数！！！！！！！！
             resultDTO.setCount(baseDao.selectLoginTotalByPath(orgIdPath,startDate,endDate));
             list.add(resultDTO);
         }
@@ -335,4 +336,20 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }
+
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @return
+     */
+    @Override
+    public PageData<CommunityLoginResultDTO> streetTotal(String orgId, Date startDate, Date endDate,Integer pageNo, Integer pageSize){
+        PageHelper.startPage(pageNo, pageSize);
+        // todo
+        List<CommunityLoginResultDTO> list = baseDao.selectStreetTotal(orgId, startDate, endDate);
+        PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml

@@ -233,4 +233,32 @@
             and l.LOGIN_TIME <= #{endDate}
         </if>
     </select>
+
+    <select id="selectStreetTotal" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
+        SELECT
+            ca.id AS agencyId,
+            ca.ORGANIZATION_NAME AS agencyName,
+            ca.LEVEL AS agencyLevel,
+            pa.ORGANIZATION_NAME as districtName,
+            count(l.id) AS count
+        FROM customer_agency ca
+        left join staff_login_log l
+            ON (
+                (ca.ID =l.AGENCY_ID  or ca.id=l.pid)
+                and l.del_flag='0'
+                )
+        left join customer_agency pa
+            on(ca.pid=pa.id)
+        WHERE
+            ca.DEL_FLAG = '0'
+            and ca.pid=#{orgId}
+            <if test='null != startDate'>
+                and l.LOGIN_TIME &gt;= #{startDate}
+            </if>
+            <if test='null != endDate'>
+                and l.LOGIN_TIME &lt;= #{endDate}
+            </if>
+        GROUP BY  ca.id
+        order by count(l.id) desc
+    </select>
 </mapper>