长庆项目day2

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

@@ -31,10 +31,8 @@ public class CqEnterController {
 
     @GetMapping("list")
     public R find(String operator, String cellId){
-
         System.out.println("cellId = " + cellId);
 
-
         List<FTo> fTo = cqEnterMapper.classifiedQuery(cellId);
         System.out.println(fTo);
 
@@ -49,7 +47,7 @@ public class CqEnterController {
             firstVos.add(firstVo);
         }
 
-        return R.ok().put("data", firstVos);
+        return R.ok().put("data", firstVos).put("total", firstVos.size());
     }
 
     @GetMapping("/getPersonType")

shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/member/CqMemberController.java

@@ -355,6 +355,12 @@ public class CqMemberController {
     @PostMapping("/newVisitor")
     public R newVisitor(@RequestBody VisitorDto visitorDto) {
 
+
+        if(visitorDto.getMemberId() != null){
+            cqMemberMapper.deleteById(visitorDto.getMemberId());
+        }
+
+
         TenPersonEntity tenPersonEntity = new TenPersonEntity();
 
         long id = new SnowflakeIdWorker().nextId();

shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/member/dto/VisitorDto.java

@@ -11,6 +11,8 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class VisitorDto extends BaseEntity {
+
+    private Integer memberId;
     private String orgId;
     private String name;
     private Integer sex;

shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java

@@ -6,6 +6,7 @@ import net.shapelight.modules.iCq.controller.enter.vo.PeronType;
 import net.shapelight.modules.iCq.controller.enter.vo.TypeRules;
 import net.shapelight.modules.iCq.dal.dataobject.enter.TenEnterConfigEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
 public interface CqEnterMapper extends BaseMapper<TenEnterConfigEntity> {
 
 
-    List<FTo> classifiedQuery(String cellId);
+    List<FTo> classifiedQuery(@Param("cellId")String cellId);
 
     List<PeronType> getPersonType();