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/SysUserController.java

@@ -329,6 +329,7 @@ public class SysUserController extends BaseController {
         ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
         return sysmenu;
     }
+
     @ApiOperation(value = "當前員工離職", notes = "當前員工離職")
     @RequestMapping(value = "/fireUser", method = RequestMethod.PUT)
     public ResponseBean fireUser(@RequestParam(value = "userId",required = false) Integer userId) {

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

@@ -1,20 +1,20 @@
 package com.huiju.welcome.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysUserRole;
 import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITdGoodsTypeService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 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.ResponseBody;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -113,4 +113,19 @@ public class TdGoodsTypeController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "商品类型列表", notes = "商品类型列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "typeName", value = "商品类型名称")
+    })
+    @RequestMapping(value = "/typeList", method = RequestMethod.GET)
+    public ResponseBean typeList(@RequestParam(defaultValue = "1") int pageNum,
+                                       @RequestParam(defaultValue = "10") int pageSize,
+                                       @RequestParam(value = "typeName",required = false) String typeName) {
+        IPage<TdGoodsType> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTdGoodsTypeService.typeList(pg,typeName);
+
+        return userManagement;
+    }
 }

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

@@ -1,18 +1,18 @@
 package com.huiju.welcome.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TdSpec;
 import com.huiju.welcome.service.ITdSpecService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -111,4 +111,19 @@ public class TdSpecController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "商品规格列表", notes = "商品规格列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "specName", value = "商品规格名称")
+    })
+    @RequestMapping(value = "/specList", method = RequestMethod.GET)
+    public ResponseBean specList(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "specName",required = false) String specName) {
+        IPage<TdSpec> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTdSpecService.specList(pg,specName);
+
+        return userManagement;
+    }
 }

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/mapper/TdGoodsTypeMapper.java

@@ -2,8 +2,10 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TdGoodsType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
 
+    /**
+     *
+     * @param pg
+     * @param typeName
+     * @return
+     */
+    IPage<TdGoodsType> typeList(IPage<TdGoodsType> pg, @Param("typeName") String typeName);
 }

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

@@ -2,8 +2,10 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TdSpec;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdSpecMapper extends BaseMapper<TdSpec> {
 
+    /**
+     *
+     * @param pg
+     * @param specName
+     * @return
+     */
+    IPage<TdSpec> specList(IPage<TdSpec> pg, @Param("specName") String specName);
 }

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/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/ITdGoodsTypeService.java

@@ -1,7 +1,9 @@
 package com.huiju.welcome.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TdGoodsType;
 
 /**
@@ -14,4 +16,12 @@ import com.huiju.welcome.model.TdGoodsType;
  */
 public interface ITdGoodsTypeService extends IService<TdGoodsType> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param typeName
+     * @return
+     */
+    ResponseBean typeList(IPage<TdGoodsType> pg, String typeName);
+
 }

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

@@ -1,7 +1,9 @@
 package com.huiju.welcome.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TdSpec;
 
 /**
@@ -14,4 +16,11 @@ import com.huiju.welcome.model.TdSpec;
  */
 public interface ITdSpecService extends IService<TdSpec> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param specName
+     * @return
+     */
+    ResponseBean specList(IPage<TdSpec> pg, String specName);
 }

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/TdGoodsTypeServiceImpl.java

@@ -1,10 +1,13 @@
 package com.huiju.welcome.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TdGoodsTypeMapper;
 import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITdGoodsTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,5 +20,14 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TdGoodsTypeServiceImpl extends ServiceImpl<TdGoodsTypeMapper, TdGoodsType> implements ITdGoodsTypeService {
+    @Autowired
+    private TdGoodsTypeMapper tdGoodsTypeMapper;
+    @Override
+    public ResponseBean typeList(IPage<TdGoodsType> pg,String typeName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TdGoodsType> list= tdGoodsTypeMapper.typeList(pg,typeName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 
 }

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

@@ -1,10 +1,13 @@
 package com.huiju.welcome.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TdSpecMapper;
 import com.huiju.welcome.model.TdSpec;
 import com.huiju.welcome.service.ITdSpecService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdSpecServiceImpl extends ServiceImpl<TdSpecMapper, TdSpec> implements ITdSpecService {
 
+    @Autowired
+    private TdSpecMapper tdSpecMapper;
+
+    @Override
+    public ResponseBean specList(IPage<TdSpec> pg, String specName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TdSpec> list= tdSpecMapper.specList(pg,specName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

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>

src/main/resources/mapper/TdGoodsTypeMapper.xml

@@ -0,0 +1,15 @@
+<?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.welcome.mapper.TdGoodsTypeMapper">
+    <select id="typeList" resultType="com.huiju.welcome.model.TdGoodsType">
+        select
+        *
+        from td_goods_type
+        <where>
+            <if test="typeName !=null and typeName !=''">
+                typeName LIKE CONCAT('%',#{typeName},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>

src/main/resources/mapper/TdSpecMapper.xml

@@ -0,0 +1,15 @@
+<?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.welcome.mapper.TdSpecMapper">
+    <select id="specList" resultType="com.huiju.welcome.model.TdSpec">
+        select
+        *
+        from td_spec
+        <where>
+            <if test="specName !=null and typeName !=''">
+                specName LIKE CONCAT('%',#{specName},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>