修改公告代码

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/dto/AddNoticeDTO.java

@@ -1,9 +1,5 @@
 package org.springblade.factory.dto;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-
 import java.time.LocalDateTime;
 
 public class AddNoticeDTO {

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/entity/PcBladeNotice.java

@@ -56,12 +56,12 @@ public class PcBladeNotice implements Serializable {
 	private String visibleRoles;
 
 	/** 品牌范围JSON [{ID,CODE,NAME}] */
-	@TableField(value = "brand_scope", typeHandler = JacksonTypeHandler.class)
-	private Object brandScope;
+	@TableField(value = "brand_scope")
+	private String brandScope;
 
 	/** 排除客户JSON [{ID,CODE,NAME}] */
-	@TableField(value = "customer_blacklist", typeHandler = JacksonTypeHandler.class)
-	private Object customerBlacklist;
+	@TableField(value = "customer_blacklist")
+	private String customerBlacklist;
 
 	/** 状态 0草稿 1已发布 2已下架 */
 	@TableField("status")

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/entity/PcBladeNoticeCategory.java

@@ -2,6 +2,7 @@ package org.springblade.factory.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -14,13 +15,13 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("pc_blade_notice_category")
-public class PcBladeNoticeCategory implements Serializable {
+public class PcBladeNoticeCategory extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	/** 主键ID(系统继承) */
-	@TableId(value = "id", type = IdType.AUTO)
-	private Long id;
+//	/** 主键ID(系统继承) */
+//	@TableId(value = "id", type = IdType.AUTO)
+//	private Long id;
 
 	/** 公告分类名称 */
 	@TableField("name")
@@ -50,32 +51,32 @@ public class PcBladeNoticeCategory implements Serializable {
 	@TableField("remark")
 	private String remark;
 
-	/** 创建人(系统继承) */
-	@TableField("create_user")
-	private Long createUser;
-
-	/** 创建部门(系统继承) */
-	@TableField("create_dept")
-	private Long createDept;
-
-	/** 创建时间(系统继承) */
-	@TableField(value = "create_time", fill = FieldFill.INSERT)
-	private LocalDateTime createTime;
-
-	/** 更新人(系统继承) */
-	@TableField("update_user")
-	private Long updateUser;
-
-	/** 更新时间(系统继承) */
-	@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
-	private LocalDateTime updateTime;
+//	/** 创建人(系统继承) */
+//	@TableField("create_user")
+//	private Long createUser;
+//
+//	/** 创建部门(系统继承) */
+//	@TableField("create_dept")
+//	private Long createDept;
+//
+//	/** 创建时间(系统继承) */
+//	@TableField(value = "create_time", fill = FieldFill.INSERT)
+//	private LocalDateTime createTime;
+//
+//	/** 更新人(系统继承) */
+//	@TableField("update_user")
+//	private Long updateUser;
+//
+//	/** 更新时间(系统继承) */
+//	@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+//	private LocalDateTime updateTime;
 
 	/** 状态 1正常(系统继承) */
 	@TableField("status")
 	private Integer status;
 
 	/** 是否已删除 0否 1是(系统继承) */
-	@TableField("is_deleted")
-	@TableLogic
-	private Integer isDeleted;
+//	@TableField("is_deleted")
+//	@TableLogic
+//	private Integer isDeleted;
 }

blade-service-api/blade-factory-api/src/main/java/org/springblade/factory/vo/PcBladeNoticeCategoryVO.java

@@ -3,4 +3,5 @@ package org.springblade.factory.vo;
 import org.springblade.factory.entity.PcBladeNoticeCategory;
 
 public class PcBladeNoticeCategoryVO extends PcBladeNoticeCategory {
+
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/controller/PcBladeNoticeCategoryController.java

@@ -8,6 +8,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.factory.dto.NoticeCategoryDTO;
 import org.springblade.factory.entity.PcBladeNoticeCategory;
 import org.springblade.factory.service.PcBladeNoticeCategoryService;
+import org.springblade.factory.vo.PcBladeNoticeCategoryVO;
+import org.springblade.factory.wrapper.PcBladeNoticeCategoryWrapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,7 @@ import java.util.List;
  */
 @AllArgsConstructor
 @RestController
-@RequestMapping("/api/notice/category")
+@RequestMapping("/api/factory/notice/category")
 public class PcBladeNoticeCategoryController {
 
 	@Autowired
@@ -54,8 +56,9 @@ public class PcBladeNoticeCategoryController {
 	}
 
 	@GetMapping("/list")
-	public R getCategorys(){
-		return R.data(categoryService.list());
+	public R<List<PcBladeNoticeCategoryVO>> getCategorys(){
+		List<PcBladeNoticeCategoryVO> categoryVOs = PcBladeNoticeCategoryWrapper.build().listVO(categoryService.list());
+		return R.data(categoryVOs);
 	}
 
 	/**
@@ -64,10 +67,7 @@ public class PcBladeNoticeCategoryController {
 	@PostMapping("/add")
 	public R save(@RequestBody NoticeCategoryDTO dto) {
 		System.out.println("接收dto：" + dto.toString());
-		PcBladeNoticeCategory category = new PcBladeNoticeCategory();
-		BeanUtils.copyProperties(dto, category);
-
-		return R.status(categoryService.save(category));
+		return R.status(categoryService.insertNoticeCategory(dto));
 	}
 
 	/**

blade-service/blade-factory/src/main/java/org/springblade/factory/controller/PcBladeNoticeController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2025-08-05
  */
 @RestController
-@RequestMapping("/blade/notice")
+@RequestMapping("/api/factory/notice")
 public class PcBladeNoticeController {
 
 	@Autowired

blade-service/blade-factory/src/main/java/org/springblade/factory/service/PcBladeNoticeCategoryService.java

@@ -1,8 +1,15 @@
 package org.springblade.factory.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.factory.dto.NoticeCategoryDTO;
 import org.springblade.factory.entity.PcBladeNoticeCategory;
+import org.springblade.factory.vo.PcBladeNoticeCategoryVO;
+
+import java.util.List;
 
 public interface PcBladeNoticeCategoryService extends IService<PcBladeNoticeCategory> {
+
+	List<PcBladeNoticeCategory> getPcBladeNoticeCategoryList();
+
+	boolean insertNoticeCategory(NoticeCategoryDTO dto);
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/PcBladeNoticeCategoryServiceImpl.java

@@ -1,14 +1,38 @@
 package org.springblade.factory.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.http.util.TextUtils;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.factory.dto.NoticeCategoryDTO;
 import org.springblade.factory.entity.PcBladeNoticeCategory;
+import org.springblade.factory.entity.PcBladeOrderInvoice;
 import org.springblade.factory.mapper.PcBladeNoticeCategoryMapper;
 import org.springblade.factory.service.PcBladeNoticeCategoryService;
+import org.springblade.factory.vo.PcBladeNoticeCategoryVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 @Service
-public class PcBladeNoticeCategoryServiceImpl
-	extends ServiceImpl<PcBladeNoticeCategoryMapper, PcBladeNoticeCategory>
+public class PcBladeNoticeCategoryServiceImpl extends BaseServiceImpl<PcBladeNoticeCategoryMapper, PcBladeNoticeCategory>
 	implements PcBladeNoticeCategoryService {
+
+
+	@Override
+	public List<PcBladeNoticeCategory> getPcBladeNoticeCategoryList() {
+		//QueryWrapper<PcBladeNoticeCategory> queryWrapper = new QueryWrapper<>();
+		return this.list();
+	}
+
+	@Override
+	public boolean insertNoticeCategory(NoticeCategoryDTO dto) {
+		PcBladeNoticeCategory category = new PcBladeNoticeCategory();
+		BeanUtils.copyProperties(dto, category);
+		return this.save(category);
+	}
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/wrapper/PcBladeNoticeCategoryWrapper.java

@@ -0,0 +1,29 @@
+package org.springblade.factory.wrapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.factory.entity.PcBladeNoticeCategory;
+import org.springblade.factory.vo.PcBladeNoticeCategoryVO;
+import org.springblade.factory.vo.PcBladeOrderInvoiceItemVO;
+import org.springframework.beans.BeanUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+public class PcBladeNoticeCategoryWrapper extends BaseEntityWrapper<PcBladeNoticeCategory, PcBladeNoticeCategoryVO> {
+
+
+	public static PcBladeNoticeCategoryWrapper build() {
+		return new PcBladeNoticeCategoryWrapper();
+	}
+
+	@Override
+	public PcBladeNoticeCategoryVO entityVO(PcBladeNoticeCategory entity) {
+		if (Objects.isNull(entity)) {
+			return null;
+		}
+		PcBladeNoticeCategoryVO pcBladeNoticeCategoryVO = new PcBladeNoticeCategoryVO();
+		BeanUtils.copyProperties(entity, pcBladeNoticeCategoryVO);
+		return pcBladeNoticeCategoryVO;
+	}
+}

blade-service/blade-factory/src/main/java/org/springblade/factory/wrapper/PcBladeNoticeWrapper.java

@@ -0,0 +1,26 @@
+package org.springblade.factory.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.factory.entity.PcBladeNotice;
+import org.springblade.factory.vo.PcBladeNoticeCategoryVO;
+import org.springblade.factory.vo.PcBladeNoticeVO;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Objects;
+
+public class PcBladeNoticeWrapper extends BaseEntityWrapper<PcBladeNotice, PcBladeNoticeVO> {
+
+	public static PcBladeNoticeWrapper build() {
+		return new PcBladeNoticeWrapper();
+	}
+
+	@Override
+	public PcBladeNoticeVO entityVO(PcBladeNotice entity) {
+		if (Objects.isNull(entity)) {
+			return null;
+		}
+		PcBladeNoticeVO pcBladeNoticeVO = new PcBladeNoticeVO();
+		BeanUtils.copyProperties(entity, pcBladeNoticeVO);
+		return pcBladeNoticeVO;
+	}
+}