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

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+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;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@RestController
+@RequestMapping("/")
+public class TaTagUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagUserController.class);
+
+    @Autowired
+    public ITaTagUserService iTaTagUserService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.GET)
+    public ResponseBean taTagUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTagUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaTagUser> result = iTaTagUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.POST)
+    public ResponseBean taTagUserAdd(@RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.save(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTagUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.updateById(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+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-09-24
+ */
+@RestController
+@RequestMapping("/api")
+public class TaTagsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagsController.class);
+
+    @Autowired
+    public ITaTagsService iTaTagsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taTags",method= RequestMethod.GET)
+    public ResponseBean taTagsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTags> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTags> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            IPage<TaTags> result = iTaTagsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags",method= RequestMethod.POST)
+    public ResponseBean taTagsAdd(@RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.save(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTags/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagsUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.updateById(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -10,17 +10,23 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 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 com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +37,7 @@ import sun.dc.pr.PRError;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.ws.Response;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -63,6 +70,12 @@ public class TaUserController extends BaseController {
 
     @Autowired
     private ITaUserAuthButtonService iTaUserAuthButtonService;
+    
+    @Autowired
+    private ITaTagUserService taTagUserService;
+    
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
 
     /**
      * 分页查询列表
@@ -219,8 +232,10 @@ public class TaUserController extends BaseController {
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
+            userMap.put("buttonList", allButtons);
             responseBean.addSuccess(userMap);
         }catch (Exception e){
             e.printStackTrace();
@@ -276,6 +291,128 @@ public class TaUserController extends BaseController {
         return ResponseBean.success(result);
     }
     
+    @PostMapping("/admin/taUser/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+    
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value ="userName",required = false) String userName,
+                                   @RequestParam(value ="phone",required = false) String phone,
+                                   @RequestParam(value ="status",required = false) Integer status,
+                                   HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+            taUserQueryWrapper.eq("org_id",getOrgId(request));
+            taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
+            taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            taUserQueryWrapper.eq(null != status,"status",status);
+            IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
+            List<TaUser> taUserList = result.getRecords();
+            taUserList.forEach(e -> {
+                List<TaTags> taTagsList = iTaUserService.getTagsList(e);
+                e.setTaTagsList(taTagsList);
+            });
+            result.setRecords(taUserList);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean adminUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaUser taUser = iTaUserService.getById(id);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id",id);
+            List<TaTagUser> taTagUserList = taTagUserService.list(queryWrapper);
+            List<Integer> tags = new ArrayList<>();
+            taTagUserList.forEach(e -> {
+                tags.add(e.getTagId());
+            });
+            taUser.setTaTags(tags);
+            taUser.setLoginPassword("");
+            QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+            taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+            TaPersonBuilding taPersonBuilding = taPersonBuildingService.getOne(taPersonBuildingQueryWrapper);
+            if (null != taPersonBuilding){
+                taUser.setBuildingId(taPersonBuilding.getBuildingId());
+            }
+            responseBean.addSuccess(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        
+        return responseBean;
+    }
+    
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.POST)
+    public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.addAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean adminUserUpdate(@PathVariable Integer id,
+                                     @RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setUserId(id);
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.updateAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
     
     private void saveToken(String token) {
         SysToken sysToken = new SysToken();

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

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTagUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员id
+     */
+    private Integer userId;
+
+    /**
+     * 标签id
+     */
+    private Integer tagId;
+
+
+}

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

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTags implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签id
+     */
+    @TableId(value = "tag_id", type = IdType.AUTO)
+    private Integer tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
+
+    /**
+     * 标签图表
+     */
+    private String tagIcon;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -110,6 +111,10 @@ public class TaUser implements Serializable {
      * 身份证号
      */
     private String idNo;
+    
+    private String address;
+    private String photo;
+    private String description;
 
 
     /**
@@ -141,4 +146,13 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private List<SysButtonInMenu> buttons;
+    
+    @TableField(exist = false)
+    private List<TaTags> taTagsList = new ArrayList<TaTags>();
+    
+    @TableField(exist = false)
+    private List<Integer> taTags = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private String buildingId;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaTagUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Mapper
+public interface TaTagUserMapper extends BaseMapper<TaTagUser> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaTagsMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Mapper
+public interface TaTagsMapper extends BaseMapper<TaTags> {
+
+}

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -2,8 +2,10 @@ package com.huiju.estateagents.center.taUser.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +22,6 @@ import java.util.Map;
 public interface TaUserMapper extends BaseMapper<TaUser> {
 	
 	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	
+	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagUserService extends IService<TaTagUser> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagsService extends IService<TaTags> {
+
+}

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

@@ -2,8 +2,10 @@ package com.huiju.estateagents.center.taUser.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,4 +29,10 @@ public interface ITaUserService extends IService<TaUser> {
     void turnUserOnOrNot(Integer id, boolean isOn) throws Exception;
 
     void resetPassword(Integer id, String newPass) throws Exception;
+    
+    List<TaTags> getTagsList(TaUser e);
+    
+    TaUser addAdminUser(TaUser taUser) throws Exception;
+    
+    TaUser updateAdminUser(TaUser taUser) throws Exception;
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagUserServiceImpl extends ServiceImpl<TaTagUserMapper, TaTagUser> implements ITaTagUserService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.mapper.TaTagsMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagsServiceImpl extends ServiceImpl<TaTagsMapper, TaTags> implements ITaTagsService {
+
+}

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

@@ -51,7 +51,7 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
         for (SysButtonInMenu sysButtonInMenu : records){
             ArrayList<Integer> roles = new ArrayList<>();
             for (TaRoleButton taRoleButton : taRoleButtons){
-                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId())){
+                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId()) && !roles.contains(taRoleButton.getBtnId())){
                     roles.add(taRoleButton.getBtnId());
                 }
             }

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

@@ -61,7 +61,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         for (SysMenu sysMenu : records){
             ArrayList<Integer> roles = new ArrayList<>();
             for (TaRoleMenu taRoleMenu : taRoleMenus){
-                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId())){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId()) && !roles.contains(taRoleMenu.getRoleId())){
                     roles.add(taRoleMenu.getRoleId());
                 }
             }

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

@@ -3,7 +3,10 @@ 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.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
@@ -12,9 +15,11 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +51,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaMiniappTemplateMapper taMiniappTemplateMapper;
 	
+	@Autowired
+	private TaTagUserMapper taTagUserMapper;
+	
+	@Autowired
+	private TaPersonBuildingMapper taPersonBuildingMapper;
+	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
@@ -171,4 +182,100 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("重置用户密码失败");
 		}
 	}
+	
+	@Override
+	public List<TaTags> getTagsList(TaUser e) {
+		return taUserMapper.getTagsList(e.getUserId(),e.getOrgId());
+	}
+	
+	@Override
+	public TaUser addAdminUser(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());
+		wrapper.eq("org_id",taUser.getOrgId());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+		taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
+		taUser.setStatus(CommConstant.STATUS_NORMAL);
+		taUser.setCreateDate(LocalDateTime.now());
+		if (taUserMapper.insert(taUser) < 1) {
+			throw new Exception("生成用户信息失败");
+		}
+		
+		//保存标签
+		List<Integer> tags = taUser.getTaTags();
+		tags.forEach(e -> {
+			TaTagUser taTagUser = new TaTagUser();
+			taTagUser.setUserId(taUser.getUserId());
+			taTagUser.setTagId(e);
+			taTagUserMapper.insert(taTagUser);
+		});
+		
+		//保存项目
+		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+		taPersonBuilding.setBuildingId(taUser.getBuildingId());
+		taPersonBuilding.setUserId(taUser.getUserId());
+		taPersonBuilding.setCreateDate(LocalDateTime.now());
+		taPersonBuildingMapper.insert(taPersonBuilding);
+		return taUser;
+	}
+	
+	@Override
+	public TaUser updateAdminUser(TaUser taUser) throws Exception {
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+		taUser.setLoginName(taUser.getPhone());
+		
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+		wrapper.eq("org_id",taUser.getOrgId());
+		wrapper.ne("user_id",taUser.getUserId());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+		if (taUserMapper.updateById(taUser) < 1){
+			throw new Exception("更新用户信息失败");
+		}
+		QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("user_id",taUser.getUserId());
+		taTagUserMapper.delete(queryWrapper);
+		//保存标签
+		List<Integer> tags = taUser.getTaTags();
+		tags.forEach(e -> {
+			TaTagUser taTagUser = new TaTagUser();
+			taTagUser.setUserId(taUser.getUserId());
+			taTagUser.setTagId(e);
+			taTagUserMapper.insert(taTagUser);
+		});
+		
+		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
+		//保存项目
+		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+		taPersonBuilding.setBuildingId(taUser.getBuildingId());
+		taPersonBuilding.setUserId(taUser.getUserId());
+		taPersonBuilding.setCreateDate(LocalDateTime.now());
+		taPersonBuildingMapper.insert(taPersonBuilding);
+		
+		return taUser;
+	}
 }

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

@@ -210,6 +210,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
         iBuildingDynamicService.save(dynamic);
+        responseBean.addSuccess(dynamic);
         return responseBean;
     }
 

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

@@ -5,6 +5,7 @@ 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.common.CommConstant;
 import com.huiju.estateagents.entity.TaPoster;
 import com.huiju.estateagents.service.TaPosterService;
 import org.slf4j.Logger;
@@ -18,6 +19,9 @@ 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;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 分享海报表  前端控制器
@@ -27,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-09-21
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaPosterController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPosterController.class);
@@ -69,10 +73,13 @@ public class TaPosterController extends BaseController {
      * @param poster 实体对象
      * @return
      */
-    @RequestMapping(value = "/poster", method = RequestMethod.POST)
-    public ResponseBean posterAdd(@RequestBody TaPoster poster) {
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.POST)
+    public ResponseBean posterAdd(@RequestBody TaPoster poster, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            poster.setStatus(CommConstant.STATUS_NORMAL);
+            poster.setOrgId(getOrgId(request));
+            poster.setCreateDate(LocalDateTime.now());
             if (iPosterService.save(poster)) {
                 responseBean.addSuccess(poster);
             } else {
@@ -116,10 +123,11 @@ public class TaPosterController extends BaseController {
      * @param poster 实体对象
      * @return
      */
-    @RequestMapping(value = "/poster/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
                                      @RequestBody TaPoster poster) {
         ResponseBean responseBean = new ResponseBean();
+        poster.setPosterId(id);
         try {
             if (iPosterService.updateById(poster)) {
                 responseBean.addSuccess(poster);
@@ -135,15 +143,13 @@ public class TaPosterController extends BaseController {
     }
 
     /**
-     * 根据id查询对象
-     *
-     * @param id 实体ID
+     * 查询对象
      */
-    @RequestMapping(value = "/poster/{id}", method = RequestMethod.GET)
-    public ResponseBean posterGet(@PathVariable Integer id) {
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.GET)
+    public ResponseBean posterGet(@RequestParam String targetId,@RequestParam String targetType ) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iPosterService.getById(id));
+            responseBean.addSuccess(iPosterService.getPostersForTarget(targetId,targetType));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("posterDelete -=- {}", e.toString());

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

@@ -5,6 +5,7 @@ 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.common.CommConstant;
 import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.service.TaShareContentService;
 import org.slf4j.Logger;
@@ -18,6 +19,9 @@ 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;
+import java.time.LocalDateTime;
+
 /**
  * <p>
     *   前端控制器
@@ -27,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-09-21
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaShareContentController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaShareContentController.class);
@@ -67,10 +71,13 @@ public class TaShareContentController extends BaseController {
      * @param shareContent 实体对象
      * @return
      */
-    @RequestMapping(value="/shareContent",method= RequestMethod.POST)
-    public ResponseBean shareContentAdd(@RequestBody TaShareContent shareContent){
+    @RequestMapping(value="/admin/shareContent",method= RequestMethod.POST)
+    public ResponseBean shareContentAdd(@RequestBody TaShareContent shareContent, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            shareContent.setStatus(CommConstant.STATUS_NORMAL);
+            shareContent.setOrgId(getOrgId(request));
+            shareContent.setCreateDate(LocalDateTime.now());
             if (iShareContentService.save(shareContent)){
                 responseBean.addSuccess(shareContent);
             }else {
@@ -112,10 +119,11 @@ public class TaShareContentController extends BaseController {
      * @param shareContent 实体对象
      * @return
      */
-    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/shareContent/{id}",method= RequestMethod.PUT)
     public ResponseBean shareContentUpdate(@PathVariable Integer id,
                                         @RequestBody TaShareContent shareContent){
         ResponseBean responseBean = new ResponseBean();
+        shareContent.setShareContentId(id);
         try {
             if (iShareContentService.updateById(shareContent)){
                 responseBean.addSuccess(shareContent);
@@ -131,14 +139,13 @@ public class TaShareContentController extends BaseController {
     }
 
     /**
-     * 根据id查询对象
-     * @param id  实体ID
+     * 查询对象
      */
-    @RequestMapping(value="/shareContent/{id}",method= RequestMethod.GET)
-    public ResponseBean shareContentGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/shareContent",method= RequestMethod.GET)
+    public ResponseBean shareContentGet(@RequestParam String targetId,@RequestParam String targetType ){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iShareContentService.getById(id));
+            responseBean.addSuccess(iShareContentService.getPostersForTarget(targetId,targetType));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("shareContentDelete -=- {}",e.toString());

src/main/resources/mapper/TaTagUserMapper.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.center.taUser.mapper.TaTagUserMapper">
+
+</mapper>

src/main/resources/mapper/TaTagsMapper.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.center.taUser.mapper.TaTagsMapper">
+
+</mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -28,4 +28,15 @@
         WHERE
             t.is_admin =1
     </select>
+
+    <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">
+        SELECT
+            t.*
+        FROM
+            ta_tag_user u
+            LEFT JOIN ta_tags t ON u.tag_id = t.tag_id
+            AND t.org_id = #{orgId}
+        WHERE
+            u.user_id = #{userId}
+    </select>
 </mapper>