修改新闻，订单返回

src/main/java/com/fdkankan/manage/controller/InvoiceController.java

@@ -40,8 +40,8 @@ public class InvoiceController {
      * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.fdkankan.manage.vo.InvoiceVO>
      **/
     @PostMapping("/pageInvoice")
-    public Page<InvoiceVO> pageInvoice(@RequestBody InvoicePageParamVO param){
-        return invoiceService.pageInvoice(param);
+    public ResultData pageInvoice(@RequestBody InvoicePageParamVO param){
+        return ResultData.ok( invoiceService.pageInvoice(param));
     }
 
     /**

src/main/java/com/fdkankan/manage/controller/NewsController.java

@@ -37,8 +37,8 @@ public class NewsController {
      * @return
      */
     @PostMapping("/pageNews")
-    public Page<PageNewsVO> pageNews(@RequestBody PageNewsParamVO param){
-        return newsService.pageNews(param);
+    public ResultData pageNews(@RequestBody PageNewsParamVO param){
+        return ResultData.ok(newsService.pageNews(param));
     }
 
     /**
@@ -87,8 +87,8 @@ public class NewsController {
      * @return
      */
     @PostMapping("/getNewsDetail")
-    public News getNewsDetail(@RequestBody @Validated BaseParamVO param){
-        return newsService.getNewsDetail(param);
+    public ResultData getNewsDetail(@RequestBody @Validated BaseParamVO param){
+        return ResultData.ok(newsService.getNewsDetail(param));
     }
 
     /**

src/main/java/com/fdkankan/manage/entity/ScenePlus.java

@@ -0,0 +1,114 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景主表
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Getter
+@Setter
+@TableName("t_scene_plus")
+public class ScenePlus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 相机id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 手机id
+     */
+    @TableField("phone_id")
+    private String phoneId;
+
+    /**
+     * 场景名称
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 场景状态：0-未建好，1--已建好，-1-计算出错，-2--不在官网显示
+     */
+    @TableField("scene_status")
+    private Integer sceneStatus;
+
+    /**
+     * 场景来源：相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
+     */
+    @TableField("scene_source")
+    private Integer sceneSource;
+
+    /**
+     * 支付状态：0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 场景类型  0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
+     */
+    @TableField("scene_type")
+    private Integer sceneType;
+
+    /**
+     * 是否推荐：0-否，1-是
+     */
+    @TableField("recommend")
+    private Integer recommend;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

src/main/java/com/fdkankan/manage/entity/ScenePlusExt.java

@@ -0,0 +1,156 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Getter
+@Setter
+@TableName("t_scene_plus_ext")
+public class ScenePlusExt implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * t_scene_plus主键
+     */
+    @TableField("plus_id")
+    private Long plusId;
+
+    /**
+     * 场景数据目录
+     */
+    @TableField("data_source")
+    private String dataSource;
+
+    /**
+     * 场景链接
+     */
+    @TableField("web_site")
+    private String webSite;
+
+    /**
+     * 缩略图链接
+     */
+    @TableField("thumb")
+    private String thumb;
+
+    /**
+     * 方案：1-双目，2-转台，3-六目,4-八目,10-获取4k图，11-获取2k，12-获取1k
+     */
+    @TableField("scene_scheme")
+    private Integer sceneScheme;
+
+    /**
+     * 使用用量
+     */
+    @TableField("space")
+    private Long space;
+
+    /**
+     * 云服务器类型
+     */
+    @TableField("ecs")
+    private String ecs;
+
+    /**
+     * 点位数量
+     */
+    @TableField("shoot_count")
+    private Integer shootCount;
+
+    /**
+     * 浏览次数
+     */
+    @TableField("view_count")
+    private Integer viewCount;
+
+    /**
+     * gps定位
+     */
+    @TableField("gps")
+    private String gps;
+
+    /**
+     * 算法类型(slam、sfm)
+     */
+    @TableField("algorithm")
+    private String algorithm;
+
+    /**
+     * 固件版本
+     */
+    @TableField("firmware_version")
+    private String firmwareVersion;
+
+    /**
+     * 算法类型（V2,V3）
+     */
+    @TableField("build_type")
+    private String buildType;
+
+    /**
+     * 分辨率（2k,4k）
+     */
+    @TableField("scene_resolution")
+    private String sceneResolution;
+
+    /**
+     * 场景来源，lite：双目lite相机，pro：八目相机，minion：双面转台相机，laser：激光相机，virtual：虚拟场景，sketch：图片建模场景
+     */
+    @TableField("scene_from")
+    private String sceneFrom;
+
+    /**
+     * 切图方式（tiles：瓦片图，face：切片图，pan：全景图 ，local：本地切片，cube：立体图）
+     */
+    @TableField("scene_kind")
+    private String sceneKind;
+
+    /**
+     * 点位视频
+     */
+    @TableField("videos")
+    private String videos;
+
+    /**
+     * 计算耗时
+     */
+    @TableField("compute_time")
+    private Long computeTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_employ_note"
+                "t_scene_plus","t_scene_plus_ext"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -46,8 +46,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://120.25.146.52:3306/4dkankan_v2",
-                "root","4dkk2020test%")
+        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
+                "root","4Dage@4Dage#@168")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/manage/mapper/IScenePlusExtMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.ScenePlusExt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Mapper
+public interface IScenePlusExtMapper extends BaseMapper<ScenePlusExt> {
+
+}

src/main/java/com/fdkankan/manage/mapper/IScenePlusMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.ScenePlus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景主表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Mapper
+public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
+
+}

src/main/java/com/fdkankan/manage/service/IInvoiceService.java

@@ -1,14 +1,13 @@
 package com.fdkankan.manage.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.Invoice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
-import com.fdkankan.manage.vo.InvoiceVO;
+
 import java.io.IOException;
-import java.util.List;
-import org.springframework.web.bind.annotation.RequestBody;
+
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface IInvoiceService extends IService<Invoice> {
 
-    Page<InvoiceVO> pageInvoice(InvoicePageParamVO param);
+    PageInfo pageInvoice(InvoicePageParamVO param);
 
     ResultData invoiceRegister(Long userId, Long id, String invoiceNum,
         String shipNum,MultipartFile file) throws IOException;

src/main/java/com/fdkankan/manage/service/INewsService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -9,11 +9,8 @@ import com.fdkankan.manage.vo.NewsDisplayParamVO;
 import com.fdkankan.manage.vo.NewsPublicParamVO;
 import com.fdkankan.manage.vo.NewsPutTopParamVO;
 import com.fdkankan.manage.vo.PageNewsParamVO;
-import com.fdkankan.manage.vo.PageNewsVO;
 import com.fdkankan.manage.vo.SaveNewsParamVO;
 import com.fdkankan.manage.vo.UpdateNewsParamVO;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -25,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  */
 public interface INewsService extends IService<News> {
 
-    Page<PageNewsVO> pageNews(PageNewsParamVO param);
+    PageInfo pageNews(PageNewsParamVO param);
 
     ResultData display(Long userId, NewsDisplayParamVO param);
 

src/main/java/com/fdkankan/manage/service/IScenePlusExtService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.ScenePlusExt;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+public interface IScenePlusExtService extends IService<ScenePlusExt> {
+
+}

src/main/java/com/fdkankan/manage/service/IScenePlusService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.ScenePlus;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景主表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+public interface IScenePlusService extends IService<ScenePlus> {
+
+}

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -1,17 +1,12 @@
 package com.fdkankan.manage.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.InvoiceType;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.entity.Invoice;
@@ -20,15 +15,12 @@ import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.fdkankan.manage.service.IInvoiceRegisterService;
 import com.fdkankan.manage.service.IInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
-import java.io.File;
+
 import java.io.IOException;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,8 +56,9 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     @Dict
     @Override
-    public Page<InvoiceVO> pageInvoice(InvoicePageParamVO param) {
-        return baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
+    public PageInfo pageInvoice(InvoicePageParamVO param) {
+        Page<InvoiceVO> invoiceVOPage = baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
+        return PageInfo.PageInfo(invoiceVOPage);
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/NewsServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.mapper.INewsMapper;
@@ -34,10 +34,10 @@ import org.springframework.stereotype.Service;
 public class NewsServiceImpl extends ServiceImpl<INewsMapper, News> implements INewsService {
 
     @Override
-    public Page<PageNewsVO> pageNews(PageNewsParamVO param) {
+    public PageInfo pageNews(PageNewsParamVO param) {
         Page<PageNewsVO> pageNewsVOPage =
             this.baseMapper.pageNews(new Page<>(param.getPageNum(), param.getPageSize()), param);
-        return pageNewsVOPage;
+        return PageInfo.PageInfo(pageNewsVOPage);
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/ScenePlusExtServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.ScenePlusExt;
+import com.fdkankan.manage.mapper.IScenePlusExtMapper;
+import com.fdkankan.manage.service.IScenePlusExtService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Service
+public class ScenePlusExtServiceImpl extends ServiceImpl<IScenePlusExtMapper, ScenePlusExt> implements IScenePlusExtService {
+
+}

src/main/java/com/fdkankan/manage/service/impl/ScenePlusServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.ScenePlus;
+import com.fdkankan.manage.mapper.IScenePlusMapper;
+import com.fdkankan.manage.service.IScenePlusService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景主表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-02
+ */
+@Service
+public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlus> implements IScenePlusService {
+
+}

src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,43 @@
+spring:
+  application:
+    name: 4dkankan-center-manage
+  cloud:
+    nacos:
+      config:
+        server-addr: 120.24.144.164:8848
+        file-extension: yaml
+        namespace: 4dkankan-v4
+        extension-configs:
+          - data-id: 4dkankan-center-manage.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config-52.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-mongodb-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-satoken-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+

src/main/resources/bootstrap-test.yml

@@ -36,8 +36,8 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
 
 
 

src/main/resources/mapper/manage/ScenePlusExtMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IScenePlusExtMapper">
+
+</mapper>

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IScenePlusMapper">
+
+</mapper>

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -17,19 +17,29 @@
         </foreach>
         GROUP BY camera_id
     </select>
+
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
-       select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize,cl.old_num,cl.create_time ,u.user_name,s.view_count,s.status,s.pay_status
+       select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize ,u.user_name,s.view_count,s.status,s.pay_status
         from t_scene_pro s
-       left join t_scene_copy_log cl on s.num = cl.new_num
-       left join t_user u on s.user_id = u.id
-       left join t_camera c on s.camera_id = c.id
-       where s.rec_status = 'A'
-       <if test="param.sceneName != null and param.sceneName!='' ">
-           and s.scene_name like concat ('%',#{param.sceneName},'%')
-       </if>
-       <if test="param.snCode != null and param.snCode !='' ">
-           and c.sn_code like concat ('%',#{param.snCode},'%')
-       </if>
+        <include refid="commonWhere"></include>
+        UNION
+        select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize ,u.user_name,e.view_count,s.scene_status as status,s.pay_status
+        from t_scene_plus s
+        left join t_scene_plus_ext e on s.id = e.plus_id
+        <include refid="commonWhere"></include>
+        order by s.id desc
+    </select>
+
+    <sql id="commonWhere">
+        left join t_user u on s.user_id = u.id
+        left join t_camera c on s.camera_id = c.id
+        where s.rec_status = 'A'
+        <if test="param.sceneName != null and param.sceneName!='' ">
+            and s.scene_name like concat ('%',#{param.sceneName},'%')
+        </if>
+        <if test="param.snCode != null and param.snCode !='' ">
+            and c.sn_code like concat ('%',#{param.snCode},'%')
+        </if>
         <if test="param.userName != null and param.userName !='' ">
             and u.user_name like concat ('%',#{param.userName},'%')
         </if>
@@ -39,6 +49,5 @@
         <if test="param.type !=null and param.type == 1">
             and s.scene_source = 3
         </if>
-        order by s.id desc
-    </select>
+    </sql>
 </mapper>