男科
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
liujie
2025-05-09 fdec3aa2487acee81ebc80aba88852f0f5036ef4 
 guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java


@@ -1,44 +1,36 @@


package com.stylefeng.guns.modular.system.controller;




import com.alibaba.druid.support.json.JSONUtils;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.mapper.Wrapper;


import com.fasterxml.jackson.databind.ObjectMapper;


import com.stylefeng.guns.core.base.controller.BaseController;


import com.stylefeng.guns.core.log.LogObjectHolder;


import com.stylefeng.guns.modular.system.dto.UserDataDto;


import com.stylefeng.guns.modular.system.dto.XDto;


import com.stylefeng.guns.modular.system.model.TUserData;


import com.stylefeng.guns.modular.system.model.TUserDateData;


import com.stylefeng.guns.modular.system.model.User;


import com.stylefeng.guns.modular.system.service.ITUserDataService;


import com.stylefeng.guns.modular.system.service.ITUserDateDataService;


import com.stylefeng.guns.modular.system.service.IUserService;


import com.stylefeng.guns.modular.system.service.impl.UserServiceImpl;


import com.stylefeng.guns.modular.system.util.ExcelUtil;


import com.stylefeng.guns.modular.system.util.R;


import com.stylefeng.guns.modular.system.util.RedisService;


import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;


import org.apache.poi.hssf.usermodel.HSSFWorkbook;


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.ui.Model;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.beans.factory.annotation.Autowired;


import com.stylefeng.guns.core.log.LogObjectHolder;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import com.stylefeng.guns.modular.system.model.TUserData;


import com.stylefeng.guns.modular.system.service.ITUserDataService;


import org.springframework.web.bind.annotation.ResponseBody;




import javax.servlet.http.HttpServletResponse;


import java.io.OutputStream;


import java.text.DateFormat;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


import java.time.LocalTime;


import java.time.ZoneId;


import java.time.format.DateTimeFormatter;


import java.util.*;


import java.util.stream.Collectors;




/**


 * 控制器


@@ -130,6 +122,18 @@




            if (time1.before(time2)){


                System.err.println("时间1<时间2");


                if (night==1){


                    //将date11和date22增加一天


                    Calendar calendar = Calendar.getInstance();


                    calendar.setTime(date11);


                    calendar.add(Calendar.DATE, 1);


                    date11 = calendar.getTime();


                    Calendar calendar1 = Calendar.getInstance();


                    calendar1.setTime(date22);


                    calendar1.add(Calendar.DATE, 1);


                    date22 = calendar1.getTime();


                }




                //正常筛选


                for (TUserData tUserDatum : tUserData) {


                    if (!tUserDatum.getDetectionTime().before(date11)&&!tUserDatum.getDetectionTime().after(date22)){