Merge branch 'dev_yushan_screen' into develop

# Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 public class RequestLogAspect extends BaseRequestLogAspect {
 
     @Override
-    @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
+    @Around(value = "execution(* com.epmet.controller..*Controller*.*(..)) ")
     public Object proceed(ProceedingJoinPoint point) throws Throwable {
         return super.proceed(point, getRequest());
     }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml

@@ -91,6 +91,7 @@
         UNION ALL
         SELECT
             c.CUSTOMER_ID,
+            c.CUSTOMER_ID AS categoryOriginCustomerId,
             left(c.CATEGORY_CODE, 4) AS CATEGORY_CODE,
             '1' AS `LEVEL`,
             p.AGENCY_ID AS orgId,

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml

@@ -31,7 +31,7 @@
         VALUES
         <foreach collection="tags" item="tag" separator=",">
             (
-            #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor} #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW()
+            #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor}, #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW()
             )
         </foreach>
         ON DUPLICATE KEY UPDATE

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolYuShanResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/25 3:50 下午
+ * @DESC
+ */
+@Data
+public class PatrolYuShanResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -54918706294182026L;
+
+    private String staffId;
+
+    private String gridId;
+
+    /**
+     * 巡查时长
+     */
+    private Integer patrolDuration;
+
+    /**
+     * 巡查次数
+     */
+    private Integer patrolCount;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -626,4 +626,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/staffrole/queryRoleStaffIds")
     Result<Set<String>> queryRoleStaffIds(@RequestBody RoleStaffIdFormDTO formDTO);
+
+    /**
+     * @Description   查询巡查次数和时长
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/8/25 3:59 下午
+     */
+    @PostMapping("/epmetuser/statsstaffpatrolrecorddaily/patrolinfo")
+    Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -445,4 +445,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<Set<String>> queryRoleStaffIds(RoleStaffIdFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryRoleStaffIds", formDTO);
     }
+
+    @Override
+    public Result<List<PatrolYuShanResultDTO>> patrolInfo(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolInfo", agencyId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsStaffPatrolRecordDailyController.java

@@ -2,12 +2,15 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
 import com.epmet.service.StatsStaffPatrolRecordDailyService;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * [天]工作人员巡查记录统计
@@ -33,4 +36,15 @@ public class StatsStaffPatrolRecordDailyController {
         ValidatorUtils.validateEntity(formDTO, PatrolCountFormDTO.PatrolCountForm.class);
         return new Result<PatrolCountResultDTO>().ok(statsStaffPatrolRecordDailyService.patrolCount(formDTO));
     }
+
+    /**
+     * @Description  查询巡查次数和时长
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/8/25 4:02 下午
+     */
+    @PostMapping("patrolinfo")
+    public Result<List<PatrolYuShanResultDTO>> patrolInfo(@RequestParam("agencyId")String agencyId){
+        return new Result<List<PatrolYuShanResultDTO>>().ok(statsStaffPatrolRecordDailyService.patrolInfo(agencyId));
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
 import com.epmet.dto.result.SelectPatrolCountResultDTO;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -71,5 +72,13 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @date 2021/8/20 9:10 上午
      */
     List<SelectPatrolCountResultDTO> selectPatrolCount(@Param("agencyId")String agencyId, @Param("dateId")String dateId);
+
+    /**
+     * @Description  查询巡查次数和时长
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/8/25 4:02 下午
+     */
+    List<PatrolYuShanResultDTO> patrolInfo(@Param("agencyId")String agencyId);
     
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsStaffPatrolRecordDailyService.java

@@ -1,10 +1,13 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
 
+import java.util.List;
+
 /**
  * [天]工作人员巡查记录统计
  *
@@ -21,4 +24,12 @@ public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsSta
      */
     PatrolCountResultDTO patrolCount(PatrolCountFormDTO formDTO);
 
+    /**
+     * @Description  查询巡查次数和时长
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/8/25 4:02 下午
+     */
+    List<PatrolYuShanResultDTO> patrolInfo(String agencyId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsStaffPatrolRecordDailyServiceImpl.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.PatrolConstant;
 import com.epmet.dao.StatsStaffPatrolRecordDailyDao;
+import com.epmet.dto.result.PatrolYuShanResultDTO;
 import com.epmet.dto.result.SelectPatrolCountResultDTO;
 import com.epmet.entity.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.service.StatsStaffPatrolRecordDailyService;
@@ -45,4 +46,15 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
         });
         return result;
     }
+
+    /**
+     * @Description  查询巡查次数和时长
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/8/25 4:02 下午
+     */
+    @Override
+    public List<PatrolYuShanResultDTO> patrolInfo(String agencyId) {
+        return baseDao.patrolInfo(agencyId);
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StatsStaffPatrolRecordDailyDao.xml

@@ -52,4 +52,17 @@
              ORDER BY STAFF_ID DESC) t GROUP BY t.STATUS
     </select>
 
+    <!-- 查询巡查次数和时长 -->
+    <select id="patrolInfo" resultType="com.epmet.dto.result.PatrolYuShanResultDTO">
+        SELECT
+            GRID_ID,
+            STAFF_ID,
+            IFNULL(SUM(PATROL_TOTAL),0) AS patrolCount,
+            IFNULL(ROUND((SUM(TOTAL_TIME)/60),0),0) AS patrolDuration
+        FROM stats_staff_patrol_record_daily
+        WHERE DEL_FLAG = 0
+          AND GRID_PIDS LIKE CONCAT('%',#{agencyId},'%')
+        GROUP BY GRID_ID,STAFF_ID
+    </select>
+
 </mapper>