goods and fireUser

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

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

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

@@ -0,0 +1,125 @@
+package com.huiju.welcome.controller;
+
+
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaCustomer;
+import com.huiju.welcome.model.TaCustomerTransfer;
+import com.huiju.welcome.service.ITaCustomerService;
+import com.huiju.welcome.service.ITaCustomerTransferService;
+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;
+
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerTransferController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerTransferController.class);
+
+    @Autowired
+    public ITaCustomerTransferService iTaCustomerTransferService;
+    @Autowired
+    public ITaCustomerService iTaCustomerService;
+
+
+    /**
+     * 保存对象
+     * @param taCustomerTransfer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerTransfer/add",method= RequestMethod.POST)
+    public ResponseBean tpShopImgAdd(@RequestBody TaCustomerTransfer taCustomerTransfer){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Boolean flag = iTaCustomerTransferService.save(taCustomerTransfer);
+            Boolean flagUpdate = false;
+            TaCustomer taCustomer = iTaCustomerService.getById(taCustomerTransfer.getCustomerId());
+            taCustomer.setConsultantId(taCustomerTransfer.getToUserId());
+            taCustomer.setRealtyConsultant(taCustomerTransfer.getToUserName());
+            flagUpdate = iTaCustomerService.updateById(taCustomer);
+            if (flag&&flagUpdate){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taCustomerTransferAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerTransfer/delete/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerTransferDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerTransferService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taCustomerTransfer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerTransfer/update",method= RequestMethod.PUT)
+    public ResponseBean tpShopImgUpdate(@RequestBody TaCustomerTransfer taCustomerTransfer){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerTransferService.updateById(taCustomerTransfer)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taCustomerTransferUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerTransfer/get/{id}",method= RequestMethod.GET)
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerTransferService.getById(id));
+        }catch (Exception e){
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,9 +1,17 @@
 package com.huiju.welcome.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoods;
+import com.huiju.welcome.model.TaGoodsImg;
+import com.huiju.welcome.model.TaGoodsSpec;
+import com.huiju.welcome.service.ITaGoodsImgService;
 import com.huiju.welcome.service.ITaGoodsService;
+import com.huiju.welcome.service.ITaGoodsSpecService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+
+
 /**
  * <p>
     *  前端控制器
@@ -30,18 +40,36 @@ public class TaGoodsController extends BaseController {
 
     @Autowired
     public ITaGoodsService iTaGoodsService;
+    @Autowired
+    public ITaGoodsImgService iTaGoodsImgService;
+    @Autowired
+    public ITaGoodsSpecService iTaGoodsSpecService;
 
 
     /**
      * 保存对象
-     * @param taGoods 实体对象
+     * @param paramStr 实体对象
      * @return
      */
     @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean tpShopImgAdd(@RequestBody TaGoods taGoods){
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
+
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
+        JSONArray spec = jsonObject.getJSONArray("spec");
+
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaGoodsService.save(taGoods)){
+            Boolean flag = iTaGoodsService.save(taGoods);
+            Boolean flagImg = iTaGoodsImgService.save(taGoodsImg);
+            Boolean flagSpec = false;
+            for(int i = 0;i<spec.size();i++){
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
+                taGoodsSpec.setGoodsId(taGoods.getGoodsId());
+                flagSpec = iTaGoodsSpecService.save(taGoodsSpec);
+            }
+            if (flag&& flagImg&&flagSpec){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -76,14 +104,26 @@ public class TaGoodsController extends BaseController {
 
     /**
      * 修改对象
-     * @param taGoods 实体对象
+     * @param paramStr 实体对象
      * @return
      */
     @RequestMapping(value="/taGoods/update",method= RequestMethod.PUT)
-    public ResponseBean tpShopImgUpdate(@RequestBody TaGoods taGoods){
+    public ResponseBean tpShopImgUpdate(@RequestBody String paramStr){
         ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
+        JSONArray spec = jsonObject.getJSONArray("spec");
+
         try {
-            if (iTaGoodsService.updateById(taGoods)){
+            Boolean flag = iTaGoodsService.updateById(taGoods);
+            Boolean flagImg = iTaGoodsImgService.updateById(taGoodsImg);
+            Boolean flagSpec = false;
+            for(int i = 0;i<spec.size();i++){
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
+                flagSpec = iTaGoodsSpecService.updateById(taGoodsSpec);
+            }
+            if (flag&& flagImg&&flagSpec){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -110,4 +150,10 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
+
+
+
+
+
+
 }

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

@@ -1,9 +1,14 @@
 package com.huiju.welcome.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoodsOrders;
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
+import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
 import com.huiju.welcome.service.ITaGoodsOrdersService;
+import com.huiju.welcome.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+
 /**
  * <p>
     *  前端控制器
@@ -30,18 +36,31 @@ public class TaGoodsOrdersController extends BaseController {
 
     @Autowired
     public ITaGoodsOrdersService iTaGoodsOrdersService;
+    @Autowired
+    public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
 
 
     /**
      * 保存对象
-     * @param taGoodsOrders 实体对象
+     * @param paramStr 实体对象
      * @return
      */
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
-    public ResponseBean tpShopImgAdd(@RequestBody TaGoodsOrders taGoodsOrders){
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
         ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
+        TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
+        JSONArray detail = jsonObject.getJSONArray("detail");
         try {
-            if (iTaGoodsOrdersService.save(taGoodsOrders)){
+            Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
+
+            Boolean flagDetail = false;
+            for(int i=0;i<detail.size();i++){
+                TaGoodsOrdersDetail taGoodsOrdersDetail = detail.getObject(i,TaGoodsOrdersDetail.class);
+                taGoodsOrdersDetail.setOrdersId(taGoodsOrders.getOrdersId());
+                flagDetail = iTaGoodsOrdersDetailService.save(taGoodsOrdersDetail);
+            }
+            if (flag&&flagDetail){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -110,4 +129,6 @@ public class TaGoodsOrdersController extends BaseController {
         }
         return responseBean;
     }
+
+
 }

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

@@ -17,4 +17,10 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
     SysUser getUserWithAuthority(@Param("userId") Integer userId);
+    /**
+     * 離職員工
+     * @param userId
+     * @return
+     */
+    void fireUser(@Param("userId") Integer userId);
 }

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

@@ -36,4 +36,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      * @return
      */
     List<SysUserRole> selectListSysUserRole(@Param("userId") Integer userId);
+
+
+
 }

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

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

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaGoodsImg;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TaGoodsImg;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TaGoodsImgMapper extends BaseMapper<TaGoodsImg> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaGoods;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TaGoods;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TaGoodsMapper extends BaseMapper<TaGoods> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TaGoodsOrdersDetail;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TaGoodsOrdersDetailMapper extends BaseMapper<TaGoodsOrdersDetail> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaGoodsOrders;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TaGoodsOrders;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TaGoodsOrdersMapper extends BaseMapper<TaGoodsOrders> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaGoodsSpec;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TaGoodsSpec;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TaGoodsSpecMapper extends BaseMapper<TaGoodsSpec> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TdGoodsType;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TdGoodsType;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TdSpec;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.welcome.model.TdSpec;
  * @author jobob
  * @since 2019-07-16
  */
+@Mapper
 public interface TdSpecMapper extends BaseMapper<TdSpec> {
 
 }

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

@@ -48,6 +48,8 @@ public class SysUser implements Serializable {
 
     private String userIdentity;
 
+    private Integer inService;
+
     // 角色列表, 逗号连接
     @TableField(exist = false)
     String authority;

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

@@ -0,0 +1,44 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerTransfer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "transfer_id", type = IdType.AUTO)
+    private Integer transferId;
+
+    private Integer fromUserId;
+
+    private Integer toUserId;
+
+    private String fromUserName;
+
+    private String toUserName;
+
+    private Integer customerId;
+
+    private String customerName;
+
+    private LocalDateTime transferTime;
+
+
+}

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

@@ -3,6 +3,9 @@ package com.huiju.welcome.model;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,7 +25,8 @@ public class TaGoods implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String goodsId;
+    @TableId(value = "goods_id", type = IdType.AUTO)
+    private Integer goodsId;
 
     private String goodsName;
 
@@ -30,7 +34,7 @@ public class TaGoods implements Serializable {
 
     private String caseId;
 
-    private String typeId;
+    private Integer typeId;
 
     private BigDecimal price;
 

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

@@ -1,6 +1,9 @@
 package com.huiju.welcome.model;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,9 +23,10 @@ public class TaGoodsImg implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String imgId;
+    @TableId(value = "img_id", type = IdType.AUTO)
+    private Integer imgId;
 
-    private String goodsId;
+    private Integer goodsId;
 
     private String imgUrl;
 

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

@@ -3,6 +3,9 @@ package com.huiju.welcome.model;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,7 +25,8 @@ public class TaGoodsOrders implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String ordersId;
+    @TableId(value = "orders_id", type = IdType.AUTO)
+    private Integer ordersId;
 
     private String ordersNo;
 
@@ -38,7 +42,7 @@ public class TaGoodsOrders implements Serializable {
 
     private String userType;
 
-    private String userId;
+    private Integer userId;
 
     private String userName;
 

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

@@ -3,6 +3,9 @@ package com.huiju.welcome.model;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,15 +25,16 @@ public class TaGoodsOrdersDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String detailId;
+    @TableId(value = "detail_id", type = IdType.AUTO)
+    private Integer detailId;
 
-    private String ordersId;
+    private Integer ordersId;
 
-    private String goodsId;
+    private Integer goodsId;
 
     private String goodsName;
 
-    private String specId;
+    private Integer specId;
 
     private String specName;
 

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

@@ -2,6 +2,9 @@ package com.huiju.welcome.model;
 
 import java.math.BigDecimal;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,9 +24,10 @@ public class TaGoodsSpec implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String specId;
+    @TableId(value = "spec_id", type = IdType.AUTO)
+    private Integer specId;
 
-    private String goodsId;
+    private Integer goodsId;
 
     private BigDecimal goodsPrice;
 

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

@@ -2,6 +2,9 @@ package com.huiju.welcome.model;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,7 +24,8 @@ public class TdGoodsType implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String typeId;
+    @TableId(value = "type_id", type = IdType.AUTO)
+    private Integer typeId;
 
     private String typeName;
 

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

@@ -2,6 +2,9 @@ package com.huiju.welcome.model;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,7 +24,8 @@ public class TdSpec implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String specId;
+    @TableId(value = "spec_id", type = IdType.AUTO)
+    private Integer specId;
 
     private String specName;
 

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

@@ -93,4 +93,11 @@ public interface ISysUserService extends IService<SysUser> {
      * @return
      */
     ResponseBean sysmenuAdd(String menuId,String menuName,String code);
+
+    /**
+     * 離職当前员工
+     * @param userId
+     * @return
+     */
+    ResponseBean fireUser(Integer userId);
 }

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

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

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

@@ -200,4 +200,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             responseBean.addSuccess("成功");
             return responseBean;
     }
+
+    @Override
+    public ResponseBean fireUser(Integer userId) {
+        ResponseBean responseBean= new ResponseBean<>();
+        sysUserMapper.fireUser(userId);
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,21 @@
+package com.huiju.welcome.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaCustomerTransferMapper;
+import com.huiju.welcome.model.TaCustomerTransfer;
+import com.huiju.welcome.service.ITaCustomerTransferService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-16
+ */
+@Service
+public class TaCustomerTransferServiceImpl extends ServiceImpl<TaCustomerTransferMapper, TaCustomerTransfer> implements ITaCustomerTransferService {
+
+}

src/main/java/com.huiju.welcome/utils/StringUtils.java

@@ -33,4 +33,20 @@ public class StringUtils {
         }
         return sb.toString();
     }
+    public static String getRandomCode(int number){
+        String codeNum = "";
+        int [] code = new int[3];
+        Random random = new Random();
+        for (int i = 0; i < number; i++) {
+            int num = random.nextInt(10) + 48;
+            int uppercase = random.nextInt(26) + 65;
+            int lowercase = random.nextInt(26) + 97;
+            code[0] = num;
+            code[1] = uppercase;
+            code[2] = lowercase;
+            codeNum+=(char)code[random.nextInt(3)];
+        }
+
+        return codeNum;
+    }
 }

src/main/resources/application.yml

@@ -1,9 +1,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: welcome
-    password: s190QU2#z%hdU%^FPkY9qjls
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    username: welcome
+#    password: s190QU2#z%hdU%^FPkY9qjls
+    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: root
+    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB

src/main/resources/mapper/SysUserMapper.xml

@@ -12,4 +12,9 @@
         GROUP BY
             user_id
     </select>
+    <update id="fireUser">
+        update sys_user
+        set status = -1, in_service = 0
+        where user_id = #{userId}
+    </update>
 </mapper>