Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -154,7 +154,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 				throw new Exception("更新用户公司信息失败");
 			}
 		}
-
+		
+		taUser.setLoginPassword(null);
 		if (taUserMapper.updateById(taUser) < 1) {
 			throw new Exception("更新用户信息失败");
 		}

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

@@ -234,6 +234,10 @@ public class TaBuildingDynamicController extends BaseController {
         }
 
         TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
+        // TODO 看代码里面是 is_enlist = 1 才是允许报名
+        if (buildingDynamic.getIsEnlist().intValue() != 1) {
+            return ResponseBean.error("活动不允许报名", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
@@ -270,7 +274,7 @@ public class TaBuildingDynamicController extends BaseController {
     }
     
     
-    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
+    @ApiOperation(value = "后端活动添加", notes = "后端活动添加")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
     })

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -15,6 +15,7 @@ import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.TaRoleButton;
 import com.huiju.estateagents.service.ISysButtonInMenuService;
 import com.huiju.estateagents.service.ITaRoleButtonService;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.jsonwebtoken.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,6 +45,9 @@ public class AccessInterceptor implements HandlerInterceptor {
     @Autowired
     private ITaButtonUriMapService taButtonUriMapService;
     
+    @Autowired
+    private ITaThirdPartyMiniappConfigService taThirdPartyMiniappConfigService;
+    
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
@@ -83,6 +87,22 @@ public class AccessInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        //第三方权限校验
+        String tokenHeader = request.getHeader("x-token");
+        if (!StringUtils.isEmpty(tokenHeader)){
+            String appidHeader = request.getHeader("x-appid");
+            String nowHeader = request.getHeader("x-time");
+            String thirdState = taThirdPartyMiniappConfigService.checkToken(tokenHeader,appidHeader,nowHeader);
+            if (thirdState.equals("success")){
+                return true;
+            }
+    
+            ResponseBean resp = ResponseBean.error(thirdState , ResponseBean.ERROR_AUTH_FAIL);
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+        
         // 白名单跳过
         if (inWhiteList(request)) {
             return true;

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

@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,9 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITaNewsService iTaNewsService;
+
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
@@ -100,6 +105,16 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         if (null == taBuilding) {
             throw new EstaException("楼盘不存在！");
         }
+        if (taNewsType.getStatus() != null && taNewsType.getStatus() == -1) {
+            QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
+            queryWrapper.gt("status", -1);
+            queryWrapper.eq("news_type_id", taNewsType.getNewsTypeId());
+            Integer newsCount = iTaNewsService.count(queryWrapper);
+            if (newsCount != null && newsCount > 0) {
+                throw new EstaException("有资讯正在使用此资讯类型！");
+            }
+        }
+
     }
 
     @Override

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

@@ -12,11 +12,13 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
@@ -58,6 +60,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     ITaUserService userService;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -189,7 +194,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
         taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
+
+        TaBuilding building = taBuildingMapper.selectById(params.getString("intention"));
+        taRecommendCustomer.setIntention(building.getBuildingName());
+
         taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
         taRecommendCustomer.setDemandType(params.getString("demandType"));
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -0,0 +1,151 @@
+package com.huiju.estateagents.third.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+public class TaThirdPartyMiniappConfigController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaThirdPartyMiniappConfigController.class);
+
+    @Autowired
+    public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/thirdPartyMiniapp",method= RequestMethod.GET)
+    public ResponseBean taThirdPartyMiniappConfigList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaThirdPartyMiniappConfig> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+
+            IPage<TaThirdPartyMiniappConfig> result = iTaThirdPartyMiniappConfigService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taThirdPartyMiniappConfigList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taThirdPartyMiniappConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/thirdPartyMiniapp/add",method= RequestMethod.POST)
+    public ResponseBean taThirdPartyMiniappConfigAdd(@RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
+            if (iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig)){
+                responseBean.addSuccess(taThirdPartyMiniappConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taThirdPartyMiniappConfigAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taThirdPartyMiniappConfig/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taThirdPartyMiniappConfigDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaThirdPartyMiniappConfigService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taThirdPartyMiniappConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taThirdPartyMiniappConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/thirdPartyMiniapp/update",method= RequestMethod.PUT)
+    public ResponseBean taThirdPartyMiniappConfigUpdate(@RequestBody TaThirdPartyMiniappConfig taThirdPartyMiniappConfig){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaThirdPartyMiniappConfigService.updateById(taThirdPartyMiniappConfig)){
+                responseBean.addSuccess(taThirdPartyMiniappConfig);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taThirdPartyMiniappConfigUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/thirdPartyMiniapp/{id}",method= RequestMethod.GET)
+    public ResponseBean taThirdPartyMiniappConfigGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaThirdPartyMiniappConfigService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taThirdPartyMiniappConfigDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/third/entity/TaThirdPartyMiniappConfig.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.third.entity;
+
+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 jobob
+ * @since 2019-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_third_party_miniapp_config")
+public class TaThirdPartyMiniappConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "config_id", type = IdType.AUTO)
+    private Integer configId;
+
+    /**
+     * appid
+     */
+    private String appid;
+
+    /**
+     * app_secret
+     */
+    private String appSecret;
+
+    /**
+     * 目标类型
+     */
+    private String targetType;
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+    
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expirationDate;
+}

src/main/java/com/huiju/estateagents/third/mapper/TaThirdPartyMiniappConfigMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.third.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Mapper
+public interface TaThirdPartyMiniappConfigMapper extends BaseMapper<TaThirdPartyMiniappConfig> {
+
+}

src/main/java/com/huiju/estateagents/third/service/ITaThirdPartyMiniappConfigService.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.third.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdPartyMiniappConfig> {
+	
+	/**
+	 * 校验是否合法第三方接口调用
+	 * @param tokenHeader
+	 * @param appidHeader
+	 * @param nowHeader
+	 * @return
+	 */
+	String checkToken(String tokenHeader, String appidHeader, String nowHeader);
+}

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.third.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.mapper.TaThirdPartyMiniappConfigMapper;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@Service
+public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPartyMiniappConfigMapper, TaThirdPartyMiniappConfig> implements ITaThirdPartyMiniappConfigService {
+	
+	@Autowired
+	private TaThirdPartyMiniappConfigMapper taThirdPartyMiniappConfigMapper;
+	
+	/**
+	 * 校验是否合法第三方接口调用
+	 *
+	 * @param tokenHeader
+	 * @param appidHeader
+	 * @param nowHeader
+	 * @return
+	 */
+	@Override
+	public String checkToken(String tokenHeader, String appidHeader, String nowHeader) {
+		//秘钥是否过期
+		QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("appid",appidHeader);
+		TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = taThirdPartyMiniappConfigMapper.selectOne(queryWrapper);
+		if (LocalDateTime.now().isAfter(taThirdPartyMiniappConfig.getExpirationDate())){
+			return "秘钥已过期，请重新申请";
+		}
+		
+		//判断nowHeader是十五分钟之内(15 * 60 * 1000)
+		if (System.currentTimeMillis() - Long.valueOf(nowHeader) > (15 * 60 * 1000)){
+			return "密钥超时，请在十五分钟内请求";
+		}
+		
+		//重新加密对比
+		StringBuilder stringBuilder = new StringBuilder();
+		stringBuilder.append(taThirdPartyMiniappConfig.getAppid()).append(taThirdPartyMiniappConfig.getAppSecret()).append(nowHeader);
+		String token = MD5Utils.md5(MD5Utils.md5(stringBuilder.toString()));
+		if (!tokenHeader.equals(token)){
+			return "秘钥出错请重新生成";
+		}
+		
+		return "success";
+	}
+}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -36,7 +36,7 @@
     <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT * FROM ta_building
         <where>
-            status =1
+            1 =1
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>

src/main/resources/mapper/TaThirdPartyMiniappConfigMapper.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.huiju.estateagents.third.mapper.TaThirdPartyMiniappConfigMapper">
+
+</mapper>