修改12

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyDataController.java

@@ -116,7 +116,7 @@ public class EnergyDataController {
     }
 
 
-    @RequestMapping("/getData")
+ /*   @RequestMapping("/getData")
     public void getData(@RequestBody Map<String, List<WaterAndElectricity>> paramsMap) {
         List<WaterAndElectricity> result = (List) paramsMap.get("result");
         System.out.println("接受到的数据格式:" + result);
@@ -494,6 +494,91 @@ public class EnergyDataController {
             }
             iEnergyDataService.save(energyData);
         }
+    }*/
+
+    @RequestMapping("/getData19")
+    public void getData19(@RequestBody Map<String, List<WaterAndElectricity>> paramsMap) {
+        List<WaterAndElectricity> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:" + result);
+        for (WaterAndElectricity jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWater());
+            energyData.setElectricityValue(jsonObject.getElectricity());
+            energyData.setGasValue("0.00");
+            energyData.setFarmId(28);
+            energyData.setCreateDate(new Date());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", 28).eq("device_code", jsonObject.getDeviceCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(device)) {
+                energyData.setUnitId(device.getUnitId());
+            }
+            iEnergyDataService.save(energyData);
+        }
+    }
+    @RequestMapping("/getData20")
+    public void getData20(@RequestBody Map<String, List<WaterAndElectricity>> paramsMap) {
+        List<WaterAndElectricity> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:" + result);
+        for (WaterAndElectricity jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWater());
+            energyData.setElectricityValue(jsonObject.getElectricity());
+            energyData.setGasValue("0.00");
+            energyData.setFarmId(29);
+            energyData.setCreateDate(new Date());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", 29).eq("device_code", jsonObject.getDeviceCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(device)) {
+                energyData.setUnitId(device.getUnitId());
+            }
+            iEnergyDataService.save(energyData);
+        }
+    }
+    @RequestMapping("/getData21")
+    public void getData21(@RequestBody Map<String, List<WaterAndElectricity>> paramsMap) {
+        List<WaterAndElectricity> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:" + result);
+        for (WaterAndElectricity jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWater());
+            energyData.setElectricityValue(jsonObject.getElectricity());
+            energyData.setGasValue("0.00");
+            energyData.setFarmId(30);
+            energyData.setCreateDate(new Date());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", 30).eq("device_code", jsonObject.getDeviceCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(device)) {
+                energyData.setUnitId(device.getUnitId());
+            }
+            iEnergyDataService.save(energyData);
+        }
+    }
+    @RequestMapping("/getData22")
+    public void getData22(@RequestBody Map<String, List<WaterAndElectricity>> paramsMap) {
+        List<WaterAndElectricity> result = (List) paramsMap.get("result");
+        System.out.println("接受到的数据格式:" + result);
+        for (WaterAndElectricity jsonObject : result) {
+            EnergyData energyData = new EnergyData();
+            energyData.setFeedValue("0.00");
+            energyData.setWaterValue(jsonObject.getWater());
+            energyData.setElectricityValue(jsonObject.getElectricity());
+            energyData.setGasValue("0.00");
+            energyData.setFarmId(31);
+            energyData.setCreateDate(new Date());
+            QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", 31).eq("device_code", jsonObject.getDeviceCode());
+            EnergyEnvDevice device = deviceService.getOne(queryWrapper);
+            if (ObjectUtil.isNotEmpty(device)) {
+                energyData.setUnitId(device.getUnitId());
+            }
+            iEnergyDataService.save(energyData);
+        }
     }
     @PostMapping("/add")
     public Result add(@RequestBody EnergyData energyData) {

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyFeedTimer.java

@@ -1,57 +1,57 @@
-package com.huimv.admin.timer;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.admin.entity.BasePigpen;
-import com.huimv.admin.entity.EnergyData;
-import com.huimv.admin.entity.ProdStock;
-import com.huimv.admin.mapper.BaseFarmMapper;
-import com.huimv.admin.mapper.BasePigpenMapper;
-import com.huimv.admin.mapper.EnergyDataMapper;
-import com.huimv.admin.mapper.ProdStockMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Date;
-
-@Configuration
-@EnableScheduling
-public class EnergyFeedTimer {
-    @Autowired
-    private BasePigpenMapper basePigpenMapper;
-    @Autowired
-    private EnergyDataMapper energyDataMapper;
-    @Autowired
-    private ProdStockMapper prodStockMapper;
-    //华统料塔
-//    @Scheduled(cron = "0 0 * * * ? ")
-//    private void action(){
-//        BigDecimal feedConsume;
-//        BasePigpen basePigpen = basePigpenMapper.selectOne(new QueryWrapper<BasePigpen>().lambda()
-//                .eq(BasePigpen::getFType, 3)
-//                .eq(BasePigpen::getFarmId, 26).last("Limit 1"));
-//        if (ObjectUtil.isNotEmpty(basePigpen)){
-//            EnergyData energyData = new EnergyData();
-//            ProdStock prodStock = prodStockMapper.selectOne(new QueryWrapper<ProdStock>().lambda()
-//                    .eq(ProdStock::getFarmId, 26)
-//                    .eq(ProdStock::getDisplayType, 0).orderByDesc(ProdStock::getCreatTime).last("LIMIT 1"));
-//            if (ObjectUtil.isNotEmpty(prodStock)){
-//                feedConsume = BigDecimal.valueOf((800*2.5)*prodStock.getZcl()/1000/12);
-//                feedConsume = feedConsume.setScale(2, RoundingMode.UP);
-//                energyData.setFeedValue(feedConsume.toString());
-//                energyData.setFarmId(26);
-//                energyData.setCreateDate(new Date());
-//                energyData.setDisplayType(1);
-//                energyData.setUnitId(basePigpen.getId());
-//                energyData.setUnitName(basePigpen.getBuildName());
-//                energyDataMapper.insert(energyData);
-//            }
+//package com.huimv.admin.timer;
 //
-//        }
-//    }
-    //景宏料塔
-}
+//import cn.hutool.core.util.ObjectUtil;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.huimv.admin.entity.BasePigpen;
+//import com.huimv.admin.entity.EnergyData;
+//import com.huimv.admin.entity.ProdStock;
+//import com.huimv.admin.mapper.BaseFarmMapper;
+//import com.huimv.admin.mapper.BasePigpenMapper;
+//import com.huimv.admin.mapper.EnergyDataMapper;
+//import com.huimv.admin.mapper.ProdStockMapper;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import java.math.BigDecimal;
+//import java.math.RoundingMode;
+//import java.util.Date;
+//
+//@Configuration
+//@EnableScheduling
+//public class EnergyFeedTimer {
+//    @Autowired
+//    private BasePigpenMapper basePigpenMapper;
+//    @Autowired
+//    private EnergyDataMapper energyDataMapper;
+//    @Autowired
+//    private ProdStockMapper prodStockMapper;
+//    //华统料塔
+////    @Scheduled(cron = "0 0 * * * ? ")
+////    private void action(){
+////        BigDecimal feedConsume;
+////        BasePigpen basePigpen = basePigpenMapper.selectOne(new QueryWrapper<BasePigpen>().lambda()
+////                .eq(BasePigpen::getFType, 3)
+////                .eq(BasePigpen::getFarmId, 26).last("Limit 1"));
+////        if (ObjectUtil.isNotEmpty(basePigpen)){
+////            EnergyData energyData = new EnergyData();
+////            ProdStock prodStock = prodStockMapper.selectOne(new QueryWrapper<ProdStock>().lambda()
+////                    .eq(ProdStock::getFarmId, 26)
+////                    .eq(ProdStock::getDisplayType, 0).orderByDesc(ProdStock::getCreatTime).last("LIMIT 1"));
+////            if (ObjectUtil.isNotEmpty(prodStock)){
+////                feedConsume = BigDecimal.valueOf((800*2.5)*prodStock.getZcl()/1000/12);
+////                feedConsume = feedConsume.setScale(2, RoundingMode.UP);
+////                energyData.setFeedValue(feedConsume.toString());
+////                energyData.setFarmId(26);
+////                energyData.setCreateDate(new Date());
+////                energyData.setDisplayType(1);
+////                energyData.setUnitId(basePigpen.getId());
+////                energyData.setUnitName(basePigpen.getBuildName());
+////                energyDataMapper.insert(energyData);
+////            }
+////
+////        }
+////    }
+//    //景宏料塔
+//}

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

@@ -69,12 +69,18 @@ public class BillPersonnelAdmissionController {
                                @RequestParam(value = "picture1",required = false) MultipartFile picture1,
                                @RequestParam(value = "picture2",required = false) MultipartFile picture2,
                                @RequestParam(value = "picture3",required = false) MultipartFile picture3,
+                               @RequestParam(value = "picture4",required = false) MultipartFile picture4,
+                               @RequestParam(value = "picture5",required = false) MultipartFile picture5,
+                               @RequestParam(value = "picture6",required = false) MultipartFile picture6,
+                               @RequestParam(value = "picture7",required = false) MultipartFile picture7,
+                               @RequestParam(value = "picture8",required = false) MultipartFile picture8,
                                @RequestParam("farmId") String farmId,
                                @RequestParam("midId") Integer midId,
                                @RequestParam("midName") String midName) throws IOException {
         return billPersonnelAdmissionService.addAdmission(httpServletRequest, admissionType, vistitType, userName, phone,
                 workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson, destId, destName, farmId, carNum,
-                source, goods, departureId, departureName, picture1, picture2, picture3,midId,midName);
+                source, goods, departureId, departureName, picture1, picture2, picture3,picture4,picture5,picture6,picture7,picture8,
+                midId,midName);
     }
 
     @PostMapping("/addAdmissionFeed")
@@ -157,6 +163,12 @@ public class BillPersonnelAdmissionController {
         return new Result(ResultCode.SUCCESS, billAdmissionAndGoods);
     }
 
+    @PostMapping("/handleAdmissionBatch")
+    public Result handleAdmissionBatch(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws IOException {
+        return billPersonnelAdmissionService.handleAdmissionBatch(httpServletRequest, paramsMap);
+    }
+
+
     @Autowired
     private IBillPersonnelAdmissionService admissionService;
 
@@ -295,11 +307,17 @@ public class BillPersonnelAdmissionController {
                                    @RequestParam(value = "picture1",required = false) MultipartFile picture1,
                                    @RequestParam(value = "picture2",required = false) MultipartFile picture2,
                                    @RequestParam(value = "picture3",required = false) MultipartFile picture3,
+                                   @RequestParam(value = "picture4",required = false) MultipartFile picture4,
+                                   @RequestParam(value = "picture5",required = false) MultipartFile picture5,
+                                   @RequestParam(value = "picture6",required = false) MultipartFile picture6,
+                                   @RequestParam(value = "picture7",required = false) MultipartFile picture7,
+                                   @RequestParam(value = "picture8",required = false) MultipartFile picture8,
                                    @RequestParam("midId") Integer midId,
                                    @RequestParam("midName") String midName) throws IOException {
         return billPersonnelAdmissionService.helpAddAdmission(httpServletRequest, userImgUrl, admissionType,
                 vistitType, userName, phone, workName, papersType, papersCode, imgUrl, img, vistitDate, vistitReson,
-                destId, destName, farmId, carNum, source, goods, departureId, departureName,picture1,picture2,picture3,midId,midName);
+                destId, destName, farmId, carNum, source, goods, departureId, departureName,picture1,picture2,picture3,
+                picture4,picture5,picture6,picture7,picture8,midId,midName);
     }
 
 }

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

@@ -39,19 +39,26 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
     Result listClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listByIdClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     Result editClean(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+
     Result editDry(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+
     Result addAdmission(HttpServletRequest httpServletRequest, String admissionType, String vistitType, String userName
             , String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl, String img,
                         String vistitDate, String vistitReson, String destId, String destName, String farmId,
                         String carNum, String source, String goods, String departureId, String departureName,
-                        MultipartFile picture1, MultipartFile picture2, MultipartFile picture3,Integer midId,String midName) throws IOException;
+                        MultipartFile picture1, MultipartFile picture2, MultipartFile picture3
+            , MultipartFile picture4, MultipartFile picture5, MultipartFile picture6
+            , MultipartFile picture7, MultipartFile picture8
+            , Integer midId, String midName) throws IOException;
+
     Result addAdmissionFeed(HttpServletRequest httpServletRequest, String admissionType, String vistitType,
                             String userName, String phone, String workName, String papersType, String papersCode,
                             MultipartFile imgUrl, String img, String vistitDate, String vistitReson, String destId,
                             String destName, String farmId, String carNum, String source, String goods, String departureId,
                             String departureName, String resource, MultipartFile feedImgUrl, Integer cleanId,
-                            String cleanName, String remark,Integer midId,String midName) throws IOException;
+                            String cleanName, String remark, Integer midId, String midName) throws IOException;
 
     Result listPersonalAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
@@ -68,6 +75,7 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
 
     //后台入场申请报表
     Result countAdmission(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
     //提交申请排名
     Result listTop(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
@@ -89,9 +97,15 @@ public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAd
 
 
     //站点人员帮忙提交入场申请
-    Result helpAddAdmission(HttpServletRequest httpServletRequest,MultipartFile userImgUrl,  String admissionType, String vistitType, String userName,
+    Result helpAddAdmission(HttpServletRequest httpServletRequest, MultipartFile userImgUrl, String admissionType, String vistitType, String userName,
                             String phone, String workName, String papersType, String papersCode, MultipartFile imgUrl,
                             String img, String vistitDate, String vistitReson, String destId, String destName,
                             String farmId, String carNum, String source, String goods, String departureId, String departureName,
-                            MultipartFile picture1,MultipartFile picture2,MultipartFile picture3,Integer midId,String midName) throws IOException;
+                            MultipartFile picture1, MultipartFile picture2, MultipartFile picture3
+            , MultipartFile picture4, MultipartFile picture5, MultipartFile picture6
+            , MultipartFile picture7, MultipartFile picture8
+            , Integer midId, String midName) throws IOException;
+
+    //统一审批多个人的入场申请
+    Result handleAdmissionBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws IOException;
 }