字典微服务调整

定时任务优化
自定义表单实体

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java

@@ -121,4 +121,10 @@ public interface ISysDictionaryService {
      */
     @ApiOperation(value = "根据父节点 以及当前节点名称 获取字典信息")
     SysDictionary getSysDictionaryByParentCodeAndName(String parentCode,String name);
+
+    /**
+     * 根据模块查询顶级字典
+     */
+    @ApiOperation(value = "根据模块查询顶级字典")
+    List<SysDictionary> findSysDictionaryByTopBySoftType(Integer softType);
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -53,7 +53,6 @@ public class SysDictionaryController extends CoreBaseController{
         try {
             // 条件验证
             ValidatorBean.beginValid(sysDictionary)
-                    .notNull("id",sysDictionary.getId())
                     .notNull("name",sysDictionary.getName())
                     .notNull("dictionarySoftType",sysDictionary.getDictionarySoftType())
                     .notNull("dictionaryCode",sysDictionary.getDictionaryCode())
@@ -221,7 +220,7 @@ public class SysDictionaryController extends CoreBaseController{
         }
     }
 
-    @GetMapping("/find/top")
+    @GetMapping("/find-top")
     @ApiOperation(value = "查询顶级字典项",notes = "查询顶级字典项")
     public ResultBean findSysDictionaryByTop() {
         try {
@@ -282,12 +281,13 @@ public class SysDictionaryController extends CoreBaseController{
             for (CommonEnumUtil.SOFT_TYPE softType :CommonEnumUtil.SOFT_TYPE.values()) {
                 if(group.containsKey(softType.getValue())){
                     child = new HashMap();
-                    child.put("id",softType.getCode());
+                    child.put("id",softType.getValue());
-                    child.put("name",softType.getValue());
+                    child.put("name",softType.getCode());
                     child.put("childList",group.get(softType.getValue()));
                     dictTree.add(child);
                 }
             }
+
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictTree);
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -295,4 +295,17 @@ public class SysDictionaryController extends CoreBaseController{
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @GetMapping("/find-soft-type")
+    @ApiOperation(value = "根据模块查询顶级字典",notes = "根据模块查询顶级字典")
+    public ResultBean findSysDictionaryByTopBySoftType(Integer softType){
+        try {
+            List<SysDictionary> dictionaryList = sysDictionaryService.findSysDictionaryByTopBySoftType(softType);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictionaryList);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java

@@ -85,8 +85,7 @@ public class SysTaskCycleController extends CoreBaseController{
             // 数据校验
             ValidatorBean.beginValid(sysTaskCycle)
                     .notNull("name", sysTaskCycle.getName())
-                    .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps())
+                    .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps());
-                    .notNull("taskCycleStartDatetime",sysTaskCycle.getTaskCycleStartDatetime());
 
             sysTaskCycleService.insertSysTaskCycle(sysTaskCycle);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -10,7 +10,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java

@@ -2,13 +2,11 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
@@ -221,4 +219,11 @@ public class SysDictionaryService implements ISysDictionaryService {
         return sysDictionaryRDao.getByProperty(new String[]{"parentCodeRdd", "name"},
                 new Object[]{parentCode, name});
     }
+
+    @Override
+    @ApiOperation(value = "根据模块查询顶级字典")
+    public List<SysDictionary> findSysDictionaryByTopBySoftType(Integer softType) {
+        return sysDictionaryRDao.findByProperty(new String[]{"parentId", "dictionarySoftType"},
+                        new Object[]{(long) CommonEnumUtil.PARENT.DEFAULT.getValue(), softType});
+    }
 }