Merge remote-tracking branch 'origin/master'

ebc-middle-platform/src/conf/services.js

@@ -167,6 +167,10 @@ export default {
    UPD_MAP_TAG: '/mapTag/modifyMapTagInfo', // 查询地图标记信息用作修改
    MAP_TAG_TYPE: '/mapTag/queryMapAreaTypeList' // 查询标记类型下拉列表
  },
  gisParam: {
    GET_PARAM: '/gisParam/querySeaMapParam', // 获取默认地图参数
    UPD_PARAM: '/gisParam/modifySeaMapParam' // 修改默认地图参数
  },
  equipment: {
    EQUIPMENT_TYPE: '/equipment/loadAllResourceToolType', // 获取所有设备类型
    GET_EQUIPMENT: '/equipment/queryEquipmentInfo', // 查询设备管理信息
@@ -189,7 +193,7 @@ export default {
    DEVICE_TRACK: '/device/queryOneDeviceLocationInfo' // 查询设备轨迹
  },
  trackAnalysis: {
    GET_TRACKANALYSIS: '/trackAnalysis/queryTrackAnalysisInfo' // 查询轨迹分析
    GET_TRACKANALYSIS: '/attendanceManagement/queryPageTrackRecord' // 查询轨迹分析
  },
  areaInOutRecord: {
    GET_ATTENDANCE: '/areaInOutRecord/queryPageAttendanceCount', // 分页查询考勤统计分析

ebc-middle-platform/src/modules/attendance/track.vue

@@ -7,7 +7,7 @@
            <t-date-picker v-model="queryCondition.rangeDate"
                           align-right
                           style="width:250px;"
                           type="dateRange"
                           type="dateTimeRange"
                           placeholder="选择时间段"
                           @date-change="onChange"></t-date-picker>
          </div>
@@ -26,14 +26,14 @@
      </div>
    </div>
    <div>
      <t-table :data="table.data">
      <t-table :data="table.data" :loading="tableLoading" >
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="userName" label="姓名"></t-table-column>
        <t-table-column prop="duty" label="职务"></t-table-column>
        <t-table-column prop="RECORD_LOCATION" label="位置区域"></t-table-column>
        <t-table-column prop="stayTime" label="停留时长（h）"></t-table-column>
        <t-table-column prop="IN_DATE" label="进入时间"></t-table-column>
        <t-table-column prop="OUT_DATE" label="离开时间"></t-table-column>
        <t-table-column prop="entityName" label="姓名"></t-table-column>
        <t-table-column prop="entityPosition" label="职务"></t-table-column>
        <t-table-column prop="mapAreaName" label="位置区域"></t-table-column>
        <t-table-column prop="durationTime" label="停留时长（h）"></t-table-column>
        <t-table-column prop="inTime" :formatter="timestampToTime" label="进入时间"></t-table-column>
        <t-table-column prop="outTime" :formatter="timestampToTime" label="离开时间"></t-table-column>
      </t-table>
      <t-pager :total="table.pager.total" :current.sync="table.pager.currentPage"
               :page-size.sync="table.pager.size"
@@ -63,7 +63,9 @@ export default {
      queryCondition: {
        rangeDate: [],
        alarmPerson: ''
      }
      },
      tableLoading: true,
      fullLoading: false
    }
  },
  mounted() {
@@ -71,104 +73,33 @@ export default {
  },
  methods: {
    getList() {
      this.table.data = [{
        userName: '周杰',
        duty: '员工',
        RECORD_LOCATION: '休息区',
        stayTime: '0.5',
        IN_DATE: '2020-11-25 10:30:30',
        OUT_DATE: '2020-11-25 11:00:30'
      }, {
        userName: '李雷',
        duty: '员工',
        RECORD_LOCATION: '禁区',
        stayTime: '1',
        IN_DATE: '2020-11-25 9:30:33',
        OUT_DATE: '2020-11-25 10:30:44'
      }, {
        userName: '刘伟',
        duty: '员工',
        RECORD_LOCATION: '考勤区',
        stayTime: '3',
        IN_DATE: '2020-11-25 08:30:23',
        OUT_DATE: '2020-11-25 11:30:45'
      }, {
        userName: '韩梅梅',
        duty: '救援',
        RECORD_LOCATION: '作业区',
        stayTime: '4',
        IN_DATE: '2020-11-25 07:28:30',
        OUT_DATE: '2020-11-25 11:34:36'
      }, {
        userName: '韩梅梅',
        duty: '救援',
        RECORD_LOCATION: ' 考勤区',
        stayTime: '1',
        IN_DATE: '2020-11-24 09:30:30',
        OUT_DATE: '2020-11-24 10:35:26'
      }, {
        userName: '李雷',
        duty: '员工',
        RECORD_LOCATION: '考勤区',
        stayTime: '11.5',
        IN_DATE: '2020-11-24 07:18:12',
        OUT_DATE: '2020-11-24 18:44:06'
      }, {
        userName: '李雷',
        duty: '员工',
        RECORD_LOCATION: '作业区',
        stayTime: '11',
        IN_DATE: '2020-11-24 07:21:25',
        OUT_DATE: '2020-11-24 18:34:04'
      }, {
        userName: '李雷',
        duty: '员工',
        RECORD_LOCATION: '禁区',
        stayTime: '1',
        IN_DATE: '2020-11-24 16:37:23',
        OUT_DATE: '2020-11-25 17:24:35'
      }, {
        userName: '刘伟',
        duty: '员工',
        RECORD_LOCATION: '休息区',
        stayTime: '0.5',
        IN_DATE: '2020-11-24 13:28:36',
        OUT_DATE: '2020-11-24 13:58:29'
      }, {
        userName: '刘伟',
        duty: '员工',
        RECORD_LOCATION: '休息区',
        stayTime: '1',
        IN_DATE: '2020-11-24 18:38:27',
        OUT_DATE: '2020-11-24 19:24:41'
      }]
      this.table.pager.total = 10
      // var start = ''
      // var end = ''
      // if (this.queryCondition.rangeDate.length > 0) {
      //   start = this.queryCondition.rangeDate[0]
      //   end = this.queryCondition.rangeDate[1]
      // }
      // var params = new FormData()
      // params.append(
      //   'data',
      //   JSON.stringify({
      //     pageNum: this.table.pager.currentPage,
      //     pageSize: this.table.pager.size,
      //     queryStartDate: start,
      //     queryEndDate: end
      //   })
      // )
      // this.$test
      //   .post(services.trackAnalysis.GET_TRACKANALYSIS, params)
      //   .then((res) => {
      //   // 请求成功处理...
      //     this.table.data = res.data.result.list
      //     this.table.pager.total = res.data.result.total
      //   })
      //   .catch((res) => {
      //   // 请求失败处理...
      //   })
      this.tableLoading = true
      var start = ''
      var end = ''
      if (this.queryCondition.rangeDate.length > 0) {
        start = this.queryCondition.rangeDate[0]
        end = this.queryCondition.rangeDate[1]
      }
      this.$test
        .post(services.trackAnalysis.GET_TRACKANALYSIS, {
          pageNumber: this.table.pager.currentPage,
          pageSize: this.table.pager.size,
          data: {
            startTime: start,
            endTime: end,
            userName: this.queryCondition.alarmPerson
          }
        })
        .then((res) => {
        // 请求成功处理...
          this.tableLoading = false
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
        // 请求失败处理...
          this.tableLoading = false
        })
    },
    onChange(value) {
      console.log('date change:' + value)
@@ -182,7 +113,8 @@ export default {
      this.getList()
    },
    onSearch() {
      this.table.pager.currentPage = 1
      this.getList()
    },
    toExport() {

ebc-middle-platform/src/modules/layouts/BasicLayout.vue

@@ -79,14 +79,14 @@ export default {
  methods: {
    async getGisToken() { // 获取GIS token并存入store
      await this.$test
          .post(services.mapTag.GET_MAP_PARAM, '')
          .then((res) => {
            this.$store.commit('setGisToken', res.data.ak)
            this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
          })
          .catch((res) => {
            // 请求失败处理...
          })
        .post(services.mapTag.GET_MAP_PARAM, '')
        .then((res) => {
          this.$store.commit('setGisToken', res.data.ak)
          this.$store.commit('setMapParam', {center: [res.data.latitude, res.data.longitude], zoom: res.data.scale})
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    load() {
      this.$test
@@ -109,6 +109,7 @@ export default {
        .then((res) => {
          this.modal = false
          EventBus.$emit('reload', true)
          this.$router.push({path: '../call-help/current'})
        })
        .catch((res) => {
          // 请求失败处理...
@@ -137,6 +138,7 @@ export default {
        ok: () => {
          this.modal = false
          EventBus.$emit('reload', true)
          this.$router.push({path: '../call-help/current'})
        }
      })
    },
@@ -152,13 +154,18 @@ export default {
      this.speckText(str)
    },
    speckText(str) {
      // var url = "http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&text=" + encodeURI(str)
      // var n = new Audio(url)
      // n.src = url
      // n.play()
      var msg = new SpeechSynthesisUtterance(str)
      speechSynthesis.speak(msg)
      window.speechSynthesis.speak()
      str += '。' + str + '。' + str + '。'
      var userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
      var isOpera = userAgent.indexOf('Opera') > -1
      if (userAgent.indexOf('compatible') > -1 && userAgent.indexOf('MSIE') > -1 && !isOpera) { // 判断是否IE浏览器
        var voiceObj = new ActiveXObject('Sapi.SpVoice')
        // 朗读
        voiceObj.Speak(str, 1)
      } else {
        var msg = new SpeechSynthesisUtterance(str)
        // 朗读
        speechSynthesis.speak(msg)
      }
    },
    connect() {
      if (this.stompClient == null || !this.stompClient.connected()) {

ebc-middle-platform/src/modules/orientation/orientation.scss

@@ -482,6 +482,36 @@ background: #344979!important;
      color: #000000;
    }
  }
  .container2{
    display: flex;
    //flex-wrap: wrap;
    padding: 10px 0 10px 0px;
    div{
      width: 45%;
      color: #ffffff;
      font-size: 10px;
      line-height: 20px;
      height: 20px;
      margin: 10px;
      text-align: center;
      border-radius: 3px;
    }
    .sos{
      background-color: #F5222D;
      animation:pointsos 1s ease infinite;
      -webkit-animation:pointsos 1s ease infinite;
    }
    .normal{
      background-color: #19BB20;
    }
    .outline{
      background-color: #FAAD14;
    }
    .offline{
      background-color: #D9D9D9;
      color: #000000;
    }
  }
  .footer{
    height: 40px;
    border-top: 1px solid #E0E0E0;

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -613,13 +613,23 @@ export default {
      // this.loadCoreEntity()
    },
    getPopup(point, positionList, type, name, offset, url) { // 生成Popup
      var container = 'container'
      if (positionList.length < 3) {
        container += positionList.length
      }
      var maxWidth = 100
      if (type) {
        maxWidth = 300
        if (positionList.length === 1) {
          maxWidth = 120
        } else if (positionList.length === 2) {
          maxWidth = 200
        } else {
          maxWidth = 300
        }
      }
      point.popup = Ai.Popup({
        maxWidth: maxWidth,
        minWidth: 100,
        minWidth: maxWidth,
        offset: offset,
        autoClose: false,
        autoPan: false,
@@ -632,7 +642,7 @@ export default {
          content += '<div><img src="' + url + '" width="20" height="20"></div>'
        }
        content += '<div>' + name + '</div></div>'
        content += '<div class="container">'
        content += '<div class="' + container + '">'
        positionList.forEach(e => {
          content +=
              '<div class="' + this.getClassByStatus(e.locationStatus) + '">' + e.name + '</div>'

ebc-middle-platform/src/modules/system-management/default-map.scss

@@ -0,0 +1,36 @@
.content{
    width: 100%;
    height: 95%;
    padding-left: 0px;
    padding-right: 0px;
    box-sizing: border-box;
}
.container{
    margin: 20px 0;
}
.content{
    display: flex;
    .left{
        width: 75%;
        height: 90%;
    }
    .radio-left{
        width: 45%;
        height: 90%;
    }
    .right{
        width: 20%;
        height: 95%;
        .header{
            display: flex;
            justify-content: space-between;
            padding-right: 10px;
            .import-down{
                display: flex;
            }
        }
    }
}
.right-span{
    margin: 6px 0 0 0;
}

ebc-middle-platform/src/modules/system-management/default-map.vue

@@ -0,0 +1,204 @@
<template>
  <div class="content">
    <div id="div1" class="left" style="margin:0 auto;height: 100%;width: 80%;"></div>
    <div class="right">
      <div class="container">
        <t-form label-position="left">
          <div class="header">
            <div>中心点</div>
          </div>
          <div class="row">
            <div class="col">
              <t-form-item label="经度">
                <t-input v-model="lng" placeholder="" @blur="inputChange"></t-input>
              </t-form-item>
            </div>
            <div class="col">
              <t-form-item label="纬度">
                <t-input v-model="lat" placeholder="" @blur="inputChange"></t-input>
              </t-form-item>
            </div>
          </div>
          <div class="header">
            <div>缩放级别</div>
          </div>
          <div class="row">
            <div class="col">
              <t-radio-group v-model="zoom" vertical @change="radioChange">
                <div class="content">
                  <span class="radio-left">&nbsp;&nbsp;级别</span>
                  <span class="right-span">标尺</span>
                </div>
                <div class="content">
                  <t-radio :label="5" :type="5" class="radio-left"></t-radio>
                  <span class="right-span">300km</span>
                </div>
                <div class="content">
                  <t-radio :label="6" :type="6" class="radio-left"></t-radio>
                  <span class="right-span">200km</span>
                </div>
                <div class="content">
                  <t-radio :label="7" :type="7" class="radio-left"></t-radio>
                  <span class="right-span">100km</span>
                </div>
                <div class="content">
                  <t-radio :label="8" :type="8" class="radio-left"></t-radio>
                  <span class="right-span">50km</span>
                </div>
                <div class="content">
                  <t-radio :label="9" :type="9" class="radio-left"></t-radio>
                  <span class="right-span">20km</span>
                </div>
                <div class="content">
                  <t-radio :label="10" :type="10" class="radio-left"></t-radio>
                  <span class="right-span">10km</span>
                </div>
                <div class="content">
                  <t-radio :label="11" :type="11" class="radio-left"></t-radio>
                  <span class="right-span">5km</span>
                </div>
                <div class="content">
                  <t-radio :label="12" :type="12" class="radio-left"></t-radio>
                  <span class="right-span">2km</span>
                </div>
                <div class="content">
                  <t-radio :label="13" :type="13" class="radio-left"></t-radio>
                  <span class="right-span">1km</span>
                </div>
                <div class="content">
                  <t-radio :label="14" :type="14" class="radio-left"></t-radio>
                  <span class="right-span">500m</span>
                </div>
                <div class="content">
                  <t-radio :label="15" :type="15" class="radio-left"></t-radio>
                  <span class="right-span">300m</span>
                </div>
                <div class="content">
                  <t-radio :label="16" :type="16" class="radio-left"></t-radio>
                  <span class="right-span">200m</span>
                </div>
                <div class="content">
                  <t-radio :label="17" :type="17" class="radio-left"></t-radio>
                  <span class="right-span">100m</span>
                </div>
                <div class="content">
                  <t-radio :label="18" :type="18" class="radio-left"></t-radio>
                  <span class="right-span">50m</span>
                </div>
              </t-radio-group>
            </div>
          </div>
          <t-form-item>
            <t-button color="success" @click="submit">保存</t-button>
            <t-button @click="cancel">取消</t-button>
          </t-form-item>
        </t-form>
      </div>
    </div>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
import './default-map.scss'
import services from '../../conf/services'
import EventBus from '../../bus'
import { GIS_SEA_LAYER_URL, GIS_SEA_URL } from '../../constants'
export default {
  data() {
    return {
      fullLoading: false,
      map: null,
      zoom: null,
      lat: null,
      lng: null
    }
  },
  mounted() {
    this.getParam().then(() => {
      this.initMap()
    })
  },
  methods: {
    async getParam() {
      await this.$test.post(services.gisParam.GET_PARAM, {}
      ).then(res => {
        // 请求成功处理...
        this.lng = res.data.SEA_MAP_PARAM_LONGITUDE // 经度
        this.lat = res.data.SEA_MAP_PARAM_LATITUDE // 纬度
        this.zoom = parseInt(res.data.SEA_MAP_PARAM_SCALE) // 比例尺
      }).catch(res => {
        // 请求失败处理...
      })
    },
    initMap() { // 加载主屏地图
      if (this.map != null && this.map != '') {
        this.map.remove()
      }
      this.map = new Ai.Map('div1', {
        ak: this.$store.getters.getGisToken,
        center: this.$store.getters.getMapParam.center,
        zoom: this.$store.getters.getMapParam.zoom
      })
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      this.map.addLayer(maplayer)
      var la = Ai.WMTSLayer(
        GIS_SEA_URL,
        { opacity: 0.5 }
      )
      this.map.addLayer(la)
      Ai.Scale({ position: 'bottomright' }).addTo(this.map)
      Ai.Zoom({ type: 'small' }).addTo(this.map)
      this.map.setMinZoom(5)
      this.map.setMaxZoom(18)
      this.map.on('mouseup', this.moveend)
      this.map.on('zoomend', this.zoomend)
    },
    zoomend(e) {
      this.zoom = this.map.getZoom()
      this.lat = this.map.getCenter().lat
      this.lng = this.map.getCenter().lng
    },
    moveend(e) {
      this.map.on('mouseup', (newe) => {
        this.lat = this.map.getCenter().lat
        this.lng = this.map.getCenter().lng
      })
    },
    radioChange() {
      this.map.setZoom(this.zoom)
    },
    inputChange() {
      if (this.lat && this.lng) {
        this.map.setView([this.lat, this.lng], this.zoom)
      } else {
        this.lat = this.map.getCenter().lat
        this.lng = this.map.getCenter().lng
      }
    },
    submit() {
      this.fullLoading = true
      this.$test
        .post(services.gisParam.UPD_PARAM, {
          SEA_MAP_PARAM_LONGITUDE: this.lng, // 经度
          SEA_MAP_PARAM_LATITUDE: this.lat, // 纬度
          SEA_MAP_PARAM_SCALE: this.zoom // 比例尺
        })
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          this.$Message.success('操作成功')
        })
        .catch((res) => {
          // 请求失败处理...
          this.fullLoading = false
        })
    },
    cancel() {
      this.getParam().then(() => {
        this.map.setView([this.lat, this.lng], this.zoom)
      })
    }
  }
}
</script>

ebc-middle-platform/src/routes.js

@@ -246,6 +246,19 @@ export default [
            }
          },
          {
            path: '/system-management/default-map',
            name: 'defaultMap',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/default-map.vue'
              ),
            meta: {
              title: '默认地图',
              hiddenHeaderContent: true,
              keepAlive: true
            }
          },
          {
            path: '/system-management/equipment-management',
            name: 'equipmentManagement',
            component: () =>

location-rescue-service/pom.xml

@@ -41,11 +41,11 @@
            <artifactId>httpmime</artifactId>
        </dependency>
        <dependency>
        <!-- <dependency>
            <groupId>com.ai.bss</groupId>
            <artifactId>work-tool-service-api</artifactId>
            <version>2.1.5-SNAPSHOT</version>
        </dependency>
        </dependency> -->
        <dependency>
            <groupId>com.ai.bss</groupId>

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/AttendanceManagementController.java

@@ -94,10 +94,8 @@ public class AttendanceManagementController {
		Map<String, Object> dataMap = new HashMap<String, Object>();
		if (request != null && request.getData() != null) {
			dataMap.put("entityName", request.getData().get("userName"));
			dataMap.put("inTimeFrom", request.getData().get("inTimeStart"));
			dataMap.put("inTimeTo", request.getData().get("inTimeEnd"));
			dataMap.put("outTimeFrom", request.getData().get("outTimeStart"));
			dataMap.put("outTimeTo", request.getData().get("outTimeEnd"));
			dataMap.put("startTime", request.getData().get("startTime"));
			dataMap.put("endTime", request.getData().get("endTime"));
		}
		return attendanceManagementService.queryPageTrackRecord(dataMap, pageNumber, pageSize);

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/EquipmentManageController.java

@@ -95,7 +95,7 @@ public class EquipmentManageController {
    }
    /**
	 * 获取所有未绑定的设备
	 * 获取所有不可绑定的设备
	 */
	@ResponseBody
	@RequestMapping("/queryAllEquipmentNotBind")

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/DeviceManageServiceImpl.java

@@ -14,9 +14,7 @@ import org.springframework.util.CollectionUtils;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpec;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.characteristic.spec.service.api.CharacteristicSpecService;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.service.interfaces.CharSpecService;
import com.ai.bss.location.rescue.service.interfaces.DeviceManageService;

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AttendanceReportController.java

@@ -4,18 +4,17 @@ package com.ai.bss.security.protection.controller;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.AttendanceReportService;
import com.ai.bss.security.protection.util.EbcConstant;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +32,7 @@ public class AttendanceReportController {
	/**
	 * 分页查询考勤报表日报
	 * @param request 组合条件
	 * @param  attendanceReport
	 *                                workDay : 日报日期 (yyyy-MM-dd格式)，必选
	 *                                orgId：所属组织ID
	 *                                id：个人编码（员工编码）
@@ -43,13 +42,19 @@ public class AttendanceReportController {
	@ResponseBody
	@RequestMapping("/queryDailyAttendanceReport")
	public CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
	public CommonResponse<PageBean<Map<String,Object>>> queryDailyAttendanceReport(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<>();
		params.put("workDay",attendanceReport.getWorkDay());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		CommonResponse<PageBean<Map<String,Object>>> commonResponse = attendanceReportService.queryDailyAttendanceReport(params, pageNumber, pageSize);
@@ -68,13 +73,18 @@ public class AttendanceReportController {
	@ResponseBody
	@RequestMapping("/queryMonthlyAttendanceReport")
	public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
	public CommonResponse<PageBean<Map<String,Object>>> queryMonthlyAttendanceReport(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<>();
		params.put("month",attendanceReport.getMonth());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
		CommonResponse<PageBean<Map<String,Object>>> commonResponse= attendanceReportService.queryMonthlyAttendanceReport(params, pageNumber, pageSize);
		return commonResponse;
@@ -87,13 +97,18 @@ public class AttendanceReportController {
	 */
	@ResponseBody
	@RequestMapping("/queryPageAbnormalAttendance")
	public CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
	public CommonResponse<PageBean<Map<String,Object>>> queryPageAbnormalAttendance(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = request.getPageNumber() < 1 ? 1 : request.getPageNumber();
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = request.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : request.getPageSize();
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : attendanceReport.getPageSize();
		Map<String, Object> params = new HashMap<>();
		params.put("month",attendanceReport.getMonth());
		params.put("orgId",attendanceReport.getOrgId());
		params.put("id",attendanceReport.getId());
		params.put("nameAsLike",attendanceReport.getNameAsLike());
		params.put("mainJobPositionId",attendanceReport.getMainJobPositionId());
		CommonResponse<PageBean<Map<String,Object>>> commonResponse= attendanceReportService.queryPageAbnormalAttendance(params, pageNumber, pageSize);
		return commonResponse;
@@ -110,8 +125,11 @@ public class AttendanceReportController {
	@ResponseBody
	@RequestMapping("/queryAttendanceDetailReport")
	public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(@RequestBody CommonRequest<Map<String, Object>> request) throws Exception {
		Map<String, Object> params = request.getData() == null ? new HashMap<String, Object>() : request.getData();
	public CommonResponse<List<Map<String, Object>>> queryAttendanceDetailReport(@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		Map<String, Object> params = new HashMap<>();
		params.put("beginDay",attendanceReport.getBeginDay());
		params.put("endDay",attendanceReport.getEndDay());
		params.put("id",attendanceReport.getId());
		CommonResponse<List<Map<String, Object>>> commonResponse = attendanceReportService.queryAttendanceDetailReport(params);
		return commonResponse;

security-protection-service/src/main/java/com/ai/bss/security/protection/model/AttendanceReport.java

@@ -0,0 +1,33 @@
package com.ai.bss.security.protection.model;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/*考勤参数接收类*/
@Data
public class AttendanceReport implements Serializable {
    private  String orgId; //组织id
    private  String id; //人员id 个人编码 员工编码
    private  String mainJobPositionId;  //职位id
    private  String nameAsLike; //姓名（模糊）
    private String workDay; //当前日期
    private String month; //月份
    private String beginDay; //开始日期
    private String endDay; //结束日期
    int pageNumber = 0; // 当前页数
    int pageSize = 0; // 每页条数
}