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

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -1,8 +1,28 @@
 package com.huiju.estateagents.base;
 
+import com.huiju.estateagents.common.JWTUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @author FXF
  * @date 2018-12-18
  */
 public class BaseController {
+	
+	/**
+	 * 获取orgId
+	 * @param request
+	 * @return
+	 */
+	public Integer getOrgId(HttpServletRequest request){
+		
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("orgId")){
+			return Integer.valueOf(map.get("orgId").toString());
+		}
+		
+		return null;
+	}
 }

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -13,6 +13,7 @@ import com.huiju.estateagents.center.sysUser.service.ISysUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,6 +155,21 @@ public class SysUserController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/current",method=RequestMethod.GET)
+    public ResponseBean currentUser(HttpServletRequest request){
+        String userName = JWTUtils.getSubject(request);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        sysUser.setPassword(null);
+
+        return ResponseBean.success(sysUser);
+    }
     
     @PostMapping("/center/signin")
     public ResponseBean signin(@RequestBody String paramStr) {

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

@@ -78,11 +78,7 @@ public class TaUserController extends BaseController {
     public ResponseBean taUserAdd(@RequestBody TaUser taUser){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaUserService.save(taUser)){
-                responseBean.addSuccess(taUser);
-            }else {
-                responseBean.addError("fail");
-            }
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserAdd -=- {}",e.toString());
@@ -119,16 +115,12 @@ public class TaUserController extends BaseController {
      * @param taUser 实体对象
      * @return
      */
-    @RequestMapping(value="/taUser/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.PUT)
     public ResponseBean taUserUpdate(@PathVariable Integer id,
                                         @RequestBody TaUser taUser){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaUserService.updateById(taUser)){
-                responseBean.addSuccess(taUser);
-            }else {
-                responseBean.addError("fail");
-            }
+            iTaUserService.updateInfoWithOrg(taUser);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserUpdate -=- {}",e.toString());
@@ -136,12 +128,30 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.getInfoWithOrg(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+
+        return responseBean;
+    }
 
     /**
      * 获取当前用户信息
+     * @param request
+     * @return
      */
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
-    public ResponseBean taUserGet(HttpServletRequest request){
+    public ResponseBean taUserGetCurrent(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Map map = JWTUtils.getUserIdAndOrgId(request);
         try {

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.center.taUser.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -79,4 +80,16 @@ public class TaUser implements Serializable {
      * 是否管理员
      */
     private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -17,4 +17,10 @@ import java.util.Map;
 public interface ITaUserService extends IService<TaUser> {
 	
 	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+
+    TaUser newUserAndOrg(TaUser taUser) throws Exception;
+
+    TaUser getInfoWithOrg(Integer id);
+
+    void updateInfoWithOrg(TaUser taUser) throws Exception;
 }

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

@@ -1,13 +1,19 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.mapper.TaOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +30,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Autowired
 	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaOrgMapper taOrgMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -31,4 +40,78 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		pg.setRecords(taUserList);
 		return pg;
 	}
+
+	@Override
+	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+
+		if (StringUtils.isEmpty(taUser.getLoginName())) {
+			taUser.setLoginName(taUser.getPhone());
+		}
+
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+
+		// 先插入 org
+		TaOrg taOrg = new TaOrg();
+		taOrg.setName(taUser.getOrgName());
+		taOrg.setWaterMark(taUser.getWaterMark());
+		taOrg.setCreateDate(LocalDateTime.now());
+		if (taOrgMapper.insert(taOrg) < 1) {
+			throw new Exception("生成用户公司信息失败");
+		}
+
+		taUser.setOrgId(taOrg.getOrgId());
+		taUser.setIsAdmin(true);
+		taUser.setStatus(CommConstant.STATUS_NORMAL);
+		taUser.setCreateDate(LocalDateTime.now());
+		if (!this.save(taUser)) {
+			throw new Exception("生成用户信息失败");
+		}
+
+		return taUser;
+	}
+
+	@Override
+	public TaUser getInfoWithOrg(Integer id) {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			return taUser;
+		}
+
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taUser.setOrgName(taOrg.getName());
+			taUser.setWaterMark(taOrg.getWaterMark());
+		}
+
+		taUser.setLoginPassword(null);
+		return taUser;
+	}
+
+	@Override
+	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taOrg.setName(taUser.getOrgName());
+			taOrg.setWaterMark(taUser.getWaterMark());
+
+			if (taOrgMapper.updateById(taOrg) < 1) {
+				throw new Exception("更新用户公司信息失败");
+			}
+		}
+
+		if (taUserMapper.updateById(taUser) < 1) {
+			throw new Exception("更新用户信息失败");
+		}
+	}
 }

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

@@ -4,6 +4,7 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -33,6 +34,32 @@ public class CommonController {
         }
     }
 
+    /**
+     * 为适应 ANTD 特制的图片上传
+     * plat 中心端传 center 管理端传 admin
+     * @param multipartFile
+     * @return
+     */
+    @PostMapping("/{plat}/antd/image")
+    public Map<String, String> uploadImageForAntd(@RequestParam("file") MultipartFile multipartFile) {
+        Map<String, String> result = new HashMap<>();
+
+        try {
+            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+
+            result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
+            result.put("status", "done");
+            result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");
+            result.put("url", img);
+
+        } catch (IOException e) {
+            result.put("status", "error");
+            result.put("message", e.getMessage());
+        }
+
+        return result;
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -76,8 +77,8 @@ public class TaBuildingDynamicController extends BaseController {
                                              @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,title);
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
         return responseBean;
     }
 
@@ -197,9 +198,10 @@ public class TaBuildingDynamicController extends BaseController {
 
 
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
         dynamic.setStatus(1);
@@ -211,9 +213,10 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
@@ -223,10 +226,11 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
         dynamic.setWeight(weight);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){

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

@@ -55,5 +55,5 @@ public class TaOrg implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    private String waterMark;
 }

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

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @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,@Param("title") String title);
+    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,@Param("orgId") Integer orgId);
 
     /**
      * 详情

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

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId);
 
     /**
      * 项目详情

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

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

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -33,6 +33,9 @@
         <if test="title != null and title != ''">
             and title = #{title}
         </if>
+        <if test="orgId != null and orgId != ''">
+            and org_id = #{orgId}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>