lyhzzz 2 vuotta sitten
vanhempi
commit
9cc0290cff

+ 1 - 1
src/main/java/com/fdkankan/manage_jp/entity/User.java

@@ -122,7 +122,7 @@ public class User implements Serializable {
      * 创建时间
      * 创建时间
      */
      */
     @TableField("create_time")
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
 
     /**
     /**
      * 记录的状态,A: 生效,I: 禁用
      * 记录的状态,A: 生效,I: 禁用

+ 2 - 1
src/main/java/com/fdkankan/manage_jp/mapper/ICameraMapper.java

@@ -5,6 +5,7 @@ import com.fdkankan.manage_jp.entity.Camera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
+import com.fdkankan.manage_jp.vo.response.ResponseCamera;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 
 
@@ -19,5 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 @Mapper
 public interface ICameraMapper extends MPJBaseMapper<Camera> {
 public interface ICameraMapper extends MPJBaseMapper<Camera> {
 
 
-    Page<RequestCamera> pageList(Page<Object> page, CameraListParam param);
+    Page<ResponseCamera> pageList(Page<Object> page, CameraListParam param);
 }
 }

+ 2 - 2
src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -24,6 +24,7 @@ import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
+import com.fdkankan.manage_jp.vo.response.ResponseCamera;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -57,8 +58,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
 
 
     @Override
     @Override
     public Object pageList(CameraListParam param) {
     public Object pageList(CameraListParam param) {
-        Page<RequestCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
-
+        Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
         return PageInfo.PageInfo(page);
         return PageInfo.PageInfo(page);
     }
     }
 
 

+ 1 - 1
src/main/resources/mapper/manage_jp/CameraMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage_jp.mapper.ICameraMapper">
 <mapper namespace="com.fdkankan.manage_jp.mapper.ICameraMapper">
 
 
-    <select id="pageList" resultType="com.fdkankan.manage_jp.vo.request.RequestCamera">
+    <select id="pageList" resultType="com.fdkankan.manage_jp.vo.response.ResponseCamera">
         select  * from t_camera c
         select  * from t_camera c
             left join t_camera_detail d on c.id = d.camera_id
             left join t_camera_detail d on c.id = d.camera_id
             left join t_goods g on d.goods_id = g.id
             left join t_goods g on d.goods_id = g.id