流程、来访类型

huimv-receive/src/main/java/com/huimv/receive/controller/BaseFlowController.java

@@ -2,6 +2,7 @@ package com.huimv.receive.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.common.token.TokenSign;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,10 +38,17 @@ public class BaseFlowController {
     }
 
     @PostMapping("/delete")
-    public Result delete(@RequestBody Integer id){
+    public Result delete(@RequestBody String id){
         return baseFlowService.delete(id);
     }
 
+    @PostMapping("/page")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        String pageNo = paramsMap.get("pageNo");
+        String pageSize = paramsMap.get("pageSize");
+        Page<BaseFlow> baseFlowPage = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,baseFlowService.page(baseFlowPage));
+    }
 
     @PostMapping("/list")
     public Result list(){

huimv-receive/src/main/java/com/huimv/receive/controller/BaseVisitingController.java

@@ -1,25 +1,20 @@
 package com.huimv.receive.controller;
 
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.huimv.receive.common.token.TokenSign;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
-import com.huimv.receive.common.utils.ResultUtil;
+import com.huimv.receive.entity.BaseFlow;
 import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.entity.BaseWashoutPoint;
 import com.huimv.receive.service.IBaseVisitingService;
 import com.huimv.receive.service.IBaseWashoutPointService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.Objects;
+import java.util.Map;
+
 
 /**
  * <p>
@@ -39,18 +34,9 @@ public class BaseVisitingController {
     @Autowired
     private IBaseWashoutPointService baseWashoutPointService;
 
-    @PostMapping("/saveOrUpdate")
-    public Result saveOrUpdate(HttpServletRequest httpServletRequest, @RequestBody BaseVisiting baseVisiting){
-        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
-        if (baseVisitingService.count(new QueryWrapper<BaseVisiting>().lambda()
-                .eq(BaseVisiting::getVisitingName,baseVisiting.getVisitingName())
-                .ne(ObjectUtil.isNotNull(baseVisiting.getId()),BaseVisiting::getId,baseVisiting.getId())
-                .eq(BaseVisiting::getFarmId,baseVisiting.getFarmId())) > 0) {
-            return new Result(10001,"来访类型已存在!",false);
-        }
-        baseVisiting.setCreateUser(userId);
-        baseVisiting.setCreateTime(LocalDateTime.now());
-        return ResultUtil.booleanResult(baseVisitingService.saveOrUpdate(baseVisiting));
+    @PostMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody BaseVisiting baseVisiting){
+        return baseVisitingService.add(httpServletRequest,baseVisiting);
     }
 
     @PostMapping("/delete")
@@ -61,8 +47,17 @@ public class BaseVisitingController {
         return baseVisitingService.delete(id);
     }
 
+    @PostMapping("/page")
+    public Result page(@RequestBody Map<String,String> paramsMap){
+        String pageNo = paramsMap.get("pageNo");
+        String pageSize = paramsMap.get("pageSize");
+        String farmId = paramsMap.get("farmId");
+        Page<BaseVisiting> baseVisitingPage = new Page<>(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,baseVisitingService.page(baseVisitingPage,new QueryWrapper<BaseVisiting>().lambda().eq(BaseVisiting::getFarmId,farmId)));
+    }
+
     @PostMapping("/list")
-    public Result list(@RequestBody Integer farmId){
+    public Result list(@RequestBody String farmId){
         return new Result(ResultCode.SUCCESS,baseVisitingService.list(new QueryWrapper<BaseVisiting>().lambda().eq(BaseVisiting::getFarmId,farmId)));
     }
 

huimv-receive/src/main/java/com/huimv/receive/service/IBaseFlowService.java

@@ -18,5 +18,5 @@ public interface IBaseFlowService extends IService<BaseFlow> {
 
     Result add(HttpServletRequest httpServletRequest, BaseFlow baseFlow);
 
-    Result delete(Integer id);
+    Result delete(String id);
 }

huimv-receive/src/main/java/com/huimv/receive/service/IBaseVisitingService.java

@@ -17,4 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 public interface IBaseVisitingService extends IService<BaseVisiting> {
 
     Result delete(Integer id);
+
+    Result add(HttpServletRequest httpServletRequest, BaseVisiting baseVisiting);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseFlowServiceImpl.java

@@ -43,7 +43,7 @@ public class BaseFlowServiceImpl extends ServiceImpl<BaseFlowMapper, BaseFlow> i
     }
 
     @Override
-    public Result delete(Integer id) {
+    public Result delete(String id) {
         return ResultUtil.deleteResult(baseFlowMapper.deleteById(id));
     }
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseVisitingServiceImpl.java

@@ -29,7 +29,22 @@ public class BaseVisitingServiceImpl extends ServiceImpl<BaseVisitingMapper, Bas
     private BaseVisitingMapper baseVisitingMapper;
 
     @Override
+    public Result add(HttpServletRequest httpServletRequest, BaseVisiting baseVisiting) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        if (baseVisitingMapper.selectCount(new QueryWrapper<BaseVisiting>().lambda()
+                .eq(BaseVisiting::getVisitingName,baseVisiting.getVisitingName())
+                .eq(BaseVisiting::getFarmId,baseVisiting.getFarmId())) > 0) {
+            return new Result(10001,"来访类型已存在!",false);
+        }
+        baseVisiting.setCreateUser(userId);
+        baseVisiting.setCreateTime(LocalDateTime.now());
+        return ResultUtil.addResult(baseVisitingMapper.insert(baseVisiting));
+    }
+
+    @Override
     public Result delete(Integer id) {
         return ResultUtil.deleteResult(baseVisitingMapper.deleteById(id));
     }
+
+
 }