操作记录列表

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java

@@ -10,4 +10,24 @@ public class LogOperationListFormDTO {
     private Integer pageNo = 1;
 
     private Integer pageSize = 10;
+    /**
+     * 姓名
+     */
+    private String operatorName;
+    /**
+     * 手机号
+     */
+    private String operatorMobile;
+    /**
+     * yyyyMMdd
+     */
+    private String startTime;
+    /**
+     * yyyyMMdd
+     */
+    private String endTime;
+    /**
+     * 默认传data_tm
+     */
+    private String category;
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java

@@ -1,7 +1,10 @@
 package com.epmet.dto.region;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  *
  */
@@ -45,4 +48,6 @@ public class LogOperationResultDTO {
      */
     private Long operatingTime;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
+    private Date operateTime;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -45,4 +46,20 @@ public class LogOperationController {
         return new Result<List<LogOperationResultDTO>>().ok(resultList);
     }
 
+    /**
+     * 数字社区-操作记录
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("page")
+    public Result<PageData<LogOperationResultDTO>> page(@RequestBody LogOperationListFormDTO formDTO){
+        return new Result<PageData<LogOperationResultDTO>>().ok(logOperationService.page(loginUserUtil.getLoginUserCustomerId(),
+                formDTO.getStartTime(),
+                formDTO.getEndTime(),
+                formDTO.getOperatorName(),
+                formDTO.getOperatorMobile(),
+                formDTO.getPageNo(),
+                formDTO.getPageSize(),
+                formDTO.getCategory()));
+    }
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java

@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 操作日指标
@@ -30,4 +34,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface LogOperationDao extends BaseDao<LogOperationEntity> {
 
+    List<LogOperationResultDTO> pageList(@Param("customerId") String customerId,
+                                         @Param("startTime")String startTime,
+                                         @Param("endTime")String endTime,
+                                         @Param("operatorName")String operatorName,
+                                         @Param("operatorMobile")String operatorMobile,
+                                         @Param("category")String category);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 
@@ -25,4 +26,20 @@ public interface LogOperationService {
      * @date 2021.06.07 21:56
     */
     List<LogOperationResultDTO> listOperationLogs(String condition, String customerId, Integer pageNo, Integer pageSize);
+
+    /**
+     * 数字社区-操作记录
+     * @param loginUserCustomerId
+     * @param startTime
+     * @param endTime
+     * @param operatorName
+     * @param operatorMobile
+     * @return
+     */
+    PageData<LogOperationResultDTO> page(String loginUserCustomerId,
+                                         String startTime,
+                                         String endTime,
+                                         String operatorName,
+                                         String operatorMobile,
+                                         Integer pageNo, Integer pageSize,String category);
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.LogOperationDao;
 import com.epmet.dto.CustomerStaffDTO;
@@ -15,6 +16,8 @@ import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.entity.LogOperationEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.LogOperationService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -174,7 +177,28 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
             ldto.setCustomerId(l.getCustomerId());
             ldto.setOperatorMobile(staffMap.get(l.getOperatorId()).getMobile());
             ldto.setOperatorName(staffMap.get(l.getOperatorId()).getRealName());
+            ldto.setOperateTime(l.getOperatingTime());
             return ldto;
         }).collect(Collectors.toList());
     }
+
+    /**
+     * 数字社区-操作记录
+     *
+     * @param customerId
+     * @param startTime
+     * @param endTime
+     * @param operatorName
+     * @param operatorMobile
+     * @return
+     */
+    @Override
+    public PageData<LogOperationResultDTO> page(String customerId, String startTime, String endTime, String operatorName, String operatorMobile,
+                                                Integer pageNo, Integer pageSize,String category) {
+        // 列表/导出查询
+        PageHelper.startPage(pageNo, pageSize);
+        List<LogOperationResultDTO> list = logOperationDao.pageList(customerId, startTime, endTime, operatorName, operatorMobile,category);
+        PageInfo<LogOperationResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }

epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml

@@ -26,5 +26,38 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="pageList" parameterType="map" resultType="com.epmet.dto.region.LogOperationResultDTO">
+        SELECT
+            lo.CATEGORY as category,
+            lo.TYPE as type,
+            lo.TYPE_DISPLAY as typeDisplay,
+            lo.CONTENT as content,
+            lo.TARGET_ID as targetId,
+            lo.CUSTOMER_ID as customerId,
+            lo.OPERATOR_ID as operatorId,
+            lo.OPERATOR_NAME as operatorName,
+            lo.OPERATOR_MOBILE as operatorMobile,
+            lo.OPERATING_TIME as operateTime
+        FROM
+            log_operation lo
+        WHERE
+            lo.del_flag = '0'
+            AND lo.CUSTOMER_ID = #{customerId}
+        <if test="category != null and category != ''">
+            AND lo.CATEGORY = #{category}
+        </if>
+        <if test="operatorName != null and operatorName != ''">
+            AND lo.OPERATOR_NAME LIKE concat('%',#{operatorName},'%')
+        </if>
+        <if test="operatorMobile != null and operatorMobile != ''">
+            AND lo.OPERATOR_MOBILE LIKE concat('%',#{operatorMobile},'%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT( lo.OPERATING_TIME, '%Y%m%d' ) &lt;= #{endTime}
+        </if>
+        ORDER BY lo.OPERATING_TIME DESC
+    </select>
 </mapper>