11

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/ProtTimer.java

@@ -1,5 +1,8 @@
 package com.huimv.admin.jinghongtimer;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.entity.EnergyData;
 import com.huimv.admin.entity.ProtData;
 import com.huimv.admin.jinghongtimer.Vo.JinghongWater;
 import com.huimv.admin.mapper.*;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -27,8 +31,11 @@ public class ProtTimer {
     private ProtDataMapper protDataMapper;
     @Autowired
     private RestTemplate restTemplate;
+    @Autowired
+    private EnergyDataMapper energyDataMapper;
 
     @Scheduled(cron = "0 0/10 * * * ? ")
+//    @Scheduled(cron = "0 * * * * ? ")
 //    @GetMapping("/test3")
     public void action(){
         String url = "http://139.9.172.209:8085/getFlow"; // 更好的做法是从配置中读取这个URL
@@ -54,6 +61,31 @@ public class ProtTimer {
                 }
                 if("865661077850256".equals(jinghongWater.getDeviceId())){
                     protData.setFlow(String.format("%.2f",Double.parseDouble(jinghongWater.getValueA()) * 0.01));
+                    QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("unit_id", 162).orderByDesc("id").last("limit 1");
+                    EnergyData energyData = energyDataMapper.selectOne(queryWrapper);
+                    EnergyData energyData1 = new EnergyData();
+                    String waterValue = energyData.getOriginalWaterValue();
+                    energyData1.setUnitName("潞水基地一层2单元");
+                    energyData1.setUnitId(162);
+                    energyData1.setFarmId(30);
+                    energyData1.setDisplayType(0);
+                    energyData1.setCreateDate(new Date());
+                    energyData1.setElectricityValue("0");
+                    energyData1.setOriginalFeedValue(jinghongWater.getValueA());
+                    energyData1.setFeedValue("0");
+                    energyData1.setGasValue("0");
+                    if (ObjectUtil.isNotEmpty(energyData)) {
+                        double v = (Double.parseDouble(jinghongWater.getValueA())- Double.parseDouble(waterValue)) *0.01;
+                        if (v < 0) {
+                            energyData1.setWaterValue("0.00");
+                        } else {
+                            energyData1.setWaterValue(String.format("%.2f", v));
+                        }
+                    } else {
+                        energyData1.setWaterValue(String.format("%.2f",Double.parseDouble(jinghongWater.getValueA()) * 0.01));
+                    }
+                    energyDataMapper.insert(energyData1);
                 }
 
                 protData.setCod("0");

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

@@ -51,9 +51,12 @@ public class BillCleanBeforeController {
     @PostMapping("/edit")
     public Result goodsCarClean(HttpServletRequest httpServletRequest, @RequestParam("id") String id,
                                 @RequestParam("date") String data,
-                                @RequestParam(value = "img", required = false) MultipartFile img,
+                                @RequestParam(value = "img1", required = false) MultipartFile img,
+                                @RequestParam(value = "img2", required = false) MultipartFile img1,
+                                @RequestParam(value = "img3", required = false) MultipartFile img2,
+                                @RequestParam(value = "img4", required = false) MultipartFile img3,
                                 @RequestParam("farmId") String farmId) throws IOException, ParseException {
-        return billCleanBeforeService.edit(httpServletRequest, farmId, id, data, img);
+        return billCleanBeforeService.edit(httpServletRequest, farmId, id, data, img,img1,img2,img3);
     }
 
     @RequestMapping("/listAll")

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

@@ -3,10 +3,7 @@ package com.huimv.receive.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.receive.common.token.TokenSign;
-import com.huimv.receive.common.utils.PdfUtil;
-import com.huimv.receive.common.utils.Result;
-import com.huimv.receive.common.utils.ResultCode;
-import com.huimv.receive.common.utils.UploadImage;
+import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.AccountGroup;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.service.IAccountGroupService;
@@ -120,11 +117,16 @@ public class SysAccountMultilevelController {
     @Transactional(rollbackFor = Exception.class)
     public Result editImg(HttpServletRequest httpServletRequest, @RequestParam("img") MultipartFile img) throws IOException {
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-        if (uploadImage.getImageCom(img).equals("上传失败")) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new Result(10001,"图片上传失败",false);
+        MultipartFile multipartFile = ImageSizeUtil.byte2Base64StringFun(img);
+        boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 100, "K");
+        if (!result) {
+            return new Result(10001, "上传个人照片太大，请重新上传", false);
         }
-        sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
+        String imageCom = uploadImage.getImageCom(multipartFile);
+        if (imageCom.equals("上传失败")) {
+            return new Result(10001, "图片上传失败！", false);
+        }
+        sysAccountMultilevel.setImgUrl(imageCom);
         accountMultilevelService.updateById(sysAccountMultilevel);
         return Result.SUCCESS();
     }

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

@@ -27,7 +27,7 @@ public interface IBillCleanBeforeService extends IService<BillCleanBefore> {
     Result listPersonalCleanBefore(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date,
-                MultipartFile img) throws ParseException, IOException;
+                MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4) throws ParseException, IOException;
 
     Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -73,7 +73,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         }
         Page<BillCleanBefore> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillCleanBefore> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId)
+        queryWrapper/*.in("farm_id", farmId)*/
                 .in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date").eq("vistit_type", type);
         if ("0".equals(data)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
@@ -89,7 +89,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         }
         QueryWrapper<BillCleanBefore> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("vistit_type", type);
-        queryWrapper2.eq("farm_id", farmId).in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
+        queryWrapper2/*.in("farm_id", farmId)*/.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, billCleanBeforeMapper.selectPage(page, queryWrapper), billCleanBeforeMapper.selectCount(queryWrapper2));
     }
@@ -120,14 +120,48 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
     }
 
     @Override
-    public Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img) throws ParseException, IOException {
-        String s = "";
-        String imgCom = uploadImage.getImageCom(img);
-        if (imgCom.equals("上传失败")) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new Result(10001, "图片1上传失败", false);
+    public Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date,
+                       MultipartFile img1,MultipartFile img2,MultipartFile img3,MultipartFile img4) throws ParseException, IOException {
+        String imgUrl = "";
+        String s1 = "";
+        String s2 = "";
+        String s3 = "";
+        String s4 = "";
+
+        if (ObjectUtil.isNotEmpty(img1)) {
+            String  s= uploadImage.uploadImg(img1);
+            if ("上传失败".equals(s1)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片1上传失败", false);
+            }
+            s1 = s;
         }
-        s = imgCom;
+        if (ObjectUtil.isNotEmpty(img2)) {
+            String  s= uploadImage.uploadImg(img2);
+            if ("上传失败".equals(s2)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片2上传失败", false);
+            }
+            s2 = "," + s;
+        }
+        if (ObjectUtil.isNotEmpty(img3)) {
+            String  s= uploadImage.uploadImg(img3);
+            s3 = "," + s;
+            if ("上传失败".equals(s)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片3上传失败", false);
+            }
+        }
+        if (ObjectUtil.isNotEmpty(img4)) {
+            String s = uploadImage.uploadImg(img4);
+            s4 = "," + s;
+            if ("上传失败".equals(s)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片4上传失败", false);
+            }
+        }
+        imgUrl=s1+s2+s3+s4;
+
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
@@ -135,7 +169,7 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
         if (cleanBefore.getBillStatus() != 0) {
             return new Result(10001, "此条记录已被他人修改，请退出刷新查看！", false);
         }
-        cleanBefore.setImgUrl(s);
+        cleanBefore.setImgUrl(imgUrl);
         cleanBefore.setImgStatus(1);