Merge branch 'master' into energy-manage-chy2

energy-manage-common/src/main/java/com/energy/manage/common/enums/DataSourceTypeEnum.java

@@ -0,0 +1,50 @@
+package com.energy.manage.common.enums;
+
+public enum DataSourceTypeEnum {
+
+    TERRACE_SOURCE(1,"平台输入"),
+    UPLOAD_SOURCE(2, "导入");
+
+    DataSourceTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    private Integer code;
+    private String name;
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public static String getKeyByValue(Integer code){
+        for(DataSourceTypeEnum e : values()){
+            if(code.equals(e.code)){
+                return e.name;
+            }
+        }
+        return "Not exist";
+    }
+
+    public static DataSourceTypeEnum getFastReplyType(Integer code){
+        for(DataSourceTypeEnum e : values()){
+            if(code.equals(e.code)){
+                return e;
+            }
+        }
+        return null;
+    }
+}

energy-manage-common/src/main/java/com/energy/manage/common/po/windenginegroup/WindEngineGroupPO.java

@@ -75,4 +75,10 @@ public class WindEngineGroupPO extends NewBaseDomain {
      */
     private Integer delState;
 
+
+    /**
+     * 数据来源1，平台输入，2导入
+     */
+    private Integer dataSource;
+
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldPO.java

@@ -87,5 +87,11 @@ public class WindFieldPO extends NewBaseDomain {
      */
     private String powerContractUrl;
 
+    /**
+     * 数据来源1，平台输入，2导入
+     */
+    private Integer dataSource;
+
 
 }
+

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -7,6 +7,7 @@ import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.constant.Constants;
 import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
+import com.energy.manage.common.enums.DataSourceTypeEnum;
 import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
@@ -89,7 +90,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         windEngineGroupPO.setUpdateTime(new Date());
         windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
         windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
-
+        windEngineGroupPO.setDataSource(DataSourceTypeEnum.TERRACE_SOURCE.getCode());
         if (windEngineGroupMapper.insertUseGeneratedKeys(windEngineGroupPO) <= 0) {
             return false;
         }
@@ -185,7 +186,9 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
             }
             if(windFieldExceVos.getSightcingString().equals("否")){
                 windEngineGroupPO.setSightcing(2);
-            }windEngineGroupPO.setCreateBy(userId);
+            }
+            windEngineGroupPO.setCreateBy(userId);
+            windEngineGroupPO.setDataSource(DataSourceTypeEnum.UPLOAD_SOURCE.getCode());
             list.add(windEngineGroupPO);
         }
         if (CollectionUtils.isEmpty(list)) {

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -8,6 +8,7 @@ import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.constant.Constants;
 import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
+import com.energy.manage.common.enums.DataSourceTypeEnum;
 import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.enums.IdPrefixEnum;
 import com.energy.manage.common.enums.TypeRelationEnum;
@@ -101,6 +102,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         windFieldPO.setUpdateTime(new Date());
         windFieldPO.setState(Constants.GLOBAL_IN_USE);
         windFieldPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
+        windFieldPO.setDataSource(DataSourceTypeEnum.TERRACE_SOURCE.getCode());
         if (windFieldMapper.insertUseGeneratedKeys(windFieldPO) <= 0) {
             return false;
         }
@@ -190,6 +192,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
             windFieldPO.setState(Constants.GLOBAL_IN_USE);
             windFieldPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
             windFieldPO.setCreateBy(windFieldImportDataDto.getCreateBy());
+            windFieldPO.setDataSource(DataSourceTypeEnum.UPLOAD_SOURCE.getCode());
             list.add(windFieldPO);
         }
         if (CollectionUtils.isEmpty(list)) {