12

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/dao/entity/LampConfig.java

@@ -40,4 +40,7 @@ public class LampConfig implements Serializable {
     private String tempSet;
 
 
+    private Integer boardGear;
+
+
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/dao/entity/LampConfigEntity.java

@@ -55,5 +55,6 @@ public class LampConfigEntity implements Serializable {
 
     private Integer   binding;
     private String    farmCode;
+    private Integer boardGear;
 
 }

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -9,8 +9,10 @@ com\huimv\env\common\dao\entity\EnvElectricityMeter.class
 com\huimv\env\common\service\impl\SensorRegisterServiceImpl.class
 com\huimv\env\common\service\ITempThresholdService.class
 com\huimv\env\common\service\IDeviceRegisterService.class
+com\huimv\env\common\service\impl\EnvElectricityDayServiceImpl.class
 com\huimv\env\common\dao\entity\EnvHumiEntity.class
 com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.class
+com\huimv\env\common\service\impl\EnvWaterMonthServiceImpl.class
 com\huimv\env\common\service\ISprayTimeService.class
 com\huimv\env\common\dao\repo\EnvTempEntityRepo.class
 com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.class
@@ -19,11 +21,13 @@ com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.class
 com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.class
 com\huimv\env\common\service\impl\SprayTimeServiceImpl.class
 com\huimv\env\common\dao\entity\EnvSprayConfigEntity.class
+com\huimv\env\common\service\impl\EnvElectricityMonthServiceImpl.class
 com\huimv\env\common\dao\entity\EnvTempThresholdEntity.class
 com\huimv\env\common\dao\repo\BasePigpenEntityRepo.class
 com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.class
 com\huimv\env\common\utils\MathUtil.class
+com\huimv\env\common\service\impl\LampConfigServiceImpl.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class
 com\huimv\env\common\dao\entity\BasePigpenEntity.class
 com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.class
@@ -33,6 +37,7 @@ com\huimv\env\common\service\impl\TempThresholdServiceImpl.class
 com\huimv\env\common\service\ISensorRegisterService.class
 com\huimv\env\common\dao\entity\EnvPh.class
 com\huimv\env\common\utils\RegexUtil.class
+com\huimv\env\common\utils\MathUtil2.class
 com\huimv\env\common\dao\repo\EnvElectricityMeterRepo.class
 com\huimv\env\common\service\ISprayConfigService.class
 com\huimv\env\common\dao\repo\EnvHumiEntityRepo.class
@@ -44,10 +49,12 @@ com\huimv\env\common\service\impl\SprayStatusServiceImpl.class
 com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.class
 com\huimv\env\common\service\impl\SprayConfigServiceImpl.class
 com\huimv\env\common\utils\DateUtil.class
+com\huimv\env\common\service\impl\LampTempServiceImpl.class
 com\huimv\env\common\service\ISprayStatusService.class
 com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.class
 com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPhEntityRepo.class
 com\huimv\env\common\dao\entity\EnvWaterGege.class
 com\huimv\env\common\dao\repo\EnvWaterMeterRepo.class
+com\huimv\env\common\service\impl\EnvWaterDayServiceImpl.class
 com\huimv\env\common\utils\SMSManager.class

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,13 +1,17 @@
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampConfigEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityDayMapper.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\BaseDeviceCofigServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterDay.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\LampTempServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvWaterDayController.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvWaterMonth.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BasePigpenEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
@@ -17,37 +21,47 @@ G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\BaseDeviceCofigMapper.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ILampTempService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterDayServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil2.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvElectricityMeter.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityDayService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvWaterMonthServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\LampConfigMapper.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvElectricityMonthController.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvElectricityMeterRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ILampConfigService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvElectricityDayController.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPh.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\SMSManager.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayTimeEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPhEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvElectricityMonthMapper.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityDay.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IBaseDeviceCofigService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityMonthServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterMeterRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampTempEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterDayMapper.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterGege.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfig.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterDayService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterMeter.java
@@ -57,14 +71,20 @@ G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceEquipment.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\mapper\EnvWaterMonthMapper.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\entity\EnvElectricityMonth.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\LampTempEntityRepo.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\LampConfigServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvWaterMonthService.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\LampConfigEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\EnvElectricityDayServiceImpl.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\EnvElectricityMonthService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\controller\EnvWaterMonthController.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
 G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceEqipmentRepo.java

huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/HuimvEnvInputApplication.java

@@ -1,6 +1,7 @@
 package com.huimv.env.input;
 
 import com.huimv.env.input.server.EnvInputServer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -21,6 +22,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
         @ComponentScan("com.huimv.env.common.service")})
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
+@MapperScan(basePackages = "com.huimv.env.common.mapper")
 @SpringBootApplication
 public class HuimvEnvInputApplication {
     public static void main(String[] args) throws InterruptedException {

huimv-env-platform/huimv-env-lamp/src/main/java/com/huimv/env/lamp/HuimvLampInputApplication.java

@@ -1,6 +1,7 @@
 package com.huimv.env.lamp;
 
 import com.huimv.env.lamp.server.LampInputServer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -18,9 +19,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  * @Create : 2020-12-25
  **/
 @ComponentScans({@ComponentScan("com.huimv.env.common.utils"),
-        @ComponentScan("com.huimv.env.common.service")})
+@ComponentScan("com.huimv.env.common.service")})
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
+@MapperScan(basePackages = "com.huimv.env.common.mapper")
 @SpringBootApplication
 public class HuimvLampInputApplication {
     public static void main(String[] args) throws InterruptedException {

huimv-env-platform/huimv-env-lamp/src/main/java/com/huimv/env/lamp/service/impl/LampInputHandleServiceImpl.java

@@ -62,12 +62,13 @@ public class LampInputHandleServiceImpl implements LampInputHandleService {
     public void getLampConfig(String askText, String idCode, ChannelHandlerContext ctx) {
         System.out.println("获取温度配置");
         List<LampConfigEntity> lampConfigEntityList = lampConfigService.getLampConfigByDeviceId(idCode);
-        String answerText ="hm+"+idCode+"+3+0+0+7+end";
+        String answerText ="hm+"+idCode+"+3+0+0+0+7+end";
         if (ObjectUtil.isNotEmpty(lampConfigEntityList)){
             LampConfigEntity lampConfigEntity = lampConfigEntityList.get(0);
             String tempSet = lampConfigEntity.getTempSet();
             Integer uploadStart = lampConfigEntity.getUploadStart();
-            answerText ="hm+"+idCode+"+3+"+uploadStart+"+"+tempSet+"+7+end";
+            Integer boardGear = lampConfigEntity.getBoardGear();
+            answerText ="hm+"+idCode+"+3+"+uploadStart+"+"+tempSet+"+"+boardGear+"+7+end";
         }
 
         log.info(">>获取保温箱温度配置请求-应答数据>>" + answerText);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java

@@ -39,7 +39,7 @@ public class HuimvEnvManageApplication {
      * http重定向到https
      * @return
      */
-    @Bean
+  /*  @Bean
     public TomcatServletWebServerFactory servletContainer() {
         TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
             @Override
@@ -66,5 +66,5 @@ public class HuimvEnvManageApplication {
         //监听到http的端口号后转向到的https的端口号,也就是项目配置的port
         connector.setRedirectPort(8097);
         return connector;
-    }
+    }*/
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/**/my/*");
+                excludePathPatterns("/my/*");
     }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvDeviceRegisterController.java

@@ -1,6 +1,10 @@
 package com.huimv.env.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.manage.entity.EnvDeviceRegister;
+import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
+import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import com.huimv.env.manage.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +28,9 @@ public class EnvDeviceRegisterController {
     @Autowired
     private IEnvDeviceRegisterService deviceRegisterService;
 
+    @Autowired
+    private IEnvDeviceEquipmentService deviceEquipmentService;
+
 
     @PostMapping("/registerList")
     public Result registerList(@RequestBody Map<String,String> paramMap){
@@ -36,6 +43,17 @@ public class EnvDeviceRegisterController {
         return  deviceRegisterService.saveRegister(paramMap);
     }
 
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String,String> paramMap){
+        String ids = paramMap.get("ids");
+        String[] split = ids.split(",");
+        for (String id : split) {
+            deviceEquipmentService.remove(new QueryWrapper<EnvDeviceEquipment>().eq("device_code", id));
+            deviceRegisterService.removeById(id);
+        }
+        return new Result(10000,"删除成功",true) ;
+    }
+
 
 
     @PostMapping("/lsitAllDeivce")

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/LoginController.java

@@ -99,9 +99,9 @@ public class LoginController {
             String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds());
             accessToken.setToken(token);
             accessToken.setFarmName("慧牧测试牧场");
-            accessToken.setOpenId(accountEntity.getOpenId());
-            accessToken.setImgUrl(accountEntity.getImgUrl());
-            accessToken.setWechatName(accountEntity.getWechatName());
+//            accessToken.setOpenId(accountEntity.getOpenId());
+//            accessToken.setImgUrl(accountEntity.getImgUrl());
+//            accessToken.setWechatName(accountEntity.getWechatName());
 
             accessToken.setId(id);
             accessToken.setLoginIp(remoteHost);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/SysAccountMultilevel.java

@@ -47,10 +47,10 @@ public class SysAccountMultilevel extends Model {
 
     private Integer type;
 
-    private String openId;
+//    private String openId;
 
-    private String imgUrl;
+//    private String imgUrl;
 
-    private String wechatName;
+//    private String wechatName;
 
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/LampConfigController.java

@@ -4,6 +4,7 @@ package com.huimv.env.manage.saas.controller;
 import com.huimv.env.manage.saas.dao.entity.LampConfig;
 import com.huimv.env.manage.saas.service.ILampConfigService;
 import com.huimv.env.manage.utils.Result;
+import com.huimv.env.manage.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -52,30 +53,53 @@ public class LampConfigController {
 
     }
 
-    //统一配置 TODO
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> map, HttpServletRequest request){
+        String ids = map.get("ids");
+        String[] split = ids.split(",");
+        for (String id : split) {
+            lampConfigService.removeById(id);
+        }
+
+        return  new Result(10000,"删除成功",true);
+
+    }
+
+    // 保温灯统一配置 -配置
     @PostMapping("/allToConfig")
     public Result allToConfig(@RequestBody Map<String, String> map, HttpServletRequest request){
         return lampConfigService.allToConfig(map,request);
 
     }
 
+
     @PostMapping("/listByUnit")
     public Result listByUnit(@RequestBody Map<String, String> map, HttpServletRequest request){
         return lampConfigService.listByUnit(map,request);
 
     }
 
+
     @PostMapping("/countByUnit")
     public Result countByUnit(@RequestBody Map<String, String> map, HttpServletRequest request){
         return lampConfigService.countByUnit(map,request);
 
     }
 
+
+    // TODO 保温灯开关
     @PostMapping("/updateLamp")
-    public Result updateLamp(@RequestBody Map<String, String> map, HttpServletRequest request){
+    public Result updateLamp(@RequestBody Map<String, Integer> map, HttpServletRequest request){
         return lampConfigService.updateLamp(map,request);
 
     }
 
 
+    @PostMapping("/listByLampId")
+    public Result listByLampId(@RequestBody Map<String, String> map, HttpServletRequest request){
+        return lampConfigService.listByLampId(map,request);
+
+    }
+
+
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/LampConfig.java

@@ -59,6 +59,9 @@ public class LampConfig implements Serializable {
     private String  lampName;
 
     private Integer   binding;
+
     private String    farmCode;
 
+    private Integer boardGear;
+
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/LampConfigAll.java

@@ -33,10 +33,8 @@ public class LampConfigAll implements Serializable {
 
     private String listDayage;
 
-    /**
-     * 1 保温灯 2加热板
-     */
-    private Integer type;
+    private Integer boardGear;
+    private Integer unitId;
 
 
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/ILampConfigService.java

@@ -33,5 +33,7 @@ public interface ILampConfigService extends IService<LampConfig> {
 
     Result countByUnit(Map<String, String> map, HttpServletRequest request);
 
-    Result updateLamp(Map<String, String> map, HttpServletRequest request);
+    Result updateLamp(Map<String, Integer> map, HttpServletRequest request);
+
+    Result listByLampId(Map<String, String> map, HttpServletRequest request);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/BasePigpenServiceImpl.java

@@ -48,6 +48,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         for (BasePigpen basePigpen : basePigpenList) {
             Map endMap = new HashMap();
             endMap.put("pigpenName",basePigpen.getPigpenName());
+            endMap.put("id",basePigpen.getId());
             endMap.put("unitNum",basePigpenMapper.selectCount(new QueryWrapper<BasePigpen>().eq("parent_id",basePigpen.getId())));
 
             endList.add(endMap);
@@ -67,14 +68,20 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         basePigpen.setPigpenName(pigpenName);
         basePigpen.setParentId(0);
         basePigpen.setFarmCode(farmCode);
+        if (  basePigpenMapper.exists(new QueryWrapper<BasePigpen>().eq("pigpen_name",pigpenName).eq("farm_code",farmCode))){
+            return new Result(10001,"该栋舍已存在",false);
+        }
+
         int insert = basePigpenMapper.insert(basePigpen);
+        System.out.println(insert);
         for (Integer integer = 1; integer <= unitNum; integer++) {
             String format = NumberChineseFormatter.format(integer, false);
 
             BasePigpen basePigpenUnit = new BasePigpen();
             basePigpenUnit.setPigpenName(pigpenName+format+"单元");
-            basePigpenUnit.setParentId(insert);
+            basePigpenUnit.setParentId(basePigpen.getId());
             basePigpenUnit.setFarmCode(farmCode);
+            basePigpenMapper.insert(basePigpenUnit);
         }
 
         return new Result(10000,"添加成功",true);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/LampConfigAllServiceImpl.java

@@ -33,21 +33,23 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
 
     @Override
     public Result listByFarmCode(Map<String, String> map, HttpServletRequest request) {
-        String type = map.get("type");
         String farmCode = map.get("farmCode");
+        String unitId = map.get("unitId");
 
-        LampConfigAll lampConfigAll = lampConfigAllMapper.selectOne(new QueryWrapper<LampConfigAll>().eq("farm_code", farmCode).eq("type", type));
+        LampConfigAll lampConfigAll = lampConfigAllMapper.selectOne(new QueryWrapper<LampConfigAll>().eq("farm_code", farmCode).eq("unit_id",unitId));
         if (ObjectUtil.isEmpty(lampConfigAll)){
             lampConfigAll = new LampConfigAll();
             lampConfigAll.setFarmCode(farmCode);
             lampConfigAll.setInitDayage(0);
-            lampConfigAll.setListDayage("0,33");
-            lampConfigAll.setType(Integer.parseInt(type));
+            lampConfigAll.setListDayage("0,33;");
+            lampConfigAll.setBoardGear(0);
+            lampConfigAllMapper.insert(lampConfigAll);
         }
         Map endMap =new HashMap();
         endMap.put("initDayage",lampConfigAll.getInitDayage());
         endMap.put("listDayage",lampConfigAll.getListDayage().split(";"));
-        endMap.put("type",lampConfigAll.getType());
+        endMap.put("boardGear",lampConfigAll.getBoardGear());
+        endMap.put("farmCode",lampConfigAll.getFarmCode());
 
         return new Result(ResultCode.SUCCESS, endMap);
     }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/LampConfigServiceImpl.java

@@ -5,9 +5,12 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.mapper.BasePigpenMapper;
 import com.huimv.env.manage.mapper.LampConfigAllMapper;
+import com.huimv.env.manage.saas.dao.entity.BasePigpen;
 import com.huimv.env.manage.saas.dao.entity.LampConfig;
 import com.huimv.env.manage.mapper.LampConfigMapper;
 import com.huimv.env.manage.saas.dao.entity.LampConfigAll;
@@ -48,13 +51,16 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     @Override
     public Result savelampConfig( LampConfig lampConfig, HttpServletRequest request) {
         String deviceId = lampConfig.getDeviceId();
-        if (ObjectUtil.isEmpty(lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("device_id",deviceId)))){
-            this.save(lampConfig);
-            return new Result(10000,"添加成功",true);
-        }else {
-            return new Result(10001,"设备已存在",false);
+        Integer unitId = lampConfig.getUnitId();
+        String location  = lampConfig.getLocation();
+        if (lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("device_id",deviceId))){
+            return new Result(10001,"保温灯已存在",false);
         }
-
+        if (lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unit_id",unitId).eq("location",location))){
+            return new Result(10002,"该位置已有保温灯",false);
+        }
+        this.save(lampConfig);
+        return new Result(10000,"添加成功",true);
 
     }
 
@@ -62,9 +68,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     public Result lsitAllLamp(Map<String, String> map, HttpServletRequest request) {
         String farmCode = map.get("farmCode");
         List<LampConfig> lampConfigs = lampConfigMapper.selectList(new QueryWrapper<LampConfig>().eq("farm_code", farmCode));
-
         List endList = new ArrayList();
-
         for (LampConfig lampConfig : lampConfigs) {
             Map endMap = new HashMap();
             endMap.put("binding",lampConfig.getBinding());
@@ -74,10 +78,15 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             endMap.put("unitId",lampConfig.getUnitId());
             endMap.put("lampName",lampConfig.getLampName());
             endMap.put("location",lampConfig.getLocation());
-            endMap.put("pigpenName",basePigpenMapper.selectById(lampConfig.getId()).getPigpenName());
+            BasePigpen basePigpen = basePigpenMapper.selectById(lampConfig.getUnitId());
+            if (ObjectUtil.isNotEmpty(basePigpen)){
+                endMap.put("pigpenName",basePigpen.getPigpenName());
+            }else {
+                endMap.put("pigpenName","该设备未绑定");
+            }
+            endList.add(endMap);
         }
 
-
         return ResultUtil.isNull(endList);
     }
 
@@ -99,6 +108,9 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         String unitId = map.get("unitId");
         String location = map.get("location");
 
+        if (lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unit_id",unitId).eq("location",location))){
+            return new Result(10002,"该位置已有保温灯",false);
+        }
 
         LampConfig lampConfig = new LampConfig();
 
@@ -134,11 +146,44 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
 
     @Override
     public Result allToConfig(Map<String, String> map, HttpServletRequest request) {
-        String initDayAge = map.get("initDayAge");
-        String dayAgeList = map.get("dayAgeList");
-        JSONArray jsonArray = JSONUtil.parseArray(dayAgeList);
+        try {
+            String initDayAge =  map.get("initDayAge");
+            String dayAgeList =  map.get("dayAgeList");
+            //
+            String boardGear = map.get("boardGear");
+            String unitId = map.get("unitId");
+            String id = map.get("id");
+
+            JSONArray jsonArray = JSONUtil.parseArray(dayAgeList);
+
+            LampConfig lampConfig = new LampConfig();
+            lampConfig.setInitAge(Integer.parseInt(initDayAge));
+            lampConfig.setBoardGear(Integer.parseInt(boardGear));
+            StringBuilder dayAgeListStr = new StringBuilder();
+            for (Object o : jsonArray) {
+                dayAgeListStr.append(o.toString()).append(";");
+            }
+            lampConfig.setAgeList(dayAgeListStr.toString());
+            UpdateWrapper<LampConfig> wrapper = new UpdateWrapper<>();
+            if (StringUtils.isBlank(id)){
+                LampConfigAll lampConfigAll = new LampConfigAll();
+                lampConfigAll.setBoardGear(Integer.parseInt(boardGear));
+//                lampConfigAll.setListDayage();
+                lampConfigAll.setInitDayage(Integer.parseInt(initDayAge));
+//                lampConfigAll.setFarmCode();
+//                lampConfigAll.setUnitId();
+                wrapper.eq("unit_id",unitId);
+            }else {
+                wrapper.eq("id",id);
+            }
+            lampConfigMapper.update(lampConfig,wrapper);
+
+            return new Result(10000,"全局配置成功",true);
+        }catch (Exception e){
+            System.out.println(e);
+            return new Result(10001,"配置失败",true);
+        }
 
-        return null;
     }
 
     @Override
@@ -173,7 +218,37 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     }
 
     @Override
-    public Result updateLamp(Map<String, String> map, HttpServletRequest request) {
-        return null;
+    public Result updateLamp(Map<String, Integer> map, HttpServletRequest request) {
+        Integer uploadStart = map.get("uploadStart");
+        Integer id = map.get("id");
+        Integer unitId = map.get("unitId");
+        LampConfig lampConfig = new LampConfig();
+        lampConfig.setUploadStart(uploadStart);
+        if (ObjectUtil.isNotEmpty(unitId)){
+            lampConfigMapper.update(lampConfig,new QueryWrapper<LampConfig>().eq("unit_id",unitId));
+        }else {
+            lampConfig.setId(id);
+            lampConfigMapper.updateById(lampConfig);
+        }
+
+        return new Result(10000,"配置成功",true);
+    }
+
+    @Override
+    public Result listByLampId(Map<String, String> map, HttpServletRequest request) {
+        String lampId = map.get("lampId");
+        LampConfig lampConfig = lampConfigMapper.selectById(lampId);
+        if (ObjectUtil.isEmpty(lampConfig)){
+            lampConfig = new LampConfig();
+            lampConfig.setInitAge(0);
+            lampConfig.setAgeList("0,33;");
+        }
+        Map endMap =new HashMap();
+        endMap.put("initDayage",lampConfig.getInitAge());
+        endMap.put("listDayage",lampConfig.getAgeList().split(";"));
+        endMap.put("id",lampConfig.getId());
+        endMap.put("lampName",lampConfig.getLampName());
+        endMap.put("deviceId",lampConfig.getDeviceId());
+        return new Result(ResultCode.SUCCESS,endMap);
     }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvDeviceRegisterServiceImpl.java

@@ -68,11 +68,7 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
             if (ObjectUtil.isEmpty(record.getAmmonia())){
                 record.setAmmonia(new BigDecimal(0));
             }
-
-
         }
-
-
         return new Result(ResultCode.SUCCESS, page);
     }
 
@@ -117,6 +113,7 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
             envDeviceEquipment.setDeviceCode(deviceCode1);
             envDeviceEquipment.setEquipmentPort(port);
             envDeviceEquipmentMapper.insert(envDeviceEquipment);
+            port++;
         }
 
         return new Result(ResultCode.SUCCESS,true);
@@ -157,8 +154,15 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
             Map endMap = new HashMap();
             String deviceCode = deviceRegister.getDeviceCode();
             endMap.put("chipId",deviceRegister.getChipId());
+            endMap.put("id",deviceRegister.getId());
             endMap.put("deviceCode",deviceCode);
-            endMap.put("unitName",basePigpenMapper.selectById(deviceRegister.getUnitId()).getPigpenName());
+            BasePigpen basePigpen = basePigpenMapper.selectById(deviceRegister.getUnitId());
+            if (ObjectUtil.isNotEmpty(basePigpen)){
+                endMap.put("unitName",basePigpen.getPigpenName());
+            }else {
+                endMap.put("unitName","");
+            }
+
             endMap.put("unitId",deviceRegister.getUnitId());
             endMap.put("equipmentList",envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("device_code",deviceCode)));
             endMap.put("binding",deviceRegister.getBinding());
@@ -175,6 +179,9 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
     public Result bindingBaseDeviceCofig(Map<String, String> map, HttpServletRequest request) {
         String deviceCode = map.get("deviceCode");
         String unitId = map.get("unitId");
+        if (envDeviceRegisterMapper.exists(new QueryWrapper<EnvDeviceRegister>().eq("unit_id",unitId))){
+            return new Result(10001,"该单元已绑定设备",false);
+        }
         EnvDeviceRegister deviceRegister = new EnvDeviceRegister();
         deviceRegister.setUnitId(unitId);
         deviceRegister.setBinding(1);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/time/Timer.java

@@ -17,8 +17,8 @@ public class Timer {
     private ILampConfigService lampConfigService;
 
     //更新日龄,温度
-//    @Scheduled(cron = "0 59 23 * * ?")
-    @Scheduled(cron = "0 * * * * ?")
+    @Scheduled(cron = "0 59 23 * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
     private void updateAge(){
         System.out.println("更新日龄");
         List<LampConfig> lampConfigs = lampConfigService.list(null);