Pārlūkot izejas kodu

调整系统参数调用,所有service可以直接通过getSysParameter获取参数信息

jyyw 1 gadu atpakaļ
vecāks
revīzija
56964f67f5

+ 25 - 2
ipfcst-spare2/src/main/java/com/jiayue/ipfcst/spare2/base4/BaseService.java

@@ -1,16 +1,39 @@
 package com.jiayue.ipfcst.spare2.base4;
 
-import com.jiayue.ipfcst.spare2.baseinfos.service.SysParameterService;
+import cn.hutool.core.util.StrUtil;
+import com.jiayue.ipfcst.common.data.entity.SysParameter;
+import com.jiayue.ipfcst.spare2.baseinfos.repository.SysParameterRepository;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.ehcache.EhCacheCacheManager;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
+@Slf4j
 public class BaseService implements Serializable {
 
     @Autowired
     public EhCacheCacheManager ehCacheCacheManager;
 
     @Autowired
-    public SysParameterService sysParameterService;
+    public SysParameterRepository sysParameterRepository;
+
+    private List<SysParameter> sysParameters() {
+        List<SysParameter> result = new ArrayList<>();
+        try {
+            result = sysParameterRepository.findAll(SysParameter.class.getSimpleName());
+        } catch (Exception ex) {
+            log.error(ex.getLocalizedMessage());
+        }
+        return result;
+    }
+
+    public String getSysParameter(String key, String defaultValue) {
+        List<SysParameter> sysParameters = sysParameters();
+        Optional<SysParameter> optional = sysParameters.stream().filter(s -> StrUtil.equals(s.getSysKey(), key)).findFirst();
+        return optional.map(SysParameter::getSysValue).orElse(defaultValue);
+    }
 }

+ 0 - 1
ipfcst-spare2/src/main/java/com/jiayue/ipfcst/spare2/baseinfos/service/ImageLoadeService.java

@@ -56,7 +56,6 @@ public class ImageLoadeService extends BaseService {
             protocolGatherDataPointService.fresh();
             pvModuleModelService.fresh();
             quartzService.fresh();
-            sysParameterService.fresh();
             uploadFileChannelService.fresh();
             uploadObjectService.fresh();
             uploadFileCodeService.fresh();

+ 4 - 7
ipfcst-spare2/src/main/java/com/jiayue/ipfcst/spare2/baseinfos/service/SysParameterService.java

@@ -2,12 +2,8 @@ package com.jiayue.ipfcst.spare2.baseinfos.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.jiayue.ipfcst.common.data.entity.SysParameter;
-import com.jiayue.ipfcst.common.data.entity.SysParameter;
 import com.jiayue.ipfcst.spare2.base4.BaseService;
-import com.jiayue.ipfcst.spare2.baseinfos.repository.SysParameterRepository;
-import com.jiayue.ipfcst.spare2.baseinfos.repository.SysParameterRepository;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,11 +13,12 @@ import java.util.Optional;
 @Slf4j
 public class SysParameterService extends BaseService {
 
-    @Autowired
-    SysParameterRepository sysParameterRepository;
-
     private final String cacheKey = SysParameter.class.getSimpleName();
 
+    public String findValueByKey(String key, String defaultValue) throws Exception {
+        return getSysParameter(key, defaultValue);
+    }
+
     public SysParameter findById(String id) throws Exception {
         List<SysParameter> list = findAll();
         Optional<SysParameter> optional = list.stream().filter(t -> ObjectUtil.equal(t.getId(), id)).findFirst();