bugfix

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -1,241 +1,240 @@
-package com.huiju.estateagents.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaPersonService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.web.bind.ServletRequestDataBinder;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.swing.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 项目动态表 前端控制器
- * </p>
- *
- * @author jobob
- * @since 2019-03-21
- */
-@RestController
-@RequestMapping("/api")
-public class TaBuildingDynamicController extends BaseController {
-
-    @Autowired
-    private ITaBuildingDynamicService iBuildingDynamicService;
-
-    @Autowired
-    private TaBuildingMapper taBuildingMapper;
-
-    @Autowired
-    private ITaPersonService taPersonService;
-
-    @InitBinder
-    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
-        binder.registerCustomEditor(Date.class, editor);
-    }
-
-    @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
-                                             @RequestParam("pageSize")Integer pageSize,
-                                             @RequestParam(required = false)String name,
-                                             @RequestParam(required = false)Integer cityId,
-                                             @RequestParam(required = false)String buildingId,
-                                             HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
-        return responseBean;
-    }
-
-    /**
-     * 活动列表
-     * @param pageNum
-     * @param pageSize
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
-                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                               @RequestParam(defaultValue = "false" )boolean mine,
-                                               HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = new ResponseBean();
-        if(mine){
-            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-            if (null == taPersons || taPersons.size() != 1) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
-        }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
-        }
-
-        return responseBean;
-    }
-
-    /**
-     * 活动详情
-     * @param dynamicId
-     * @return
-     */
-    @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
-    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-
-                                             HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        String buildingId = "";
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
-        return responseBean;
-    }
-
-    /**
-     * 添加活动报名
-     * @param taActivityDynamicEnlist
-     * @param request
-     * @return
-     */
-    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
-    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
-                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
-        return responseBean;
-    }
-
-
-    @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
-        ResponseBean responseBean = new ResponseBean();
-        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        dynamic.setStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
-        dynamic.setPublishDate(LocalDateTime.now());
-        dynamic.setCreateDate(LocalDateTime.now());
-        iBuildingDynamicService.save(dynamic);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
-        ResponseBean responseBean = new ResponseBean();
-        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
-        iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
-    public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
-        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean send(@PathVariable String dynamicId) {
-        ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
-        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
-        dynamic.setStatus(1);
-        dynamic.setPublishDate(LocalDateTime.now());
-        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean cancel(@PathVariable String dynamicId) {
-        ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
-        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
-        dynamic.setStatus(0);
-        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
-    public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
-        ResponseBean responseBean = new ResponseBean();
-        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
-        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
-        TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
-
-        if (null != building) {
-            dynamic.setBuildingName(building.getBuildingName());
-        }
-
-        responseBean.addSuccess(dynamic);
-        return responseBean;
-    }
-
-    @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
-    public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
-                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
-        Page<TaActivityDynamicEnlist> page = new Page<>();
-        page.setSize(pageSize);
-        page.setCurrent(pageNum);
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
-
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("list", signList);
-        map.put("total", page.getTotal());
-        map.put("pageNum", page.getCurrent());
-        map.put("pageSize", page.getSize());
-        return ResponseBean.success(map);
-    }
-
-    @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
-        ResponseBean responseBean = new ResponseBean();
-        JSONObject object = JSONObject.parseObject(parameter);
-        String dynamicId = object.getString("dynamicId");
-        String top = object.getString("top");
-        QueryWrapper<TaBuildingDynamic> taBuildingDynamic = new QueryWrapper<>();
-        taBuildingDynamic.eq("dynamic_id", dynamicId);
-        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(taBuildingDynamic);
-        if ("1".equals(top)) {
-            dynamic.setCreateDate(LocalDateTime.now());
-        } else {
-            dynamic.setIsEnlist("2");
-        }
-        iBuildingDynamicService.update(dynamic, taBuildingDynamic);
-        responseBean.addSuccess("成功");
-        return responseBean;
-    }
-    }
-
+package com.huiju.estateagents.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.swing.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 项目动态表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaBuildingDynamicController extends BaseController {
+
+    @Autowired
+    private ITaBuildingDynamicService iBuildingDynamicService;
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private ITaPersonService taPersonService;
+
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+
+    @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
+                                             @RequestParam("pageSize")Integer pageSize,
+                                             @RequestParam(required = false)String name,
+                                             @RequestParam(required = false)Integer cityId,
+                                             @RequestParam(required = false)String buildingId,
+                                             HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "id") String id, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
+        return responseBean;
+    }
+
+    /**
+     * 活动列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                               @RequestParam(defaultValue = "false" )boolean mine,
+                                               HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = new ResponseBean();
+        if(mine){
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
+        }else {
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @return
+     */
+    @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        String buildingId = "";
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
+        return responseBean;
+    }
+
+    /**
+     * 添加活动报名
+     * @param taActivityDynamicEnlist
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
+    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
+                                                HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setStatus(1);
+//        dynamic.setDynamicId(idGen.nextId()+"");
+        dynamic.setPublishDate(LocalDateTime.now());
+        dynamic.setCreateDate(LocalDateTime.now());
+        iBuildingDynamicService.save(dynamic);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
+        iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
+    public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
+        ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(1);
+        dynamic.setPublishDate(LocalDateTime.now());
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        dynamic.setStatus(0);
+        iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
+    public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
+        TaBuilding building= taBuildingMapper.selectBuilding(dynamic.getBuildingId());
+
+        if (null != building) {
+            dynamic.setBuildingName(building.getBuildingName());
+        }
+
+        responseBean.addSuccess(dynamic);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
+    public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                    @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
+        Page<TaActivityDynamicEnlist> page = new Page<>();
+        page.setSize(pageSize);
+        page.setCurrent(pageNum);
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", signList);
+        map.put("total", page.getTotal());
+        map.put("pageNum", page.getCurrent());
+        map.put("pageSize", page.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(parameter);
+        String dynamicId = object.getString("dynamicId");
+        String top = object.getString("top");
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamic = new QueryWrapper<>();
+        taBuildingDynamic.eq("dynamic_id", dynamicId);
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(taBuildingDynamic);
+        if ("1".equals(top)) {
+            dynamic.setCreateDate(LocalDateTime.now());
+        } else {
+            dynamic.setIsEnlist("2");
+        }
+        iBuildingDynamicService.update(dynamic, taBuildingDynamic);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
+    }
+

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -1,285 +1,286 @@
-package com.huiju.estateagents.service.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.ServletRequestDataBinder;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 项目动态表 服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-03-21
- */
-@Service
-public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicMapper, TaBuildingDynamic> implements ITaBuildingDynamicService {
-
-    @Autowired
-    private TaBuildingDynamicMapper buildingDynamicMapper;
-
-    @Autowired
-    private TaBuildingMapper buildingMapper;
-
-
-    @Autowired
-    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
-
-    @Autowired
-    private TaPersonMapper taPersonMapper;
-
-
-    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
-        binder.registerCustomEditor(Date.class, editor);
-    }
-    @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
-        Page<TaBuildingDynamic> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
-
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
-        List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
-        for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
-            QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
-            taActivityDynamicEnlist.eq("dynamic_id",taBuildingDynamic.getDynamicId());
-            taActivityDynamicEnlist.eq("building_id",taBuildingDynamic.getBuildingId());
-            int singCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-            taBuildingDynamic.setCount(singCount);
-        }
-
-        HashMap hashMap= new HashMap<>();
-        hashMap.put("list",buildingDynamicList);
-        hashMap.put("total",buildingDynamic.getTotal());
-        hashMap.put("pageNum",buildingDynamic.getCurrent());
-        hashMap.put("pageSize",buildingDynamic.getSize());
-        return ResponseBean.success(hashMap);
-    }
-
-    @Override
-    public ResponseBean iBuildingDynamicSelectId(String id) {
-        TaBuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
-        return ResponseBean.success(buildingDynamicList);
-    }
-
-    @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
-        Page<TaBuildingDynamic> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
-        buildingDynamicQueryWrapper.eq("status", "1");
-        buildingDynamicQueryWrapper.orderByDesc("create_date");
-        IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
-        List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
-        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
-        for (TaBuildingDynamic taBuildingDynamic:records){
-            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
-            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
-            if (null == taPerson){
-                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            activityDynamicEnlist.eq("phone", taPerson.getPhone());
-            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-            if (null == taActivityDynamicEnlistPhone){
-                taBuildingDynamic.setIsSing("1");
-            }
-            // 获取当前时间状态
-            taBuildingDynamic= timeCondition(taBuildingDynamic);
-        }
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("list", records);
-        map.put("total", buildingDynamicIPage.getTotal());
-        map.put("pageNum", buildingDynamicIPage.getCurrent());
-        map.put("pageSize", buildingDynamicIPage.getSize());
-        return ResponseBean.success(map);
-    }
-
-    @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
-
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
-        buildingDynamicQueryWrapper.eq("status",1);
-        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
-        // 当前阅读量加1
-
-        buildingDynamicMapper.updateById( tabuildingDynamic.setSaveNum(tabuildingDynamic.getSaveNum()+1));
-        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
-        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
-        if (null == taPerson){
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        // 查询是否报名
-        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
-        activityDynamicEnlist.eq("phone", taPerson.getPhone());
-        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
-        if (null == taActivityDynamicEnlistPhone){
-            buildingDynamic.setIsSing("1");
-        }
-        // 获取报名总数
-        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
-        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
-        taActivityDynamicEnlist.eq("building_id",buildingId);
-        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
-        buildingDynamic.setCount(applyCount);
-        // 获取当前时间状态
-        buildingDynamic = timeCondition(buildingDynamic);
-
-        return ResponseBean.success(buildingDynamic);
-    }
-
-    @Override
-    public ResponseBean buildingDynamicAdd(HashMap map) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-        Date time = (Date)map.get("publishDate");
-        Instant instant = time.toInstant();
-        ZoneId zoneId = ZoneId.systemDefault();
-        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
-
-//        buildingDynamic.setDynamicId(idGen.nextId()+"");
-        buildingDynamic.setBuildingId(map.get("buildingId")+"");
-        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
-        buildingDynamic.setDesc(map.get("desc")+"");
-        buildingDynamic.setUrl(map.get("url")+"");
-        buildingDynamic.setTitle(map.get("title")+"");
-        buildingDynamic.setPublishDate(localDateTime);
-        buildingDynamic.setStatus(1);
-        buildingDynamic.setCreateDate(LocalDateTime.now());
-
-        buildingDynamicMapper.insertBuildingDynamic(buildingDynamic);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean buildingDynamicDelete(String id) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-        buildingDynamic.setDynamicId(id);
-        buildingDynamic.setStatus(-1);
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.eq("dynamic_id", id);
-        buildingDynamicMapper.update(buildingDynamic,buildingDynamicQueryWrapper);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map) {
-        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
-
-        Date time = (Date)map.get("publishDate");
-        Instant instant = time.toInstant();
-        ZoneId zoneId = ZoneId.systemDefault();
-        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
-
-        buildingDynamic.setDynamicId(map.get("dynamicId")+"");
-        buildingDynamic.setBuildingId(map.get("buildingId")+"");
-        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
-        buildingDynamic.setDesc(map.get("desc")+"");
-        buildingDynamic.setUrl(map.get("url")+"");
-        buildingDynamic.setTitle(map.get("title")+"");
-        buildingDynamic.setPublishDate(localDateTime);
-        buildingDynamic.setStatus(1);
-        buildingDynamic.setCreateDate(LocalDateTime.now());
-
-        buildingDynamicMapper.buildingDynamicUpdate(buildingDynamic);
-        return ResponseBean.success("成功");
-    }
-
-    @Override
-    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
-        ResponseBean responseBean= new ResponseBean<>();
-        // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
-        // 判断当前活动是否满
-        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
-        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
-        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
-        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
-        // 当报名人数已满时，活动为已结束
-        if (contActivity >= personNum){
-            taBuildingDynamic.setIsEnlist("2");
-            buildingDynamicMapper.updateById(taBuildingDynamic);
-            responseBean.addError("当前报名人数已满");
-            return responseBean;
-        }
-        // 判断是否报名根据电话号码校验
-        taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
-        TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
-        if (null !=activityDynamicEnlist){
-            responseBean.addError("此号码已报名活动");
-            return responseBean;
-        }
-        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                               .setBuildingId(taBuildingDynamic.getDynamicId());
-        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
-        int joinNum = taBuildingDynamic.getEnlistNum()+1;
-        taBuildingDynamic.setEnlistNum(joinNum);
-        buildingDynamicMapper.updateById(taBuildingDynamic);
-        return ResponseBean.success(state);
-    }
-
-    @Override
-    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
-        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
-        return ResponseBean.success(signList);
-    }
-
-    /**
-     *     根据报名开始时间和结束时间判断当前图标状态
-     */
-    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
-        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
-            return  taBuildingDynamic;
-        }
-        // 报名截止时间
-        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        // 报名开始时间
-        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
-        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
-        }
-        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
-        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
-        }
-        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
-        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
-            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
-        }
-        return taBuildingDynamic;
-    }
-}
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.ServletRequestDataBinder;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 项目动态表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-21
+ */
+@Service
+public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicMapper, TaBuildingDynamic> implements ITaBuildingDynamicService {
+
+    @Autowired
+    private TaBuildingDynamicMapper buildingDynamicMapper;
+
+    @Autowired
+    private TaBuildingMapper buildingMapper;
+
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
+    @Override
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
+        Page<TaBuildingDynamic> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId);
+        List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
+        for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
+            QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();
+            taActivityDynamicEnlist.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+            taActivityDynamicEnlist.eq("building_id",taBuildingDynamic.getBuildingId());
+            int singCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+            taBuildingDynamic.setCount(singCount);
+        }
+
+        HashMap hashMap= new HashMap<>();
+        hashMap.put("list",buildingDynamicList);
+        hashMap.put("total",buildingDynamic.getTotal());
+        hashMap.put("pageNum",buildingDynamic.getCurrent());
+        hashMap.put("pageSize",buildingDynamic.getSize());
+        return ResponseBean.success(hashMap);
+    }
+
+    @Override
+    public ResponseBean iBuildingDynamicSelectId(String id) {
+        TaBuildingDynamic buildingDynamicList= buildingDynamicMapper.iBuildingDynamicSelectId(id);
+        return ResponseBean.success(buildingDynamicList);
+    }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
+        Page<TaBuildingDynamic> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
+        buildingDynamicQueryWrapper.eq("status", "1");
+        buildingDynamicQueryWrapper.orderByDesc("create_date");
+        IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
+        List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
+        // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）
+        for (TaBuildingDynamic taBuildingDynamic:records){
+            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+            if (null == taPerson){
+                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            activityDynamicEnlist.eq("phone", taPerson.getPhone());
+            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+            if (null == taActivityDynamicEnlistPhone){
+                taBuildingDynamic.setIsSing("1");
+            }
+            // 获取当前时间状态
+            taBuildingDynamic= timeCondition(taBuildingDynamic);
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("list", records);
+        map.put("total", buildingDynamicIPage.getTotal());
+        map.put("pageNum", buildingDynamicIPage.getCurrent());
+        map.put("pageSize", buildingDynamicIPage.getSize());
+        return ResponseBean.success(map);
+    }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
+
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        buildingDynamicQueryWrapper.eq("status",1);
+        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        // 当前阅读量加1
+        Integer saveNum = tabuildingDynamic.getSaveNum() == null ? 1:tabuildingDynamic.getSaveNum()+1;
+        tabuildingDynamic.setSaveNum(saveNum);
+        buildingDynamicMapper.updateById(tabuildingDynamic);
+        TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
+        if (null == taPerson){
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        // 查询是否报名
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
+        activityDynamicEnlist.eq("phone", taPerson.getPhone());
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
+        if (null == taActivityDynamicEnlistPhone){
+            buildingDynamic.setIsSing("1");
+        }
+        // 获取报名总数
+        QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
+        taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
+        taActivityDynamicEnlist.eq("building_id",buildingId);
+        int applyCount= taActivityDynamicEnlistMapper.selectCount(taActivityDynamicEnlist);
+        buildingDynamic.setCount(applyCount);
+        // 获取当前时间状态
+        buildingDynamic = timeCondition(buildingDynamic);
+
+        return ResponseBean.success(buildingDynamic);
+    }
+
+    @Override
+    public ResponseBean buildingDynamicAdd(HashMap map) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+        Date time = (Date)map.get("publishDate");
+        Instant instant = time.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+
+//        buildingDynamic.setDynamicId(idGen.nextId()+"");
+        buildingDynamic.setBuildingId(map.get("buildingId")+"");
+        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setDesc(map.get("desc")+"");
+        buildingDynamic.setUrl(map.get("url")+"");
+        buildingDynamic.setTitle(map.get("title")+"");
+        buildingDynamic.setPublishDate(localDateTime);
+        buildingDynamic.setStatus(1);
+        buildingDynamic.setCreateDate(LocalDateTime.now());
+
+        buildingDynamicMapper.insertBuildingDynamic(buildingDynamic);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean buildingDynamicDelete(String id) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+        buildingDynamic.setDynamicId(id);
+        buildingDynamic.setStatus(-1);
+        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", id);
+        buildingDynamicMapper.update(buildingDynamic,buildingDynamicQueryWrapper);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean buildingDynamicUpdate(HashMap<Object, Object> map) {
+        TaBuildingDynamic buildingDynamic= new TaBuildingDynamic();
+
+        Date time = (Date)map.get("publishDate");
+        Instant instant = time.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+
+        buildingDynamic.setDynamicId(map.get("dynamicId")+"");
+        buildingDynamic.setBuildingId(map.get("buildingId")+"");
+        buildingDynamic.setImgUrl((String) map.get("imgUrl"));
+        buildingDynamic.setDesc(map.get("desc")+"");
+        buildingDynamic.setUrl(map.get("url")+"");
+        buildingDynamic.setTitle(map.get("title")+"");
+        buildingDynamic.setPublishDate(localDateTime);
+        buildingDynamic.setStatus(1);
+        buildingDynamic.setCreateDate(LocalDateTime.now());
+
+        buildingDynamicMapper.buildingDynamicUpdate(buildingDynamic);
+        return ResponseBean.success("成功");
+    }
+
+    @Override
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+        ResponseBean responseBean= new ResponseBean<>();
+        // 查询当前活动属于哪个楼盘
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
+        // 判断当前活动是否满
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
+        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
+        // 当报名人数已满时，活动为已结束
+        if (contActivity >= personNum){
+            taBuildingDynamic.setIsEnlist("2");
+            buildingDynamicMapper.updateById(taBuildingDynamic);
+            responseBean.addError("当前报名人数已满");
+            return responseBean;
+        }
+        // 判断是否报名根据电话号码校验
+        taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
+        TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
+        if (null !=activityDynamicEnlist){
+            responseBean.addError("此号码已报名活动");
+            return responseBean;
+        }
+        taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
+                               .setBuildingId(taBuildingDynamic.getDynamicId());
+        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        int joinNum = taBuildingDynamic.getEnlistNum() == null ? 1:taBuildingDynamic.getEnlistNum()+1;
+        taBuildingDynamic.setEnlistNum(joinNum);
+        buildingDynamicMapper.updateById(taBuildingDynamic);
+        return ResponseBean.success(state);
+    }
+
+    @Override
+    public ResponseBean signList(Page<TaActivityDynamicEnlist> page, String dynamicId) {
+        List<TaActivityDynamicEnlist> signList= taActivityDynamicEnlistMapper.signList(page,dynamicId);
+        return ResponseBean.success(signList);
+    }
+
+    /**
+     *     根据报名开始时间和结束时间判断当前图标状态
+     */
+    private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
+        Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
+            return  taBuildingDynamic;
+        }
+        // 报名截止时间
+        Long enlistEnd = taBuildingDynamic.getEnlistEnd ().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // 报名开始时间
+        Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PROCESSING);
+        }
+        //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
+        if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_PREPARE);
+        }
+        //(3:结束)当前时间大于报名结束时间,并且报名状态为1
+        if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_FINISH);
+        }
+        return taBuildingDynamic;
+    }
+}