From e20426de129f50a06859cb5230c797c5094143e2 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期五, 21 十一月 2025 12:28:00 +0800
Subject: [PATCH] 调整结构，提交银行管理
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 210 +++--------------------
fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java | 1
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/BankService.java | 58 ++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/BankMapper.java | 9 +
fzzy-igdss-web/src/main/resources/application-dev.yml | 5
fzzy-igdss-web/src/main/resources/application.yml | 1
fzzy-igdss-web/pom.xml | 3
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java | 1
fzzy-igdss-view/pom.xml | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java | 62 ++++++
fzzy-igdss-web/src/main/resources/d7/common.css | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml | 144 ++++-----------
12 files changed, 218 insertions(+), 286 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java
index c8d1fd9..a406221 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Bank.java
@@ -17,6 +17,7 @@
@Data
@Entity
@Table(name = "t_bank")
+@TableName("t_bank")
@EqualsAndHashCode(callSuper=false)
public class Bank extends BizBaseEntity implements Serializable {
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/BankMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/BankMapper.java
new file mode 100644
index 0000000..c637555
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/BankMapper.java
@@ -0,0 +1,9 @@
+package com.fzzy.igds.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fzzy.igds.domain.Bank;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BankMapper extends BaseMapper<Bank> {
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/BankService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/BankService.java
new file mode 100644
index 0000000..8f0ca6a
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/BankService.java
@@ -0,0 +1,58 @@
+package com.fzzy.igds.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.domain.Bank;
+import com.fzzy.igds.mapper.BankMapper;
+import com.fzzy.igds.utils.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 閾惰淇℃伅绠＄悊
+ */
+@Service
+public class BankService {
+
+ @Resource
+ private BankMapper bankMapper;
+
+ public List<Bank> listAll(IgdsBaseParam param) {
+
+ if(null == param)
+ return bankMapper.selectList(null);
+
+ QueryWrapper<Bank> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(param.getName())){
+ queryWrapper.like("name", param.getName());
+ }
+ return bankMapper.selectList(queryWrapper);
+ }
+
+ public BaseResp addData(Bank bank) {
+ bank.setId(ContextUtil.generateId());
+ bank.setCompanyId(ContextUtil.getCompanyId());
+ bank.setUpdateBy(ContextUtil.getLoginUserName());
+ bank.setUpdateTime(new Date());
+ bank.setCreateBy(ContextUtil.getLoginUserName());
+ bank.setCreateTime(new Date());
+
+ return bankMapper.insert(bank) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ }
+
+ public BaseResp updateData(Bank bank) {
+ bank.setUpdateBy(ContextUtil.getLoginUserName());
+ bank.setUpdateTime(new Date());
+ return bankMapper.updateById(bank) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+ }
+
+ public BaseResp deleteData(Bank bank) {
+ return bankMapper.deleteById(bank) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+ }
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index 3ae83a7..b845309 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -7,7 +7,10 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
/**
* 绯荤粺鍏敤鏂规硶
@@ -16,202 +19,47 @@
*/
public class ContextUtil {
- public static Map<String, Boolean> l = new HashMap<>();
- //鍏ㄥ眬鐢ㄦ埛瀹炴椂鍧愬湪閮ㄩ棬
- public static Map<String, String> contextUserDept = new HashMap<>();
- /**
- * 鍏ㄥ眬鍛戒护ID
- */
- public static Map<String, Integer> contextOrderId = new HashMap<>();
+ private static final AtomicLong sequence = new AtomicLong(0);
+ private static String lastTimestamp = "";
/**
- * UUID鐢熸垚瑙勫垯
+ * 鐢熸垚椤哄簭ID锛氬勾鏈堟棩鏃跺垎绉掓绉�(17浣�) + 搴忓垪鍙�(4浣�) = 21浣�
*
* @return
*/
- public static String getUUID() {
- return UUID.randomUUID().toString().replaceAll("-", "").toUpperCase();
- }
+ public static String generateId() {
+ String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+ long seq;
+ synchronized (ContextUtil.class) {
+ if (currentTimestamp.equals(lastTimestamp)) {
+ seq = sequence.incrementAndGet();
+ } else {
+ sequence.set(0);
+ seq = 0;
- public static String getBusinessID() {
- return DateFormatUtils.format(new Date(), "yyyyMMdd") + String.format("%04d", RandomUtils.nextInt(0, 10000));
- }
-
- public static String getCurTimeMillis() {
- return System.currentTimeMillis() + "";
- }
-
- public static String getTimeId() {
- return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
- }
-
- public static String getTimeId(int start, int end) {
- return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(start, end);
- }
-
-
- /**
- * 鑾峰彇褰撳墠骞翠唤
- *
- * @return
- */
- public static String getYear() {
- return DateFormatUtils.format(new Date(), "yyyyMM");
- }
-
- /**
- * 鐢熸垚璧勪骇缂栫爜ID
- * @return
- */
- public static String createAssetId() {
- return "NO" + randomChar(4) + getYear() + randomNum(6);
- }
-
-
- /**
- * 鐢熸垚涓氬姟ID
- * @param prefix
- * @return
- */
- public static String getBizId(String prefix) {
- if (prefix == null) prefix = "ID";
- return prefix + getTimeId() + randomNum(4);
- }
-
-
- /**
- * 闅忔満鐢熸垚澶у啓瀛楁瘝
- *
- * @param length 闀垮害
- * @return
- */
- public static String randomChar(int length) {
- Random random = new Random();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < length; i++) {
- char randomLetter = (char) (random.nextInt(26) + 'A'); // 65-90
- sb.append(randomLetter);
+ lastTimestamp = currentTimestamp;
+ }
}
- return sb.toString();
+ return String.format("%s%04d", currentTimestamp, seq);
}
+
+ public static String UUID() {
+ return UUID.randomUUID().toString().replaceAll("-", "");
+ }
+
/**
- * 闅忔満鐢熸垚鏁板瓧
- * @param length
- * @return
- */
- public static String randomNum(int length) {
- Random random = new Random();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < length; i++) {
- int digit = random.nextInt(10); // 鐢熸垚0-9鐨勯殢鏈烘暟
- sb.append(digit);
- }
- return sb.toString();
- }
-
-
- public static String getDefaultBatchId() {
- return DateFormatUtils.format(new Date(), "yyyyMMddHHmm");
- }
-
- /**
- * 鏍规嵁褰撳墠鐧婚檰浜鸿幏鍙栫粍缁囩紪鍙凤紝濡傛灉娌℃湁鐧婚檰浜鸿幏鍙栫郴缁熼粯璁ょ殑缁勭粐缂栧彿
- *
- * @return
+ * 榛樿鑾峰彇鐧诲綍浜烘墍鍦ㄧ粍缁囷紝濡傛灉鏈櫥褰曞垯鑾峰彇绯荤粺榛樿缁勭粐
+ * @return 缁勭粐ID
*/
public static String getCompanyId() {
- return ShiroUtils.getLoginUserCompanyId();
- }
- /**
- * 鑾峰彇绯荤粺榛樿鐨�=companyId
- *
- * @return
- */
- public static String getDefaultCompanyId() {
SysUser user = ShiroUtils.getSysUser();
- if (null != user) {
- return user.getCompanyId();
- } else {
- return FrameworkConfig.getCompanyId();
- }
+ if(null != user) return user.getCompanyId();
+ return FrameworkConfig.getCompanyId();
}
-
- /**
- * 鏈�楂樼殑缂栫爜涓猴細缁勭粐缂栫爜锛岀劧鍚庨�愮骇寰�涓嬶紝濡傦細5013,5013_001,5013_002,5013_001_001
- *
- * @param companyId 蹇呴』
- * @param parentId 鍙┖
- * @param endId 鍙┖
- * @param format 蹇呴』 涓変綅浼�1000锛屽洓浣嶄紶10000
- * @return
- */
- public static String getNextId(String companyId, String parentId,
- String endId, int format) {
- if (parentId == null) {
- return companyId;
- }
- try {
- int endNum = 0;
- if (StringUtils.isNotEmpty(endId)) {
- endNum = Integer.valueOf(endId.substring(endId.length() - 3));
- }
- String endStr = ("" + (endNum + format + 1)).substring(1);
-
- if (parentId.equals(companyId)) {
- return companyId + "_" + endStr;
- }
- parentId = parentId.substring(parentId.lastIndexOf("_") + 1);
- return companyId + "_" + parentId + "_" + endStr;
-
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+ public static String getLoginUserName() {
+ return ShiroUtils.getUserName() ;
}
-
- /**
- * 鑾峰彇浠撳簱缂栫爜 鏍煎紡锛�
- *
- * @param deptId 5102_001_001 5102_001_002
- * 蹇呴』 鍒嗗簱缂栫爜
- * @param endId 蹇呴』 鏈�鍚庣殑浠撳簱缂栫爜
- * @param format 蹇呴』 涓変綅浼�1000锛屽洓浣嶄紶10000锛岄粯璁ら兘浼�1000
- * @return
- */
- public static String getNextDepotId(String deptId, String endId, int format) {
- try {
- int endNum = 0;
- if (StringUtils.isNotEmpty(endId)) {
- endNum = Integer.valueOf(endId.substring(endId.length() - 3));
- }
- String endStr = ("" + (endNum + format + 1)).substring(1);
-
- endStr = deptId.substring(deptId.indexOf("_") + 1) + "_" + endStr;
-
- return endStr.replaceAll("_", "");
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-
- /**
- * 鑾峰彇鍒犻櫎娉ㄩ噴
- *
- * @author sgj
- * @date 2025/08/05
- * @param desc 鍒犻櫎鏂囨鎻忚堪
- */
- public static String getDeleteDesc(String desc) {
- if (StringUtils.isEmpty(desc)) {
- desc = "鍒犻櫎鏁版嵁";
- }
- return desc + "_" + ShiroUtils.getLoginName() + "_" + new Date();
- }
-
-
}
diff --git a/fzzy-igdss-view/pom.xml b/fzzy-igdss-view/pom.xml
index c5e7d64..8bd8fd0 100644
--- a/fzzy-igdss-view/pom.xml
+++ b/fzzy-igdss-view/pom.xml
@@ -107,6 +107,12 @@
<artifactId>commons-jexl</artifactId>
<version>2.1.1</version>
</dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>2.3</version>
+</dependency>
</dependencies>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
index 47f5d5d..9fa0f12 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
@@ -4,17 +4,10 @@
<Context/>
<Model/>
<View layout="padding:10">
- <ClientEvent name="onReady">
-flushData = function(){
- var dataTree = view.get("#dataTree1");
- var current = dataTree.get("currentEntity");
- view.get("#dsMain").set("parameter",current.get("id")).flushAsync();
-}
-</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtBank]</Property>
- <Property name="pageSize">20</Property>
+ <Property name="dataProvider">bankPR#listAll</Property>
</DataSet>
<DataSet id="dsParam">
<ClientEvent name="onReady">self.insert();</ClientEvent>
@@ -34,10 +27,18 @@
<Editor/>
</AutoFormElement>
<Button>
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMian").set("parameter",param).flushAsync();
+</ClientEvent>
<Property name="caption">鎼滅储</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-q1</Property>
</Button>
<Button>
+ <ClientEvent name="onClick">view.get("#dsParam").set("data",{});</ClientEvent>
<Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
</Button>
</AutoForm>
</Container>
@@ -45,34 +46,16 @@
<Property name="className">c-data</Property>
<ToolBar>
<ToolBarButton>
- <ClientEvent name="onClick">flushData();</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="width">100</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </ToolBarButton>
- <ToolBarButton>
- <ClientEvent name="onClick">var dataTree = view.get("#dataTree1");
-var current = dataTree.get("currentEntity");
-
-var newData = {warehouseId:current.get("id")};
-view.get("#dsMain").insert(newData);
-
-view.get("#dialogMain").show();
-</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
+view.get("#dialogMain").show();</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn1</Property>
<Property name="width">100</Property>
- <Property name="iconClass">fa fa-plus-circle</Property>
+ <Property name="iconClass">fa fa-plus</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">
- const data = view.get("#dgMain").get("selection");
- if (!data) {
- $alert("璇烽�夋嫨鏁版嵁");
- return;
- }
- view.get("#dialogUpdate").show();
+ <ClientEvent name="onClick">var data = view.get("#dgMain").get("selection");
+view.get("#dialogMain").show();
</ClientEvent>
<Property name="id">btnUpdate</Property>
<Property name="caption">淇敼</Property>
@@ -81,39 +64,23 @@
<Property name="iconClass">fa fa-pencil-square-o</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">
- let data = view.get("#dgMain").get("selection")
- if(!data){
- $alert("璇烽�夋嫨鏁版嵁")
- }else{
- view.get("#ajaxDelData").set("parameter", data).execute(function(result){
- data.remove()
- })
- }
- </ClientEvent>
+ <ClientEvent name="onClick">var data = view.get("#dgMain").get("selection")
+if(!data){
+ $alert("璇烽�夋嫨鏁版嵁");
+ }else{
+ view.get("#ajaxDelData").set("parameter", data).execute(function(result){
+ if("200"!=result.code){
+ $alert("寮傚父淇℃伅锛�"+result.message);
+ }else{
+ $notify("鎵ц鎴愬姛");
+ data.remove()
+ }
+ })
+}</ClientEvent>
<Property name="caption">鍒犻櫎</Property>
<Property name="exClassName">btn3</Property>
<Property name="width">100</Property>
- <Property name="iconClass">fa fa-times-circle</Property>
- </ToolBarButton>
- <Separator/>
- <ToolBarButton>
- <Property name="caption">瀵煎嚭</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="width">100</Property>
- <Property name="iconClass">fa fa-file-excel-o</Property>
- </ToolBarButton>
- <ToolBarButton>
- <Property name="caption">鎵撳嵃</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="width">100</Property>
- </ToolBarButton>
- <ToolBarButton>
- <Property name="caption">甯姪</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="iconClass">fa fa-question-circle</Property>
- <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-times</Property>
</ToolBarButton>
</ToolBar>
<DataGrid id="dgMain" layoutConstraint="padding:8" selectionMode="singleRow">
@@ -138,18 +105,10 @@
<Property name="property">updateTime</Property>
</DataColumn>
</DataGrid>
- <ToolBar layoutConstraint="bottom">
- <Fill/>
- <DataPilot>
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </ToolBar>
</Container>
<Dialog id="dialogMain">
- <Property name="width">90%</Property>
- <Property name="height">90%</Property>
- <Property name="caption">浜у搧淇℃伅</Property>
+ <Property name="width">550</Property>
+ <Property name="caption">閾惰淇℃伅</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
@@ -173,57 +132,37 @@
</Buttons>
<Children>
<AutoForm layoutConstraint="padding:10">
- <Property name="cols">*,*,*</Property>
+ <Property name="cols">*</Property>
<Property name="dataSet">dsMain</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">model</Property>
- <Property name="property">model</Property>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">unit</Property>
- <Property name="property">unit</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">warehouseId</Property>
- <Property name="property">warehouseId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">disabled</Property>
- <Property name="property">disabled</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">spec</Property>
- <Property name="property">spec</Property>
- <Property name="editorType">TextArea</Property>
- <Property name="height">150</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
+ <Property name="name">updateBy</Property>
+ <Property name="property">updateBy</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">updateUser</Property>
- <Property name="property">updateUser</Property>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -231,6 +170,7 @@
<Tools/>
</Dialog>
<UpdateAction id="saveAction">
+ <Property name="dataResolver">bankPR#saveUpdate</Property>
<UpdateItem>
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">[#current]</Property>
@@ -238,7 +178,7 @@
</UpdateAction>
<AjaxAction id="ajaxDelData">
<Property name="confirmMessage">纭畾瑕佸垹闄ゆ暟鎹箞锛�</Property>
- <Property name="service">imsProductPR#delete</Property>
+ <Property name="service">bankPR#delete</Property>
</AjaxAction>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java
new file mode 100644
index 0000000..f817bcd
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/BankPR.java
@@ -0,0 +1,62 @@
+package com.fzzy.igds;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.domain.Bank;
+import com.fzzy.igds.service.BankService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 閾惰绠＄悊
+ * Created by fzzy on 2017/5/23.
+ */
+@Component
+public class BankPR {
+ @Resource
+ private BankService bankService;
+
+ /**
+ * bankPR#listAll
+ * 閾惰鍒楄〃
+ */
+ @DataProvider
+ public List<Bank> listAll(IgdsBaseParam param) {
+ return bankService.listAll(param);
+ }
+
+ /**
+ * 淇濆瓨/鏇存柊
+ * @param bank
+ * @return
+ */
+ @Transactional
+ @DataResolver
+ public BaseResp saveUpdate(Bank bank){
+
+ if(StringUtils.isEmpty(bank.getId())){
+ return bankService.addData(bank);
+ }else {
+ return bankService.updateData(bank);
+ }
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * @param bank
+ * @return
+ */
+ @Expose
+ public BaseResp delete(Bank bank){
+ if(StringUtils.isNotEmpty(bank.getId())) return bankService.deleteData(bank);
+ return BaseResp.success();
+ }
+}
diff --git a/fzzy-igdss-web/pom.xml b/fzzy-igdss-web/pom.xml
index 2bb05e1..4b90a1f 100644
--- a/fzzy-igdss-web/pom.xml
+++ b/fzzy-igdss-web/pom.xml
@@ -50,7 +50,7 @@
<version>${fzzy.igdss.version}</version>
</dependency>
- <!-- d7鐨偆鍖� -->
+ <!-- d7鐨偆鍖�-->
<dependency>
<groupId>dorado.skins</groupId>
<artifactId>ruoyi</artifactId>
@@ -60,6 +60,7 @@
</dependency>
+
</dependencies>
<build>
diff --git a/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java b/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
index 48d09ad..e2ecdd8 100644
--- a/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
+++ b/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
@@ -26,6 +26,7 @@
import javax.servlet.ServletContext;
+import com.ruoyi.common.config.FrameworkConfig;
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/fzzy-igdss-web/src/main/resources/application-dev.yml b/fzzy-igdss-web/src/main/resources/application-dev.yml
index 41d85b4..0901ae2 100644
--- a/fzzy-igdss-web/src/main/resources/application-dev.yml
+++ b/fzzy-igdss-web/src/main/resources/application-dev.yml
@@ -75,3 +75,8 @@
jdbc:
batch_size: 500
batch_versioned_data: true
+
+#绯荤粺鏋舵瀯閰嶇疆
+framework:
+ companyId: "1000"
+ doradoMode: debug
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/application.yml b/fzzy-igdss-web/src/main/resources/application.yml
index f5d305f..868cba5 100644
--- a/fzzy-igdss-web/src/main/resources/application.yml
+++ b/fzzy-igdss-web/src/main/resources/application.yml
@@ -98,6 +98,7 @@
phone: 400-627-1116
website: http://www.fzzygf.com
address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+ doradoMode:
# 鏃ュ織閰嶇疆
diff --git a/fzzy-igdss-web/src/main/resources/d7/common.css b/fzzy-igdss-web/src/main/resources/d7/common.css
index f77635e..10453bb 100644
--- a/fzzy-igdss-web/src/main/resources/d7/common.css
+++ b/fzzy-igdss-web/src/main/resources/d7/common.css
@@ -161,8 +161,8 @@
border-radius: 50px;
color: #fff !important;
padding: 0 15px;
- background-color: #037d41 !important;
- border-color: #037d41;
+ background-color: #1c84c6 !important;
+ border-color: #1c84c6;
white-space: nowrap;
cursor: pointer;
}
--
Gitblit v1.9.3