流程、来访类型

huimv-receive/pom.xml

@@ -23,6 +23,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>

huimv-receive/src/main/java/com/huimv/receive/common/utils/ResultUtil.java

@@ -40,6 +40,14 @@ public class ResultUtil {
         }
     }
 
+    public static Result booleanResult(Boolean flag){
+        if(flag){
+            return new Result(10000, "添加成功",true);
+        }else{
+            return new Result(10001, "添加失败",false);
+        }
+    }
+
     public static Result addResult(Integer rows){
         if(rows > 0){
             return new Result(10000, "添加成功",true);

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

@@ -1,9 +1,19 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.entity.BaseFlow;
+import com.huimv.receive.entity.BaseWashoutPoint;
+import com.huimv.receive.service.IBaseFlowService;
+import com.huimv.receive.service.IBaseWashoutPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotBlank;
 
 /**
  * <p>
@@ -15,6 +25,24 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/base-flow")
+@CrossOrigin
 public class BaseFlowController {
+    @Autowired
+    private IBaseFlowService baseFlowService;
 
+    @PostMapping("/add")
+    public Result save(HttpServletRequest httpServletRequest, @RequestBody BaseFlow baseFlow){
+        return baseFlowService.add(httpServletRequest,baseFlow);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Integer id){
+        return baseFlowService.delete(id);
+    }
+
+
+    @PostMapping("/list")
+    public Result list(){
+        return new Result(ResultCode.SUCCESS,baseFlowService.list());
+    }
 }

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

@@ -1,9 +1,25 @@
 package com.huimv.receive.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+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.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.common.utils.ResultUtil;
+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 org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * <p>
@@ -15,6 +31,40 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/base-visiting")
+@CrossOrigin
 public class BaseVisitingController {
 
+    @Autowired
+    private IBaseVisitingService baseVisitingService;
+    @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("/delete")
+    public Result delete(@RequestBody Integer id){
+        if (baseWashoutPointService.count(new QueryWrapper<BaseWashoutPoint>().lambda().eq(BaseWashoutPoint::getVisitingType,id)) > 0) {
+            return new Result(10001,"请先删除该来访类型所有洗消点!",false);
+        }
+        return baseVisitingService.delete(id);
+    }
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Integer farmId){
+        return new Result(ResultCode.SUCCESS,baseVisitingService.list(new QueryWrapper<BaseVisiting>().lambda().eq(BaseVisiting::getFarmId,farmId)));
+    }
+
+
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BaseFlow.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -30,9 +32,10 @@ public class BaseFlow implements Serializable {
 
     private String flowName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
-    private Integer createId;
+    private Integer createUser;
 
 
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BaseVisiting.java

@@ -5,9 +5,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -20,6 +26,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@Validated
 @TableName("base_visiting")
 public class BaseVisiting implements Serializable {
 
@@ -33,13 +40,9 @@ public class BaseVisiting implements Serializable {
      */
     private String visitingName;
 
-    /**
-     * 来访类型
-     */
-    private Integer visitingType;
-
     private Integer farmId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private Integer createUser;

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

@@ -1,8 +1,11 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBaseFlowService extends IService<BaseFlow> {
 
+    Result add(HttpServletRequest httpServletRequest, BaseFlow baseFlow);
+
+    Result delete(Integer id);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.receive.service;
 
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseVisiting;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBaseVisitingService extends IService<BaseVisiting> {
 
+    Result delete(Integer id);
 }

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

@@ -1,11 +1,21 @@
 package com.huimv.receive.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseFlow;
+import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.mapper.BaseFlowMapper;
 import com.huimv.receive.service.IBaseFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +27,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseFlowServiceImpl extends ServiceImpl<BaseFlowMapper, BaseFlow> implements IBaseFlowService {
 
+    @Autowired
+    private BaseFlowMapper baseFlowMapper;
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, BaseFlow baseFlow) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        if (baseFlowMapper.selectCount(new QueryWrapper<BaseFlow>().lambda()
+                .eq(BaseFlow::getFlowName,baseFlow.getFlowName())) > 0) {
+            return new Result(10001,"流程已存在!",false);
+        }
+        baseFlow.setCreateUser(userId);
+        baseFlow.setCreateTime(LocalDateTime.now());
+        return ResultUtil.addResult(baseFlowMapper.insert(baseFlow));
+    }
+
+    @Override
+    public Result delete(Integer id) {
+        return ResultUtil.deleteResult(baseFlowMapper.deleteById(id));
+    }
 }

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

@@ -1,11 +1,19 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.receive.common.token.TokenSign;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseVisiting;
 import com.huimv.receive.mapper.BaseVisitingMapper;
 import com.huimv.receive.service.IBaseVisitingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseVisitingServiceImpl extends ServiceImpl<BaseVisitingMapper, BaseVisiting> implements IBaseVisitingService {
 
+    @Autowired
+    private BaseVisitingMapper baseVisitingMapper;
+
+    @Override
+    public Result delete(Integer id) {
+        return ResultUtil.deleteResult(baseVisitingMapper.deleteById(id));
+    }
 }