update

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingDynamicController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.wholeestate.common.base.BaseController;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
+import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.BuildingDynamic;
 import com.example.wholeestate.model.PageImg;
 import com.example.wholeestate.service.IBuildingDynamicService;
@@ -54,21 +55,26 @@ public class BuildingDynamicController extends BaseController {
     @ApiOperation(value = "项目动态管理列表", notes = "项目动态管理列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度")
-
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度"),
+            @ApiImplicitParam(paramType = "Query",dataType = "string",name = "name",value = "name:动态标题"),
+            @ApiImplicitParam(paramType = "Query",dataType = "string",name = "buildingId",value = "buildingId:楼盘id")
     })
     @RequestMapping(value = "/iBuildingDynamicList", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize);
+    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
+                                             @RequestParam("pageSize")Integer pageSize,
+                                             @RequestParam(required = false)String name ,
+                                             @RequestParam(required = false)String buildingId,
+                                             HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId);
         return responseBean;
     }
 
     @RequestMapping(value = "/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
     @ApiOperation(value = "项目动态详情", notes = "项目动态详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "项目动态id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "项目动态id"),
     })
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
         return responseBean;
     }
@@ -90,7 +96,7 @@ public class BuildingDynamicController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "dynamicId", value = "项目动态dynamicId"),
     })
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
         return responseBean;
     }
@@ -119,7 +125,7 @@ public class BuildingDynamicController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         BuildingDynamic dynamic = JSONObject.parseObject(parameter, BuildingDynamic.class);
         QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("page_id", dynamic.getDynamicId());
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;
     }
@@ -130,42 +136,38 @@ public class BuildingDynamicController extends BaseController {
     })
     @RequestMapping(value = "/buildingDynamic/delete", method = RequestMethod.DELETE)
     public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
-        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelect(id);
+        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
         return responseBean;
     }
 
-    @RequestMapping(value = "/buildingDynamic/delete" ,method =RequestMethod.DELETE)
-    @ApiOperation(value = "动态删除",notes="动态删除")
+    @RequestMapping(value = "/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "项目动态发布", notes = "项目动态发布")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "id",value = "动态id" ),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "dynamicId", value = "dynamicId主键")
     })
-    public  ResponseBean buildingDynamicDelete(@RequestParam(required = false) String id){
-        ResponseBean responseBean= iBuildingDynamicService.buildingDynamicDelete(id);
+    public ResponseBean send(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<BuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        BuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(1);
+        dynamic.setPublishDate(LocalDateTime.now());
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
 
-    @RequestMapping(value = "/buildingDynamic/update" ,method =RequestMethod.POST)
-    @ApiOperation(value = "动态管理修改",notes="动态管理添加")
+    @RequestMapping(value = "/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "项目动态取消发布", notes = "项目动态取消发布")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "dynamicId",value = "动态id" ),
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "buildingId",value = "楼盘id" ),
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "imgUrl",value = "首页图片" ),
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "title",value = "标题" ),
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "desc",value = "描述" ),
-            @ApiImplicitParam(paramType = "Query",dataTypeClass = String.class,name = "url",value = "url" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "Date",name = "publishDate",value = "publishDate" )
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "dynamicId", value = "dynamicId主键")
     })
-    public  ResponseBean buildingDynamicUpdate(@RequestParam(required = false) String buildingId,
-                                            @RequestParam(required = false) String imgUrl,
-                                            @RequestParam(required = false) String title,
-                                            @RequestParam(required = false) String desc,
-                                            @RequestParam(required = false) String url,
-                                            @RequestParam(value = "publishDate",required = false) Date publishDate,
-                                            @RequestParam(required = false) String dynamicId){
-        HashMap<Object,Object> map= new HashMap<>();
-        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);
-        ResponseBean responseBean= iBuildingDynamicService.buildingDynamicUpdate(map);
+    public ResponseBean cancel(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<BuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        BuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(0);
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-
 }

whole-estate/src/main/java/com/example/wholeestate/controller/CustomerController.java

@@ -75,9 +75,9 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/customerSelectId/{id}", method = RequestMethod.GET)
     @ApiOperation(value = "会员详情", notes = "会员详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass=Integer.class, name = "id", value = "会员id"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "会员id"),
     })
-    public ResponseBean customerSelectId(@PathVariable(value = "id") Integer id, HttpSession session){
+    public ResponseBean customerSelectId(@PathVariable(value = "id") String id, HttpSession session){
         ResponseBean  responseBean = iCustomerService.customerSelectId(id);
         return responseBean;
     }

whole-estate/src/main/java/com/example/wholeestate/dao/BuildingDynamicMapper.java

@@ -22,14 +22,14 @@ public interface BuildingDynamicMapper extends BaseMapper<BuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<BuildingDynamic> buildingDynamicList(Page page);
+    IPage<BuildingDynamic> buildingDynamicList(Page page,@Param("name") String name,@Param("buildingId") String buildingId);
 
     /**
      * 详情
      * @param id
      * @return
      */
-    BuildingDynamic iBuildingDynamicSelectId(@Param("id") Integer id);
+    BuildingDynamic iBuildingDynamicSelectId(@Param("id") String id);
 
     /**
      * 新增动态

whole-estate/src/main/java/com/example/wholeestate/model/BuildingDynamic.java

@@ -52,7 +52,7 @@ public class BuildingDynamic implements Serializable {
     /**
      * 描述
      */
-    @TableField("DESC")
+    @TableField("`desc`")
     private String desc;
 
     /**
@@ -63,6 +63,7 @@ public class BuildingDynamic implements Serializable {
     /**
      * 0正常，-1删除
      */
+    @TableField("`status`")
     private Integer status;
 
     /**

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingDynamicService.java

@@ -20,14 +20,14 @@ public interface IBuildingDynamicService extends IService<BuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize);
+    ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize, String name, String buildingId);
 
     /**
      * 项目详情
      * @param id
      * @return
      */
-    ResponseBean iBuildingDynamicSelectId(Integer id);
+    ResponseBean iBuildingDynamicSelectId(String id);
 
     /**
      * 微信小程序 项目动态管理列表
@@ -62,4 +62,5 @@ public interface IBuildingDynamicService extends IService<BuildingDynamic> {
      * @return
      */
     ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map);
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/ICustomerService.java

@@ -26,7 +26,7 @@ public interface ICustomerService extends IService<Customer> {
      * @param id
      * @return
      */
-    ResponseBean customerSelectId(Integer id);
+    ResponseBean customerSelectId(String id);
 
     /**
      * 注册微信小程序用户

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingDynamicServiceImpl.java

@@ -53,13 +53,14 @@ public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMappe
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize, String name, String buildingId) {
         ResponseBean response= new ResponseBean();
 
         Page<BuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        IPage<BuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page);
+
+        IPage<BuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId);
         List<BuildingDynamic> buildingDynamicList=buildingDynamic.getRecords();
 
         HashMap hashMap= new HashMap<>();
@@ -72,7 +73,7 @@ public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMappe
     }
 
     @Override
-    public ResponseBean iBuildingDynamicSelectId(Integer id) {
+    public ResponseBean iBuildingDynamicSelectId(String id) {
         ResponseBean response= new ResponseBean();
         BuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
         response.addSuccess(buildingDynamicList);
@@ -173,4 +174,6 @@ public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMappe
         responseBean.addSuccess("成功");
         return responseBean;
     }
+
+
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -57,7 +57,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     }
 
     @Override
-    public ResponseBean customerSelectId(Integer id) {
+    public ResponseBean customerSelectId(String id) {
         ResponseBean response= new ResponseBean();
         QueryWrapper<Customer> customer=new QueryWrapper<>();
         customer.lambda().eq(Customer::getStatus,1);

whole-estate/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 9090
 spring:
   application:
     name: whole-estate

whole-estate/src/main/resources/mapper/BuildingDynamicMapper.xml

@@ -18,9 +18,15 @@
     </insert>
     <select id="buildingDynamicList" resultType="com.example.wholeestate.model.BuildingDynamic">
         select * from ta_building_dynamic where status>-1
+        <if test="name != null and name !=''">
+            and title like CONCAT('%', #{name} , '%')
+        </if>
+        <if test="buildingId != null and buildingId !=''">
+            and building_id = #{buildingId}
+        </if>
   </select>
 
-    <select id="iBuildingDynamicSelectId" parameterType="int" resultType="com.example.wholeestate.model.BuildingDynamic">
+    <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.example.wholeestate.model.BuildingDynamic">
       SELECT
             dynamic_id,
             building_id as buildingId,
@@ -34,8 +40,7 @@
         FROM
             ta_building_dynamic
         WHERE
-	      STATUS = 1
-	      and ta_building_dynamic.dynamic_id = #{id}
+	      ta_building_dynamic.dynamic_id = #{id}
     </select>
     <update id="buildingDynamicUpdate" parameterType="com.example.wholeestate.model.BuildingDynamic" >
         update ta_building_dynamic