Guwan
/
cqyt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

长庆项目day2

This commit is contained in:
ovo 2024-10-18 21:12:31 +08:00
parent 8719457339
commit 5f14c3613d
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
View File

@ -1,39 +1,19 @@
package net.shapelight.modules.iCq.controller.enter; package net.shapelight.modules.iCq.controller.enter;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.minio.MinioClient;
import io.minio.PutObjectOptions;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.shapelight.common.config.MinioConfig;
import net.shapelight.common.utils.R; import net.shapelight.common.utils.R;
import net.shapelight.common.utils.SnowflakeIdWorker;
import net.shapelight.common.utils.UUIDUtil;
import net.shapelight.modules.iCq.controller.enter.to.FTo; import net.shapelight.modules.iCq.controller.enter.to.FTo;
import net.shapelight.modules.iCq.controller.enter.vo.FirstVo; import net.shapelight.modules.iCq.controller.enter.vo.FirstVo;
import net.shapelight.modules.iCq.controller.enter.vo.PeronType; import net.shapelight.modules.iCq.controller.enter.vo.PeronType;
import net.shapelight.modules.iCq.controller.enter.vo.TypeRules; import net.shapelight.modules.iCq.controller.enter.vo.TypeRules;
import net.shapelight.modules.iCq.controller.member.dto.VisitorDto;
import net.shapelight.modules.iCq.controller.member.vo.MemberListVo;
import net.shapelight.modules.iCq.dal.dataobject.member.TenPersonEntity;
import net.shapelight.modules.iCq.dal.dataobject.video.FileEntity;
import net.shapelight.modules.iCq.dal.mysql.enter.CqEnterMapper; import net.shapelight.modules.iCq.dal.mysql.enter.CqEnterMapper;
import net.shapelight.modules.iCq.dal.mysql.member.CqMemberMapper; import net.shapelight.modules.iCq.dal.mysql.member.CqMemberMapper;
import net.shapelight.modules.iCq.dal.mysql.video.CqFileMapper;
import net.shapelight.modules.iCq.dal.mysql.video.CqSafeVideoMapper; import net.shapelight.modules.iCq.dal.mysql.video.CqSafeVideoMapper;
import net.shapelight.modules.ten.service.TenPersonService;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.UUID;
@RestController @RestController
@ -52,6 +32,9 @@ public class CqEnterController {
@GetMapping("list") @GetMapping("list")
public R find(String operator, String cellId){ public R find(String operator, String cellId){
System.out.println("cellId = " + cellId);
List<FTo> fTo = cqEnterMapper.classifiedQuery(cellId); List<FTo> fTo = cqEnterMapper.classifiedQuery(cellId);
System.out.println(fTo); System.out.println(fTo);
@ -59,7 +42,6 @@ public class CqEnterController {
for (FTo f : fTo) { for (FTo f : fTo) {
FirstVo firstVo = new FirstVo(); FirstVo firstVo = new FirstVo();
firstVo.setOrgId(f.getCellId()); firstVo.setOrgId(f.getCellId());
firstVo.setUnitName(safeVideoMapper.findTheNameById(f.getCellId())); firstVo.setUnitName(safeVideoMapper.findTheNameById(f.getCellId()));
firstVo.setPerson(operator); firstVo.setPerson(operator);

2
shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/to/FTo.java
View File

@ -12,8 +12,6 @@ import java.util.Date;
public class FTo { public class FTo {
private String cellId; private String cellId;
private Date operateTime; private Date operateTime;
} }

2
shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
View File

@ -17,7 +17,7 @@
ten_enter_config_cell ten_enter_config_cell
WHERE 1 = 1 WHERE 1 = 1
<if test="cellId != null and cellId != ''"> <if test="cellId != null and cellId != ''">
AND cell_id = #{uploader} AND cell_id = #{cellId}
</if> </if>
GROUP BY GROUP BY
cell_id ; cell_id ;