diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index edf7168..2ff776e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,7 @@
-
-
-
+
@@ -60,25 +58,25 @@
- {
- "keyToString": {
- "ApiPost:METDOD_SEND_RECORD:cloud-market-server": "{\"/apitype/standing\":[{\"url\":\"http://localhost:10008/apitype/standing\",\"header\":[{\"value\":\"\",\"type\":\"Text\",\"is_checked\":1,\"not_null\":\"1\",\"field_type\":\"string\"}],\"query\":[{\"value\":\"\",\"type\":\"Text\",\"is_checked\":1,\"not_null\":\"1\",\"field_type\":\"string\"}],\"rest\":[{\"value\":\"\",\"type\":\"Text\",\"is_checked\":1,\"not_null\":\"1\",\"field_type\":\"string\"}],\"requestBody\":\"{\\n \\\"idcard\\\": \\\"330921200301116511\\\",\\n \\\"realname\\\": \\\"王意航\\\"\\n}\",\"responseBody\":\"发送失败: http://localhost:10008/apitype/standing\\n\\nConnectException: Connection refused: connect\",\"selectedItem\":\"POST\",\"time\":{\"date\":{\"year\":2024,\"month\":9,\"day\":8},\"time\":{\"hour\":21,\"minute\":8,\"second\":37,\"nano\":929385300}}}]}",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "E:/桌面/cloud-market/cloud-market-server/src/main/java/com/muyu/market/controller",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices",
- "spring.configuration.checksum": "647853898192e405c7aff8ecac5564ea",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -188,90 +186,7 @@
-
-
- 1724918082451
-
-
-
- 1724918082451
-
-
- 1724918094895
-
-
-
- 1724918094895
-
-
- 1724920119938
-
-
-
- 1724920119938
-
-
- 1725161627925
-
-
-
- 1725161627925
-
-
- 1725247697205
-
-
-
- 1725247697205
-
-
- 1725412228813
-
-
-
- 1725412228813
-
-
- 1725434075951
-
-
-
- 1725434075951
-
-
- 1725441635174
-
-
-
- 1725441635174
-
-
- 1725535665636
-
-
-
- 1725535665636
-
-
- 1725535740781
-
-
-
- 1725535740781
-
-
- 1725535995757
-
-
-
- 1725535995757
-
-
- 1725536412572
-
-
-
- 1725536412572
+
1725537357138
@@ -532,7 +447,91 @@
1725843461227
-
+
+ 1725843808662
+
+
+
+ 1725843808662
+
+
+ 1725844255814
+
+
+
+ 1725844255814
+
+
+ 1725844685646
+
+
+
+ 1725844685646
+
+
+ 1725863698925
+
+
+
+ 1725863698925
+
+
+ 1725864590358
+
+
+
+ 1725864590358
+
+
+ 1725865421475
+
+
+
+ 1725865421475
+
+
+ 1725866928373
+
+
+
+ 1725866928373
+
+
+ 1725867686157
+
+
+
+ 1725867686157
+
+
+ 1725871495132
+
+
+
+ 1725871495132
+
+
+ 1725872239199
+
+
+
+ 1725872239199
+
+
+ 1725874552030
+
+
+
+ 1725874552030
+
+
+ 1725875021671
+
+
+
+ 1725875021671
+
+
diff --git a/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java b/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java
index 0dc5804..f0d6905 100644
--- a/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java
+++ b/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java
@@ -65,10 +65,31 @@ public class SysFirminfoController extends BaseController
return success(sysFirminfoService.selectSysFirminfoByAdminsid(adminsid));
}
- @RequiresPermissions("market:firminfo:edit")
- @PostMapping("/edit")
- public Result edit(@RequestBody SysFirm sysFirm)
+ @RequiresPermissions("ruleEngine:firminfo:add")
+ @PostMapping
+ public Result add(
+ @Validated @RequestBody SysFirm sysFirminfo)
{
- return toAjax(sysFirminfoService.updateFirmFromByFirmId(sysFirm));
+ Long adminsid = SecurityUtils.getUserId();
+ if (sysFirminfoService.checkIdUnique(sysFirminfo)) {
+ return error("新增 firmList '" + sysFirminfo + "'失败，firmList已存在");
+ }
+ sysFirminfo.setAdminsid(adminsid);
+ return toAjax(sysFirminfoService.save(sysFirminfo));
}
+
+ /**
+ * 修改firmList
+ */
+ @RequiresPermissions("ruleEngine:firminfo:edit")
+ @PutMapping
+ public Result edit(
+ @Validated @RequestBody SysFirm sysFirminfo)
+ {
+ if (!sysFirminfoService.checkIdUnique(sysFirminfo)) {
+ return error("修改 firmList '" + sysFirminfo + "'失败，firmList不存在");
+ }
+ return toAjax(sysFirminfoService.updateById(sysFirminfo));
+ }
+
}