Browse Source

增加字典转换公式

Airhead 6 years ago
parent
commit
7490300678

+ 1 - 0
src/main/java/com/yihu/quota/contants/MicroServiceApi.java

@ -11,6 +11,7 @@ public interface MicroServiceApi {
    interface Resource {
        String DICT_ENTRY = "cache/dict-entry";
        String DICT_ENTRIES = "cache/dict-entries";
    }
    interface Redis {

+ 4 - 4
src/main/java/com/yihu/quota/etl/formula/DateFunc.java

@ -10,14 +10,14 @@ public class DateFunc implements Functioner {
     * @return
     */
    @Override
    public Integer execute(Object... args) {
    public Integer execute(Object... args) throws Exception {
        if (args.length < 2) {
            return 0;
            throw new Exception("args error");
        }
        Date date = (Date) args[0];
        Integer span = (Integer) args[0];
        if (span != Calendar.YEAR && span != Calendar.MONTH && span != Calendar.DAY_OF_MONTH){
        Integer span = (Integer) args[1];
        if (span != Calendar.YEAR && span != Calendar.MONTH && span != Calendar.DAY_OF_MONTH) {
            return 0;
        }

+ 19 - 0
src/main/java/com/yihu/quota/etl/formula/DictFunc.java

@ -0,0 +1,19 @@
package com.yihu.quota.etl.formula;
import com.yihu.quota.feign.RsDictClient;
import com.yihu.quota.util.SpringUtil;
public class DictFunc implements Functioner {
    @Override
    public String execute(Object... args) throws Exception {
        if (args.length < 2) {
            throw new Exception("args error");
        }
        String dict = (String) args[0];
        String code = (String) args[1];
        RsDictClient rsDictClient = SpringUtil.getBean(RsDictClient.class);
        return rsDictClient.getCacheValue(dict, code);
    }
}

+ 2 - 2
src/main/java/com/yihu/quota/etl/formula/Division.java

@ -13,9 +13,9 @@ public class Division implements Functioner {
     * @return
     */
    @Override
    public String execute(Object... args) {
    public String execute(Object... args) throws Exception {
        if (args.length < 2) {
            return "";
            throw new Exception("args error");
        }
        String orgCode = (String) args[0];

+ 1 - 1
src/main/java/com/yihu/quota/etl/formula/Functioner.java

@ -4,5 +4,5 @@ package com.yihu.quota.etl.formula;
 * @author l4qiang
 */
public interface Functioner {
    Object execute(Object... args);
    Object execute(Object... args) throws Exception;
}

+ 8 - 0
src/main/java/com/yihu/quota/feign/RsDictClient.java

@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import springfox.documentation.annotations.ApiIgnore;
import java.io.Serializable;
import java.util.List;
/**
 * @author l4qiang
 */
@ -23,6 +26,11 @@ public interface RsDictClient {
            @ApiParam(name = "dict") @RequestParam(value = "dict") String dict,
            @ApiParam(name = "code") @RequestParam(value = "code") String code);
    @RequestMapping(value = MicroServiceApi.Resource.DICT_ENTRIES, method = RequestMethod.GET)
    @ApiOperation(value = "根据dict从缓存获取字典项")
    List<Serializable> getCacheEntries(
            @ApiParam(name = "dict") @RequestParam(value = "dict") String dict);
    @RequestMapping(value = MicroServiceApi.Resource.DICT_ENTRY, method = RequestMethod.DELETE)
    @ApiOperation(value = "清空缓存字典项")
    void deleteCacheValue(