Forráskód Böngészése

feat(product): 添加客户站点DIY标识字段

- 在ClientSite实体类中添加isDiy字段用于标识是否DIY
- 在ClientSiteBo业务对象中添加isDiy字段支持
- 在ClientSiteVo视图对象中添加isDiy字段返回
- 为ClientSiteFloorVo添加updateTime更新时间字段
- 修复ClientSiteProductController中exportData方法的参数注解问题
肖路 1 hónapja
szülő
commit
f29f50e577

+ 1 - 1
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ClientSiteProductController.java

@@ -174,7 +174,7 @@ public class ClientSiteProductController extends BaseController {
      */
      */
     @Log(title = "客户站点产品配置", businessType = BusinessType.EXPORT)
     @Log(title = "客户站点产品配置", businessType = BusinessType.EXPORT)
     @PostMapping("/exportData")
     @PostMapping("/exportData")
-    public void exportData(ClientSiteProductBo bo, HttpServletResponse response) {
+    public void exportData(@RequestBody ClientSiteProductBo bo, HttpServletResponse response) {
         // 站点下的产品
         // 站点下的产品
         List<ClientSiteProduct> clientSiteProducts = clientSiteProductService.list(Wrappers.lambdaQuery(ClientSiteProduct.class)
         List<ClientSiteProduct> clientSiteProducts = clientSiteProductService.list(Wrappers.lambdaQuery(ClientSiteProduct.class)
             .eq(ClientSiteProduct::getSiteId, bo.getSiteId()));
             .eq(ClientSiteProduct::getSiteId, bo.getSiteId()));

+ 4 - 1
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ClientSite.java

@@ -127,8 +127,11 @@ public class ClientSite extends TenantEntity {
     /**
     /**
      * 删除标志(0代表存在 2代表删除)
      * 删除标志(0代表存在 2代表删除)
      */
      */
-    @TableLogic
     private String delFlag;
     private String delFlag;
 
 
+    /**
+     * 是否diy (0不diy,1diy)
+     * */
+    private Long isDiy;
 
 
 }
 }

+ 5 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ClientSiteBo.java

@@ -139,5 +139,10 @@ public class ClientSiteBo extends BaseEntity {
     //@NotBlank(message = "状态(0正常 1停用)不能为空", groups = { AddGroup.class, EditGroup.class })
     //@NotBlank(message = "状态(0正常 1停用)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
     private String status;
 
 
+    /**
+    * 是否diy (0不diy,1diy)
+    * */
+    private Long isDiy;
+
 
 
 }
 }

+ 6 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ClientSiteFloorVo.java

@@ -96,5 +96,11 @@ public class ClientSiteFloorVo implements Serializable {
     @ExcelProperty(value = "备注")
     @ExcelProperty(value = "备注")
     private String remark;
     private String remark;
 
 
+    /**
+    * 更新时间
+    * */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
 
 
 }
 }

+ 6 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ClientSiteVo.java

@@ -158,4 +158,10 @@ public class ClientSiteVo implements Serializable {
     private String status;
     private String status;
 
 
 
 
+    /**
+     * 是否diy (0不diy,1diy)
+     * */
+    private Long isDiy;
+
+
 }
 }