diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java new file mode 100644 index 0000000..502d49c --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java @@ -0,0 +1,61 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.List; +import java.util.Map; + +@Controller +public class StatisticController { + + @Autowired + private IStatisticService statisticService; + + @RequestMapping("/device/countByType") + @ResponseBody + public Object countDeviceByType() { + Map map = statisticService.countDeviceByType(); + return ResponseData.success(map); + } + + @RequestMapping("/statistic/peopleCountByDevice") + @ResponseBody + public Object peopelCountByDevice(String startTime,String endTime) { + List> list = statisticService.peopleCountByDevice(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/peopleCountByDept") + @ResponseBody + public Object peopelCountByDept(String startTime,String endTime) { + List> list = statisticService.peopleCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/printCountByDept") + @ResponseBody + public Object printCountByDept(String startTime,String endTime) { + List> list = statisticService.printCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyTime") + @ResponseBody + public Object countbyTime(String date){ + List> list = statisticService.countByTime(date); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyDay") + @ResponseBody + public Object countbyTime(String startDate, String endDate){ + List> list = statisticService.countByDate(startDate, endDate); + return ResponseData.success(list); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java new file mode 100644 index 0000000..502d49c --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java @@ -0,0 +1,61 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.List; +import java.util.Map; + +@Controller +public class StatisticController { + + @Autowired + private IStatisticService statisticService; + + @RequestMapping("/device/countByType") + @ResponseBody + public Object countDeviceByType() { + Map map = statisticService.countDeviceByType(); + return ResponseData.success(map); + } + + @RequestMapping("/statistic/peopleCountByDevice") + @ResponseBody + public Object peopelCountByDevice(String startTime,String endTime) { + List> list = statisticService.peopleCountByDevice(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/peopleCountByDept") + @ResponseBody + public Object peopelCountByDept(String startTime,String endTime) { + List> list = statisticService.peopleCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/printCountByDept") + @ResponseBody + public Object printCountByDept(String startTime,String endTime) { + List> list = statisticService.printCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyTime") + @ResponseBody + public Object countbyTime(String date){ + List> list = statisticService.countByTime(date); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyDay") + @ResponseBody + public Object countbyTime(String startDate, String endDate){ + List> list = statisticService.countByDate(startDate, endDate); + return ResponseData.success(list); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java new file mode 100644 index 0000000..75c9fbe --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.RecognitionRecords; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface StatisticMapper { + + Map countDeviceByType(); + + List> peopleCountByDevice(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> peopleCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> printCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> countByTime(@Param("deptIds")List deptIds,@Param("date")String date); + + List selectByDay(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("deptIds")List deptIds); + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java new file mode 100644 index 0000000..502d49c --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java @@ -0,0 +1,61 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.List; +import java.util.Map; + +@Controller +public class StatisticController { + + @Autowired + private IStatisticService statisticService; + + @RequestMapping("/device/countByType") + @ResponseBody + public Object countDeviceByType() { + Map map = statisticService.countDeviceByType(); + return ResponseData.success(map); + } + + @RequestMapping("/statistic/peopleCountByDevice") + @ResponseBody + public Object peopelCountByDevice(String startTime,String endTime) { + List> list = statisticService.peopleCountByDevice(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/peopleCountByDept") + @ResponseBody + public Object peopelCountByDept(String startTime,String endTime) { + List> list = statisticService.peopleCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/printCountByDept") + @ResponseBody + public Object printCountByDept(String startTime,String endTime) { + List> list = statisticService.printCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyTime") + @ResponseBody + public Object countbyTime(String date){ + List> list = statisticService.countByTime(date); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyDay") + @ResponseBody + public Object countbyTime(String startDate, String endDate){ + List> list = statisticService.countByDate(startDate, endDate); + return ResponseData.success(list); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java new file mode 100644 index 0000000..75c9fbe --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.RecognitionRecords; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface StatisticMapper { + + Map countDeviceByType(); + + List> peopleCountByDevice(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> peopleCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> printCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> countByTime(@Param("deptIds")List deptIds,@Param("date")String date); + + List selectByDay(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("deptIds")List deptIds); + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml new file mode 100644 index 0000000..c9e6a78 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java new file mode 100644 index 0000000..502d49c --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java @@ -0,0 +1,61 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.List; +import java.util.Map; + +@Controller +public class StatisticController { + + @Autowired + private IStatisticService statisticService; + + @RequestMapping("/device/countByType") + @ResponseBody + public Object countDeviceByType() { + Map map = statisticService.countDeviceByType(); + return ResponseData.success(map); + } + + @RequestMapping("/statistic/peopleCountByDevice") + @ResponseBody + public Object peopelCountByDevice(String startTime,String endTime) { + List> list = statisticService.peopleCountByDevice(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/peopleCountByDept") + @ResponseBody + public Object peopelCountByDept(String startTime,String endTime) { + List> list = statisticService.peopleCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/printCountByDept") + @ResponseBody + public Object printCountByDept(String startTime,String endTime) { + List> list = statisticService.printCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyTime") + @ResponseBody + public Object countbyTime(String date){ + List> list = statisticService.countByTime(date); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyDay") + @ResponseBody + public Object countbyTime(String startDate, String endDate){ + List> list = statisticService.countByDate(startDate, endDate); + return ResponseData.success(list); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java new file mode 100644 index 0000000..75c9fbe --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.RecognitionRecords; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface StatisticMapper { + + Map countDeviceByType(); + + List> peopleCountByDevice(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> peopleCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> printCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> countByTime(@Param("deptIds")List deptIds,@Param("date")String date); + + List selectByDay(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("deptIds")List deptIds); + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml new file mode 100644 index 0000000..c9e6a78 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java new file mode 100644 index 0000000..84b4d72 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.service; + +import java.util.List; +import java.util.Map; + +public interface IStatisticService { + + Map countDeviceByType(); + + List> peopleCountByDevice(String startTime, String endTime); + + List> peopleCountByDept(String startTime, String endTime); + + List> printCountByDept(String startTime, String endTime); + + List> countByTime(String date); + + List> countByDate(String startDate, String endDate); + + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java new file mode 100644 index 0000000..502d49c --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/StatisticController.java @@ -0,0 +1,61 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.List; +import java.util.Map; + +@Controller +public class StatisticController { + + @Autowired + private IStatisticService statisticService; + + @RequestMapping("/device/countByType") + @ResponseBody + public Object countDeviceByType() { + Map map = statisticService.countDeviceByType(); + return ResponseData.success(map); + } + + @RequestMapping("/statistic/peopleCountByDevice") + @ResponseBody + public Object peopelCountByDevice(String startTime,String endTime) { + List> list = statisticService.peopleCountByDevice(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/peopleCountByDept") + @ResponseBody + public Object peopelCountByDept(String startTime,String endTime) { + List> list = statisticService.peopleCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/printCountByDept") + @ResponseBody + public Object printCountByDept(String startTime,String endTime) { + List> list = statisticService.printCountByDept(startTime, endTime); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyTime") + @ResponseBody + public Object countbyTime(String date){ + List> list = statisticService.countByTime(date); + return ResponseData.success(list); + } + + @RequestMapping("/statistic/countbyDay") + @ResponseBody + public Object countbyTime(String startDate, String endDate){ + List> list = statisticService.countByDate(startDate, endDate); + return ResponseData.success(list); + } +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java new file mode 100644 index 0000000..75c9fbe --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.RecognitionRecords; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface StatisticMapper { + + Map countDeviceByType(); + + List> peopleCountByDevice(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> peopleCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> printCountByDept(@Param("deptIds")List deptIds,@Param("startTime")String startTime,@Param("endTime")String endTime); + + List> countByTime(@Param("deptIds")List deptIds,@Param("date")String date); + + List selectByDay(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("deptIds")List deptIds); + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml new file mode 100644 index 0000000..c9e6a78 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java new file mode 100644 index 0000000..84b4d72 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IStatisticService.java @@ -0,0 +1,21 @@ +package com.casic.missiles.modular.system.service; + +import java.util.List; +import java.util.Map; + +public interface IStatisticService { + + Map countDeviceByType(); + + List> peopleCountByDevice(String startTime, String endTime); + + List> peopleCountByDept(String startTime, String endTime); + + List> printCountByDept(String startTime, String endTime); + + List> countByTime(String date); + + List> countByDate(String startDate, String endDate); + + +} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java new file mode 100644 index 0000000..a676898 --- /dev/null +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -0,0 +1,199 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.shiro.ShiroUser; +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dao.StatisticMapper; +import com.casic.missiles.modular.system.model.RecognitionRecords; +import com.casic.missiles.modular.system.service.IStatisticService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; + +@Service +public class StatisticServiceImpl implements IStatisticService { + @Resource + private StatisticMapper statisticMapper; + @Autowired + private ICommonPermissionService permissionService; + + @Override + public Map countDeviceByType() { + return statisticMapper.countDeviceByType(); + } + + @Override + public List> peopleCountByDevice(String startTime,String endTime) { + List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); + if(ToolUtil.isEmpty(startTime)){ + startTime = getZeroTime(); + } + if(ToolUtil.isEmpty(endTime)) { + endTime = getTwelveTime(); + } + List> list = this.statisticMapper.peopleCountByDevice(deptIds,startTime,endTime); + return list; + } + + @Override + public List> peopleCountByDept(String startTime, String endTime) { + List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); + if(ToolUtil.isEmpty(startTime)){ + startTime = getZeroTime(); + } + if(ToolUtil.isEmpty(endTime)) { + endTime = getTwelveTime(); + } + List> list = this.statisticMapper.peopleCountByDept(deptIds,startTime,endTime); + convDeptName(list); + processEmptyList(list); + return list; + } + + @Override + public List> printCountByDept(String startTime, String endTime) { + List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); + if(ToolUtil.isEmpty(startTime)){ + startTime = getZeroTime(); + } + if(ToolUtil.isEmpty(endTime)) { + endTime = getTwelveTime(); + } + List> list = this.statisticMapper.printCountByDept(deptIds,startTime,endTime); + convDeptName(list); + processEmptyList(list); + return list; + } + + @Override + public List> countByTime(String date) { + List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); + if(ToolUtil.isEmpty(date)){ + date = DateUtil.getDay(); + } + List> list = this.statisticMapper.countByTime(deptIds,date); + for (Map map : list) { + map.replace("time",map.get("time").toString()+"时"); + } + return list; + } + + @Override + public List> countByDate(String startDate, String endDate) { + // 默认7天 + if(ToolUtil.isEmpty(startDate)){ + startDate = get7DaysAgo(); + } + if(ToolUtil.isEmpty(endDate)) { + endDate = DateUtil.getDay(); + } + List dates = getDateRange(startDate, endDate); + List> res = new ArrayList<>(); + Map> resMap = new HashMap<>(); + // 每个日期生成一个map + for (String date : dates) { + Map map = new HashMap<>(); + map.put("date",date); + map.put("total",0); + map.put("temp",0); + res.add(map); + resMap.put(date,map); + } + List deptIds = permissionService.getCurrUserDataScope().getDeptIds(); + // 获取日期内的识别记录 + List records = statisticMapper.selectByDay(startDate,endDate,deptIds); + for (RecognitionRecords record : records) { + String date = DateUtil.formatDate(record.getDatetime(),"yyyy-MM-dd"); + if(ToolUtil.isNotEmpty(record.getInoutType())){ + Map dateMap = resMap.get(date); + dateMap.replace("total",Integer.valueOf(dateMap.get("total").toString()) + 1); + } + if(ToolUtil.isNotEmpty(record.getTemperature())){ + Map dateMap = resMap.get(date); + dateMap.replace("temp",Integer.valueOf(dateMap.get("temp").toString()) + 1); + } + } + return res; + } + + /** + * 获取当天0点时间 + * @return + */ + private String getZeroTime(){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + Date zero = calendar.getTime(); + return DateUtil.getTime(zero); + } + + private String get7DaysAgo(){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.DAY_OF_MONTH,-7); + return DateUtil.getDay(calendar.getTime()); + } + + /** + * 获取当天24点时间 + * @return + */ + private String getTwelveTime() { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + Date twelve = calendar.getTime(); + return DateUtil.getTime(twelve); + } + + private List getDateRange(String startDate, String endDate){ + Date d1 = DateUtil.parseDate(startDate); + Date d2 = DateUtil.parseDate(endDate); + //定义日期实例 + Calendar cal = Calendar.getInstance(); + //设置日期起始时间 + cal.setTime(d1); + List dates = new ArrayList<>(); + //判断是否到结束日期 + while(cal.getTime().before(d2)){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String str = sdf.format(cal.getTime()); + dates.add(str); + //进行当前日期月份加1 + cal.add(Calendar.DAY_OF_MONTH, 1); + } + return dates; + } + + + private void convDeptName(List> list) { + for (Map map : list) { + if(ToolUtil.isNotEmpty(map.get("deptId"))){ + String deptId = String.valueOf(map.get("deptId")); + String deptName = permissionService.getDeptName(deptId); + map.put("deptName",deptName); + } + } + } + + private void processEmptyList(List> list) { + if(ToolUtil.isEmpty(list)){ + Map emptyResult = new HashMap<>(); + ShiroUser currentUser = permissionService.getCurrLoginUser(); + emptyResult.put("deptId",currentUser.getDeptId()); + emptyResult.put("deptName",currentUser.getDeptName()); + emptyResult.put("count",0); + list.add(emptyResult); + } + } +}