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

pom.xml

 				<profiles.active>nj</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>gzysd</id>
+			<properties>
+				<profiles.active>gzysd</profiles.active>
+			</properties>
+		</profile>
 	</profiles>
 	<build>
 		<plugins>

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
     public ResponseBean taUserGet(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String userId = JWTUtils.getSubject(request);
+        Map map = JWTUtils.getUserIdAndOrgId(request);
         try {
-            TaUser taUser = iTaUserService.getById(userId);
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
             taUser.setLoginPassword("");
             responseBean.addSuccess(taUser);
         }catch (Exception e){
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
         taUser.setLoginPassword("");
-        String token = JWTUtils.newToken(taUser.getUserId().toString());
+        Map map = new HashMap();
+        map.put("userId",taUser.getUserId().toString());
+        map.put("orgId",taUser.getOrgId().toString());
+        String token = JWTUtils.newTokenByMap(map);
     
         //保存token
         saveToken(token);

src/main/java/com/huiju/estateagents/common/CommConstant.java

      */
     public final static String PERSON_ESTATE_AGENT = "estate agent";
 
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CUSTOMER = "customer";
+
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CHANNEL = "channel agent";
+
+    /**
+     * 人员类型: 游客
+     */
+    public final static String PERSON_ESTATE_DRIFT = "drift";
+
     /**
      * 状态: 正常
      */

src/main/java/com/huiju/estateagents/common/JWTUtils.java

         return null;
     }
     
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return null;
+    }
+    
     /**
      * getSubject 获取 jwt subject
      * @param request

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

 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaCustomerPersonService;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
     @Autowired
     private TaShareMapper taShareMapper;
 
+    @Autowired
+    private ITaOrgService taOrgService;
+
 
 
     /**
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-
+            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
+                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                TaOrg org = taOrgService.getOne(orgQueryWrapper);
+                taPerson.setOrg(org);
+            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());

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

 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,Integer.valueOf(map.get("orgId").toString()));
     }
 
     /**

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

                                              @RequestParam(required = false)String name,
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
+                                             @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
         return responseBean;
     }
 

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

 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
+    @Autowired
+    TaChannelService taChannelService;
+    @Autowired
+    TaChannelPersonService taChannelPersonService;
+    @Autowired
+    ITaUserService taUserService;
 
     /**
      *
 
     }
 
+    @PutMapping("/wx/registerConsultant")
+    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("您不是置业顾问。");
+        }
+        return responseBean;
+    }
+
+    @PutMapping("/wx/registerAgent")
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        person.setAgentCode(taPersonService.agentCodeGenerator());
+        if (!StringUtils.isEmpty(recommendAgentCode)){
+            QueryWrapper<TaPerson> agentWrapper = new QueryWrapper();
+            agentWrapper.eq("agent_code",recommendAgentCode);
+            agentWrapper.eq("org_id",orgId);
+            TaPerson agent = taPersonService.getOne(agentWrapper);
+            if (null != agent){
+                person.setRecommendAgent(agent.getPersonId());
+            }
+        }
+        if(StringUtils.isEmpty(channelCode)){
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        }else {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("channel_code",channelCode);
+            TaChannel channel = taChannelService.getOne(queryWrapper);
+            TaChannelPerson channelPerson = new TaChannelPerson();
+            channelPerson.setChannelId(channel.getChannelId());
+            channelPerson.setPersonId(person.getPersonId());
+            channelPerson.setCreateDate(LocalDateTime.now());
+            taChannelPersonService.save(channelPerson);
+        }
+        taPersonService.updateById(person);
+        responseBean.addSuccess(person);
+
+        return responseBean;
+    }
+
     /**
      * 绑定卡片
      * @param paramStr

src/main/java/com/huiju/estateagents/entity/TaPerson.java

 
     private String fromCode;
 
+    private String orgId;
+
     private Integer userId;
 
     private String userPort;
 
+    private String agentCode;
+
+    private String recommendAgent;
+
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private TaOrg org;
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
 
     /**
      * 详情

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

      * @param page
      * @return
      */
-    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain,@Param("orgId") Integer orgId);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
 
     /**
      * 项目详情

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
 
     /**
      * 楼盘详情

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

 
     List<TaPersonBuilding> getPersonBuildings(String personId);
 
+    String agentCodeGenerator ();
+
+
+
     /**
      * 渠道管理下的经纪人
      * @param name

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

         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
         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,isEnlist,time);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

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

         return ResponseBean.success(page);
     }
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId);
         page.setRecords(building);
 
         return ResponseBean.success(page);

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

 
     }
 
+    public String codeGenerator (){
+        double r = Math.random();
+        int i = (int)(r*100000);
+        return String.valueOf(i);
+    }
+
+    @Override
+    public String agentCodeGenerator (){
+        QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
+        while (true){
+            String code = codeGenerator();
+            queryWrapper.eq("agent_code",code);
+            Integer count = taPersonMapper.selectCount(queryWrapper);
+            if (count<=0){
+                return code;
+            }
+        }
+    }
+
 
 }

src/main/resources/application-gzysd.yml

+server:
+  port: 8009
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/*.xml
+wx:
+  miniapp:
+    appid: wxe3b1e683853800b5
+    secret: 207dd6d0f807b2dd0d41b57a8184365f
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+

src/main/resources/mapper/TaBuildingDynamicMapper.xml

         <if test="cityId != 0 and cityId != null">
             and city_id = #{cityId}
         </if>
+        <if test="title != null and title != ''">
+            and title = #{title}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>

src/main/resources/mapper/TaBuildingMapper.xml

             <if test="isMain != null and isMain != ''">
                 and  ta_building.is_main = #{isMain}
             </if>
+            <if test="orgId != null and orgId != ''">
+                and  ta_building.org_id = #{orgId}
+            </if>
         </where>
         ORDER BY create_date DESC
     </select>