wangfei 6 年前
父节点
当前提交
5e606cf3e6

+ 36
- 34
whole-estate/src/main/java/com/example/wholeestate/controller/BuildingDynamicController.java 查看文件

6
 import com.example.wholeestate.common.base.BaseController;
6
 import com.example.wholeestate.common.base.BaseController;
7
 import com.example.wholeestate.common.resp.ResponseBean;
7
 import com.example.wholeestate.common.resp.ResponseBean;
8
 import com.example.wholeestate.common.uuid.IdGen;
8
 import com.example.wholeestate.common.uuid.IdGen;
9
+import com.example.wholeestate.model.Activity;
9
 import com.example.wholeestate.model.BuildingDynamic;
10
 import com.example.wholeestate.model.BuildingDynamic;
10
 import com.example.wholeestate.model.PageImg;
11
 import com.example.wholeestate.model.PageImg;
11
 import com.example.wholeestate.service.IBuildingDynamicService;
12
 import com.example.wholeestate.service.IBuildingDynamicService;
54
     @ApiOperation(value = "项目动态管理列表", notes = "项目动态管理列表")
55
     @ApiOperation(value = "项目动态管理列表", notes = "项目动态管理列表")
55
     @ApiImplicitParams({
56
     @ApiImplicitParams({
56
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
57
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
57
-            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度")
58
-
58
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度"),
59
+            @ApiImplicitParam(paramType = "Query",dataType = "string",name = "name",value = "name:动态标题"),
60
+            @ApiImplicitParam(paramType = "Query",dataType = "string",name = "buildingId",value = "buildingId:楼盘id")
59
     })
61
     })
60
     @RequestMapping(value = "/iBuildingDynamicList", method = RequestMethod.GET)
62
     @RequestMapping(value = "/iBuildingDynamicList", method = RequestMethod.GET)
61
-    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session){
62
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize);
63
+    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
64
+                                             @RequestParam("pageSize")Integer pageSize,
65
+                                             @RequestParam(required = false)String name ,
66
+                                             @RequestParam(required = false)String buildingId,
67
+                                             HttpSession session){
68
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId);
63
         return responseBean;
69
         return responseBean;
64
     }
70
     }
65
 
71
 
66
     @RequestMapping(value = "/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
72
     @RequestMapping(value = "/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
67
     @ApiOperation(value = "项目动态详情", notes = "项目动态详情")
73
     @ApiOperation(value = "项目动态详情", notes = "项目动态详情")
68
     @ApiImplicitParams({
74
     @ApiImplicitParams({
69
-            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "项目动态id"),
75
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "项目动态id"),
70
     })
76
     })
71
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
77
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
72
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
78
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
73
         return responseBean;
79
         return responseBean;
74
     }
80
     }
90
     @ApiImplicitParams({
96
     @ApiImplicitParams({
91
             @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "dynamicId", value = "项目动态dynamicId"),
97
             @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "dynamicId", value = "项目动态dynamicId"),
92
     })
98
     })
93
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
99
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
94
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
100
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
95
         return responseBean;
101
         return responseBean;
96
     }
102
     }
119
         ResponseBean responseBean = new ResponseBean();
125
         ResponseBean responseBean = new ResponseBean();
120
         BuildingDynamic dynamic = JSONObject.parseObject(parameter, BuildingDynamic.class);
126
         BuildingDynamic dynamic = JSONObject.parseObject(parameter, BuildingDynamic.class);
121
         QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
127
         QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
122
-        buildingDynamicQueryWrapper.eq("page_id", dynamic.getDynamicId());
128
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
123
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
129
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
124
         return responseBean;
130
         return responseBean;
125
     }
131
     }
130
     })
136
     })
131
     @RequestMapping(value = "/buildingDynamic/delete", method = RequestMethod.DELETE)
137
     @RequestMapping(value = "/buildingDynamic/delete", method = RequestMethod.DELETE)
132
     public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
138
     public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
133
-        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelect(id);
139
+        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
134
         return responseBean;
140
         return responseBean;
135
     }
141
     }
136
 
142
 
137
-    @RequestMapping(value = "/buildingDynamic/delete" ,method =RequestMethod.DELETE)
138
-    @ApiOperation(value = "动态删除",notes="动态删除")
143
+    @RequestMapping(value = "/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
144
+    @ApiOperation(value = "项目动态发布", notes = "项目动态发布")
139
     @ApiImplicitParams({
145
     @ApiImplicitParams({
140
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "id",value = "动态id" ),
146
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "dynamicId", value = "dynamicId主键")
141
     })
147
     })
142
-    public  ResponseBean buildingDynamicDelete(@RequestParam(required = false) String id){
143
-        ResponseBean responseBean= iBuildingDynamicService.buildingDynamicDelete(id);
148
+    public ResponseBean send(@PathVariable String dynamicId) {
149
+        ResponseBean responseBean = new ResponseBean();
150
+        QueryWrapper<BuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
151
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
152
+        BuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
153
+        dynamic.setStatus(1);
154
+        dynamic.setPublishDate(LocalDateTime.now());
155
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
144
         return responseBean;
156
         return responseBean;
145
     }
157
     }
146
 
158
 
147
-    @RequestMapping(value = "/buildingDynamic/update" ,method =RequestMethod.POST)
148
-    @ApiOperation(value = "动态管理修改",notes="动态管理添加")
159
+    @RequestMapping(value = "/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
160
+    @ApiOperation(value = "项目动态取消发布", notes = "项目动态取消发布")
149
     @ApiImplicitParams({
161
     @ApiImplicitParams({
150
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "dynamicId",value = "动态id" ),
151
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "buildingId",value = "楼盘id" ),
152
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "imgUrl",value = "首页图片" ),
153
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "title",value = "标题" ),
154
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "desc",value = "描述" ),
155
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "url",value = "url" ),
156
-            @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "publishDate",value = "publishDate" )
162
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "dynamicId", value = "dynamicId主键")
157
     })
163
     })
158
-    public  ResponseBean buildingDynamicUpdate(@RequestParam(required = false) String buildingId,
159
-                                            @RequestParam(required = false) String imgUrl,
160
-                                            @RequestParam(required = false) String title,
161
-                                            @RequestParam(required = false) String desc,
162
-                                            @RequestParam(required = false) String url,
163
-                                            @RequestParam(value = "publishDate",required = false) Date publishDate,
164
-                                            @RequestParam(required = false) String dynamicId){
165
-        HashMap<Object,Object> map= new HashMap<>();
166
-        map.put("buildingId",buildingId);map.put("imgUrl",imgUrl);map.put("title",title);map.put("desc",desc);map.put("url",url);map.put("publishDate",publishDate);map.put("dynamicId",dynamicId);
167
-        ResponseBean responseBean= iBuildingDynamicService.buildingDynamicUpdate(map);
164
+    public ResponseBean cancel(@PathVariable String dynamicId) {
165
+        ResponseBean responseBean = new ResponseBean();
166
+        QueryWrapper<BuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
167
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
168
+        BuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
169
+        dynamic.setStatus(0);
170
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
168
         return responseBean;
171
         return responseBean;
169
     }
172
     }
170
-
171
 }
173
 }

+ 2
- 2
whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java 查看文件

75
     @RequestMapping(value = "/customerSelectId/{id}", method = RequestMethod.GET)
75
     @RequestMapping(value = "/customerSelectId/{id}", method = RequestMethod.GET)
76
     @ApiOperation(value = "会员详情", notes = "会员详情")
76
     @ApiOperation(value = "会员详情", notes = "会员详情")
77
     @ApiImplicitParams({
77
     @ApiImplicitParams({
78
-            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "会员id"),
78
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "会员id"),
79
     })
79
     })
80
-    public ResponseBean customerSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
80
+    public ResponseBean customerSelectId(@PathVariable(value = "id") String id, HttpSession session){
81
         ResponseBean  responseBean = iCustomerService.customerSelectId(id);
81
         ResponseBean  responseBean = iCustomerService.customerSelectId(id);
82
         return responseBean;
82
         return responseBean;
83
     }
83
     }

+ 2
- 2
whole-estate/src/main/java/com/example/wholeestate/dao/BuildingDynamicMapper.java 查看文件

22
      * @param page
22
      * @param page
23
      * @return
23
      * @return
24
      */
24
      */
25
-    IPage<BuildingDynamic> buildingDynamicList(Page page);
25
+    IPage<BuildingDynamic> buildingDynamicList(Page page,@Param("name") String name,@Param("buildingId") String buildingId);
26
 
26
 
27
     /**
27
     /**
28
      * 详情
28
      * 详情
29
      * @param id
29
      * @param id
30
      * @return
30
      * @return
31
      */
31
      */
32
-    BuildingDynamic iBuildingDynamicSelectId(@Param("id") Integer id);
32
+    BuildingDynamic iBuildingDynamicSelectId(@Param("id") String id);
33
 
33
 
34
     /**
34
     /**
35
      * 新增动态
35
      * 新增动态

+ 2
- 1
whole-estate/src/main/java/com/example/wholeestate/model/BuildingDynamic.java 查看文件

52
     /**
52
     /**
53
      * 描述
53
      * 描述
54
      */
54
      */
55
-    @TableField("DESC")
55
+    @TableField("`desc`")
56
     private String desc;
56
     private String desc;
57
 
57
 
58
     /**
58
     /**
63
     /**
63
     /**
64
      * 0正常,-1删除
64
      * 0正常,-1删除
65
      */
65
      */
66
+    @TableField("`status`")
66
     private Integer status;
67
     private Integer status;
67
 
68
 
68
     /**
69
     /**

+ 3
- 2
whole-estate/src/main/java/com/example/wholeestate/service/IBuildingDynamicService.java 查看文件

20
      * 项目动态管理列表
20
      * 项目动态管理列表
21
      * @return
21
      * @return
22
      */
22
      */
23
-    ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize);
23
+    ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize, String name, String buildingId);
24
 
24
 
25
     /**
25
     /**
26
      * 项目详情
26
      * 项目详情
27
      * @param id
27
      * @param id
28
      * @return
28
      * @return
29
      */
29
      */
30
-    ResponseBean iBuildingDynamicSelectId(Integer id);
30
+    ResponseBean iBuildingDynamicSelectId(String id);
31
 
31
 
32
     /**
32
     /**
33
      * 微信小程序 项目动态管理列表
33
      * 微信小程序 项目动态管理列表
62
      * @return
62
      * @return
63
      */
63
      */
64
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
64
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
65
+
65
 }
66
 }

+ 1
- 1
whole-estate/src/main/java/com/example/wholeestate/service/ICustomerService.java 查看文件

26
      * @param id
26
      * @param id
27
      * @return
27
      * @return
28
      */
28
      */
29
-    ResponseBean customerSelectId(Integer id);
29
+    ResponseBean customerSelectId(String id);
30
 
30
 
31
     /**
31
     /**
32
      * 注册微信小程序用户
32
      * 注册微信小程序用户

+ 6
- 3
whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingDynamicServiceImpl.java 查看文件

53
         binder.registerCustomEditor(Date.class, editor);
53
         binder.registerCustomEditor(Date.class, editor);
54
     }
54
     }
55
     @Override
55
     @Override
56
-    public ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize) {
56
+    public ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize, String name, String buildingId) {
57
         ResponseBean response= new ResponseBean();
57
         ResponseBean response= new ResponseBean();
58
 
58
 
59
         Page<BuildingDynamic> page = new Page<>();
59
         Page<BuildingDynamic> page = new Page<>();
60
         page.setSize(pageSize == null ? 10 : pageSize);
60
         page.setSize(pageSize == null ? 10 : pageSize);
61
         page.setCurrent(pageNum == null ? 1 : pageNum);
61
         page.setCurrent(pageNum == null ? 1 : pageNum);
62
-        IPage<BuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page);
62
+
63
+        IPage<BuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId);
63
         List<BuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
64
         List<BuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
64
 
65
 
65
         HashMap hashMap= new HashMap<>();
66
         HashMap hashMap= new HashMap<>();
72
     }
73
     }
73
 
74
 
74
     @Override
75
     @Override
75
-    public ResponseBean iBuildingDynamicSelectId(Integer id) {
76
+    public ResponseBean iBuildingDynamicSelectId(String id) {
76
         ResponseBean response= new ResponseBean();
77
         ResponseBean response= new ResponseBean();
77
         BuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
78
         BuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
78
         response.addSuccess(buildingDynamicList);
79
         response.addSuccess(buildingDynamicList);
173
         responseBean.addSuccess("成功");
174
         responseBean.addSuccess("成功");
174
         return responseBean;
175
         return responseBean;
175
     }
176
     }
177
+
178
+
176
 }
179
 }

+ 1
- 1
whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java 查看文件

57
     }
57
     }
58
 
58
 
59
     @Override
59
     @Override
60
-    public ResponseBean customerSelectId(Integer id) {
60
+    public ResponseBean customerSelectId(String id) {
61
         ResponseBean response= new ResponseBean();
61
         ResponseBean response= new ResponseBean();
62
         QueryWrapper<Customer> customer=new QueryWrapper<>();
62
         QueryWrapper<Customer> customer=new QueryWrapper<>();
63
         customer.lambda().eq(Customer::getStatus,1);
63
         customer.lambda().eq(Customer::getStatus,1);

+ 1
- 1
whole-estate/src/main/resources/application.yml 查看文件

1
 server:
1
 server:
2
-  port: 8080
2
+  port: 9090
3
 spring:
3
 spring:
4
   application:
4
   application:
5
     name: whole-estate
5
     name: whole-estate

+ 8
- 3
whole-estate/src/main/resources/mapper/BuildingDynamicMapper.xml 查看文件

18
     </insert>
18
     </insert>
19
     <select id="buildingDynamicList" resultType="com.example.wholeestate.model.BuildingDynamic">
19
     <select id="buildingDynamicList" resultType="com.example.wholeestate.model.BuildingDynamic">
20
         select * from ta_building_dynamic where status>-1
20
         select * from ta_building_dynamic where status>-1
21
+        <if test="name != null and name !=''">
22
+            and title like CONCAT('%', #{name} , '%')
23
+        </if>
24
+        <if test="buildingId != null and buildingId !=''">
25
+            and building_id = #{buildingId}
26
+        </if>
21
   </select>
27
   </select>
22
 
28
 
23
-    <select id="iBuildingDynamicSelectId" parameterType="int" resultType="com.example.wholeestate.model.BuildingDynamic">
29
+    <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.example.wholeestate.model.BuildingDynamic">
24
       SELECT
30
       SELECT
25
             dynamic_id,
31
             dynamic_id,
26
             building_id as buildingId,
32
             building_id as buildingId,
34
         FROM
40
         FROM
35
             ta_building_dynamic
41
             ta_building_dynamic
36
         WHERE
42
         WHERE
37
-	      STATUS = 1
38
-	      and ta_building_dynamic.dynamic_id = #{id}
43
+	      ta_building_dynamic.dynamic_id = #{id}
39
     </select>
44
     </select>
40
     <update id="buildingDynamicUpdate" parameterType="com.example.wholeestate.model.BuildingDynamic" >
45
     <update id="buildingDynamicUpdate" parameterType="com.example.wholeestate.model.BuildingDynamic" >
41
         update ta_building_dynamic
46
         update ta_building_dynamic