菜品分类，菜品列表

2024-12-10 17:22:09 +08:00
1 parent 26a17cec9a
commit e42d890504
@@ -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接口不适用---------------
+
+
+
 }
@@ -43,6 +43,12 @@
            <groupId>com.bsd</groupId>
            <artifactId>pjcloud-common-security</artifactId>
        </dependency>
+        <!--文件系统-->
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId>pjcloud-common-oss</artifactId>
+        </dependency>
+
        <!--必备：xss 过滤模块-->
        <dependency>
            <groupId>com.bsd</groupId>
@@ -118,4 +118,20 @@ public class CanteenCategoryController {
    public List<CanteenCategoryEntity> 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<CanteenCategoryEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(CanteenCategoryEntity::getSystemType,systemType);
+        wrapper.orderByAsc(CanteenCategoryEntity::getSort);
+        List<CanteenCategoryEntity> list = canteenCategoryService.list(wrapper);
+        return R.ok(list);
+    }
 }
@@ -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
@@ -60,23 +60,26 @@ public class CanteenCategoryEntity extends Model<CanteenCategoryEntity> {
    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在线订餐
 	*/
@@ -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<CanteenSpuEntity> {
 数组，以逗号分隔
 最多上传15张
 	*/
-    @Schema(description="商品轮播图地址")
+    @Schema(description="商品轮播图")
    private String sliderPicUrls;

 	/**
@@ -133,11 +133,12 @@ public class CanteenSpuEntity extends Model<CanteenSpuEntity> {
    @Schema(description="商品点击量")
    private Integer browseCount;

-	/**
-	* 是否删除
-	*/
-    @Schema(description="是否删除")
-    private String delFlag;
+
+
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "是否删除  -1：已删除  0：正常")
+	private String delFlag;

 	/**
 	* 系统类型 2每日 3在线订餐
@@ -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<CanteenSpuMapper, CanteenSpuEntity> implements CanteenSpuService {
@@ -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
@@ -10,8 +10,8 @@
        <result property="picUrl" column="pic_url"/>
        <result property="sort" column="sort"/>
        <result property="status" column="status"/>
-        <result property="creator" column="creator"/>
-        <result property="updater" column="updater"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
        <result property="delFlag" column="del_flag"/>
        <result property="systemType" column="system_type"/>
        <result property="deptId" column="dept_id"/>