diff --git a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java
index 265350f5b..b58d9a12b 100644
--- a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java
+++ b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java
@@ -19,8 +19,11 @@ package com.bsd.pjcloud.app.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.admin.api.dto.UserInfo;
+import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
import com.bsd.pjcloud.app.api.dto.AppUserDTO;
import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.api.feign.RemoteAppUserService;
import com.bsd.pjcloud.app.api.vo.AppUserExcelVO;
import com.bsd.pjcloud.app.service.AppUserService;
import com.bsd.pjcloud.common.core.constant.CommonConstants;
@@ -60,6 +63,8 @@ public class AppUserController {
private final AppUserService appUserService;
+ private final RemoteUserService remoteUserService;
+
@Inner
@GetMapping("/info/{username}")
public R info(@PathVariable String username) {
@@ -204,4 +209,9 @@ public class AppUserController {
return appUserService.registerAppUser(appUser);
}
+
+ //------------------------------------以下是经过系统表查询，原因的app接口不适用---------------
+
+
+
}
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/pom.xml b/pjcloud-canteen/pjcloud-canteen-biz/pom.xml
index eac081a61..29a39d3df 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/pom.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/pom.xml
@@ -43,6 +43,12 @@
com.bsd
pjcloud-common-security
+
+
+ com.bsd
+ pjcloud-common-oss
+
+
com.bsd
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
index 206c92d1c..7042bee57 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java
@@ -118,4 +118,20 @@ public class CanteenCategoryController {
public List export(CanteenCategoryEntity canteenCategory,Long[] ids) {
return canteenCategoryService.list(Wrappers.lambdaQuery(canteenCategory).in(ArrayUtil.isNotEmpty(ids), CanteenCategoryEntity::getId, ids));
}
+
+
+ /**
+ * 查询所有的菜品分类
+ * @return R
+ */
+ @Operation(summary = "通过id查询" , description = "通过id查询" )
+ @GetMapping("/getAllSimple" )
+ @PreAuthorize("@pms.hasPermission('canteen_canteenCategory_view')" )
+ public R getAllSimple(@RequestParam("systemType")Integer systemType) {
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(CanteenCategoryEntity::getSystemType,systemType);
+ wrapper.orderByAsc(CanteenCategoryEntity::getSort);
+ List list = canteenCategoryService.list(wrapper);
+ return R.ok(list);
+ }
}
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
index 0b36e596d..1a7455160 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
@@ -27,7 +27,7 @@ import java.util.Objects;
* 菜品spu
*
* @author zhangjiafu
- * @date 2024-12-06 15:48:25
+ * @date 2024-12-10 12:51:53
*/
@RestController
@RequiredArgsConstructor
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java
index e8733384e..19b223169 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenCategoryEntity.java
@@ -60,23 +60,26 @@ public class CanteenCategoryEntity extends Model {
private Integer status;
/**
- * 创建者
- */
- @Schema(description="创建者")
- private String creator;
+ * 创建人
+ */
+ @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "创建人")
+ private String createBy;
/**
- * 更新者
- */
- @Schema(description="更新者")
- private String updater;
+ * 修改人
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ @Schema(description = "修改人")
+ private String updateBy;
/**
- * 是否删除
- */
- @Schema(description="是否删除")
- private String delFlag;
-
+ * 是否删除 -1：已删除 0：正常
+ */
+ @TableLogic
+ @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "是否删除 -1：已删除 0：正常")
+ private String delFlag;
/**
* 系统类型 1商品 2每日 3在线订餐
*/
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java
index 84aa202ab..dfe706538 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/entity/CanteenSpuEntity.java
@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
* 菜品spu
*
* @author zhangjiafu
- * @date 2024-12-06 15:48:25
+ * @date 2024-12-10 12:51:53
*/
@Data
@TenantTable
@@ -64,7 +64,7 @@ public class CanteenSpuEntity extends Model {
数组，以逗号分隔
最多上传15张
*/
- @Schema(description="商品轮播图地址")
+ @Schema(description="商品轮播图")
private String sliderPicUrls;
/**
@@ -133,11 +133,12 @@ public class CanteenSpuEntity extends Model {
@Schema(description="商品点击量")
private Integer browseCount;
- /**
- * 是否删除
- */
- @Schema(description="是否删除")
- private String delFlag;
+
+
+ @TableLogic
+ @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "是否删除 -1：已删除 0：正常")
+ private String delFlag;
/**
* 系统类型 2每日 3在线订餐
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
index e0d2c83a6..8dfa96ce4 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
* 菜品spu
*
* @author zhangjiafu
- * @date 2024-12-06 15:48:25
+ * @date 2024-12-10 12:51:53
*/
@Service
public class CanteenSpuServiceImpl extends ServiceImpl implements CanteenSpuService {
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
index 663b69942..d4495b43a 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
@@ -16,10 +16,10 @@ spring:
import:
- optional:nacos:application-@profiles.active@.yml
- optional:nacos:${spring.application.name}-@profiles.active@.yml
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- username: root
- password: root
- url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_canteen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+# datasource:
+# type: com.alibaba.druid.pool.DruidDataSource
+# druid:
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# username: root
+# password: root
+# url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_canteen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml
index 332420faf..25a94fb96 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenCategoryMapper.xml
@@ -10,8 +10,8 @@
-
-
+
+