合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -495,7 +495,7 @@ public class HKOpenApi {
      *  * personName 卡号
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Integer personNo,String personName,String cardNo) {
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo) {
         byte [] fileByte = new byte[0];
         try {
             fileByte = faceImg.getBytes();

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -128,7 +128,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 Integer faceNum = (Integer) jsonObject.get("face_num");
 
              /*推送海康*/
-            String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
+            String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo());
 
               /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -477,6 +477,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
         TaUser user = new TaUser();
+        user.setHkPersonNo(idGen.nextId());
         user.setUserName(userName);
         user.setLoginName(phone);
         user.setGender(gender);
@@ -597,7 +598,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 添加人员
         Map<String,Object> parUser = Maps.newHashMap();
-        parUser.put("personNo",user.getHkPersonNo());
+        parUser.put("personNo", user.getHkPersonNo());
         parUser.put("personName",user.getUserName());
         parUser.put("phoneNo",user.getLoginName());
         parUser.put("deptUuid",deptUuid);

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java

@@ -1,9 +1,20 @@
 package com.community.huiju.controller;
 
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.service.ITpActivityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>
@@ -14,7 +25,88 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2018-12-28
  */
 @RestController
-@RequestMapping("/tp/activity")
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "活动 Api", description = "活动 Api")
 public class ActivityController extends BaseController {
 
+    @Autowired
+    private ITpActivityService iTpActivityService;
+
+    @ApiOperation(value = "查询活动列表数据", notes = "根据条件查询活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageNum第几页;" +
+                    "pageSize一页多少行;activityTitle活动标题;id活动编号")
+    })
+    @RequestMapping(value = "/activity/list", method = RequestMethod.POST)
+    public ResponseBean listQuery(@RequestBody String parameter, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpActivityService.listQuery(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加活动", notes = "添加活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityTitle活动标题;" +
+                    "activityCarouselImg轮播图;activityContent活动详情;contentImg活动内容配图;signUpMax活动人数上限;" +
+                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿")
+    })
+    @RequestMapping(value = "/activity/add", method = RequestMethod.POST)
+    public ResponseBean addActivity(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpActivityService.addActivity(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改活动", notes = "修改活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id活动编号;activityTitle活动标题;" +
+                    "activityCarouselImg轮播图;activityContent活动详情;contentImg活动内容配图;signUpMax活动人数上限;" +
+                    "registrationEndTime报名活动结束时间;sort权重;status状态 0 是已作废 1 是已发布   2 是草稿")
+    })
+    @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
+    public ResponseBean updateActivity(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpActivityService.updateActivity(parameter, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "活动作废", notes = "活动作废")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids", value = "活动id集合")
+    })
+    @RequestMapping(value = "/activity/invalid", method = RequestMethod.PUT)
+    public ResponseBean invalidActivity(@RequestBody List<Integer> ids, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpActivityService.updateStatusInvalid(ids, userElement);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "活动详情", notes = "活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "活动id")
+    })
+    @RequestMapping(value = "/activity/{id}", method = RequestMethod.GET)
+    public ResponseBean invalidActivity(@PathVariable(value = "id") Integer id, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpActivityService.getById(id);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java

@@ -0,0 +1,46 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ImageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: ImageController
+ * @Description: 图片上传以及获取url
+ * @date 2018/10/31
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "图片操作API", description = "图片操作API")
+public class ImageController extends BaseController {
+
+    @Autowired
+    private ImageServiceI imageService;
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -0,0 +1,67 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.ITransactionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业web端二手交易表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "二手租赁相关信息", description = "二手租赁相关信息Api")
+public class TransactionController extends BaseController {
+	
+	@Autowired
+	private ITransactionService transactionService;
+	
+	@ApiOperation(value = "根据搜索条件获取二手租赁列表", notes = "根据搜索条件获取二手租赁列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "transactionId", value = "帖子编号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "status", value = "发布状态"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "isReported", value = "是否被举报"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+	})
+	@RequestMapping(value = "/transactions",method = RequestMethod.GET)
+	public ResponseBean getList(@RequestParam(value = "transactionId", required = false) Integer transactionId,
+	                            @RequestParam(value = "transactionTitle", required = false) String transactionTitle,
+	                            @RequestParam(value = "status", required = false) String status,
+	                            @RequestParam(value = "isReported", required = false) String isReported,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpTransaction tpTransaction = new TpTransaction();
+		tpTransaction.setId(transactionId);
+		tpTransaction.setTransactionTitle(transactionTitle);
+		tpTransaction.setStatus(status);
+		tpTransaction.setIsReported(isReported);
+		tpTransaction.setCommunityId(userElement.getCommunityId());
+		responseBean = transactionService.getTransactionList(tpTransaction,pageNum,pageSize);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TdImagesMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TdImages;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 图片表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-29
+ */
+@Mapper
+public interface TdImagesMapper extends BaseMapper<TdImages> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -0,0 +1,21 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.community.huiju.model.TpTransaction;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业web端二手交易表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
+	
+	List<TpTransaction> selectListByParams(IPage page,@Param("tpTransaction") TpTransaction tpTransaction);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TdImages.java

@@ -0,0 +1,58 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 图片表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("td_images")
+public class TdImages implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 图片路径
+     */
+    private String imageUrl;
+
+    /**
+     * 图片关联的内容的id  根据类型来判断
+     */
+    private Integer uuid;
+
+    /**
+     *  服务：service, 公告：announcement , 活动：activity  租赁 ： transaction可添加
+     */
+    private String type;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -1,5 +1,7 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +26,9 @@ public class TpActivity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 小区id
      */

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业web端二手交易表
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_transaction")
+public class TpTransaction implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 住户app的用户id
+     */
+    private Integer taUserId;
+
+    /**
+     * 交易标题
+     */
+    private String transactionTitle;
+
+    /**
+     * 交易内容
+     */
+    private String transactionContent;
+
+    /**
+     * 查看人数
+     */
+    private Integer viewCount;
+
+    /**
+     * 0 是已作废 1 是已发布   
+     */
+    private String status;
+
+    /**
+     * 0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）
+     */
+    private String type;
+
+    /**
+     * 是否被举报 1是被举报 0或null是没被举报
+     */
+    private String isReported;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+    
+    /**
+     * 创建人
+     */
+    private String userName;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITdImagesService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TdImages;
+
+/**
+ * <p>
+ * 图片表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-29
+ */
+public interface ITdImagesService extends IService<TdImages> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpActivityService.java

@@ -1,6 +1,8 @@
 package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpActivity;
 
 import java.util.List;
@@ -18,8 +20,40 @@ public interface ITpActivityService extends IService<TpActivity> {
     /**
      * 根据条件查询 活动列表
      * @param parameter
+     * @param userElement 用户登录信息体
      * @return
      */
-    List<TpActivity> listQuery(String parameter);
+    ResponseBean listQuery(String parameter, UserElement userElement);
+
+    /**
+     * 添加活动列表
+     * @param parameter
+     * @param userElement
+     * @return
+     */
+    ResponseBean addActivity(String parameter, UserElement userElement);
+
+    /**
+     * 修改 活动
+     * @param parameter
+     * @param userElement
+     * @return
+     */
+    ResponseBean updateActivity(String parameter, UserElement userElement);
+
+    /**
+     * 根据 活动Id 查询
+     * @param id
+     * @return
+     */
+    ResponseBean getById(Integer id);
+
+    /**
+     * 批量活动 作废
+     * @param ids
+     * @param userElement 用户session信息体
+     * @return
+     */
+    ResponseBean updateStatusInvalid(List<Integer> ids, UserElement userElement);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITransactionService.java

@@ -0,0 +1,19 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpTransaction;
+
+/**
+ * <p>
+ * 物业web端二手交易表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+public interface ITransactionService extends IService<TpTransaction> {
+	
+	ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ImageServiceI.java

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author admin
+ * @Title: ImageServiceI
+ * @Description: TODO
+ * @date 2018/11/5
+ */
+public interface ImageServiceI {
+    String getImageUrl(MultipartFile uploadFile) throws IOException;
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.aliyun.oss.OSSClient;
+import com.community.huiju.service.ImageServiceI;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * @author weichaochao
+ * @Title: ImageServiceimpl
+ * @Description: 获取图片地址实现类
+ * @date 2018/11/5
+ */
+@Service("ImageService")
+public class ImageServiceimpl implements ImageServiceI {
+
+    private static String endpoint = "http://oss-cn-shanghai.aliyuncs.com";
+    private static String accessKeyId = "LTAIkc75dpkJw8Lb";
+    private static String accessKeySecret = "v4bvXCaix6vSDTCFfwSAdqV53iFEQw";
+    private static String bucketName = "jingcheng-h5temp";
+
+    @Override
+    public String getImageUrl(MultipartFile uploadFile) throws IOException {
+
+        String imgName = System.currentTimeMillis() + ".png";
+        // 创建OSSClient实例
+        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        // 上传
+        long time = System.currentTimeMillis();
+
+        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
+
+        // 关闭client
+        ossClient.shutdown();
+        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
+        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
+        return url;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TdTdImagesServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TdImagesMapper;
+import com.community.huiju.model.TdImages;
+import com.community.huiju.service.ITdImagesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 图片表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-29
+ */
+@Service
+public class TdTdImagesServiceImpl extends ServiceImpl<TdImagesMapper, TdImages> implements ITdImagesService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -2,15 +2,31 @@ package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 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.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.commom.utils.BeanTools;
+import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpActivityMapper;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TdImages;
 import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.User;
+import com.community.huiju.service.ITdImagesService;
 import com.community.huiju.service.ITpActivityService;
+import com.community.huiju.service.IUserService;
+import com.community.huiju.vo.ActivityVO;
+import com.google.common.collect.Maps;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -26,17 +42,185 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
     @Autowired
     private TpActivityMapper tpActivityMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Autowired
+    private ITdImagesService iTdImagesService;
+
+    // 物业用户
+    @Autowired
+    private IUserService iUserService;
+
     @Override
-    public List<TpActivity> listQuery(String parameter) {
+    public ResponseBean listQuery(String parameter, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
-        Integer pageNum = jsonObject.getInteger("pageNum");
-        Integer pageSize = jsonObject.getInteger("pageSize");
+        // TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
+        String id = jsonObject.getString("id");
+        String activityTitle = jsonObject.getString("activityTitle");
+        Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
+        Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
 
-        QueryWrapper<TpActivity> queryWrapper = new QueryWrapper<>();
         Page<TpActivity> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TpActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(id != null && !"".equals(id),"id", id);
+        queryWrapper.like(activityTitle != null && !"".equals(activityTitle),"activity_title", activityTitle);
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.orderByDesc("sort","create_date");
+
+        IPage<TpActivity> infoPage = tpActivityMapper.selectPage(page, queryWrapper);
+        List<TpActivity> activityList = infoPage.getRecords();
+        List<ActivityVO> activityVOList = activityList.stream().map(activity-> {
+            ActivityVO activityVO = new ActivityVO();
+            BeanUtils.copyProperties(activity, activityVO);
+            User createUser = iUserService.getById(activity.getCreateUser());
+            User updateUser = iUserService.getById(activity.getUpdateUser());
+            activityVO.setCrateUserName(createUser.getUserName());
+            activityVO.setUpdateUserName(updateUser.getUserName());
+            return activityVO;
+        }).collect(Collectors.toList());
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("list", activityVOList);
+        map.put("total", infoPage.getTotal());
+        map.put("pageNum", infoPage.getCurrent());
+        map.put("pageSize", infoPage.getSize());
+
+        responseBean.addSuccess(map);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addActivity(String parameter, UserElement userElement) {
+
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        // 活动配图
+        String [] contentImgArray = (String[]) jsonObject.get("contentImg");
+        TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
+        tpActivity.setCommunityId(userElement.getCommunityId());
+        tpActivity.setUpdateDate(LocalDateTime.now());
+        tpActivity.setUpdateUser(userElement.getId());
+        tpActivity.setCreateDate(LocalDateTime.now());
+        tpActivity.setCreateUser(userElement.getId());
+
+        int row = tpActivityMapper.insert(tpActivity);
+
+        // 插入图片
+        insertImg(contentImgArray, userElement, tpActivity);
+
+        if (row <= 0) {
+            throw new WisdomException("操作失败!");
+        } else {
+            responseBean.addSuccess("操作成功!");
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 插入图片
+     * @param contentImgArray
+     * @param userElement
+     * @param tpActivity
+     */
+    private void insertImg(String [] contentImgArray, UserElement userElement, TpActivity tpActivity) {
+        if (contentImgArray == null) {
+            return;
+        }
+        for (String img : contentImgArray) {
+            TdImages tdImages = new TdImages();
+            tdImages.setCreateTime(LocalDateTime.now());
+            tdImages.setCreateUser(userElement.getId());
+            tdImages.setImageUrl(img);
+            tdImages.setType("activity");
+            tdImages.setUuid(tpActivity.getId());
+
+            tdImagesMapper.insert(tdImages);
+        }
+    }
+
+    @Override
+    public ResponseBean updateActivity(String parameter, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+
+        // 活动配图
+        String [] contentImgArray = (String[]) jsonObject.get("contentImg");
+        TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
+
+        TpActivity selectTpActivity = tpActivityMapper.selectById(tpActivity.getId());
+        if (null == selectTpActivity) {
+            responseBean.addError("活动不存在!");
+            return responseBean;
+        }
+
+        BeanTools.copyProperties(tpActivity, selectTpActivity);
+
+        selectTpActivity.setUpdateDate(LocalDateTime.now());
+        selectTpActivity.setUpdateUser(userElement.getId());
+
+        int row = tpActivityMapper.updateById(selectTpActivity);
+
+        // 先将原图删除!
+        if (contentImgArray.length > 0) {
+            QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("uuid", tpActivity.getId());
+            queryWrapper.eq("type", "activity");
+            tdImagesMapper.delete(queryWrapper);
+        }
+
+        // 插入图片
+        insertImg(contentImgArray, userElement, tpActivity);
+
+        if (row <= 0) {
+            throw new WisdomException("操作失败!");
+        } else {
+            responseBean.addSuccess("操作成功!");
+        }
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getById(Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TpActivity tpActivity = tpActivityMapper.selectById(id);
+
+        QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("uuid", tpActivity.getId());
+        queryWrapper.eq("type", "activity");
+        List<TdImages> imagesList = tdImagesMapper.selectList(queryWrapper);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("info", tpActivity);
+        map.put("contentImg", imagesList);
+
+        responseBean.addSuccess(map);
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateStatusInvalid(List<Integer> ids, UserElement userElement) {
+
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> tpActivityList = (List<TpActivity>) listByIds(ids);
+        tpActivityList.stream().forEach(e-> {
+            e.setStatus("0");
+            e.setUpdateUser(userElement.getId());
+        });
+        updateBatchById(tpActivityList);
+
+        responseBean.addSuccess("操作成功!");
 
-        return null;
+        return responseBean;
     }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -0,0 +1,47 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+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.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.TpTransaction;
+import com.community.huiju.service.ITransactionService;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端二手交易表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-29
+ */
+@Service
+public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpTransaction> implements ITransactionService {
+	
+	@Autowired
+	private TpTransactionMapper tpTransactionMapper;
+	
+	@Override
+	public ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		// 分页查询
+		List<TpTransaction> list = tpTransactionMapper.selectListByParams(page,tpTransaction);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("list",list);
+		map.put("total",page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/ActivityVO.java

@@ -0,0 +1,20 @@
+package com.community.huiju.vo;
+
+import com.community.huiju.model.TpActivity;
+import lombok.Data;
+
+@Data
+public class ActivityVO extends TpActivity {
+
+    /**
+     * 创建人
+     */
+    private String crateUserName;
+
+    /**
+     * 更新人
+     */
+    private String updateUserName;
+
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/TdImagesMapper.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.community.huiju.dao.TdImagesMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -0,0 +1,35 @@
+<?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.community.huiju.dao.TpTransactionMapper">
+    <select id="selectListByParams" resultType="com.community.huiju.model.TpTransaction">
+        SELECT
+            t.id,
+            t.community_id AS communityId,
+            t.transaction_title AS transactionTitle,
+            t.view_count AS viewCount,
+            t.`status`,
+            t.type,
+            t.is_reported AS isReported,
+            t.create_date AS createDate,
+            u.user_name AS userName
+        FROM
+            tp_transaction t
+            LEFT JOIN ta_user u ON t.ta_user_id = u.id
+            AND u.community_id = #{tpTransaction.communityId}
+        WHERE
+            1 = 1
+            AND t.community_id = #{tpTransaction.communityId}
+        <if test="tpTransaction.id != null and tpTransaction.id != ''">
+            and t.id = #{tpTransaction.id}
+        </if>
+        <if test="tpTransaction.transactionTitle != null and tpTransaction.transactionTitle != ''">
+            and t.transaction_title like concat('%',#{tpTransaction.transactionTitle,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="tpTransaction.status != null and tpTransaction.status != ''">
+            and t.status = #{tpTransaction.status}
+        </if>
+        <if test="tpTransaction.isReported != null and tpTransaction.isReported != ''">
+            and t.is_reported = #{tpTransaction.isReported}
+        </if>
+    </select>
+</mapper>

VUECODE/smart-property-manage/src/api/activity.js

@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+
+// 查询活动数据列表
+export function activityList(data) {
+  return request({
+    url: '/activity/list',
+    method: 'post',
+    data: {
+      id: data.id,
+      activityTitle: data.activityTitle,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+
+// 添加活动
+export function addActivity(data) {
+  return request({
+    url: '/activity/add',
+    method: 'post',
+    data: {
+      activityTitle: data.activityTitle,
+      activityCarouselImg: data.activityCarouselImg, // 轮播图
+      activityContent: data.activityContent, // 活动内容详细
+      contentImg: data.contentImg, // 活动内容配图
+      signUpMax: data.signUpMax, //  活动人数上限
+      registrationEndTime: data.registrationEndTime, // 报名活动结束时间
+      sort: data.sort, // 权重
+      status: data.status // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+    }
+  })
+}
+
+// 修改活动
+export function updateActivity(data) {
+  return request({
+    url: '/activity/update',
+    method: 'put',
+    data: {
+      id: data.id,
+      activityTitle: data.activityTitle,
+      activityCarouselImg: data.activityCarouselImg, // 轮播图
+      activityContent: data.activityContent, // 活动内容详细
+      contentImg: data.contentImg, // 活动内容配图
+      signUpMax: data.signUpMax, //  活动人数上限
+      registrationEndTime: data.registrationEndTime, // 报名活动结束时间
+      sort: data.sort, // 权重
+      status: data.status // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+    }
+  })
+}
+
+// 查询 活动详情
+export function activityById(id) {
+  return request({
+    url: '/activity/' + id,
+    method: 'get'
+  })
+}
+
+// 批量活动作废
+export function invalidActivity(data) {
+  return request({
+    url: '/activity/invalid',
+    method: 'put',
+    data: {
+      ids: data
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/api/transaction.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/transactions',
+    method: 'get',
+    params: query
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -115,6 +115,27 @@ export const constantRouterMap = [
         component: () => import('@/views/social/transaction/index'),
         name: 'transaction-import',
         meta: { title: '二手求购租赁管理', icon: 'table' }
+      },
+      {
+        path: '/activity/add',
+        component: () => import('@/views/social/activity/add/index'),
+        name: 'activity-add',
+        hidden: true,
+        meta: { title: '添加活动', icon: 'table' }
+      },
+      {
+        path: '/activity/edi',
+        component: () => import('@/views/social/activity/edi/index'),
+        name: 'activity-edi',
+        hidden: true,
+        meta: { title: '修改活动', icon: 'table' }
+      },
+      {
+        path: '/activity/info',
+        component: () => import('@/views/social/activity/info/index'),
+        name: 'activity-info',
+        hidden: true,
+        meta: { title: '活动详情', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/index.js

@@ -6,9 +6,11 @@ import banner from './modules/banner'
 import community from './modules/community'
 import trunkIndex from './modules/trunkIndex'
 import batchImport from './modules/batchImport'
+import transaction from './modules/transaction'
 import getters from './getters'
 import announcement from './modules/announcement'
 import buildingOwnerInfo from './modules/buildingOwnerInfo'
+import activity from './modules/activity'
 
 Vue.use(Vuex)
 
@@ -21,7 +23,9 @@ const store = new Vuex.Store({
     trunkIndex,
     batchImport,
     buildingOwnerInfo,
-    announcement
+    announcement,
+    activity,
+    transaction
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/activity.js

@@ -0,0 +1,58 @@
+import { activityList, addActivity, updateActivity, activityById, invalidActivity  } from '@/api/activity'
+
+const activityInfo = {
+  state: {
+  },
+  mutations: {
+  },
+  actions: {
+    ActivityList({ commit, state }, data) { // 查询数据列表
+      return new Promise((resolve, reject) => {
+        activityList(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    AddActivity({ commit, state }, data) { // 添加活动
+      return new Promise((resolve, reject) => {
+        addActivity(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    UpdateActivity({ commit, state }, data) { // 修改活动
+      return new Promise((resolve, reject) => {
+        updateActivity(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ActivityById({ commit, state }, data) { // 查询活动详情
+      return new Promise((resolve, reject) => {
+        activityById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    InvalidActivity({ commit, state }, data) { // 批量活动作废
+      return new Promise((resolve, reject) => {
+        invalidActivity(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+
+  }
+}
+
+export default activityInfo

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -0,0 +1,36 @@
+import { fetchList } from '@/api/transaction'
+
+const transaction = {
+  namespaced: true,
+  state: {
+    total: '',
+    transactionList: []
+  },
+
+  mutations: {
+    SET_LIST: (state, list) => {
+      state.transactionList = list
+    },
+    SET_TOTAL: (state, total) => {
+      state.total = total
+    }
+  },
+
+  actions: {
+    // fetchList,获取社区列表
+    FetchTransactionList({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        fetchList(listQuery).then(response => {
+          const data = response.data
+          commit('SET_LIST', data.list)
+          commit('SET_TOTAL', data.total)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default transaction

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -0,0 +1,206 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
+      <el-form-item label="活动标题" prop="activityTitle">
+        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
+      </el-form-item>
+      <el-form-item label="活动轮播图" prop="activityCarouselImg">
+        <el-upload
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          class="avatar-uploader"
+          name="uploadFiles"
+          action="http://localhost:8086/property-api/uploadimage">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="活动详细描述">
+        <el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      </el-form-item>
+      <el-form-item label="活动配图">
+        <el-upload
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessContentImg"
+          name="uploadFiles"
+          action="http://localhost:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrl" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="报名人数上限" prop="signUpMax">
+        <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+      </el-form-item>
+      <el-form-item label="报名截止时间" prop="registrationEndTime">
+        <el-date-picker
+          v-model="ruleForm.registrationEndTime"
+          type="date"
+          placeholder="选择日期"/>
+      </el-form-item>
+      <el-form-item label="权重值" prop="sort">
+        <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="resetForm('ruleForm')">存为草稿</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      ruleForm: {
+        activityTitle: '',
+        activityCarouselImg: '', // 轮播图
+        activityContent: '', // 活动内容详细
+        contentImg: [], // 活动内容配图
+        signUpMax: '', //  活动人数上限
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      imageUrl: '', // 轮播图预览
+      rules: {
+        activityTitle: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
+        ],
+        activityContent: [
+          { required: true, message: '活动详细描述', trigger: 'blur' }
+        ],
+        signUpMax: [
+          { required: true, message: '请输入报名人数上限', trigger: 'blur' }
+        ],
+        registrationEndTime: [
+          { type: 'date', required: true, message: '报名截止时间', trigger: 'change' }
+        ],
+        sort: [
+          { required: true, message: '请输入权重值', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    submitForm(formName) {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            return false
+          }
+          this.ruleForm.status = 1 // 发布状态
+          this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'activity-index' })
+              loading.close()
+              return
+            }
+            this.$message.error(res.message)
+            loading.close()
+          }).catch(() => {
+            console.log('error AddActivity')
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleAvatarSuccess(res, file) { // 轮播图上传回调
+      this.ruleForm.activityCarouselImg = res.data[0]
+      this.imageUrl = URL.createObjectURL(file.raw)
+    },
+    beforeAvatarUpload(file) { // 轮播图上传前操作
+      // const isJPG = file.type === 'image/jpeg'
+      // const isLt2M = file.size / 1024 / 1024 < 2
+      //
+      // if (!isJPG) {
+      //   this.$message.error('上传头像图片只能是 JPG 格式!')
+      // }
+      // if (!isLt2M) {
+      //   this.$message.error('上传头像图片大小不能超过 2MB!')
+      // }
+      // return isJPG && isLt2M
+    },
+    handleRemove(file, fileList) { // 活动配图移除时
+      this.ruleForm.contentImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.ruleForm.contentImg.push(fileList[i].response.data[0])
+      }
+      console.log(file, fileList)
+    },
+    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.ruleForm.contentImg.push(resImg)
+      console.log('上传活动配图成功时回调!')
+    },
+    sortHandleChange(value) { // 权重值
+      this.ruleForm.sort = value
+      console.log(value)
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue

@@ -0,0 +1,210 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
+      <el-form-item label="活动标题" prop="activityTitle">
+        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
+      </el-form-item>
+      <el-form-item label="活动轮播图" prop="activityCarouselImg">
+        <el-upload
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          class="avatar-uploader"
+          name="uploadFiles"
+          action="http://localhost:8086/property-api/uploadimage">
+          <img v-if="imageUrl" :src="imageUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="活动详细描述">
+        <el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      </el-form-item>
+      <el-form-item label="活动配图">
+        <el-upload
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessContentImg"
+          name="uploadFiles"
+          action="http://localhost:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrl" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="报名人数上限" prop="signUpMax">
+        <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
+      </el-form-item>
+      <el-form-item label="报名截止时间" prop="registrationEndTime">
+        <el-date-picker
+          v-model="ruleForm.registrationEndTime"
+          type="date"
+          placeholder="选择日期"/>
+      </el-form-item>
+      <el-form-item label="权重值" prop="sort">
+        <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="resetForm('ruleForm')">存为草稿</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        activityTitle: '',
+        activityCarouselImg: '', // 轮播图
+        activityContent: '', // 活动内容详细
+        contentImg: [], // 活动内容配图
+        signUpMax: '', //  活动人数上限
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      },
+      imageUrl: '', // 轮播图预览
+      rules: {
+        activityTitle: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
+        ],
+        activityContent: [
+          { required: true, message: '活动详细描述', trigger: 'blur' }
+        ],
+        signUpMax: [
+          { required: true, message: '请输入报名人数上限', trigger: 'blur' }
+        ],
+        registrationEndTime: [
+          { type: 'date', required: true, message: '报名截止时间', trigger: 'change' }
+        ],
+        sort: [
+          { required: true, message: '请输入权重值', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    submitForm(formName) {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            return false
+          }
+          this.ruleForm.status = 1 // 发布状态
+          this.$store.dispatch('UpdateActivity', this.ruleForm).then((res) => {
+            if (res.code === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'activity-index' })
+              loading.close()
+              return
+            }
+            this.$message.error(res.message)
+            loading.close()
+          }).catch(() => {
+            console.log('error UpdateActivity')
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleAvatarSuccess(res, file) { // 轮播图上传回调
+      this.ruleForm.activityCarouselImg = res.data[0]
+      this.imageUrl = URL.createObjectURL(file.raw)
+    },
+    beforeAvatarUpload(file) { // 轮播图上传前操作
+      // const isJPG = file.type === 'image/jpeg'
+      // const isLt2M = file.size / 1024 / 1024 < 2
+      //
+      // if (!isJPG) {
+      //   this.$message.error('上传头像图片只能是 JPG 格式!')
+      // }
+      // if (!isLt2M) {
+      //   this.$message.error('上传头像图片大小不能超过 2MB!')
+      // }
+      // return isJPG && isLt2M
+    },
+    handleRemove(file, fileList) { // 活动配图移除时
+      this.ruleForm.contentImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.ruleForm.contentImg.push(fileList[i].response.data[0])
+      }
+      console.log(file, fileList)
+    },
+    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.ruleForm.contentImg.push(resImg)
+      console.log('上传活动配图成功时回调!')
+    },
+    sortHandleChange(value) { // 权重值
+      this.ruleForm.sort = value
+      console.log(value)
+    },
+    getById() { // 根据 id 查询活动详情
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+}
+.ruleForm {
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

VUECODE/smart-property-manage/src/views/social/activity/index.vue

@@ -1,81 +1,102 @@
 
 <template>
   <div id="root">
-    <el-form :inline="true" :model="formInline" class="form-inline">
+    <el-form :inline="true" :model="listQuery" class="form-inline">
       <el-form-item label="活动编号">
-        <el-input v-model="formInline.user" placeholder="活动编号"/>
+        <el-input v-model="listQuery.id" placeholder="活动编号"/>
       </el-form-item>
       <el-form-item label="活动标题">
-        <el-input v-model="formInline.user" placeholder="活动标题"/>
+        <el-input v-model="listQuery.activityTitle" placeholder="活动标题"/>
       </el-form-item>
       <!--<el-form-item label="活动内容">-->
-      <!--<el-input v-model="formInline.user" placeholder="审批人"/>-->
+      <!--<el-input v-model="formInline.user" placeholder="活动内容"/>-->
       <!--</el-form-item>-->
       <el-form-item>
-        <el-button type="info">清空</el-button>
+        <el-button type="info" @click="clearListQuery">清空</el-button>
         <el-button type="primary" @click="onSubmit">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="operation">
-      <el-button type="primary">主要按钮</el-button>
-      <el-button type="warning">警告按钮</el-button>
-      <el-button type="danger">危险按钮</el-button>
+      <el-button type="primary" @click="addActivity">添加</el-button>
+      <el-button type="warning" @click="ediActivity">修改</el-button>
+      <el-button type="danger" >作废</el-button>
     </div>
     <el-table
+      v-loading="listLoading"
       ref="multipleTable"
-      :data="tableData3"
+      :data="list"
       tooltip-effect="dark"
       style="width: 100%; margin-top: 20px;"
-      border="true"
+      border
       @selection-change="handleSelectionChange">
       <el-table-column
-        type="selection"/>
+        type="selection"
+        align="center"/>
       <el-table-column
-        label="编号">
+        label="编号"
+        align="center">
         <template slot-scope="scope">{{ scope.row.id }}</template>
       </el-table-column>
       <el-table-column
-        prop="name"
-        label="标题"/>
+        prop="activityTitle"
+        label="标题"
+        align="center"/>
       <el-table-column
-        prop="address"
+        prop="viewCount"
         label="阅读量"
-        show-overflow-tooltip/>
+        show-overflow-tooltip
+        align="center"/>
       <el-table-column
-        prop="name"
-        label="报名上限"/>
+        prop="signUpMax"
+        label="报名上限"
+        align="center"/>
       <el-table-column
-        prop="name"
-        label="已报名人数"/>
+        prop="signUpCount"
+        label="已报名人数"
+        align="center"/>
       <el-table-column
-        prop="name"
-        label="状态"/>
+        prop="status"
+        label="状态"
+        align="center">
+        <template slot-scope="scope">{{ getStatus(scope.row.status) }}</template>
+      </el-table-column>
       <el-table-column
-        prop="name"
-        label="权重"/>
+        prop="sort"
+        label="权重"
+        align="center"/>
       <el-table-column
-        prop="name"
-        label="发布时间"/>
+        prop="createDate"
+        label="发布时间"
+        align="center">
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
       <el-table-column
-        prop="name"
+        prop="registrationEndTime"
         label="报名截止时间"
-        width="120"/>
+        align="center">
+        <template slot-scope="scope">{{ formatDate(scope.row.registrationEndTime) }}</template>
+      </el-table-column>
       <el-table-column
-        prop="name"
-        label="发布人"/>
+        prop="crateUserName"
+        label="发布人"
+        align="center"/>
       <el-table-column
-        prop="name"
-        label="修改时间"/>
+        prop="updateDate"
+        label="修改时间"
+        align="center">
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+      </el-table-column>
       <el-table-column
-        prop="name"
-        label="修改人"/>
+        prop="updateUserName"
+        label="修改人"
+        align="center"/>
     </el-table>
     <div class="block">
       <el-pagination
-        :current-page="currentPage4"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
-        :total="400"
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 40, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
@@ -87,33 +108,98 @@ export default {
   name: 'Index',
   data() {
     return {
-      formInline: {
-        user: '',
-        region: '',
-        currentPage4: 4
+      listQuery: {
+        id: '',
+        activityTitle: '',
+        pageNum: 1,
+        pageSize: 10
       },
-      tableData3: [{
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }]
+      total: 0, // 数据总数
+      list: [],
+      listLoading: true // 表格加载框
     }
   },
+  mounted() {
+    this.activityList()
+  },
   methods: {
     onSubmit() {
-      console.log('submit!')
+      this.listQuery.pageNum = 1
+      this.activityList()
+    },
+    clearListQuery() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.id = ''
+      this.listQuery.activityTitle = ''
+      this.activityList()
     },
     handleSelectionChange(val) { // 表格选择
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = val
+      this.activityList()
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.activityList()
+    },
+    activityList() { // 查询列表
+      this.listLoading = true
+      this.$store.dispatch('ActivityList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.list = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ActivityList get')
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    getStatus(status) { // 获取状态
+      let statusName = ''
+      switch (status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+        case '3':
+          statusName = '已修改'
+          break
+        default:
+          statusName = '状态异常'
+      }
+      return statusName
+    },
+    addActivity() { // 添加活动
+      this.$router.push({ name: 'activity-add' })
+    },
+    ediActivity() { // 修改活动
+      this.$router.push({ name: 'activity-edi' })
+    },
+    infoActivity() { // 查看活动
+      this.$router.push({ name: 'activity-info' })
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>查看</div>
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped>
+
+</style>

VUECODE/smart-property-manage/src/views/social/transaction/index.vue

@@ -1,13 +1,272 @@
-
 <template>
-  <div>二手求购租赁</div>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="listQuery.transactionId" placeholder="帖子编号" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-input v-model="listQuery.transactionTitle" placeholder="帖子标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
+      <el-select v-model="listQuery.status" placeholder="发布状态" style="width: 130px" class="filter-item">
+        <el-option label="已发布" value="1"/>
+        <el-option label="已作废" value="0"/>
+      </el-select>
+      <el-select v-model="listQuery.isReported" placeholder="是否被举报" class="filter-item" style="width: 130px">
+        <el-option label="无举报" value="0"/>
+        <el-option label="被举报" value="1"/>
+      </el-select>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
+    </div>
+
+    <el-table
+      v-loading="listLoading"
+      :key="tableKey"
+      :data="transactionList"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%; margin-top: 20px;"
+      @sort-change="sortChange">
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        width="50"/>
+      <el-table-column label="编号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type === '0'">二手</span>
+          <span v-if="scope.row.type === '1'">求购</span>
+          <span v-if="scope.row.type === '2'">租赁</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.transactionTitle }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="查看人数" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.viewCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布人" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.userName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.createDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布状态" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status === '0'">已作废</span>
+          <span v-if="scope.row.status === '1'">已发布</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="举报状态" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isReported === '1' ? "被举报" : "无举报" }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
+    <el-pagination
+      :total="total"
+      :current-page="listQuery.pageNum"
+      :page-sizes="[5, 10, 20, 30]"
+      :page-size="listQuery.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"/>
+
+  </div>
 </template>
+
 <script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+
 export default {
-  name: 'Index'
+  computed: {
+    ...mapState('transaction', {
+      transactionList: s => s.transactionList,
+      total: s => s.total
+    })
+  },
+  directives: { waves },
+  data() {
+    var _self = this
+    return {
+      events: {
+        click: (e) => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          _self.detail.longitude = e.lnglat.lng
+          _self.detail.latitude = e.lnglat.lat
+        }
+      },
+      markers: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      listLoading: true,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 20,
+        transactionId: undefined,
+        transactionTitle: undefined,
+        status: undefined,
+        isReported: undefined
+      },
+      tableKey: 0,
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    ...mapMutations('transaction', {
+    }),
+    ...mapActions('transaction', [
+      'FetchTransactionList'
+    ]),
+    setCurrent(item) {
+      this.setDetail({ ...item })
+    },
+    getList() {
+      this.listLoading = true
+      this.FetchTransactionList(this.listQuery).then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
+    clearListQuery() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.transactionId = undefined
+      this.listQuery.transactionTitle = undefined
+      this.listQuery.status = undefined
+      this.listQuery.isReported = undefined
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.getList()
+    },
+    handleModifyStatus(row, status) {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      })
+      row.status = status
+    },
+    sortChange(data) {
+      const { prop, order } = data
+      if (prop === 'id') {
+        this.sortByID(order)
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+    handleUpdate(row) {
+      this.setCurrent(row)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleLook(row) {
+      this.setCurrent(row)
+      this.dialogLookFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleCreate() {
+      this.resetDetail()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    handleDelete(row) {
+      this.$notify({
+        title: '成功',
+        message: '删除成功',
+        type: 'success',
+        duration: 2000
+      })
+      const index = this.list.indexOf(row)
+      this.list.splice(index, 1)
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+        const data = this.formatJson(filterVal, this.list)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: 'table-list'
+        })
+        this.downloadLoading = false
+      })
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    },
+  }
 }
 </script>
-
-<style scoped>
-
-</style>