Merge branch 'v4' of http://git.ycjcjy.com/welcome/service-welcome3 into v4

src/main/java/com.huiju.welcome/controller/SysDictController.java

@@ -0,0 +1,134 @@
+package com.huiju.welcome.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysDict;
+import com.huiju.welcome.service.ISysDictService;
+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-07-16
+ */
+@RestController
+@RequestMapping("/")
+public class SysDictController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysDictController.class);
+
+    @Autowired
+    public ISysDictService iSysDictService;
+
+
+    /**
+     * 保存对象
+     * @param sysDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysDict/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody SysDict sysDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysDictService.save(sysDict)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysDictAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysDict/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysDictDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysDictService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param sysDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysDict/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody SysDict sysDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysDictService.updateById(sysDict)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("sysDictUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysDict/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysDictService.getById(id));
+        }catch (Exception e){
+            logger.error("sysDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 根据TYPE查询对象
+     * @param type  实体type
+     */
+    @RequestMapping(value="/dict/get",method= RequestMethod.GET)
+    public ResponseBean getDictByType(@RequestParam  String type){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type",type);
+            responseBean.addSuccess(iSysDictService.list(queryWrapper));
+        }catch (Exception e){
+            logger.error("getByType -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com.huiju.welcome/controller/SysMenuController.java

@@ -0,0 +1,58 @@
+package com.huiju.welcome.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysMenu;
+import com.huiju.welcome.service.ISysMenuService;
+import com.huiju.welcome.utils.StatusUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/")
+public class SysMenuController extends BaseController {
+    @Autowired
+    ISysMenuService iSysMenuService;
+
+    @GetMapping("/menu")
+    public ResponseBean all() {
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", StatusUtils.Delete);
+        queryWrapper.orderByAsc("sort_no");
+
+        List<SysMenu> result = iSysMenuService.list(queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/menu")
+    public ResponseBean save(@RequestBody SysMenu sysMenu) {
+        sysMenu.setStatus(StatusUtils.Normal);
+        sysMenu.setCreateDate(LocalDateTime.now());
+        iSysMenuService.save(sysMenu);
+        return ResponseBean.success(sysMenu);
+    }
+
+    @PutMapping("/menu/{id}")
+    public ResponseBean update(@PathVariable("id") String menuId, @RequestBody SysMenu sysMenu) {
+        sysMenu.setMenuId(menuId);
+        iSysMenuService.updateById(sysMenu);
+        return ResponseBean.success(sysMenu);
+    }
+
+    @DeleteMapping("/menu/{id}")
+    public ResponseBean delete(@PathVariable("id") String menuId) {
+        // 删除子节点
+        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("menu_parents", menuId);
+        iSysMenuService.remove(queryWrapper);
+
+        // 删除当前
+        iSysMenuService.removeById(menuId);
+        return ResponseBean.success("ok");
+    }
+
+}

src/main/java/com.huiju.welcome/controller/SysRoleController.java

@@ -1,9 +1,13 @@
 package com.huiju.welcome.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.SysRole;
+import com.huiju.welcome.model.SysRoleMenu;
+import com.huiju.welcome.service.ISysRoleMenuService;
 import com.huiju.welcome.service.ISysRoleService;
+import com.huiju.welcome.utils.StatusUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +29,9 @@ public class SysRoleController {
     @Autowired
     private ISysRoleService iSysRoleService;
 
+    @Autowired
+    private ISysRoleMenuService iSysRoleMenuService;
+
     @ApiOperation("查询角色列表")
     @GetMapping(value = "/role")
     public ResponseBean getList(@RequestParam(value = "roleName", required = false) String roleName,
@@ -34,8 +41,8 @@ public class SysRoleController {
     }
 
     @ApiOperation("根据角色Id查询")
-    @GetMapping("/roleById")
-    public ResponseBean getRoleId(@RequestParam("roleId") Integer roleId) {
+    @GetMapping("/role/{id}")
+    public ResponseBean getRoleId(@PathVariable("id") Integer roleId) {
         return iSysRoleService.getByRoleId(roleId);
     }
 
@@ -66,18 +73,18 @@ public class SysRoleController {
 
 
     @ApiOperation("删除角色")
-    @DeleteMapping("/role")
-    public ResponseBean deleteRole(@RequestParam("menuIds") String [] menuIds){
-        ResponseBean responseBean = new ResponseBean();
-        List<SysRole> sysRoleList = Arrays.asList(menuIds).stream().map(e-> {
-            SysRole sysRole = new SysRole();
-            sysRole.setRoleId(Integer.valueOf(e));
-            sysRole.setStatus(-1);
-            return sysRole;
-        }).collect(Collectors.toList());
-        iSysRoleService.updateBatchById(sysRoleList);
+    @DeleteMapping("/role/{id}")
+    public ResponseBean deleteRole(@PathVariable("id") Integer roleId){
+        // 删除角色
+        SysRole sysRole = iSysRoleService.getById(roleId);
+        sysRole.setStatus(StatusUtils.Delete);
+        iSysRoleService.updateById(sysRole);
+
+        // 删除角色对应菜单
+        QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_id", roleId);
+        iSysRoleMenuService.remove(queryWrapper);
 
-        responseBean.addSuccess("操作成功！");
-        return responseBean;
+        return ResponseBean.success("ok");
     }
 }

src/main/java/com.huiju.welcome/mapper/SysDictMapper.java

@@ -0,0 +1,19 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.SysDict;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@Mapper
+public interface SysDictMapper extends BaseMapper<SysDict> {
+
+}

src/main/java/com.huiju.welcome/model/SysDict.java

@@ -0,0 +1,63 @@
+package com.huiju.welcome.model;
+
+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;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    private String label;
+
+    private String value;
+
+    private Integer dictPid;
+
+    private String dictParents;
+
+    /**
+     * 1:意向房型      ROOM_TYPE
+     * 2:意向等级      GRADE
+     * 3:来访目的      VISIT_PURPOSE
+     * 4:来访渠道      VISIT_CHANNEL
+     * 5:来访人数      NUMBER_OF_VISITORS
+     * 6:客户年龄      CUSTOMER_AGE
+     * 7:现居住区域    RESIDENTIAL_AREA
+     * 8:工作行业      WORK_INDUSTRY
+     * 9:工作职务      WORK_DUTY
+     * 10:置业次数     NUMBER_OF_HOME_PURCHASES
+     * 11:名下房产数量 NUMBER_OF_PROPERTIES
+     * 12:现居住面积   LIVING_AREA
+     * 13:现住户型     RESIDENTIAL_UNIT
+     * 14:目前家庭结构 FAMILY_STRUCTURE
+     */
+    private String type;
+
+    private Integer sort;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com.huiju.welcome/model/SysMenu.java

@@ -4,7 +4,9 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,6 +27,7 @@ public class SysMenu implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /*菜单ID*/
+    @TableId(value = "menu_id", type = IdType.INPUT)
     private String menuId;
 
     /* 菜单名称*/
@@ -42,6 +45,8 @@ public class SysMenu implements Serializable {
     /*创建*/
     private LocalDateTime createDate;
 
+    private Integer sortNo;
+
     /**
      * 子节点
      */

src/main/java/com.huiju.welcome/model/TaCustomer.java

@@ -69,4 +69,81 @@ public class TaCustomer implements Serializable {
 
     @TableField(exist = false)
     Boolean apointment;
+
+
+    /**
+     * 是否购买过银城的房子
+     */
+    private Integer haveHouse;
+
+    /**
+     * 老业主小区
+     */
+    private String oldCommunity;
+
+    /**
+     * 现居住区域
+     */
+    private Integer nowArea;
+
+    /**
+     * 现居住小区
+     */
+    private String nowCommunity;
+
+    /**
+     * 现居住城市(城市不在居住区域有效)
+     */
+    private String nowCity;
+
+    /**
+     * 家庭成员收入工作城市
+     */
+    private Integer familyWork;
+
+    /**
+     * 请填写具体城市名称
+     */
+    private String cityName;
+
+    /**
+     * 家庭收入成员工作单位
+     */
+    private String familyCompany;
+
+    /**
+     * 家庭收入成员工作行业
+     */
+    private String familyIndustry;
+
+    /**
+     * 家庭收入成员工作职务
+     */
+    private String familyDuty;
+
+    /**
+     * 家庭本市置业次数
+     */
+    private Integer housePurchasing;
+
+    /**
+     * 家庭本市名下房产数量
+     */
+    private Integer houseProperty;
+
+    /**
+     * 现居住面积
+     */
+    private Integer houseLivingArea;
+
+    /**
+     * 现居住户型
+     */
+    private Integer houseType;
+
+    /**
+     * 目前家庭结构
+     */
+    private Integer familyStructure;
+
 }

src/main/java/com.huiju.welcome/service/ISysDictService.java

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.SysDict;
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+public interface ISysDictService extends IService<SysDict> {
+
+}

src/main/java/com.huiju.welcome/service/ISysMenuService.java

@@ -0,0 +1,7 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.SysMenu;
+
+public interface ISysMenuService extends IService<SysMenu> {
+}

src/main/java/com.huiju.welcome/service/ISysRoleMenuService.java

@@ -0,0 +1,7 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.SysRoleMenu;
+
+public interface ISysRoleMenuService extends IService<SysRoleMenu> {
+}

src/main/java/com.huiju.welcome/service/impl/SysDictServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.SysDictMapper;
+import com.huiju.welcome.model.SysDict;
+import com.huiju.welcome.service.ISysDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@Service
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
+
+}

src/main/java/com.huiju.welcome/service/impl/SysMenuServiceImpl.java

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.SysMenuMapper;
+import com.huiju.welcome.model.SysMenu;
+import com.huiju.welcome.service.ISysMenuService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
+    @Autowired
+    SysMenuMapper sysMenuMapper;
+}

src/main/java/com.huiju.welcome/service/impl/SysRoleMenuServiceImpl.java

@@ -0,0 +1,13 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.SysRoleMenuMapper;
+import com.huiju.welcome.model.SysRoleMenu;
+import com.huiju.welcome.service.ISysRoleMenuService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
+}

src/main/java/com.huiju.welcome/service/impl/SysRoleServiceImpl.java

@@ -12,6 +12,7 @@ import com.huiju.welcome.model.SysMenu;
 import com.huiju.welcome.model.SysRole;
 import com.huiju.welcome.model.SysRoleMenu;
 import com.huiju.welcome.service.ISysRoleService;
+import com.huiju.welcome.utils.StatusUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         page.setSize(pageSize);
 
         QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", StatusUtils.Delete);
         queryWrapper.like(StringUtils.isNotBlank(roleName), "role_name", roleName);
         IPage<SysRole> sysRoleIPage = this.page(page, queryWrapper);
         responseBean.addSuccess(sysRoleIPage);

src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java

@@ -120,7 +120,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         ResponseBean responseBean= new ResponseBean<>();
         List<Integer> arrayList= new ArrayList<>();
         SysUser user= sysUserMapper.selectById(userId);
-        List<SysRole> sysRole= sysRoleMapper.selectroleAll();
+//        List<SysRole> sysRole = sysRoleMapper.selectroleAll();
+
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", StatusUtils.Delete);
+        List<SysRole> sysRole = sysRoleMapper.selectList(queryWrapper);
+
         List<SysUserRole> sysUserRoleList= sysUserRoleMapper.selectListSysUserRole(userId);
         for (SysUserRole sysUserRole:sysUserRoleList){
             arrayList.add(sysUserRole.getRoleId());

src/main/resources/mapper/SysDictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.fxf.mapper.SysDictMapper">
+
+</mapper>