修改端口等

huimv-farm-admin/src/main/java/com/huimv/admin/system/service/impl/SysAccountMultilevelServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.admin.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.system.entity.SysAccountMultilevel;
@@ -40,6 +41,13 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
     @Override
     public Result add(SysAccountMultilevel sysAccountMultilevel, Integer userId) {
+
+        int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
+        if (account > 0 ){
+            return new Result(10001,"该账号已经存在，请重新创建",false);
+
+        }
+
         SysAccountMultilevel byId = this.getById(userId);
 
 
@@ -86,6 +94,10 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
         wrapper.like("pids",userId);
+        if (StringUtils.isNotBlank(searchStr)){
+            wrapper.like("user_name",searchStr);
+        }
+
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
         return new Result(ResultCode.SUCCESS,page);
     }
@@ -108,5 +120,4 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return new Result(ResultCode.SUCCESS,lastFarmId);
     }
 
-
 }

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

@@ -1,5 +1,5 @@
 server:
-  port: 8097
+  port: 8090
 spring:
   application:
     name: pigfarm-local-device

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseRoomServiceImpl.java

@@ -54,13 +54,13 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     @Override
     public Result getAllRoomEnvironment(Integer farmId) {
 
-       List<AllRoomEnvironment> list =  baseRoomMapper.getAllRoomEnvironment(farmId);
+        List<AllRoomEnvironment> list =  baseRoomMapper.getAllRoomEnvironment(farmId);
 
         return new Result(ResultCode.SUCCESS,list);
     }
 
     @Override
-    public Result listByRoom(Map<String, String> map) {
+    public Result listByRoom(Map<String,String> map) {
         String roomId = map.get("roomId");
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
@@ -143,7 +143,7 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     }
 
     @Override
-    public Result listAllWaterEnvPowerApp(Map<String, String> map) {
+    public Result listAllWaterEnvPowerApp(Map<String,String> map) {
         String farmId = map.get("farmId");
         String roomName = map.get("roomName");
         QueryWrapper<BaseRoom> wrapper = new QueryWrapper<>();

huimv-farm-gateway/src/main/resources/application-dev.yml

@@ -9,19 +9,19 @@ spring:
       enabled: true
       routes:
         - id: admin
-          uri: http://127.0.0.1:8097
+          uri: http://127.0.0.1:8090
           predicates:
             - Path=/admin/**
           filters:
             - StripPrefix=1
         - id: video
-          uri: http://127.0.0.1:8098
+          uri: http://127.0.0.1:8096
           predicates:
             - Path=/video/**
           filters:
             - StripPrefix=1
         - id: produce
-          uri: http://127.0.0.1:8099
+          uri: http://127.0.0.1:8094
           predicates:
             - Path=/produce/**
           filters:

huimv-farm-produce/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8099
+  port: 8094
 spring:
   application:
     name: pigfarm-local-device

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/controller/EcoController.java

@@ -0,0 +1,23 @@
+package com.huimv.receiver.eco.controller;
+
+import com.huimv.receiver.eco.service.ISysHumidityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+//接收温湿度数据
+@RestController
+@RequestMapping(value = "/receiver/eco")
+public class EcoController {
+    @Autowired
+    private ISysHumidityService sysHumidityService;
+
+
+    @PostMapping(value = "/save")
+    public void save(){
+//        sysHumidityService.saveHumAndTem();
+    }
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysHumidity.java

@@ -0,0 +1,43 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysHumidity extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "hum_id", type = IdType.AUTO)
+    private Integer humId;
+
+    private String id;
+
+    private Double value;
+
+    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+    private Date createTime;
+
+    private Integer roomId;
+
+    private Integer farmId;
+
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysTemperature.java

@@ -0,0 +1,47 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysTemperature extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "tem_id", type = IdType.AUTO)
+    private Integer temId;
+
+    private String id;
+
+    private Double value;
+
+    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+    private Date createTime;
+
+    private Integer roomId;
+
+    private Integer farmId;
+
+
+    private Double original;
+
+
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysHumidityMapper.java

@@ -0,0 +1,24 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.receiver.eco.entity.SysHumidity;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Repository
+public interface SysHumidityMapper extends BaseMapper<SysHumidity> {
+
+    List<SysHumidity> listDay(@Param(Constants.WRAPPER) QueryWrapper<SysHumidity> humidityWrapper);
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysTemperatureMapper.java

@@ -0,0 +1,24 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.receiver.eco.entity.SysTemperature;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Repository
+public interface SysTemperatureMapper extends BaseMapper<SysTemperature> {
+
+    List<SysTemperature> listDay(@Param(Constants.WRAPPER) QueryWrapper<SysTemperature> temperatureWrapper);
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysHumidityService.java

@@ -0,0 +1,16 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receiver.eco.entity.SysHumidity;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+public interface ISysHumidityService extends IService<SysHumidity> {
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysTemperatureService.java

@@ -0,0 +1,16 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receiver.eco.entity.SysTemperature;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+public interface ISysTemperatureService extends IService<SysTemperature> {
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysHumidityServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.SysHumidity;
+import com.huimv.receiver.eco.mapper.SysHumidityMapper;
+import com.huimv.receiver.eco.service.ISysHumidityService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Service
+public class SysHumidityServiceImpl extends ServiceImpl<SysHumidityMapper, SysHumidity> implements ISysHumidityService {
+
+}

huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysTemperatureServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.SysTemperature;
+import com.huimv.receiver.eco.mapper.SysTemperatureMapper;
+import com.huimv.receiver.eco.service.ISysTemperatureService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-11
+ */
+@Service
+public class SysTemperatureServiceImpl extends ServiceImpl<SysTemperatureMapper, SysTemperature> implements ISysTemperatureService {
+
+}

huimv-farm-video/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8098
+  port: 8096
 spring:
   application:
     name: pigfarm-local-device