地点

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

@@ -34,17 +34,6 @@ 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 Map<String,String> paramsMap){
-        String id = paramsMap.get("id");
-        return baseFlowService.delete(id);
-    }
-
     @PostMapping("/page")
     public Result list(@RequestBody Map<String,String> paramsMap){
         String pageNum = paramsMap.get("pageNum");

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

@@ -2,8 +2,10 @@ package com.huimv.receive.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
 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.BaseLocation;
 import com.huimv.receive.entity.Exist;
 import com.huimv.receive.service.IBaseLocationService;
@@ -11,6 +13,7 @@ import com.huimv.receive.service.IExistService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -27,40 +30,28 @@ import java.util.Map;
 public class BaseLocationController {
     @Autowired
     private IBaseLocationService baseLocationService;
-    @Autowired
-    private IExistService existService;
 
     @PostMapping("/listAll")
     public Result listAll(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        String vistitType = paramsMap.get("vistitType");
-        QueryWrapper<Exist> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
-        Exist one = existService.getOne(queryWrapper);
-        if (one.getExist() == 1 && vistitType.equals("0")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id", 3)));
-        }
-        if (one.getExist() == 1 && vistitType.equals("3")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .ne("location_type", 0).ne("id", 7)));
-        }
-        if (one.getExist() == 1 && vistitType.equals("5")) {
-            return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                    .eq("vistit_type", vistitType)
-                    .eq("id", 9)));
-        }
-        return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                .eq("vistit_type", vistitType)
-                .ne("location_type", 0)));
+        return new Result(ResultCode.SUCCESS,baseLocationService.list(new QueryWrapper<BaseLocation>().lambda()
+                .like(BaseLocation::getFarmIds,farmId)));
     }
 
     @PostMapping("/listLuggageLocation")
     public Result listLuggageLocation(@RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS, baseLocationService.list(new QueryWrapper<BaseLocation>()
-                .eq("vistit_type", 0).eq("parent_id", 0)));
+                .eq("is_luggage", 1).like("farmId", farmId)));
+    }
+
+    @PostMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody BaseLocation baseLocation){
+        return baseLocationService.add(httpServletRequest,baseLocation);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return baseLocationService.delete(httpServletRequest,paramsMap);
     }
 }

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

@@ -33,29 +33,9 @@ public class BaseLocation implements Serializable {
      */
     private String locationName;
 
+    private Integer isLuggage;
 
-    /*private Integer farmId;*/
-
-    /**
-     * 0检测地点，1 工作地点
-     */
-    private Integer locationType;
-
-    private String parentIds;
-
-    private Integer parentId;
-
-    private Integer nextId;
-
-    private String nextLocation;
-    /*
-    * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
-    */
-    private Integer vistitType;
-
-
-
-//    private Integer processId;
+    private String farmIds;
 
 
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BaseLocationMapper.java

@@ -13,4 +13,5 @@ import com.huimv.receive.entity.BaseLocation;
  */
 public interface BaseLocationMapper extends BaseMapper<BaseLocation> {
 
+    int countLocation(String locationName, String farmId);
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.receive.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.BaseLocation;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,7 @@ import com.huimv.receive.entity.BaseLocation;
  */
 public interface IBaseLocationService extends IService<BaseLocation> {
 
+    Result add(HttpServletRequest httpServletRequest, BaseLocation baseLocation);
+
+    Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -1,11 +1,21 @@
 package com.huimv.receive.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receive.common.utils.Result;
+import com.huimv.receive.common.utils.ResultUtil;
 import com.huimv.receive.entity.BaseLocation;
+import com.huimv.receive.entity.Farm;
 import com.huimv.receive.mapper.BaseLocationMapper;
+import com.huimv.receive.mapper.FarmMapper;
 import com.huimv.receive.service.IBaseLocationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.soap.Addressing;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +27,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseLocationServiceImpl extends ServiceImpl<BaseLocationMapper, BaseLocation> implements IBaseLocationService {
 
+    @Autowired
+    private FarmMapper farmMapper;
+    @Autowired
+    private BaseLocationMapper baseLocationMapper;
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, BaseLocation baseLocation) {
+        String[] farmIds = baseLocation.getFarmIds().split(",");
+        for (String farmId : farmIds) {
+            int locationCount = baseLocationMapper.countLocation(baseLocation.getLocationName(),farmId);
+            if (locationCount > 0){
+                Farm farm = farmMapper.selectById(farmId);
+                return new Result(10001,farm.getFarmName()+"存在相同地点!",false);
+            }
+        }
+        return ResultUtil.addResult(baseLocationMapper.insert(baseLocation));
+    }
+
+    @Override
+    public Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        return ResultUtil.deleteResult(baseLocationMapper.deleteById(id));
+    }
 }

huimv-receive/src/main/resources/com/huimv/receive/mapper/BaseLocationMapper.xml

@@ -2,16 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.receive.mapper.BaseLocationMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.receive.entity.BaseLocation">
-        <id column="id" property="id" />
-        <result column="location_name" property="locationName" />
-        <result column="pcr_num" property="pcrNum" />
-        <result column="wash_num" property="washNum" />
-        <result column="bathe_num" property="batheNum" />
-        <result column="farm_id" property="farmId" />
-        <result column="location_type" property="locationType" />
-        <result column="process_id" property="processId" />
-    </resultMap>
+    <select id="countLocation" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM `base_location` WHERE location_name = #{locationName} AND farm_ids like concat('%',#{farmId},'%')
+    </select>
 
 </mapper>