添加门店日志

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -8,6 +8,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseRestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.log.api.service.LogApiService;
 import com.gic.redis.data.util.RedisUtil;
@@ -18,6 +19,7 @@ import com.gic.store.dto.*;
 import com.gic.store.service.StoreApiService;
 import com.gic.store.service.StoreAuthorizationApiService;
 import com.gic.store.service.StoreDictApiService;
+import com.gic.store.service.StoreLogApiService;
 import com.gic.store.utils.StoreRedisKeyUtils;
 import com.gic.store.web.qo.PageQO;
 import com.gic.store.web.qo.store.StoreQO;
@@ -35,9 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zhiwj
@@ -54,6 +54,8 @@ public class StoreController {
     private StoreDictApiService storeDictApiService;
     @Autowired
     private LogApiService logApiService;
+    @Autowired
+    private StoreLogApiService storeLogApiService;
 
     @RequestMapping("/save-store")
     public RestResponse saveOrUpdate(@Validated({StoreQO.SaveValidView.class}) StoreQO storeQO) {
@@ -184,17 +186,26 @@ public class StoreController {
         return EnterpriseRestResponse.failure(response);
     }
 
+//    @RequestMapping("list-store-log")
+//    public RestResponse listStoreLog(Integer storeId, PageQO pageQO) {
+//        Page page = new Page(pageQO.getCurrentPage(), pageQO.getPageSize());
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("relationId", storeId);
+//        page.setParams(params);
+//        ServiceResponse response = this.logApiService.listSystemSetLog(page);
+//        if (response.isSuccess()) {
+//            return RestResponse.success(response.getResult());
+//        }
+//        return EnterpriseRestResponse.failure(response);
+//    }
     @RequestMapping("list-store-log")
-    public RestResponse listStoreLog(Integer storeId, PageQO pageQO) {
-        Page page = new Page(pageQO.getCurrentPage(), pageQO.getPageSize());
-        Map<String, Object> params = new HashMap<>();
-        params.put("relationId", storeId);
-        page.setParams(params);
-        ServiceResponse response = this.logApiService.listSystemSetLog(page);
-        if (response.isSuccess()) {
-            return RestResponse.success(response.getResult());
-        }
-        return EnterpriseRestResponse.failure(response);
+    public RestResponse listStoreLog(com.gic.enterprise.qo.PageQO pageQO, String content, Integer reason, Integer logType) {
+        StoreLogDTO storeLog = new StoreLogDTO();
+        storeLog.setContent(content);
+        storeLog.setReason(reason);
+        storeLog.setLogType(logType);
+        ServiceResponse<Page<StoreLogDTO>> response = storeLogApiService.listStoreLog(storeLog, pageQO);
+        return ResultControllerUtils.commonResult(response);
     }
 
     @RequestMapping("bulk-update-store")