生物防控人员2

huimv-admin/pom.xml

@@ -21,6 +21,13 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -37,6 +37,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/huatongApi/energy-data/getData20"
                         ,"/huatongApi/energy-data/getData21"
                         ,"/huatongApi/energy-data/getData22"
+                        ,"/huatongApi/test/test3"
                         ,"/huatongApi/energy-data/getDeviceStatus");
     }
 }

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

@@ -43,4 +43,6 @@ public class EnergyFeedController {
     public Result listPigpenApp(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return energyFeedService.listPigpenApp(httpServletRequest, paramsMap);
     }
+
+
 }

huimv-admin/src/main/java/com/huimv/admin/entity/WriteProtData.java

@@ -53,5 +53,12 @@ public class WriteProtData implements Serializable {
      */
     private String type;
 
-
+    public WriteProtData(String ph, String cod, String tn, String tp, String nh3n, String flow) {
+        this.ph = ph;
+        this.cod = cod;
+        this.tn = tn;
+        this.tp = tp;
+        Nh3n = nh3n;
+        this.flow = flow;
+    }
 }

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

@@ -1,21 +1,111 @@
 package com.huimv.admin.jinghongtimer;
 
-import com.huimv.admin.mapper.BasePigpenMapper;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+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.EnergyEnvDevice;
+import com.huimv.admin.jinghongtimer.Vo.EneryDataVo;
+import com.huimv.admin.jinghongtimer.Vo.EneryDataVo3;
+import com.huimv.admin.jinghongtimer.Vo.TokenVo;
 import com.huimv.admin.mapper.EnergyDataMapper;
-import com.huimv.admin.mapper.ProdStockMapper;
+import com.huimv.admin.mapper.EnergyEnvDeviceMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
+import java.util.List;
+
+
+//@RestController
+//@RequestMapping("/test")
 @Configuration
 @EnableScheduling
 public class EnergyFeedTimer {
     @Autowired
-    private BasePigpenMapper basePigpenMapper;
+    private EnergyEnvDeviceMapper energyEnvDeviceMapper;
     @Autowired
     private EnergyDataMapper energyDataMapper;
     @Autowired
-    private ProdStockMapper prodStockMapper;
+    private RestTemplate restTemplate;
+
+
+//    @GetMapping("/test3")
+    @Scheduled(cron = "0 0 * * * ? ")
+    public void action(){
+        DateTime dateTime = DateUtil.offsetHour(new Date(),-1);
+        DateTime endOfMonth = new DateTime();
+        List<EnergyEnvDevice> remark = energyEnvDeviceMapper.selectList(new QueryWrapper<EnergyEnvDevice>().eq("remark", 3));
+        String url = "http://api.infoexdata.cn/foreignApps/foreignerDevice/getDeviceInventoryList";
+        String token = getToke();
+        for (EnergyEnvDevice energyEnvDevice : remark) {
+
+            MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
+            formData.add("pageNum", "1");
+            formData.add("pageSize", "20");
+            formData.add("uniqueNo", energyEnvDevice.getDeviceCode());
+            formData.add("type", "2");
+            formData.add("compensate", "0");
+            formData.add("startTime", dateTime.toString("yyyy-MM-dd HH:mm:ss"));
+            formData.add("endTime", endOfMonth.toString("yyyy-MM-dd HH:mm:ss"));
+
+            // 设置请求头，指定内容类型为 form-data
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("token",token);
+            headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+            // 创建 HttpEntity
+            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(formData, headers);
+            // 发送 POST 请求
+            ResponseEntity<EneryDataVo> response = restTemplate.postForEntity(url, requestEntity, EneryDataVo.class);
+            EneryDataVo body = response.getBody();
+            System.out.println(body);
+            if (ObjectUtil.isEmpty(body) || ObjectUtil.isEmpty(body.getData())){
+                continue;
+            }
+            if (body.getData().getRecords() !=null){
+                List<EneryDataVo3> records = body.getData().getRecords();
+                for (EneryDataVo3 record : records) {
+                    EnergyData energyData = new EnergyData();
+//                    energyData.setCreateDate(DateUtil.parse(record.getEndTime(),"yyyy-MM-dd HH:mm:ss"));
+                    energyData.setCreateDate(record.getEndTime());
+                    energyData.setDisplayType(0);
+                    energyData.setFeedValue(record.getNum()+"");
+                    energyData.setUnitId(energyEnvDevice.getUnitId());
+                    energyData.setUnitName(energyEnvDevice.getUnitName());
+                    energyData.setFarmId(energyEnvDevice.getFarmId());
+                    energyDataMapper.insert(energyData);
+                }
+            }
+        }
+
+    }
+
+
+    private  String getToke(){
+        String url = "http://api.infoexdata.cn/foreignApps/foreignApplications/getToken?appId=farnek23dxr5yk8ymvwuhbmup&appKey=x6re4jt63kcpyt3jhyjzb4ckj";
+        TokenVo forObject = restTemplate.getForObject(url, TokenVo.class);
+        if (ObjectUtil.isNotEmpty(forObject) &&forObject.getCode() ==200 ){
+            return forObject.getData();
+        }else {
+            return null;
+        }
+    }
+
+
     //华统料塔
 //    @Scheduled(cron = "0 0 * * * ? ")
 //    private void action(){

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

@@ -0,0 +1,86 @@
+package com.huimv.admin.jinghongtimer;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+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.EnergyEnvDevice;
+import com.huimv.admin.entity.EnvData;
+import com.huimv.admin.entity.EnvDevice;
+import com.huimv.admin.jinghongtimer.Vo.*;
+import com.huimv.admin.mapper.EnergyDataMapper;
+import com.huimv.admin.mapper.EnergyEnvDeviceMapper;
+import com.huimv.admin.mapper.EnvDataMapper;
+import com.huimv.admin.mapper.EnvDeviceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/test")
+public class EnvTimer {
+    @Autowired
+    private EnvDataMapper envDataMapper;
+    @Autowired
+    private EnvDeviceMapper envDeviceMapper;
+    @GetMapping("/test3")
+    public Object test3(@RequestParam String verify) throws IOException {
+        System.out.println(verify);
+        return verify;
+    }
+    @PostMapping("/test3")
+    public Object test3( @RequestBody JingHongWenShi data) throws IOException {
+        System.out.println("test3");
+        System.out.println(data.toString());
+        JingHongWenShi2 data1 = data.getData();
+        String deviceId = data1.getDeviceId();
+        EnvDevice envDevice = envDeviceMapper.selectOne(new QueryWrapper<EnvDevice>().eq("device_code", deviceId));
+
+        EnvData envData = new EnvData();
+        envData.setDeviceId(envDevice.getDeviceCode());
+        envData.setCreateTime(new Date());
+        envData.setFarmId(envDevice.getFarmId());
+        envData.setEnvHum(getHum(data1));
+        envData.setEnvTemp(getTem(data1));
+        envData.setUnitId(envDevice.getUnitId());
+//        envData.setReceiveDate();
+        envDataMapper.insert(envData);
+        return data;
+    }
+
+    private String getHum(JingHongWenShi2 data1) {
+        List<JingHongWenShi3> dataPoints = data1.getDataPoints();
+        for (JingHongWenShi3 dataPoint : dataPoints) {
+            if ("湿度".equals(dataPoint.getVariableName())){
+                return dataPoint.getValue();
+            }
+        }
+        return "0";
+    }
+    private String getTem(JingHongWenShi2 data1) {
+        List<JingHongWenShi3> dataPoints = data1.getDataPoints();
+        for (JingHongWenShi3 dataPoint : dataPoints) {
+            if ("温度".equals(dataPoint.getVariableName())){
+                return dataPoint.getValue();
+            }
+        }
+        return "0";
+    }
+
+
+}

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

@@ -0,0 +1,101 @@
+package com.huimv.admin.jinghongtimer;
+
+import com.huimv.admin.entity.ProtData;
+import com.huimv.admin.jinghongtimer.Vo.JinghongWater;
+import com.huimv.admin.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Objects;
+
+//@RestController
+//@RequestMapping("/test")
+@Configuration
+@EnableScheduling
+public class ProtTimer {
+
+    @Autowired
+    private ProtDataMapper protDataMapper;
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Scheduled(cron = "0 0/10 * * * ? ")
+//    @GetMapping("/test3")
+    public void action(){
+        String url = "http://139.9.172.209:8085/getFlow"; // 更好的做法是从配置中读取这个URL
+        try {
+            // 使用泛型来指定返回类型
+            ResponseEntity<List<JinghongWater>> response = restTemplate.exchange(
+                    url,
+                    org.springframework.http.HttpMethod.GET,
+                    null,
+                    new org.springframework.core.ParameterizedTypeReference<List<JinghongWater>>() {}
+            );
+
+            for (JinghongWater jinghongWater : Objects.requireNonNull(response.getBody())) {
+                ProtData protData = new ProtData();
+                protData.setCreateDate(jinghongWater.getCreateTime());
+                protData.setFarmId(getFarmId(jinghongWater.getDeviceId()));
+                protData.setFlow(jinghongWater.getValueA());
+
+                if ("861213058872158".equals(jinghongWater.getDeviceId())){
+                    protData.setLoctionType(2);
+                }else {
+                    protData.setLoctionType(1);
+                }
+
+                protData.setCod("0");
+                protData.setNh3n("0");
+                protData.setPh("0");
+                protData.setTn("0");
+                protData.setTp("0");
+                protDataMapper.insert(protData);
+            }
+
+        } catch (RestClientException e) {
+            // 处理异常，比如记录日志或抛出更具体的业务异常
+            e.printStackTrace();
+            throw new RuntimeException("Failed to fetch flows", e);
+        }
+    }
+    private Integer getFarmId(String deivceId){
+        switch (deivceId){
+            case "861213058861409":
+                return 28;
+            case "861213058829596":
+                return 31;
+            case "861213058846764":
+                return 29;
+            case "861213058846640":
+                return 30;
+            default: //"861213058872158":
+                return 28;
+        }
+
+    }
+    private String getDevice(String deivceId){
+        switch (deivceId){
+            case "861213058861409":
+                return "芙江";
+            case "861213058829596":
+                return "凤行";
+            case "861213058846764":
+                return "庙贝";
+            case "861213058846640":
+                return "潞水";
+            default: //"861213058872158"
+                return "芙江2";
+        }
+
+
+    }
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/EneryDataVo.java

@@ -0,0 +1,10 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+@Data
+public class EneryDataVo {
+    private String msg;
+    private Integer code;
+    private EneryDataVo2 data;
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/EneryDataVo2.java

@@ -0,0 +1,15 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EneryDataVo2 {
+    private Integer pageNum;
+    private Integer pageSize;
+    private Integer totalPages;
+    private Integer total;
+    private List<EneryDataVo3> records;
+
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/EneryDataVo3.java

@@ -0,0 +1,25 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class EneryDataVo3 {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date staTime;
+
+    //结束量
+    private Integer afterWeight;
+    //变化量
+    private int num;
+    private Long id;
+
+    private Integer beforeWeight;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date endTime;
+    private Integer type;
+    private String deviceUniqueno;
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/JingHongWenShi.java

@@ -0,0 +1,9 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+@Data
+public class JingHongWenShi {
+    private JingHongWenShi2 data;
+    private String type;
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/JingHongWenShi2.java

@@ -0,0 +1,13 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class JingHongWenShi2 {
+    private List<JingHongWenShi3> dataPoints;
+    private Integer version;
+    private String deviceId;
+    private String deviceName;
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/JingHongWenShi3.java

@@ -0,0 +1,19 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+@Data
+public class JingHongWenShi3 {
+    private  String variableName ;
+    private  String dataPointId ;
+    private  Integer err ;
+    private  String slaveName ;
+    private  Long time ;
+    private  String value ;
+//    "variableName": "湿度", // 名称
+//            "dataPointId": "TEMP", //点位标识
+//            "err": 0, // 错误码
+//            "slaveName": "1", // 从机
+//            "time": 1725006601000, // 时间戳
+//            "value": "66.80" // 值
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/JinghongWater.java

@@ -0,0 +1,39 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2025-03-11
+ */
+@Data
+public class JinghongWater implements Serializable {
+
+    private Integer id;
+
+    private String raw;
+
+    private String deviceId;
+
+    private String deviceName;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    private String valueA;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/Vo/TokenVo.java

@@ -0,0 +1,10 @@
+package com.huimv.admin.jinghongtimer.Vo;
+
+import lombok.Data;
+
+@Data
+public class TokenVo {
+    private String msg;
+    private Integer code;
+    private String data;
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/PjDataServiceImpl.java

@@ -37,7 +37,7 @@ public class PjDataServiceImpl extends ServiceImpl<PjDataMapper, PjData> impleme
         queryWrapper.eq("farm_id", farmId);
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-        queryWrapper.ge("date_time", calendar.getTime());
+        queryWrapper.ge("create_date", calendar.getTime());
         List<EnergyAllDataVo> energyGasDataVos = pjDataMapper.listDayGas(queryWrapper);
         return new Result(ResultCode.SUCCESS, energyGasDataVos);
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -985,24 +985,39 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             // ProCountDto proCountDto = new ProCountDto();
             queryWrapper.eq("farm_id", farmId).eq("loction_type", 1).orderByDesc("create_date").last(" limit 1");
             ProtData protData = protDataMapper.selectOne(queryWrapper);
-            jsonObject.put("in", protData);
+            if (ObjectUtil.isEmpty(protData)) {
+                jsonObject.put("in", getWriteProtData() );
+            } else {
+                jsonObject.put("in", protData);
+            }
+
 
             QueryWrapper<ProtData> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("farm_id", farmId).eq("loction_type", 2).orderByDesc("create_date").last(" limit 1");
             ProtData protData1 = protDataMapper.selectOne(queryWrapper1);
-            jsonObject.put("deal", protData1);
+            if (ObjectUtil.isEmpty(protData1)) {
+                jsonObject.put("deal", getWriteProtData() );
+            } else {
+                jsonObject.put("deal", protData1);
+            }
+
 
             QueryWrapper<ProtData> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("farm_id", farmId).eq("loction_type", 3).orderByDesc("create_date").last(" limit 1");
             ProtData protData2 = protDataMapper.selectOne(queryWrapper2);
-            jsonObject.put("out", protData2);
+            if (ObjectUtil.isEmpty(protData2)) {
+                jsonObject.put("out", getWriteProtData() );
+            } else {
+                jsonObject.put("out", protData2);
+            }
+
         } else {
             QueryWrapper<WriteProtData> queryWrapper = new QueryWrapper<>();
             // ProCountDto proCountDto = new ProCountDto();
             queryWrapper.eq("farm_id", farmId).eq("type", 1).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData = writeProtDataMapper.selectOne(queryWrapper);
             if (ObjectUtil.isEmpty(writeProtData)) {
-                jsonObject.put("in", new WriteProtData());
+                jsonObject.put("in", getWriteProtData() );
             } else {
                 jsonObject.put("in", writeProtData);
             }
@@ -1011,7 +1026,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             queryWrapper1.eq("farm_id", farmId).eq("type", 2).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData1 = writeProtDataMapper.selectOne(queryWrapper1);
             if (ObjectUtil.isEmpty(writeProtData1)) {
-                jsonObject.put("deal", new WriteProtData());
+                jsonObject.put("deal", getWriteProtData() );
             } else {
                 jsonObject.put("deal", writeProtData1);
             }
@@ -1020,7 +1035,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             queryWrapper2.eq("farm_id", farmId).eq("type", 3).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData2 = writeProtDataMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isEmpty(writeProtData2)) {
-                jsonObject.put("out", new WriteProtData());
+                jsonObject.put("out",getWriteProtData() );
             } else {
                 jsonObject.put("out", writeProtData2);
             }
@@ -1030,6 +1045,10 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+    private  WriteProtData getWriteProtData() {
+      return new WriteProtData("0","0","0","0","0","0");
+    }
+
     @Override
     public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         Date timesmorning = DataUill.getTimesmorning();

huimv-admin/src/main/resources/application-dev.yml

@@ -11,7 +11,8 @@ spring:
 
 
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://218.76.168.4:3309/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    url: jdbc:mysql://192.168.1.7:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: 123456

huimv-admin/src/main/resources/mapper/PjDataMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.huimv.admin.mapper.PjDataMapper">
 
     <select id="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
-        SELECT Convert((IFNUll(sum(weight),'0')),DECIMAL(10,2)) 'value',date_time 'createDate' FROM `pj_data`
+        SELECT Convert((IFNUll(sum(feed_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(date_time,'%Y-%m-%d')
-        ORDER BY date_time ASC
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
     </select>
 </mapper>

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

@@ -1123,7 +1123,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             if ("21".equals(farmId)) {
                 queryWrapper.eq("farm_id", 26).orderByDesc("check_date");
             } else {
-                queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
+
+                queryWrapper.eq("farm_id", Integer.parseInt(farmId)).orderByDesc("check_date");
             }
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);

huimv-receive/src/main/resources/application-dev.yml

@@ -12,8 +12,9 @@ spring:
 
   datasource:
 #    url: jdbc:mysql://192.168.1.7:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://127.0.0.1:3306/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://192.168.1.254:3306/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://218.76.168.4:3309/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    #    url: jdbc:mysql://192.168.1.254:3306/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver