修改首页报警信息

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/SetTemperature.java

@@ -1,23 +1,19 @@
 package com.huimv.environment.controller;
 
 import com.huimv.common.result.Result;
-import com.huimv.environment.entity.SttTemperatureEntity;
-import com.huimv.environment.entity.SysAccountEntity;
-import com.huimv.environment.repo.SttTemperatureEntityRepo;
-import com.huimv.environment.session.AccessToken;
+import com.huimv.common.result.ResultCode;
+import com.huimv.environment.entity.SetTemperatureEntity;
+import com.huimv.environment.repo.SetTemperatureEntityRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -33,7 +29,7 @@ public class SetTemperature {
 
 
     @Autowired
-    private SttTemperatureEntityRepo sttTemperatureEntityRepo;
+    private SetTemperatureEntityRepo setTemperatureEntityRepo;
 
     @RequestMapping(value = "/temperature", method = RequestMethod.POST)
     public Result login(HttpSession session,
@@ -41,14 +37,22 @@ public class SetTemperature {
                              @RequestParam(name = "low_temperature", required = true) String low_temperature,
                              @RequestParam(name = "remark", required = true) String remark,
                              HttpServletRequest req)  {
-
-
-        Optional<SttTemperatureEntity> byId = sttTemperatureEntityRepo.findById(2);
+        Optional<SetTemperatureEntity> byId = setTemperatureEntityRepo.findById(1);
         byId.get().setHighTemperature(high_temperature);
         byId.get().setLowTemperature(low_temperature);
         byId.get().setRemark(remark);
-        byId.get().setUpdata(new Date());
-        sttTemperatureEntityRepo.save(byId.get());
+        byId.get().setUpdataTime(new Date());
+        byId.get().setCreateTimee(new Date());
+
+        setTemperatureEntityRepo.save(byId.get());
         return  new Result(10000,"设置成功", true);
     }
+
+
+    @RequestMapping(value = "/findAll", method = RequestMethod.POST)
+    public Result findAll()  {
+        List<SetTemperatureEntity> all = setTemperatureEntityRepo.findAll();
+
+        return  new Result(ResultCode.SUCCESS,all);
+    }
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/controller/WarningParameterController.java

@@ -10,7 +10,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@CrossOrigin
 @RequestMapping("/warningParameter")
 public class WarningParameterController {
 

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/ConfigEntity.java

@@ -0,0 +1,26 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "config")
+@Data
+public class ConfigEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "property_key")
+    private String propertyKey;
+
+    @Column(name = "property_value")
+    private String propertyValue;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/IndexParameter2Entity.java

@@ -0,0 +1,36 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name = "index_parameter2")
+public class IndexParameter2Entity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "data")
+    private String data;
+
+    @Column(name = "create_time", nullable = false)
+    private Date createTime;
+
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    @Column(name = "check_parameter")
+    private Integer checkParameter;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/IndexParameterEntity.java

@@ -0,0 +1,36 @@
+package com.huimv.environment.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Table(name = "index_parameter")
+@Entity
+@Data
+public class IndexParameterEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "data")
+    private String data;
+
+    @Column(name = "create_time")
+    private Date createTime;
+
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    @Column(name = "check_parameter")
+    private Integer checkParameter;
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/entity/SttTemperatureEntity.java

@@ -7,15 +7,12 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Entity
-@Table(name = "stt_temperature")
+@Table(name = "set_temperature")
 @Data
-public class SttTemperatureEntity implements Serializable {
+public class SetTemperatureEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * id
-     */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
@@ -27,13 +24,13 @@ public class SttTemperatureEntity implements Serializable {
     @Column(name = "low_temperature")
     private String lowTemperature;
 
-    @Column(name = "create", nullable = false)
-    private Date create;
-
-    @Column(name = "updata", nullable = false)
-    private Date updata;
+    @Column(name = "create_timee")
+    private Date createTimee;
 
     @Column(name = "remark")
     private String remark;
 
+    @Column(name = "updata_time")
+    private Date updataTime;
+
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/ConfigEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.ConfigEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ConfigEntityRepo extends JpaRepository<ConfigEntity, Integer>, JpaSpecificationExecutor<ConfigEntity> {
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/IndexParameter2EntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.IndexParameter2Entity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface IndexParameter2EntityRepo extends JpaRepository<IndexParameter2Entity, Integer>, JpaSpecificationExecutor<IndexParameter2Entity> {
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/IndexParameterEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.environment.repo;
+
+import com.huimv.environment.entity.IndexParameterEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface IndexParameterEntityRepo extends JpaRepository<IndexParameterEntity, Integer>, JpaSpecificationExecutor<IndexParameterEntity> {
+
+}

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/repo/SttTemperatureEntityRepo.java

@@ -1,9 +1,9 @@
 package com.huimv.environment.repo;
 
-import com.huimv.environment.entity.SttTemperatureEntity;
+import com.huimv.environment.entity.SetTemperatureEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-public interface SttTemperatureEntityRepo extends JpaRepository<SttTemperatureEntity, Integer>, JpaSpecificationExecutor<SttTemperatureEntity> {
+public interface SetTemperatureEntityRepo extends JpaRepository<SetTemperatureEntity, Integer>, JpaSpecificationExecutor<SetTemperatureEntity> {
 
 }

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/task/WarningParameterTask.java

@@ -1,7 +1,15 @@
 package com.huimv.environment.task;
 
+import com.huimv.environment.entity.*;
+import com.huimv.environment.repo.*;
+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.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -15,5 +23,86 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 public class WarningParameterTask {
 
-    
+    @Autowired
+    private ConfigEntityRepo configEntityRepo;
+
+    @Autowired
+    private WarningParameterRepository warningParameterRepository;
+
+    //本地参数
+    @Autowired
+    private IndexParameter2EntityRepo indexParameter2EntityRepo;
+    //erp 参数
+    @Autowired
+    private IndexParameterEntityRepo indexParameterEntityRepo;
+
+    @Autowired
+    private WarningInfoEntityRepo warningInfoEntityRepo;
+
+    @Scheduled(cron = "0 51 13 * * ?")
+    public void warningTask() {
+        List<ConfigEntity> all = configEntityRepo.findAll();
+        ConfigEntity configEntity = all.get(0);
+        String propertyValue = configEntity.getPropertyValue();
+
+        List<WarningParameter> warningParameterList = warningParameterRepository.findAll();
+
+        if ("true".equals(propertyValue)) {
+            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
+            List<IndexParameter2Entity> collect = localList.stream()
+                    .filter(localEntity -> warningParameterList.stream()
+                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+                    .collect(Collectors.toList());
+
+            List<IndexParameter2Entity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
+                    .collect(Collectors.toList());
+
+            for (IndexParameter2Entity indexParameter2Entity : collect1) {
+                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+                warningInfoEntity.setUploadTime(new Date());
+                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntityRepo.save(warningInfoEntity);
+            }
+        }
+
+        if ("false".equals(propertyValue)) {
+            List<IndexParameterEntity> localList = indexParameterEntityRepo.findAll();
+            List<IndexParameterEntity> collect = localList.stream()
+                    .filter(localEntity -> warningParameterList.stream()
+                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+                    .collect(Collectors.toList());
+
+            List<IndexParameterEntity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
+                    .collect(Collectors.toList());
+
+            for (IndexParameterEntity indexParameter2Entity : collect1) {
+                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+                warningInfoEntity.setUploadTime(new Date());
+                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntityRepo.save(warningInfoEntity);
+            }
+        }
+
+
+//            for (IndexParameter2Entity entity : collect) {
+//                for (WarningParameter warningParameter : warningParameterList) {
+//                    if (entity.getName().equals(warningParameter.getParameterName())) {
+//                        double data = Double.parseDouble(entity.getData());
+//                        if (data < warningParameter.getThresholdValue()) {
+//                            WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+//                            warningInfoEntity.setUploadTime(new Date());
+//                            warningInfoEntity.setType(warningParameter.getParameterName() + "参数小于阈值，请核查！");
+//                            warningInfoEntityRepo.save(warningInfoEntity);
+//                        }
+//                    }
+//                }
+//            }
+//        if ("true".equals(propertyValue)) {
+//            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
+//            for (IndexParameter2Entity entity : localList) {
+////                if (entity.getName())
+//            }
+    }
 }
+
+

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/ConfigEntity.java

@@ -1,8 +1,11 @@
 package com.huimv.production.domain;
 
+
 import javax.persistence.*;
 import java.io.Serializable;
 
+
+
 @Entity
 @Table(name = "config")
 public class ConfigEntity implements Serializable {

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/IndexParameter2Entity.java

@@ -0,0 +1,36 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name = "index_parameter2")
+public class IndexParameter2Entity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "data")
+    private String data;
+
+    @Column(name = "create_time", nullable = false)
+    private Date createTime;
+
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    @Column(name = "check_parameter")
+    private Integer checkParameter;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/WarningParameter.java

@@ -0,0 +1,24 @@
+package com.huimv.production.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@Table(name = "warning_parameter")
+public class WarningParameter implements Serializable {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Integer id;
+
+	@Column(name = "parameter_name")
+	private String parameterName;
+
+	@Column(name = "threshold_value")
+	private Double thresholdValue;
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/ConfigEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.ConfigEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ConfigEntityRepo extends JpaRepository<ConfigEntity, Integer>, JpaSpecificationExecutor<ConfigEntity> {
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexParameter2EntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.IndexParameter2Entity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface IndexParameter2EntityRepo extends JpaRepository<IndexParameter2Entity, Integer>, JpaSpecificationExecutor<IndexParameter2Entity> {
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexParameterEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.IndexParameterEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface IndexParameterEntityRepo extends JpaRepository<IndexParameterEntity, Integer>, JpaSpecificationExecutor<IndexParameterEntity> {
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/WarningParameterEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.production.repo;
+
+import com.huimv.production.domain.WarningParameter;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface WarningParameterEntityRepo extends JpaRepository<WarningParameter, Integer>, JpaSpecificationExecutor<WarningParameter> {
+
+}

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/WarningInfoServiceImpl.java

@@ -37,19 +37,28 @@ public class WarningInfoServiceImpl implements WarningInfoService {
 
         for (WarningInfoEntity warningInfoEntity : all) {
             Map map = new HashMap();
-
-            String lqid = warningInfoEntity.getLQID();
-            FarmSmEntity byLqid = farmSmEntityRepo.findByLQID(lqid);
             Date uploadTime = warningInfoEntity.getUploadTime();
-            String name = byLqid.getName();
-            String type = warningInfoEntity.getType();
-            Double temperature = warningInfoEntity.getTemperature();
-            String str = type+"报警,当前温度为："+temperature+" ℃";
-
-            map.put("farmName",name);
-            map.put("time",simpleDateFormat.format(uploadTime));
-            map.put("msg",str);
-            list.add(map);
+            String lqid = warningInfoEntity.getLQID();
+            if (lqid == null || lqid == ""){
+                map.put("farmName","");
+                map.put("time",simpleDateFormat.format(uploadTime));
+                map.put("msg",warningInfoEntity.getType());
+                list.add(map);
+            }else {
+                FarmSmEntity byLqid = farmSmEntityRepo.findByLQID(lqid);
+
+                String name = byLqid.getName();
+                String type = warningInfoEntity.getType();
+                Double temperature = warningInfoEntity.getTemperature();
+                String str = type+"报警,当前温度为："+temperature+" ℃";
+
+                map.put("farmName",name);
+                map.put("time",simpleDateFormat.format(uploadTime));
+                map.put("msg",str);
+                list.add(map);
+            }
+
+
 
         }
         return new Result(ResultCode.SUCCESS,list);

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/task/WarningParameterTask.java

@@ -0,0 +1,106 @@
+package com.huimv.production.task;
+
+import com.huimv.production.domain.*;
+import com.huimv.production.repo.*;
+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.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 定时任务
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/5/28 10:34
+ */
+@Configuration
+@EnableScheduling
+public class WarningParameterTask {
+
+    @Autowired
+    private ConfigEntityRepo configEntityRepo;
+
+    //本地参数
+    @Autowired
+    private IndexParameter2EntityRepo indexParameter2EntityRepo;
+    //erp 参数
+    @Autowired
+    private IndexParameterEntityRepo indexParameterEntityRepo;
+
+    @Autowired
+    private WarningInfoEntityRepo warningInfoEntityRepo;
+
+    @Autowired
+    private WarningParameterEntityRepo warningParameterEntityRepo;
+
+    @Scheduled(cron = "0 46 14 * * ?")
+    public void warningTask() {
+        List<ConfigEntity> all = configEntityRepo.findAll();
+        ConfigEntity configEntity = all.get(0);
+        String propertyValue = configEntity.getValue();
+
+        List<WarningParameter> warningParameterList = warningParameterEntityRepo.findAll();
+
+        if ("true".equals(propertyValue)) {
+            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
+            List<IndexParameter2Entity> collect = localList.stream()
+                    .filter(localEntity -> warningParameterList.stream()
+                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+                    .collect(Collectors.toList());
+
+            List<IndexParameter2Entity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
+                    .collect(Collectors.toList());
+
+            for (IndexParameter2Entity indexParameter2Entity : collect1) {
+                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+                warningInfoEntity.setUploadTime(new Date());
+                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntityRepo.save(warningInfoEntity);
+            }
+        }
+
+        if ("false".equals(propertyValue)) {
+            List<IndexParameterEntity> localList = indexParameterEntityRepo.findAll();
+            List<IndexParameterEntity> collect = localList.stream()
+                    .filter(localEntity -> warningParameterList.stream()
+                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+                    .collect(Collectors.toList());
+
+            List<IndexParameterEntity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() >= Double.parseDouble(s.getData())))
+                    .collect(Collectors.toList());
+
+            for (IndexParameterEntity indexParameter2Entity : collect1) {
+                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+                warningInfoEntity.setUploadTime(new Date());
+                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntityRepo.save(warningInfoEntity);
+            }
+        }
+
+
+//            for (IndexParameter2Entity entity : collect) {
+//                for (WarningParameter warningParameter : warningParameterList) {
+//                    if (entity.getName().equals(warningParameter.getParameterName())) {
+//                        double data = Double.parseDouble(entity.getData());
+//                        if (data < warningParameter.getThresholdValue()) {
+//                            WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+//                            warningInfoEntity.setUploadTime(new Date());
+//                            warningInfoEntity.setType(warningParameter.getParameterName() + "参数小于阈值，请核查！");
+//                            warningInfoEntityRepo.save(warningInfoEntity);
+//                        }
+//                    }
+//                }
+//            }
+//        if ("true".equals(propertyValue)) {
+//            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
+//            for (IndexParameter2Entity entity : localList) {
+////                if (entity.getName())
+//            }
+    }
+}

huimv-ql-farm/huimv-ql-production/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #spring.profiles.active=ycg
 #spring.profiles.active=wuyi
-spring.profiles.active=haiyan
+#spring.profiles.active=haiyan
 #spring.profiles.active=wjj
 #spring.profiles.active=haiyan-demo1
 #spring.profiles.active=haiyan-demo2
@@ -11,7 +11,7 @@ spring.profiles.active=haiyan
 #spring.profiles.active=ycg-demo1
 #spring.profiles.active=ycg-demo2
 #spring.profiles.active=ycg-demo3
-#spring.profiles.active=ycg-demo4
+spring.profiles.active=ycg-demo4
 #spring.profiles.active=ycg-demo5
 #spring.profiles.active=ycg-demo6