From a98cd3b39ddf5dfe1036b22ac73f6c009d890601 Mon Sep 17 00:00:00 2001
From: yaoq <Yaoq@92827>
Date: Thu, 28 Jul 2022 10:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/web/design/form/CodeBuildHandler.java      | 12 +++++++-
 .../system/bpm/web/sys/base/dict/DictHandler.java  | 32 ++++++++++++++++++++++
 .../system/bpm/web/sys/base/dict/DictService.java  | 24 ++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictHandler.java
 create mode 100644 smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictService.java

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
index bc56fa1..aba8189 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
@@ -174,7 +174,17 @@ public class CodeBuildHandler extends AbstractHandler {
     private void buildJavaService(long pageId) {
         ModelForm form = ModelFormCache.getInstance().get(pageId);
         String sName = form.getService();
-        if (StringUtils.isEmpty(sName)) throw new BizException("页面设置未定义服务名！" + form.getTitle());
+        if (StringUtils.isEmpty(sName)) {
+            //模块名称
+            form = ModelFormCache.getInstance().get(form.getParent());
+            if(form == null){
+                throw new BizException("页面设置未定义服务名！" + form.getTitle());
+            }
+            sName = form.getService();
+            if(StringUtils.isEmpty(sName)){
+                throw new BizException("模块设置未定义服务名！" + form.getTitle());
+            }
+        }
         sName = CodeGenUtil.toUpperHump(sName);
 
         SwMap model = new SwMap();
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictHandler.java
new file mode 100644
index 0000000..631bed3
--- /dev/null
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictHandler.java
@@ -0,0 +1,32 @@
+package cc.smtweb.system.bpm.web.sys.base.dict;
+
+import cc.smtweb.framework.core.db.impl.DefaultEntity;
+import cc.smtweb.framework.core.util.NumberUtil;
+import cc.smtweb.system.bpm.web.engine.dynPage.DynPageSaveHandler;
+
+/**
+ * Created by Akmm at 2022/7/1 15:47
+ * 区划保存
+ */
+public class DictHandler {
+
+    static class DictSaveHandler extends DynPageSaveHandler {
+
+        @Override
+        protected void setNewId(DefaultEntity bean) {
+            //字典 id用 类型id+编码
+            if (bean instanceof Dict) {
+                Dict dict = (Dict) bean;
+                dict.setEntityId(NumberUtil.getLongIgnoreErr(dict.getType() + dict.getCode()));
+                return;
+            }
+            //字典类型 id用编码
+            if (bean instanceof DictType) {
+                DictType dictType = (DictType) bean;
+                dictType.setEntityId(NumberUtil.getLongIgnoreErr(dictType.getCode()));
+                return;
+            }
+            super.setNewId(bean);
+        }
+    }
+}
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictService.java
new file mode 100644
index 0000000..24f9225
--- /dev/null
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/base/dict/DictService.java
@@ -0,0 +1,24 @@
+package cc.smtweb.system.bpm.web.sys.base.dict;
+
+import cc.smtweb.framework.core.annotation.SwService;
+import cc.smtweb.framework.core.mvc.service.AbstractHandler;
+import cc.smtweb.system.bpm.web.engine.dynPage.DynPageService;
+import cc.smtweb.system.bpm.web.sys.user.area.AreaHandler;
+
+/**
+ * Created by 1 at 2022-07-28 09:23:54
+ * 页面【[数据字典]的服务类
+ */
+@SwService
+public class DictService extends DynPageService {
+
+    @Override
+    protected AbstractHandler createHandler(String type) {
+        switch (type) {
+            case TYPE_SAVE:
+                return new DictHandler.DictSaveHandler();
+        }
+        return super.createHandler(type);
+    }
+
+}