恢复监管数据

huimv-cattle/src/main/java/com/huimv/cattle/controller/SuperviseController.java

@@ -69,8 +69,14 @@ public class SuperviseController {
     }
     @PostMapping("/getSupervise")
     public  Result list(@RequestBody Supervise supervise, HttpServletRequest request){
-        String farmCode = FarmCodeUtils.getFarmCode(supervise.getFarmCode(),   request);
-        return   superviseService.getSupervise(farmCode);
+        String farmCode = FarmCodeUtils.getFarmCode(supervise.getFarmCode(),request);
+        return superviseService.getSupervise(farmCode);
+    }
+
+    @PostMapping("/getSuperviseScreen")
+    public  Result getSuperviseScreen(@RequestBody Supervise supervise, HttpServletRequest request){
+        String farmCode = FarmCodeUtils.getFarmCode(supervise.getFarmCode(),request);
+        return superviseService.getSuperviseScreen(farmCode);
     }
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/SuperviseMapper.java

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.Supervise;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-15
  */
+@Repository
 public interface SuperviseMapper extends BaseMapper<Supervise> {
-
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/SuperviseService.java

@@ -15,4 +15,6 @@ import com.huimv.common.utils.Result;
 public interface SuperviseService extends IService<Supervise> {
 
     Result getSupervise(String farmCode);
+
+    Result getSuperviseScreen(String farmCode);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SuperviseServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.cattle.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
 import com.huimv.cattle.pojo.Supervise;
 import com.huimv.cattle.mapper.SuperviseMapper;
 import com.huimv.cattle.service.SuperviseService;
@@ -27,6 +28,8 @@ public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise
 
     @Autowired
     private SuperviseMapper superviseMapper;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
     @Override
     public Result getSupervise(String farmCode) {
         Map map = new HashMap();
@@ -45,6 +48,14 @@ public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise
         return new Result(ResultCode.SUCCESS,map);
     }
 
+    @Override
+    public Result getSuperviseScreen(String farmCode) {
+//        String s = superviseVillageGatValue(farmCode);
+//        System.out.println(s);
+//        return new Result(ResultCode.SUCCESS,s);
+        return null;
+    }
+
     private String superviseGatValue(String farmCode,String key) {
         QueryWrapper<Supervise> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_code",farmCode);
@@ -57,4 +68,15 @@ public class SuperviseServiceImpl extends ServiceImpl<SuperviseMapper, Supervise
         }
     }
 
+    private String superviseVillageGatValue(String farmCode) {
+//        String[] city = sysRegionCounTownVillMapper.listSub(farmCode).split(",");
+//        SuperviseVo supervise = superviseMapper.superviseVillageGatValue(city);
+//        if (ObjectUtil.isEmpty(supervise)){
+//            return "0";
+//        }else {
+//            return supervise.getData();
+//        }
+        return null;
+    }
+
 }