timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

v1.0.12 #19

Merged
timi merged 7 commits from dev into master 2026-08-12 17:02:43 +00:00
Conversation 0 Commits 7 Files Changed 51
+48 -26
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f36844279 - Show all commits
src/main/java/com/imyeyu/api/modules/gao/controller/GaoStoreController.java
+16
View File
@@ -1,10 +1,13 @@
package com.imyeyu.api.modules.gao.controller;
import com.imyeyu.api.bean.ModuleCode;
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
import com.imyeyu.api.modules.gao.entity.GaoStore;
import com.imyeyu.api.modules.gao.service.GaoStoreService;
import com.imyeyu.api.modules.user.service.PermissionChecker;
import com.imyeyu.api.modules.user.service.UserLoginService;
import com.imyeyu.java.TimiJava;
import com.imyeyu.network.Network;
import com.imyeyu.spring.TimiSpring;
import com.imyeyu.spring.annotation.AOPLog;
@@ -35,6 +38,7 @@ public class GaoStoreController {
private final GaoStoreService service;
private final UserLoginService userLoginService;
private final PermissionChecker permissionChecker;
@AOPLog
@RequestRateLimit
@@ -66,7 +70,19 @@ public class GaoStoreController {
@RequireGaoPermission(GaoPermissionCode.STORE_UPDATE)
@PostMapping("/update")
public void update(@RequestBody GaoStore store) {
if (permissionChecker.hasAny(ModuleCode.GAO, GaoPermissionCode.STORE_CREATE.getValue())) {
// 门店管理
service.update(store);
} else {
// 店长
GaoStore dbStore = service.get(store.getId());
dbStore.setName(store.getName());
dbStore.setTelephone(store.getTelephone());
dbStore.setAddress(store.getAddress());
dbStore.setRemark(store.getRemark());
dbStore.setAutoClosedDay(TimiJava.defaultIfNull(store.getAutoClosedDay(), false));
service.update(dbStore);
}
}
@AOPLog
src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoStoreServiceImplement.java
+23 -17
View File
@@ -74,8 +74,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
} catch (Exception e) {
logger.setLevel(Logger.Level.ERROR);
logger.setException(TimiJava.serializeThrowable(e));
log.error("新增 GAO 门店失败", e);
throw new TimiException(TimiCode.ERROR, "新增 GAO 门店失败", e);
log.error("create store error", e);
throw new TimiException(TimiCode.ERROR, "新增门店失败", e);
} finally {
loggerService.create(logger);
}
@@ -93,16 +93,7 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
try {
logger.setContent(jackson.writeValueAsString(store));
checkUnique(store);
GaoStore dbStore = get(store.getId());
dbStore.setCode(store.getCode());
dbStore.setName(store.getName());
dbStore.setStatus(store.getStatus());
dbStore.setTelephone(store.getTelephone());
dbStore.setAddress(store.getAddress());
dbStore.setRemark(store.getRemark());
dbStore.setAutoClosedDay(TimiJava.defaultIfNull(store.getAutoClosedDay(), false));
super.update(dbStore);
logger.setLevel(Logger.Level.INFO);
super.update(store);
logger.setResult(store.getId());
} catch (TimiException e) {
logger.setLevel(Logger.Level.WARN);
@@ -111,8 +102,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
} catch (Exception e) {
logger.setLevel(Logger.Level.ERROR);
logger.setException(TimiJava.serializeThrowable(e));
log.error("修改 GAO 门店失败", e);
throw new TimiException(TimiCode.ERROR, "修改 GAO 门店失败", e);
log.error("update store error", e);
throw new TimiException(TimiCode.ERROR, "修改门店失败", e);
} finally {
loggerService.create(logger);
}
@@ -137,8 +128,8 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
} catch (Exception e) {
logger.setLevel(Logger.Level.ERROR);
logger.setException(TimiJava.serializeThrowable(e));
log.error("删除 GAO 门店失败", e);
throw new TimiException(TimiCode.ERROR, "删除 GAO 门店失败", e);
log.error("delete store error", e);
throw new TimiException(TimiCode.ERROR, "删除门店失败", e);
} finally {
loggerService.create(logger);
}
@@ -174,7 +165,9 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
if (TimiJava.isEmpty(idList)) {
return;
}
Logger logger = new Logger(Logger.Module.GAO, "GAO_STORE_SORT");
try {
logger.setContent(jackson.writeValueAsString(idList));
List<GaoStore> storeList = mapper.selectByIdList(new LinkedHashSet<>(idList));
Map<String, GaoStore> storeMap = storeList.stream().collect(Collectors.toMap(GaoStore::getId, Function.identity()));
for (int i = 0; i < idList.size(); i++) {
@@ -185,6 +178,19 @@ public class GaoStoreServiceImplement extends AbstractEntityService<GaoStore, St
store.setSort(i);
mapper.update(store);
}
logger.setLevel(Logger.Level.INFO);
} catch (TimiException e) {
logger.setLevel(Logger.Level.WARN);
logger.setException(e.getMessage());
throw e;
} catch (Exception e) {
logger.setLevel(Logger.Level.ERROR);
logger.setException(TimiJava.serializeThrowable(e));
log.error("删除 GAO 门店失败", e);
throw new TimiException(TimiCode.ERROR, "删除 GAO 门店失败", e);
} finally {
loggerService.create(logger);
}
}
private void checkUnique(GaoStore store) {