张延森 6 years ago
parent
commit
236cc9d526
53 changed files with 2024 additions and 21 deletions
  1. 26
    2
      src/main/java/com.huiju.welcome/controller/SysUserController.java
  2. 125
    0
      src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java
  3. 159
    0
      src/main/java/com.huiju.welcome/controller/TaGoodsController.java
  4. 113
    0
      src/main/java/com.huiju.welcome/controller/TaGoodsImgController.java
  5. 134
    0
      src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java
  6. 113
    0
      src/main/java/com.huiju.welcome/controller/TaGoodsOrdersDetailController.java
  7. 114
    0
      src/main/java/com.huiju.welcome/controller/TaGoodsSpecController.java
  8. 0
    2
      src/main/java/com.huiju.welcome/controller/TaPersonController.java
  9. 116
    0
      src/main/java/com.huiju.welcome/controller/TdGoodsTypeController.java
  10. 114
    0
      src/main/java/com.huiju.welcome/controller/TdSpecController.java
  11. 13
    0
      src/main/java/com.huiju.welcome/mapper/SysMenuMapper.java
  12. 6
    0
      src/main/java/com.huiju.welcome/mapper/SysUserMapper.java
  13. 3
    0
      src/main/java/com.huiju.welcome/mapper/SysUserRoleMapper.java
  14. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaCustomerTransferMapper.java
  15. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsImgMapper.java
  16. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsMapper.java
  17. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersDetailMapper.java
  18. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersMapper.java
  19. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsSpecMapper.java
  20. 19
    0
      src/main/java/com.huiju.welcome/mapper/TdGoodsTypeMapper.java
  21. 19
    0
      src/main/java/com.huiju.welcome/mapper/TdSpecMapper.java
  22. 2
    0
      src/main/java/com.huiju.welcome/model/SysUser.java
  23. 77
    0
      src/main/java/com.huiju.welcome/model/TaCustomer.java
  24. 44
    0
      src/main/java/com.huiju.welcome/model/TaCustomerTransfer.java
  25. 48
    0
      src/main/java/com.huiju.welcome/model/TaGoods.java
  26. 36
    0
      src/main/java/com.huiju.welcome/model/TaGoodsImg.java
  27. 54
    0
      src/main/java/com.huiju.welcome/model/TaGoodsOrders.java
  28. 48
    0
      src/main/java/com.huiju.welcome/model/TaGoodsOrdersDetail.java
  29. 35
    0
      src/main/java/com.huiju.welcome/model/TaGoodsSpec.java
  30. 45
    0
      src/main/java/com.huiju.welcome/model/TdGoodsType.java
  31. 41
    0
      src/main/java/com.huiju.welcome/model/TdSpec.java
  32. 23
    6
      src/main/java/com.huiju.welcome/service/ISysUserService.java
  33. 17
    0
      src/main/java/com.huiju.welcome/service/ITaCustomerTransferService.java
  34. 17
    0
      src/main/java/com.huiju.welcome/service/ITaGoodsImgService.java
  35. 17
    0
      src/main/java/com.huiju.welcome/service/ITaGoodsOrdersDetailService.java
  36. 17
    0
      src/main/java/com.huiju.welcome/service/ITaGoodsOrdersService.java
  37. 17
    0
      src/main/java/com.huiju.welcome/service/ITaGoodsService.java
  38. 17
    0
      src/main/java/com.huiju.welcome/service/ITaGoodsSpecService.java
  39. 17
    0
      src/main/java/com.huiju.welcome/service/ITdGoodsTypeService.java
  40. 17
    0
      src/main/java/com.huiju.welcome/service/ITdSpecService.java
  41. 44
    8
      src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java
  42. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaCustomerTransferServiceImpl.java
  43. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaGoodsImgServiceImpl.java
  44. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersDetailServiceImpl.java
  45. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java
  46. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaGoodsServiceImpl.java
  47. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaGoodsSpecServiceImpl.java
  48. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TdGoodsTypeServiceImpl.java
  49. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TdSpecServiceImpl.java
  50. 16
    0
      src/main/java/com.huiju.welcome/utils/StringUtils.java
  51. 6
    3
      src/main/resources/application.yml
  52. 8
    0
      src/main/resources/mapper/SysMenuMapper.xml
  53. 5
    0
      src/main/resources/mapper/SysUserMapper.xml

+ 26
- 2
src/main/java/com.huiju.welcome/controller/SysUserController.java View File

@@ -265,9 +265,9 @@ public class SysUserController extends BaseController {
265 265
 
266 266
     @ApiOperation(value = "员工管理角色权限添加", notes = "员工管理角色权限添加")
267 267
     @RequestMapping(value = "/addUserRole", method = RequestMethod.POST)
268
-    public ResponseBean userManagement(@RequestParam(value = "phone",required = false) String phone,
268
+    public ResponseBean userManagement(@RequestParam(value = "userId",required = false) String userId,
269 269
                                        @RequestParam(value = "roleId",required = false) List<String> roleId) {
270
-        ResponseBean userManagement= sysUserService.addUserRole(phone,roleId);
270
+        ResponseBean userManagement= sysUserService.addUserRole(userId,roleId);
271 271
         return userManagement;
272 272
     }
273 273
 
@@ -311,4 +311,28 @@ public class SysUserController extends BaseController {
311 311
         ResponseBean deleteUserRole= sysUserService.deleteUserRole(userId);
312 312
         return deleteUserRole;
313 313
     }
314
+
315
+    @ApiOperation(value = "菜单列表", notes = "菜单列表")
316
+    @RequestMapping(value = "/sysmenu", method = RequestMethod.GET)
317
+    public ResponseBean sysmenu(@RequestParam(defaultValue = "1") int pageNum,
318
+                                       @RequestParam(defaultValue = "10") int pageSize) {
319
+        IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
320
+        ResponseBean sysmenu= sysUserService.sysmenu(pg);
321
+        return sysmenu;
322
+    }
323
+
324
+    @ApiOperation(value = "操作菜单", notes = "操作菜单")
325
+    @RequestMapping(value = "/sysmenuAdd", method = RequestMethod.POST)
326
+    public ResponseBean sysmenuAdd(@RequestParam(value = "menuId",required = false) String menuId,
327
+                                   @RequestParam(value = "menuName",required = false) String menuName,
328
+                                   @RequestParam(value = "Integer",required = false) String code) {
329
+        ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
330
+        return sysmenu;
331
+    }
332
+    @ApiOperation(value = "當前員工離職", notes = "當前員工離職")
333
+    @RequestMapping(value = "/fireUser", method = RequestMethod.PUT)
334
+    public ResponseBean fireUser(@RequestParam(value = "userId",required = false) Integer userId) {
335
+        ResponseBean fireUser= sysUserService.fireUser(userId);
336
+        return fireUser;
337
+    }
314 338
 }

+ 125
- 0
src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java View File

@@ -0,0 +1,125 @@
1
+package com.huiju.welcome.controller;
2
+
3
+
4
+import com.huiju.welcome.common.base.BaseController;
5
+import com.huiju.welcome.common.base.ResponseBean;
6
+import com.huiju.welcome.model.TaCustomer;
7
+import com.huiju.welcome.model.TaCustomerTransfer;
8
+import com.huiju.welcome.service.ITaCustomerService;
9
+import com.huiju.welcome.service.ITaCustomerTransferService;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.PathVariable;
14
+import org.springframework.web.bind.annotation.RequestBody;
15
+import org.springframework.web.bind.annotation.RequestMapping;
16
+import org.springframework.web.bind.annotation.RequestMethod;
17
+import org.springframework.web.bind.annotation.ResponseBody;
18
+import org.springframework.web.bind.annotation.RestController;
19
+
20
+
21
+/**
22
+ * <p>
23
+    *  前端控制器
24
+    * </p>
25
+ *
26
+ * @author jobob
27
+ * @since 2019-07-16
28
+ */
29
+@RestController
30
+@RequestMapping("/")
31
+public class TaCustomerTransferController extends BaseController {
32
+
33
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerTransferController.class);
34
+
35
+    @Autowired
36
+    public ITaCustomerTransferService iTaCustomerTransferService;
37
+    @Autowired
38
+    public ITaCustomerService iTaCustomerService;
39
+
40
+
41
+    /**
42
+     * 保存对象
43
+     * @param taCustomerTransfer 实体对象
44
+     * @return
45
+     */
46
+    @RequestMapping(value="/taCustomerTransfer/add",method= RequestMethod.POST)
47
+    public ResponseBean tpShopImgAdd(@RequestBody TaCustomerTransfer taCustomerTransfer){
48
+        ResponseBean responseBean = new ResponseBean();
49
+        try {
50
+            Boolean flag = iTaCustomerTransferService.save(taCustomerTransfer);
51
+            Boolean flagUpdate = false;
52
+            TaCustomer taCustomer = iTaCustomerService.getById(taCustomerTransfer.getCustomerId());
53
+            taCustomer.setConsultantId(taCustomerTransfer.getToUserId());
54
+            taCustomer.setRealtyConsultant(taCustomerTransfer.getToUserName());
55
+            flagUpdate = iTaCustomerService.updateById(taCustomer);
56
+            if (flag&&flagUpdate){
57
+                responseBean.addSuccess("success");
58
+            }else {
59
+                responseBean.addError("fail");
60
+            }
61
+        }catch (Exception e){
62
+            logger.error("taCustomerTransferAdd -=- {}",e.toString());
63
+            responseBean.addError(e.getMessage());
64
+        }
65
+        return responseBean;
66
+    }
67
+
68
+    /**
69
+     * 根据id删除对象
70
+     * @param id  实体ID
71
+     */
72
+    @ResponseBody
73
+    @RequestMapping(value="/taCustomerTransfer/delete/{id}", method= RequestMethod.DELETE)
74
+    public ResponseBean taCustomerTransferDelete(@PathVariable Integer id){
75
+        ResponseBean responseBean = new ResponseBean();
76
+        try {
77
+            if(iTaCustomerTransferService.removeById(id)){
78
+                responseBean.addSuccess("success");
79
+            }else {
80
+                responseBean.addError("fail");
81
+            }
82
+        }catch (Exception e){
83
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
84
+            responseBean.addError(e.getMessage());
85
+        }
86
+        return responseBean;
87
+    }
88
+
89
+    /**
90
+     * 修改对象
91
+     * @param taCustomerTransfer 实体对象
92
+     * @return
93
+     */
94
+    @RequestMapping(value="/taCustomerTransfer/update",method= RequestMethod.PUT)
95
+    public ResponseBean tpShopImgUpdate(@RequestBody TaCustomerTransfer taCustomerTransfer){
96
+        ResponseBean responseBean = new ResponseBean();
97
+        try {
98
+            if (iTaCustomerTransferService.updateById(taCustomerTransfer)){
99
+                responseBean.addSuccess("success");
100
+            }else {
101
+                responseBean.addError("fail");
102
+            }
103
+        }catch (Exception e){
104
+            logger.error("taCustomerTransferUpdate -=- {}",e.toString());
105
+            responseBean.addError(e.getMessage());
106
+        }
107
+        return responseBean;
108
+    }
109
+
110
+    /**
111
+     * 根据id查询对象
112
+     * @param id  实体ID
113
+     */
114
+    @RequestMapping(value="/taCustomerTransfer/get/{id}",method= RequestMethod.GET)
115
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
116
+        ResponseBean responseBean = new ResponseBean();
117
+        try {
118
+            responseBean.addSuccess(iTaCustomerTransferService.getById(id));
119
+        }catch (Exception e){
120
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
121
+            responseBean.addError(e.getMessage());
122
+        }
123
+        return responseBean;
124
+    }
125
+}

+ 159
- 0
src/main/java/com.huiju.welcome/controller/TaGoodsController.java View File

@@ -0,0 +1,159 @@
1
+package com.huiju.welcome.controller;
2
+
3
+import com.alibaba.fastjson.JSONArray;
4
+import com.alibaba.fastjson.JSONObject;
5
+import com.google.gson.JsonArray;
6
+import com.google.gson.JsonObject;
7
+import com.huiju.welcome.common.base.BaseController;
8
+import com.huiju.welcome.common.base.ResponseBean;
9
+import com.huiju.welcome.model.TaGoods;
10
+import com.huiju.welcome.model.TaGoodsImg;
11
+import com.huiju.welcome.model.TaGoodsSpec;
12
+import com.huiju.welcome.service.ITaGoodsImgService;
13
+import com.huiju.welcome.service.ITaGoodsService;
14
+import com.huiju.welcome.service.ITaGoodsSpecService;
15
+import org.slf4j.Logger;
16
+import org.slf4j.LoggerFactory;
17
+import org.springframework.beans.factory.annotation.Autowired;
18
+import org.springframework.web.bind.annotation.PathVariable;
19
+import org.springframework.web.bind.annotation.RequestBody;
20
+import org.springframework.web.bind.annotation.RequestMapping;
21
+import org.springframework.web.bind.annotation.RequestMethod;
22
+import org.springframework.web.bind.annotation.ResponseBody;
23
+import org.springframework.web.bind.annotation.RestController;
24
+
25
+
26
+
27
+/**
28
+ * <p>
29
+    *  前端控制器
30
+    * </p>
31
+ *
32
+ * @author jobob
33
+ * @since 2019-07-16
34
+ */
35
+@RestController
36
+@RequestMapping("/")
37
+public class TaGoodsController extends BaseController {
38
+
39
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
40
+
41
+    @Autowired
42
+    public ITaGoodsService iTaGoodsService;
43
+    @Autowired
44
+    public ITaGoodsImgService iTaGoodsImgService;
45
+    @Autowired
46
+    public ITaGoodsSpecService iTaGoodsSpecService;
47
+
48
+
49
+    /**
50
+     * 保存对象
51
+     * @param paramStr 实体对象
52
+     * @return
53
+     */
54
+    @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
55
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
56
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
57
+
58
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
59
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
60
+        JSONArray spec = jsonObject.getJSONArray("spec");
61
+
62
+        ResponseBean responseBean = new ResponseBean();
63
+        try {
64
+            Boolean flag = iTaGoodsService.save(taGoods);
65
+            Boolean flagImg = iTaGoodsImgService.save(taGoodsImg);
66
+            Boolean flagSpec = false;
67
+            for(int i = 0;i<spec.size();i++){
68
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
69
+                taGoodsSpec.setGoodsId(taGoods.getGoodsId());
70
+                flagSpec = iTaGoodsSpecService.save(taGoodsSpec);
71
+            }
72
+            if (flag&& flagImg&&flagSpec){
73
+                responseBean.addSuccess("success");
74
+            }else {
75
+                responseBean.addError("fail");
76
+            }
77
+        }catch (Exception e){
78
+            logger.error("taGoodsAdd -=- {}",e.toString());
79
+            responseBean.addError(e.getMessage());
80
+        }
81
+        return responseBean;
82
+    }
83
+
84
+    /**
85
+     * 根据id删除对象
86
+     * @param id  实体ID
87
+     */
88
+    @ResponseBody
89
+    @RequestMapping(value="/taGoods/delete/{id}", method= RequestMethod.DELETE)
90
+    public ResponseBean taGoodsDelete(@PathVariable Integer id){
91
+        ResponseBean responseBean = new ResponseBean();
92
+        try {
93
+            if(iTaGoodsService.removeById(id)){
94
+                responseBean.addSuccess("success");
95
+            }else {
96
+                responseBean.addError("fail");
97
+            }
98
+        }catch (Exception e){
99
+            logger.error("taGoodsDelete -=- {}",e.toString());
100
+            responseBean.addError(e.getMessage());
101
+        }
102
+        return responseBean;
103
+    }
104
+
105
+    /**
106
+     * 修改对象
107
+     * @param paramStr 实体对象
108
+     * @return
109
+     */
110
+    @RequestMapping(value="/taGoods/update",method= RequestMethod.PUT)
111
+    public ResponseBean tpShopImgUpdate(@RequestBody String paramStr){
112
+        ResponseBean responseBean = new ResponseBean();
113
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
114
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
115
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
116
+        JSONArray spec = jsonObject.getJSONArray("spec");
117
+
118
+        try {
119
+            Boolean flag = iTaGoodsService.updateById(taGoods);
120
+            Boolean flagImg = iTaGoodsImgService.updateById(taGoodsImg);
121
+            Boolean flagSpec = false;
122
+            for(int i = 0;i<spec.size();i++){
123
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
124
+                flagSpec = iTaGoodsSpecService.updateById(taGoodsSpec);
125
+            }
126
+            if (flag&& flagImg&&flagSpec){
127
+                responseBean.addSuccess("success");
128
+            }else {
129
+                responseBean.addError("fail");
130
+            }
131
+        }catch (Exception e){
132
+            logger.error("taGoodsUpdate -=- {}",e.toString());
133
+            responseBean.addError(e.getMessage());
134
+        }
135
+        return responseBean;
136
+    }
137
+
138
+    /**
139
+     * 根据id查询对象
140
+     * @param id  实体ID
141
+     */
142
+    @RequestMapping(value="/taGoods/get/{id}",method= RequestMethod.GET)
143
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
144
+        ResponseBean responseBean = new ResponseBean();
145
+        try {
146
+            responseBean.addSuccess(iTaGoodsService.getById(id));
147
+        }catch (Exception e){
148
+            logger.error("taGoodsDelete -=- {}",e.toString());
149
+            responseBean.addError(e.getMessage());
150
+        }
151
+        return responseBean;
152
+    }
153
+
154
+
155
+
156
+
157
+
158
+
159
+}

+ 113
- 0
src/main/java/com.huiju.welcome/controller/TaGoodsImgController.java View File

@@ -0,0 +1,113 @@
1
+package com.huiju.welcome.controller;
2
+
3
+import com.huiju.welcome.common.base.BaseController;
4
+import com.huiju.welcome.common.base.ResponseBean;
5
+import com.huiju.welcome.model.TaGoodsImg;
6
+import com.huiju.welcome.service.ITaGoodsImgService;
7
+import org.slf4j.Logger;
8
+import org.slf4j.LoggerFactory;
9
+import org.springframework.beans.factory.annotation.Autowired;
10
+import org.springframework.web.bind.annotation.PathVariable;
11
+import org.springframework.web.bind.annotation.RequestBody;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RequestMethod;
14
+import org.springframework.web.bind.annotation.ResponseBody;
15
+import org.springframework.web.bind.annotation.RestController;
16
+
17
+/**
18
+ * <p>
19
+    *  前端控制器
20
+    * </p>
21
+ *
22
+ * @author jobob
23
+ * @since 2019-07-16
24
+ */
25
+@RestController
26
+@RequestMapping("/")
27
+public class TaGoodsImgController extends BaseController {
28
+
29
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsImgController.class);
30
+
31
+    @Autowired
32
+    public ITaGoodsImgService iTaGoodsImgService;
33
+
34
+
35
+    /**
36
+     * 保存对象
37
+     * @param taGoodsImg 实体对象
38
+     * @return
39
+     */
40
+    @RequestMapping(value="/taGoodsImg/add",method= RequestMethod.POST)
41
+    public ResponseBean tpShopImgAdd(@RequestBody TaGoodsImg taGoodsImg){
42
+        ResponseBean responseBean = new ResponseBean();
43
+        try {
44
+            if (iTaGoodsImgService.save(taGoodsImg)){
45
+                responseBean.addSuccess("success");
46
+            }else {
47
+                responseBean.addError("fail");
48
+            }
49
+        }catch (Exception e){
50
+            logger.error("taGoodsImgAdd -=- {}",e.toString());
51
+            responseBean.addError(e.getMessage());
52
+        }
53
+        return responseBean;
54
+    }
55
+
56
+    /**
57
+     * 根据id删除对象
58
+     * @param id  实体ID
59
+     */
60
+    @ResponseBody
61
+    @RequestMapping(value="/taGoodsImg/delete/{id}", method= RequestMethod.DELETE)
62
+    public ResponseBean taGoodsImgDelete(@PathVariable Integer id){
63
+        ResponseBean responseBean = new ResponseBean();
64
+        try {
65
+            if(iTaGoodsImgService.removeById(id)){
66
+                responseBean.addSuccess("success");
67
+            }else {
68
+                responseBean.addError("fail");
69
+            }
70
+        }catch (Exception e){
71
+            logger.error("taGoodsImgDelete -=- {}",e.toString());
72
+            responseBean.addError(e.getMessage());
73
+        }
74
+        return responseBean;
75
+    }
76
+
77
+    /**
78
+     * 修改对象
79
+     * @param taGoodsImg 实体对象
80
+     * @return
81
+     */
82
+    @RequestMapping(value="/taGoodsImg/update",method= RequestMethod.PUT)
83
+    public ResponseBean tpShopImgUpdate(@RequestBody TaGoodsImg taGoodsImg){
84
+        ResponseBean responseBean = new ResponseBean();
85
+        try {
86
+            if (iTaGoodsImgService.updateById(taGoodsImg)){
87
+                responseBean.addSuccess("success");
88
+            }else {
89
+                responseBean.addError("fail");
90
+            }
91
+        }catch (Exception e){
92
+            logger.error("taGoodsImgUpdate -=- {}",e.toString());
93
+            responseBean.addError(e.getMessage());
94
+        }
95
+        return responseBean;
96
+    }
97
+
98
+    /**
99
+     * 根据id查询对象
100
+     * @param id  实体ID
101
+     */
102
+    @RequestMapping(value="/taGoodsImg/get/{id}",method= RequestMethod.GET)
103
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
104
+        ResponseBean responseBean = new ResponseBean();
105
+        try {
106
+            responseBean.addSuccess(iTaGoodsImgService.getById(id));
107
+        }catch (Exception e){
108
+            logger.error("taGoodsImgDelete -=- {}",e.toString());
109
+            responseBean.addError(e.getMessage());
110
+        }
111
+        return responseBean;
112
+    }
113
+}

+ 134
- 0
src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java View File

@@ -0,0 +1,134 @@
1
+package com.huiju.welcome.controller;
2
+
3
+import com.alibaba.fastjson.JSONArray;
4
+import com.alibaba.fastjson.JSONObject;
5
+import com.huiju.welcome.common.base.BaseController;
6
+import com.huiju.welcome.common.base.ResponseBean;
7
+import com.huiju.welcome.model.TaGoodsOrders;
8
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
9
+import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
10
+import com.huiju.welcome.service.ITaGoodsOrdersService;
11
+import com.huiju.welcome.utils.StringUtils;
12
+import org.slf4j.Logger;
13
+import org.slf4j.LoggerFactory;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.web.bind.annotation.PathVariable;
16
+import org.springframework.web.bind.annotation.RequestBody;
17
+import org.springframework.web.bind.annotation.RequestMapping;
18
+import org.springframework.web.bind.annotation.RequestMethod;
19
+import org.springframework.web.bind.annotation.ResponseBody;
20
+import org.springframework.web.bind.annotation.RestController;
21
+
22
+
23
+/**
24
+ * <p>
25
+    *  前端控制器
26
+    * </p>
27
+ *
28
+ * @author jobob
29
+ * @since 2019-07-16
30
+ */
31
+@RestController
32
+@RequestMapping("/")
33
+public class TaGoodsOrdersController extends BaseController {
34
+
35
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsOrdersController.class);
36
+
37
+    @Autowired
38
+    public ITaGoodsOrdersService iTaGoodsOrdersService;
39
+    @Autowired
40
+    public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
41
+
42
+
43
+    /**
44
+     * 保存对象
45
+     * @param paramStr 实体对象
46
+     * @return
47
+     */
48
+    @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
49
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
50
+        ResponseBean responseBean = new ResponseBean();
51
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
52
+        TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
53
+        JSONArray detail = jsonObject.getJSONArray("detail");
54
+        try {
55
+            Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
56
+
57
+            Boolean flagDetail = false;
58
+            for(int i=0;i<detail.size();i++){
59
+                TaGoodsOrdersDetail taGoodsOrdersDetail = detail.getObject(i,TaGoodsOrdersDetail.class);
60
+                taGoodsOrdersDetail.setOrdersId(taGoodsOrders.getOrdersId());
61
+                flagDetail = iTaGoodsOrdersDetailService.save(taGoodsOrdersDetail);
62
+            }
63
+            if (flag&&flagDetail){
64
+                responseBean.addSuccess("success");
65
+            }else {
66
+                responseBean.addError("fail");
67
+            }
68
+        }catch (Exception e){
69
+            logger.error("taGoodsOrdersAdd -=- {}",e.toString());
70
+            responseBean.addError(e.getMessage());
71
+        }
72
+        return responseBean;
73
+    }
74
+
75
+    /**
76
+     * 根据id删除对象
77
+     * @param id  实体ID
78
+     */
79
+    @ResponseBody
80
+    @RequestMapping(value="/taGoodsOrders/delete/{id}", method= RequestMethod.DELETE)
81
+    public ResponseBean taGoodsOrdersDelete(@PathVariable Integer id){
82
+        ResponseBean responseBean = new ResponseBean();
83
+        try {
84
+            if(iTaGoodsOrdersService.removeById(id)){
85
+                responseBean.addSuccess("success");
86
+            }else {
87
+                responseBean.addError("fail");
88
+            }
89
+        }catch (Exception e){
90
+            logger.error("taGoodsOrdersDelete -=- {}",e.toString());
91
+            responseBean.addError(e.getMessage());
92
+        }
93
+        return responseBean;
94
+    }
95
+
96
+    /**
97
+     * 修改对象
98
+     * @param taGoodsOrders 实体对象
99
+     * @return
100
+     */
101
+    @RequestMapping(value="/taGoodsOrders/update",method= RequestMethod.PUT)
102
+    public ResponseBean tpShopImgUpdate(@RequestBody TaGoodsOrders taGoodsOrders){
103
+        ResponseBean responseBean = new ResponseBean();
104
+        try {
105
+            if (iTaGoodsOrdersService.updateById(taGoodsOrders)){
106
+                responseBean.addSuccess("success");
107
+            }else {
108
+                responseBean.addError("fail");
109
+            }
110
+        }catch (Exception e){
111
+            logger.error("taGoodsOrdersUpdate -=- {}",e.toString());
112
+            responseBean.addError(e.getMessage());
113
+        }
114
+        return responseBean;
115
+    }
116
+
117
+    /**
118
+     * 根据id查询对象
119
+     * @param id  实体ID
120
+     */
121
+    @RequestMapping(value="/taGoodsOrders/get/{id}",method= RequestMethod.GET)
122
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
123
+        ResponseBean responseBean = new ResponseBean();
124
+        try {
125
+            responseBean.addSuccess(iTaGoodsOrdersService.getById(id));
126
+        }catch (Exception e){
127
+            logger.error("taGoodsOrdersDelete -=- {}",e.toString());
128
+            responseBean.addError(e.getMessage());
129
+        }
130
+        return responseBean;
131
+    }
132
+
133
+
134
+}

+ 113
- 0
src/main/java/com.huiju.welcome/controller/TaGoodsOrdersDetailController.java View File

@@ -0,0 +1,113 @@
1
+package com.huiju.welcome.controller;
2
+
3
+import com.huiju.welcome.common.base.BaseController;
4
+import com.huiju.welcome.common.base.ResponseBean;
5
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
6
+import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
7
+import org.slf4j.Logger;
8
+import org.slf4j.LoggerFactory;
9
+import org.springframework.beans.factory.annotation.Autowired;
10
+import org.springframework.web.bind.annotation.PathVariable;
11
+import org.springframework.web.bind.annotation.RequestBody;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RequestMethod;
14
+import org.springframework.web.bind.annotation.ResponseBody;
15
+import org.springframework.web.bind.annotation.RestController;
16
+
17
+/**
18
+ * <p>
19
+    *  前端控制器
20
+    * </p>
21
+ *
22
+ * @author jobob
23
+ * @since 2019-07-16
24
+ */
25
+@RestController
26
+@RequestMapping("/")
27
+public class TaGoodsOrdersDetailController extends BaseController {
28
+
29
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsOrdersDetailController.class);
30
+
31
+    @Autowired
32
+    public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
33
+
34
+
35
+    /**
36
+     * 保存对象
37
+     * @param taGoodsOrdersDetail 实体对象
38
+     * @return
39
+     */
40
+    @RequestMapping(value="/taGoodsOrdersDetail/add",method= RequestMethod.POST)
41
+    public ResponseBean tpShopImgAdd(@RequestBody TaGoodsOrdersDetail taGoodsOrdersDetail){
42
+        ResponseBean responseBean = new ResponseBean();
43
+        try {
44
+            if (iTaGoodsOrdersDetailService.save(taGoodsOrdersDetail)){
45
+                responseBean.addSuccess("success");
46
+            }else {
47
+                responseBean.addError("fail");
48
+            }
49
+        }catch (Exception e){
50
+            logger.error("taGoodsOrdersDetailAdd -=- {}",e.toString());
51
+            responseBean.addError(e.getMessage());
52
+        }
53
+        return responseBean;
54
+    }
55
+
56
+    /**
57
+     * 根据id删除对象
58
+     * @param id  实体ID
59
+     */
60
+    @ResponseBody
61
+    @RequestMapping(value="/taGoodsOrdersDetail/delete/{id}", method= RequestMethod.DELETE)
62
+    public ResponseBean taGoodsOrdersDetailDelete(@PathVariable Integer id){
63
+        ResponseBean responseBean = new ResponseBean();
64
+        try {
65
+            if(iTaGoodsOrdersDetailService.removeById(id)){
66
+                responseBean.addSuccess("success");
67
+            }else {
68
+                responseBean.addError("fail");
69
+            }
70
+        }catch (Exception e){
71
+            logger.error("taGoodsOrdersDetailDelete -=- {}",e.toString());
72
+            responseBean.addError(e.getMessage());
73
+        }
74
+        return responseBean;
75
+    }
76
+
77
+    /**
78
+     * 修改对象
79
+     * @param taGoodsOrdersDetail 实体对象
80
+     * @return
81
+     */
82
+    @RequestMapping(value="/taGoodsOrdersDetail/update",method= RequestMethod.PUT)
83
+    public ResponseBean tpShopImgUpdate(@RequestBody TaGoodsOrdersDetail taGoodsOrdersDetail){
84
+        ResponseBean responseBean = new ResponseBean();
85
+        try {
86
+            if (iTaGoodsOrdersDetailService.updateById(taGoodsOrdersDetail)){
87
+                responseBean.addSuccess("success");
88
+            }else {
89
+                responseBean.addError("fail");
90
+            }
91
+        }catch (Exception e){
92
+            logger.error("taGoodsOrdersDetailUpdate -=- {}",e.toString());
93
+            responseBean.addError(e.getMessage());
94
+        }
95
+        return responseBean;
96
+    }
97
+
98
+    /**
99
+     * 根据id查询对象
100
+     * @param id  实体ID
101
+     */
102
+    @RequestMapping(value="/taGoodsOrdersDetail/get/{id}",method= RequestMethod.GET)
103
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
104
+        ResponseBean responseBean = new ResponseBean();
105
+        try {
106
+            responseBean.addSuccess(iTaGoodsOrdersDetailService.getById(id));
107
+        }catch (Exception e){
108
+            logger.error("taGoodsOrdersDetailDelete -=- {}",e.toString());
109
+            responseBean.addError(e.getMessage());
110
+        }
111
+        return responseBean;
112
+    }
113
+}

+ 114
- 0
src/main/java/com.huiju.welcome/controller/TaGoodsSpecController.java View File

@@ -0,0 +1,114 @@
1
+package com.huiju.welcome.controller;
2
+
3
+
4
+import com.huiju.welcome.common.base.BaseController;
5
+import com.huiju.welcome.common.base.ResponseBean;
6
+import com.huiju.welcome.model.TaGoodsSpec;
7
+import com.huiju.welcome.service.ITaGoodsSpecService;
8
+import org.slf4j.Logger;
9
+import org.slf4j.LoggerFactory;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.web.bind.annotation.PathVariable;
12
+import org.springframework.web.bind.annotation.RequestBody;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RequestMethod;
15
+import org.springframework.web.bind.annotation.ResponseBody;
16
+import org.springframework.web.bind.annotation.RestController;
17
+
18
+/**
19
+ * <p>
20
+    *  前端控制器
21
+    * </p>
22
+ *
23
+ * @author jobob
24
+ * @since 2019-07-16
25
+ */
26
+@RestController
27
+@RequestMapping("/")
28
+public class TaGoodsSpecController extends BaseController {
29
+
30
+    private final Logger logger = LoggerFactory.getLogger(TaGoodsSpecController.class);
31
+
32
+    @Autowired
33
+    public ITaGoodsSpecService iTaGoodsSpecService;
34
+
35
+
36
+    /**
37
+     * 保存对象
38
+     * @param taGoodsSpec 实体对象
39
+     * @return
40
+     */
41
+    @RequestMapping(value="/taGoodsSpec/add",method= RequestMethod.POST)
42
+    public ResponseBean tpShopImgAdd(@RequestBody TaGoodsSpec taGoodsSpec){
43
+        ResponseBean responseBean = new ResponseBean();
44
+        try {
45
+            if (iTaGoodsSpecService.save(taGoodsSpec)){
46
+                responseBean.addSuccess("success");
47
+            }else {
48
+                responseBean.addError("fail");
49
+            }
50
+        }catch (Exception e){
51
+            logger.error("taGoodsSpecAdd -=- {}",e.toString());
52
+            responseBean.addError(e.getMessage());
53
+        }
54
+        return responseBean;
55
+    }
56
+
57
+    /**
58
+     * 根据id删除对象
59
+     * @param id  实体ID
60
+     */
61
+    @ResponseBody
62
+    @RequestMapping(value="/taGoodsSpec/delete/{id}", method= RequestMethod.DELETE)
63
+    public ResponseBean taGoodsSpecDelete(@PathVariable Integer id){
64
+        ResponseBean responseBean = new ResponseBean();
65
+        try {
66
+            if(iTaGoodsSpecService.removeById(id)){
67
+                responseBean.addSuccess("success");
68
+            }else {
69
+                responseBean.addError("fail");
70
+            }
71
+        }catch (Exception e){
72
+            logger.error("taGoodsSpecDelete -=- {}",e.toString());
73
+            responseBean.addError(e.getMessage());
74
+        }
75
+        return responseBean;
76
+    }
77
+
78
+    /**
79
+     * 修改对象
80
+     * @param taGoodsSpec 实体对象
81
+     * @return
82
+     */
83
+    @RequestMapping(value="/taGoodsSpec/update",method= RequestMethod.PUT)
84
+    public ResponseBean tpShopImgUpdate(@RequestBody TaGoodsSpec taGoodsSpec){
85
+        ResponseBean responseBean = new ResponseBean();
86
+        try {
87
+            if (iTaGoodsSpecService.updateById(taGoodsSpec)){
88
+                responseBean.addSuccess("success");
89
+            }else {
90
+                responseBean.addError("fail");
91
+            }
92
+        }catch (Exception e){
93
+            logger.error("taGoodsSpecUpdate -=- {}",e.toString());
94
+            responseBean.addError(e.getMessage());
95
+        }
96
+        return responseBean;
97
+    }
98
+
99
+    /**
100
+     * 根据id查询对象
101
+     * @param id  实体ID
102
+     */
103
+    @RequestMapping(value="/taGoodsSpec/get/{id}",method= RequestMethod.GET)
104
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
105
+        ResponseBean responseBean = new ResponseBean();
106
+        try {
107
+            responseBean.addSuccess(iTaGoodsSpecService.getById(id));
108
+        }catch (Exception e){
109
+            logger.error("taGoodsSpecDelete -=- {}",e.toString());
110
+            responseBean.addError(e.getMessage());
111
+        }
112
+        return responseBean;
113
+    }
114
+}

+ 0
- 2
src/main/java/com.huiju.welcome/controller/TaPersonController.java View File

@@ -1,7 +1,5 @@
1 1
 package com.huiju.welcome.controller;
2 2
 
3
-import com.alibaba.fastjson.JSONObject;
4
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
5 3
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 4
 import com.huiju.welcome.common.base.BaseController;
7 5
 import com.huiju.welcome.common.base.ResponseBean;

+ 116
- 0
src/main/java/com.huiju.welcome/controller/TdGoodsTypeController.java View File

@@ -0,0 +1,116 @@
1
+package com.huiju.welcome.controller;
2
+
3
+
4
+import com.huiju.welcome.common.base.BaseController;
5
+import com.huiju.welcome.common.base.ResponseBean;
6
+import com.huiju.welcome.model.TdGoodsType;
7
+import com.huiju.welcome.service.ITdGoodsTypeService;
8
+import org.slf4j.Logger;
9
+import org.slf4j.LoggerFactory;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.web.bind.annotation.PathVariable;
12
+import org.springframework.web.bind.annotation.RequestBody;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RequestMethod;
15
+import org.springframework.web.bind.annotation.ResponseBody;
16
+
17
+import org.springframework.web.bind.annotation.RestController;
18
+
19
+
20
+/**
21
+ * <p>
22
+    *  前端控制器
23
+    * </p>
24
+ *
25
+ * @author jobob
26
+ * @since 2019-07-16
27
+ */
28
+@RestController
29
+@RequestMapping("/")
30
+public class TdGoodsTypeController extends BaseController {
31
+
32
+    private final Logger logger = LoggerFactory.getLogger(TdGoodsTypeController.class);
33
+
34
+    @Autowired
35
+    public ITdGoodsTypeService iTdGoodsTypeService;
36
+
37
+
38
+    /**
39
+     * 保存对象
40
+     * @param tdGoodsType 实体对象
41
+     * @return
42
+     */
43
+    @RequestMapping(value="/tdGoodsType/add",method= RequestMethod.POST)
44
+    public ResponseBean tpShopImgAdd(@RequestBody TdGoodsType tdGoodsType){
45
+        ResponseBean responseBean = new ResponseBean();
46
+        try {
47
+            if (iTdGoodsTypeService.save(tdGoodsType)){
48
+                responseBean.addSuccess("success");
49
+            }else {
50
+                responseBean.addError("fail");
51
+            }
52
+        }catch (Exception e){
53
+            logger.error("tdGoodsTypeAdd -=- {}",e.toString());
54
+            responseBean.addError(e.getMessage());
55
+        }
56
+        return responseBean;
57
+    }
58
+
59
+    /**
60
+     * 根据id删除对象
61
+     * @param id  实体ID
62
+     */
63
+    @ResponseBody
64
+    @RequestMapping(value="/tdGoodsType/delete/{id}", method= RequestMethod.DELETE)
65
+    public ResponseBean tdGoodsTypeDelete(@PathVariable Integer id){
66
+        ResponseBean responseBean = new ResponseBean();
67
+        try {
68
+            if(iTdGoodsTypeService.removeById(id)){
69
+                responseBean.addSuccess("success");
70
+            }else {
71
+                responseBean.addError("fail");
72
+            }
73
+        }catch (Exception e){
74
+            logger.error("tdGoodsTypeDelete -=- {}",e.toString());
75
+            responseBean.addError(e.getMessage());
76
+        }
77
+        return responseBean;
78
+    }
79
+
80
+    /**
81
+     * 修改对象
82
+     * @param tdGoodsType 实体对象
83
+     * @return
84
+     */
85
+    @RequestMapping(value="/tdGoodsType/update",method= RequestMethod.PUT)
86
+    public ResponseBean tpShopImgUpdate(@RequestBody TdGoodsType tdGoodsType){
87
+        ResponseBean responseBean = new ResponseBean();
88
+        try {
89
+            if (iTdGoodsTypeService.updateById(tdGoodsType)){
90
+                responseBean.addSuccess("success");
91
+            }else {
92
+                responseBean.addError("fail");
93
+            }
94
+        }catch (Exception e){
95
+            logger.error("tdGoodsTypeUpdate -=- {}",e.toString());
96
+            responseBean.addError(e.getMessage());
97
+        }
98
+        return responseBean;
99
+    }
100
+
101
+    /**
102
+     * 根据id查询对象
103
+     * @param id  实体ID
104
+     */
105
+    @RequestMapping(value="/tdGoodsType/get/{id}",method= RequestMethod.GET)
106
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
107
+        ResponseBean responseBean = new ResponseBean();
108
+        try {
109
+            responseBean.addSuccess(iTdGoodsTypeService.getById(id));
110
+        }catch (Exception e){
111
+            logger.error("tdGoodsTypeDelete -=- {}",e.toString());
112
+            responseBean.addError(e.getMessage());
113
+        }
114
+        return responseBean;
115
+    }
116
+}

+ 114
- 0
src/main/java/com.huiju.welcome/controller/TdSpecController.java View File

@@ -0,0 +1,114 @@
1
+package com.huiju.welcome.controller;
2
+
3
+import com.huiju.welcome.common.base.BaseController;
4
+import com.huiju.welcome.common.base.ResponseBean;
5
+import com.huiju.welcome.model.TdSpec;
6
+import com.huiju.welcome.service.ITdSpecService;
7
+import org.slf4j.Logger;
8
+import org.slf4j.LoggerFactory;
9
+import org.springframework.beans.factory.annotation.Autowired;
10
+import org.springframework.web.bind.annotation.PathVariable;
11
+import org.springframework.web.bind.annotation.RequestBody;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RequestMethod;
14
+import org.springframework.web.bind.annotation.ResponseBody;
15
+import org.springframework.web.bind.annotation.RestController;
16
+
17
+
18
+/**
19
+ * <p>
20
+    *  前端控制器
21
+    * </p>
22
+ *
23
+ * @author jobob
24
+ * @since 2019-07-16
25
+ */
26
+@RestController
27
+@RequestMapping("/")
28
+public class TdSpecController extends BaseController {
29
+
30
+    private final Logger logger = LoggerFactory.getLogger(TdSpecController.class);
31
+
32
+    @Autowired
33
+    public ITdSpecService iTdSpecService;
34
+
35
+
36
+    /**
37
+     * 保存对象
38
+     * @param tdSpec 实体对象
39
+     * @return
40
+     */
41
+    @RequestMapping(value="/tdSpec/add",method= RequestMethod.POST)
42
+    public ResponseBean tpShopImgAdd(@RequestBody TdSpec tdSpec){
43
+        ResponseBean responseBean = new ResponseBean();
44
+        try {
45
+            if (iTdSpecService.save(tdSpec)){
46
+                responseBean.addSuccess("success");
47
+            }else {
48
+                responseBean.addError("fail");
49
+            }
50
+        }catch (Exception e){
51
+            logger.error("tdSpecAdd -=- {}",e.toString());
52
+            responseBean.addError(e.getMessage());
53
+        }
54
+        return responseBean;
55
+    }
56
+
57
+    /**
58
+     * 根据id删除对象
59
+     * @param id  实体ID
60
+     */
61
+    @ResponseBody
62
+    @RequestMapping(value="/tdSpec/delete/{id}", method= RequestMethod.DELETE)
63
+    public ResponseBean tdSpecDelete(@PathVariable Integer id){
64
+        ResponseBean responseBean = new ResponseBean();
65
+        try {
66
+            if(iTdSpecService.removeById(id)){
67
+                responseBean.addSuccess("success");
68
+            }else {
69
+                responseBean.addError("fail");
70
+            }
71
+        }catch (Exception e){
72
+            logger.error("tdSpecDelete -=- {}",e.toString());
73
+            responseBean.addError(e.getMessage());
74
+        }
75
+        return responseBean;
76
+    }
77
+
78
+    /**
79
+     * 修改对象
80
+     * @param tdSpec 实体对象
81
+     * @return
82
+     */
83
+    @RequestMapping(value="/tdSpec/update",method= RequestMethod.PUT)
84
+    public ResponseBean tpShopImgUpdate(@RequestBody TdSpec tdSpec){
85
+        ResponseBean responseBean = new ResponseBean();
86
+        try {
87
+            if (iTdSpecService.updateById(tdSpec)){
88
+                responseBean.addSuccess("success");
89
+            }else {
90
+                responseBean.addError("fail");
91
+            }
92
+        }catch (Exception e){
93
+            logger.error("tdSpecUpdate -=- {}",e.toString());
94
+            responseBean.addError(e.getMessage());
95
+        }
96
+        return responseBean;
97
+    }
98
+
99
+    /**
100
+     * 根据id查询对象
101
+     * @param id  实体ID
102
+     */
103
+    @RequestMapping(value="/tdSpec/get/{id}",method= RequestMethod.GET)
104
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
105
+        ResponseBean responseBean = new ResponseBean();
106
+        try {
107
+            responseBean.addSuccess(iTdSpecService.getById(id));
108
+        }catch (Exception e){
109
+            logger.error("tdSpecDelete -=- {}",e.toString());
110
+            responseBean.addError(e.getMessage());
111
+        }
112
+        return responseBean;
113
+    }
114
+}

+ 13
- 0
src/main/java/com.huiju.welcome/mapper/SysMenuMapper.java View File

@@ -1,8 +1,10 @@
1 1
 package com.huiju.welcome.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import com.huiju.welcome.model.SysMenu;
5 6
 import com.huiju.welcome.model.SysRole;
7
+import com.huiju.welcome.model.SysUserRole;
6 8
 import org.apache.ibatis.annotations.Mapper;
7 9
 import org.apache.ibatis.annotations.Param;
8 10
 import org.apache.ibatis.annotations.ResultType;
@@ -35,4 +37,15 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
35 37
 
36 38
     List<SysMenu> getAllMenusWithAuthority();
37 39
 
40
+    /**
41
+     * 菜单列表
42
+     * @param pg
43
+     * @return
44
+     */
45
+    IPage<SysMenu> selectSysMenu(IPage<SysMenu> pg);
46
+
47
+    /**
48
+     * 添加菜单
49
+     */
50
+    void updateSysMenu(@Param("menuId") String menuId,@Param("menuName") String menuName);
38 51
 }

+ 6
- 0
src/main/java/com.huiju.welcome/mapper/SysUserMapper.java View File

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

+ 3
- 0
src/main/java/com.huiju.welcome/mapper/SysUserRoleMapper.java View File

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

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaCustomerTransferMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaCustomerTransfer;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaCustomerTransferMapper extends BaseMapper<TaCustomerTransfer> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsImgMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaGoodsImg;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaGoodsImgMapper extends BaseMapper<TaGoodsImg> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaGoods;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaGoodsMapper extends BaseMapper<TaGoods> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersDetailMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaGoodsOrdersDetailMapper extends BaseMapper<TaGoodsOrdersDetail> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaGoodsOrders;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaGoodsOrdersMapper extends BaseMapper<TaGoodsOrders> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsSpecMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaGoodsSpec;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaGoodsSpecMapper extends BaseMapper<TaGoodsSpec> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TdGoodsTypeMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TdGoodsType;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
18
+
19
+}

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TdSpecMapper.java View File

@@ -0,0 +1,19 @@
1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TdSpec;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TdSpecMapper extends BaseMapper<TdSpec> {
18
+
19
+}

+ 2
- 0
src/main/java/com.huiju.welcome/model/SysUser.java View File

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

+ 77
- 0
src/main/java/com.huiju.welcome/model/TaCustomer.java View File

@@ -69,4 +69,81 @@ public class TaCustomer implements Serializable {
69 69
 
70 70
     @TableField(exist = false)
71 71
     Boolean apointment;
72
+
73
+
74
+    /**
75
+     * 是否购买过银城的房子
76
+     */
77
+    private Integer haveHouse;
78
+
79
+    /**
80
+     * 老业主小区
81
+     */
82
+    private String oldCommunity;
83
+
84
+    /**
85
+     * 现居住区域
86
+     */
87
+    private Integer nowArea;
88
+
89
+    /**
90
+     * 现居住小区
91
+     */
92
+    private String nowCommunity;
93
+
94
+    /**
95
+     * 现居住城市(城市不在居住区域有效)
96
+     */
97
+    private String nowCity;
98
+
99
+    /**
100
+     * 家庭成员收入工作城市
101
+     */
102
+    private Integer familyWork;
103
+
104
+    /**
105
+     * 请填写具体城市名称
106
+     */
107
+    private String cityName;
108
+
109
+    /**
110
+     * 家庭收入成员工作单位
111
+     */
112
+    private String familyCompany;
113
+
114
+    /**
115
+     * 家庭收入成员工作行业
116
+     */
117
+    private String familyIndustry;
118
+
119
+    /**
120
+     * 家庭收入成员工作职务
121
+     */
122
+    private String familyDuty;
123
+
124
+    /**
125
+     * 家庭本市置业次数
126
+     */
127
+    private Integer housePurchasing;
128
+
129
+    /**
130
+     * 家庭本市名下房产数量
131
+     */
132
+    private Integer houseProperty;
133
+
134
+    /**
135
+     * 现居住面积
136
+     */
137
+    private Integer houseLivingArea;
138
+
139
+    /**
140
+     * 现居住户型
141
+     */
142
+    private Integer houseType;
143
+
144
+    /**
145
+     * 目前家庭结构
146
+     */
147
+    private Integer familyStructure;
148
+
72 149
 }

+ 44
- 0
src/main/java/com.huiju.welcome/model/TaCustomerTransfer.java View File

@@ -0,0 +1,44 @@
1
+package com.huiju.welcome.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import java.time.LocalDateTime;
6
+import java.io.Serializable;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+/**
12
+ * <p>
13
+ * 
14
+ * </p>
15
+ *
16
+ * @author jobob
17
+ * @since 2019-07-16
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+public class TaCustomerTransfer implements Serializable {
23
+
24
+    private static final long serialVersionUID = 1L;
25
+
26
+    @TableId(value = "transfer_id", type = IdType.AUTO)
27
+    private Integer transferId;
28
+
29
+    private Integer fromUserId;
30
+
31
+    private Integer toUserId;
32
+
33
+    private String fromUserName;
34
+
35
+    private String toUserName;
36
+
37
+    private Integer customerId;
38
+
39
+    private String customerName;
40
+
41
+    private LocalDateTime transferTime;
42
+
43
+
44
+}

+ 48
- 0
src/main/java/com.huiju.welcome/model/TaGoods.java View File

@@ -0,0 +1,48 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.math.BigDecimal;
4
+import java.time.LocalDateTime;
5
+import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
9
+import lombok.Data;
10
+import lombok.EqualsAndHashCode;
11
+import lombok.experimental.Accessors;
12
+
13
+/**
14
+ * <p>
15
+ * 
16
+ * </p>
17
+ *
18
+ * @author jobob
19
+ * @since 2019-07-16
20
+ */
21
+@Data
22
+@EqualsAndHashCode(callSuper = false)
23
+@Accessors(chain = true)
24
+public class TaGoods implements Serializable {
25
+
26
+    private static final long serialVersionUID = 1L;
27
+
28
+    @TableId(value = "goods_id", type = IdType.AUTO)
29
+    private Integer goodsId;
30
+
31
+    private String goodsName;
32
+
33
+    private String orgId;
34
+
35
+    private String caseId;
36
+
37
+    private Integer typeId;
38
+
39
+    private BigDecimal price;
40
+
41
+    private Integer status;
42
+
43
+    private LocalDateTime createDate;
44
+
45
+    private String createUser;
46
+
47
+
48
+}

+ 36
- 0
src/main/java/com.huiju.welcome/model/TaGoodsImg.java View File

@@ -0,0 +1,36 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.io.Serializable;
4
+
5
+import com.baomidou.mybatisplus.annotation.IdType;
6
+import com.baomidou.mybatisplus.annotation.TableId;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+/**
12
+ * <p>
13
+ * 
14
+ * </p>
15
+ *
16
+ * @author jobob
17
+ * @since 2019-07-16
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+public class TaGoodsImg implements Serializable {
23
+
24
+    private static final long serialVersionUID = 1L;
25
+
26
+    @TableId(value = "img_id", type = IdType.AUTO)
27
+    private Integer imgId;
28
+
29
+    private Integer goodsId;
30
+
31
+    private String imgUrl;
32
+
33
+    private Integer status;
34
+
35
+
36
+}

+ 54
- 0
src/main/java/com.huiju.welcome/model/TaGoodsOrders.java View File

@@ -0,0 +1,54 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.math.BigDecimal;
4
+import java.time.LocalDateTime;
5
+import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
9
+import lombok.Data;
10
+import lombok.EqualsAndHashCode;
11
+import lombok.experimental.Accessors;
12
+
13
+/**
14
+ * <p>
15
+ * 
16
+ * </p>
17
+ *
18
+ * @author jobob
19
+ * @since 2019-07-16
20
+ */
21
+@Data
22
+@EqualsAndHashCode(callSuper = false)
23
+@Accessors(chain = true)
24
+public class TaGoodsOrders implements Serializable {
25
+
26
+    private static final long serialVersionUID = 1L;
27
+
28
+    @TableId(value = "orders_id", type = IdType.AUTO)
29
+    private Integer ordersId;
30
+
31
+    private String ordersNo;
32
+
33
+    private String orgId;
34
+
35
+    private String caseId;
36
+
37
+    private BigDecimal amount;
38
+
39
+    private LocalDateTime createDate;
40
+
41
+    private Integer status;
42
+
43
+    private String userType;
44
+
45
+    private Integer userId;
46
+
47
+    private String userName;
48
+
49
+    private Integer ordersNum;
50
+
51
+    private String remark;
52
+
53
+
54
+}

+ 48
- 0
src/main/java/com.huiju.welcome/model/TaGoodsOrdersDetail.java View File

@@ -0,0 +1,48 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.math.BigDecimal;
4
+import java.time.LocalDateTime;
5
+import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
9
+import lombok.Data;
10
+import lombok.EqualsAndHashCode;
11
+import lombok.experimental.Accessors;
12
+
13
+/**
14
+ * <p>
15
+ * 
16
+ * </p>
17
+ *
18
+ * @author jobob
19
+ * @since 2019-07-16
20
+ */
21
+@Data
22
+@EqualsAndHashCode(callSuper = false)
23
+@Accessors(chain = true)
24
+public class TaGoodsOrdersDetail implements Serializable {
25
+
26
+    private static final long serialVersionUID = 1L;
27
+
28
+    @TableId(value = "detail_id", type = IdType.AUTO)
29
+    private Integer detailId;
30
+
31
+    private Integer ordersId;
32
+
33
+    private Integer goodsId;
34
+
35
+    private String goodsName;
36
+
37
+    private Integer specId;
38
+
39
+    private String specName;
40
+
41
+    private Integer number;
42
+
43
+    private BigDecimal price;
44
+
45
+    private LocalDateTime createDate;
46
+
47
+
48
+}

+ 35
- 0
src/main/java/com.huiju.welcome/model/TaGoodsSpec.java View File

@@ -0,0 +1,35 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.math.BigDecimal;
4
+import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+
12
+/**
13
+ * <p>
14
+ * 
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2019-07-16
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TaGoodsSpec implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    @TableId(value = "spec_id", type = IdType.AUTO)
28
+    private Integer specId;
29
+
30
+    private Integer goodsId;
31
+
32
+    private BigDecimal goodsPrice;
33
+
34
+
35
+}

+ 45
- 0
src/main/java/com.huiju.welcome/model/TdGoodsType.java View File

@@ -0,0 +1,45 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.time.LocalDateTime;
4
+import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+
12
+/**
13
+ * <p>
14
+ * 
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2019-07-16
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TdGoodsType implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    @TableId(value = "type_id", type = IdType.AUTO)
28
+    private Integer typeId;
29
+
30
+    private String typeName;
31
+
32
+    private String caseId;
33
+
34
+    private String orgId;
35
+
36
+    private String createUser;
37
+
38
+    private LocalDateTime createTime;
39
+
40
+    private Integer status;
41
+
42
+    private String englishName;
43
+
44
+
45
+}

+ 41
- 0
src/main/java/com.huiju.welcome/model/TdSpec.java View File

@@ -0,0 +1,41 @@
1
+package com.huiju.welcome.model;
2
+
3
+import java.time.LocalDateTime;
4
+import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import lombok.Data;
9
+import lombok.EqualsAndHashCode;
10
+import lombok.experimental.Accessors;
11
+
12
+/**
13
+ * <p>
14
+ * 
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2019-07-16
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TdSpec implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    @TableId(value = "spec_id", type = IdType.AUTO)
28
+    private Integer specId;
29
+
30
+    private String specName;
31
+
32
+    private Integer status;
33
+
34
+    private String orgId;
35
+
36
+    private String caseId;
37
+
38
+    private LocalDateTime createDate;
39
+
40
+
41
+}

+ 23
- 6
src/main/java/com.huiju.welcome/service/ISysUserService.java View File

@@ -3,10 +3,7 @@ package com.huiju.welcome.service;
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5 5
 import com.huiju.welcome.common.base.ResponseBean;
6
-import com.huiju.welcome.model.SysRole;
7
-import com.huiju.welcome.model.SysUser;
8
-import com.huiju.welcome.model.SysUserRole;
9
-import com.huiju.welcome.model.TaVisitorAppointment;
6
+import com.huiju.welcome.model.*;
10 7
 
11 8
 import java.util.Map;
12 9
 import java.util.List;
@@ -51,11 +48,10 @@ public interface ISysUserService extends IService<SysUser> {
51 48
     Map<String,Object> getProfileWithRights(Integer userId);
52 49
     /**
53 50
      * 添加角色权限
54
-     * @param phone
55 51
      * @param role
56 52
      * @return
57 53
      */
58
-    ResponseBean addUserRole(String phone, List<String> role);
54
+    ResponseBean addUserRole(String userId, List<String> role);
59 55
 
60 56
     /**
61 57
      * 查询当前员工所有权限
@@ -83,4 +79,25 @@ public interface ISysUserService extends IService<SysUser> {
83 79
      * @return
84 80
      */
85 81
     ResponseBean deleteUserRole(Integer userId);
82
+
83
+    /**
84
+     * 菜单管理
85
+     * @param pg
86
+     * @return
87
+     */
88
+    ResponseBean sysmenu(IPage<SysMenu> pg);
89
+
90
+    /**
91
+     * 添加当前节点
92
+     * @param menuId
93
+     * @return
94
+     */
95
+    ResponseBean sysmenuAdd(String menuId,String menuName,String code);
96
+
97
+    /**
98
+     * 離職当前员工
99
+     * @param userId
100
+     * @return
101
+     */
102
+    ResponseBean fireUser(Integer userId);
86 103
 }

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaCustomerTransferService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaCustomerTransfer;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaCustomerTransferService extends IService<TaCustomerTransfer> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaGoodsImgService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaGoodsImg;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaGoodsImgService extends IService<TaGoodsImg> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaGoodsOrdersDetailService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaGoodsOrdersDetailService extends IService<TaGoodsOrdersDetail> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaGoodsOrdersService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaGoodsOrders;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaGoodsOrdersService extends IService<TaGoodsOrders> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaGoodsService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaGoods;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaGoodsService extends IService<TaGoods> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaGoodsSpecService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaGoodsSpec;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaGoodsSpecService extends IService<TaGoodsSpec> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITdGoodsTypeService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TdGoodsType;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITdGoodsTypeService extends IService<TdGoodsType> {
16
+
17
+}

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITdSpecService.java View File

@@ -0,0 +1,17 @@
1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TdSpec;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITdSpecService extends IService<TdSpec> {
16
+
17
+}

+ 44
- 8
src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java View File

@@ -11,6 +11,7 @@ import com.huiju.welcome.utils.StatusUtils;
11 11
 import org.springframework.beans.factory.annotation.Autowired;
12 12
 import org.springframework.stereotype.Service;
13 13
 
14
+import java.time.LocalDateTime;
14 15
 import java.util.ArrayList;
15 16
 import java.util.HashMap;
16 17
 import java.util.List;
@@ -92,18 +93,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
92 93
             put("menus", menus);
93 94
         }};
94 95
     }
95
-
96
-    public ResponseBean addUserRole(String phone, List<String> role) {
96
+    @Override
97
+    public ResponseBean addUserRole(String userId, List<String> role) {
97 98
         ResponseBean responseBean = new ResponseBean<>();
98 99
         String[] strArray = role.toArray(new String[role.size()]);
99
-        /*查询当前号码是否存在*/
100 100
         QueryWrapper<SysUser> sysUserQueryWrapper= new QueryWrapper<>();
101
-        sysUserQueryWrapper.eq("phone",phone);
101
+        sysUserQueryWrapper.eq("user_id",userId);
102 102
         SysUser sysUser = sysUserMapper.selectOne(sysUserQueryWrapper);
103
-        if (null == sysUser){
104
-            responseBean.addError("此号码不存在");
105
-            return responseBean;
106
-        }
107 103
         // 查询当前人员角色权限是否存在
108 104
         List<SysUserRole> sysUserRole= sysUserRoleMapper.selectListSysUserRole(sysUser.getUserId());
109 105
         if (sysUserRole!=null && !sysUserRole.isEmpty()){
@@ -177,4 +173,44 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
177 173
         responseBean.addSuccess(sysUserRole);
178 174
         return responseBean;
179 175
     }
176
+
177
+    @Override
178
+    public ResponseBean sysmenu(IPage<SysMenu> pg) {
179
+        ResponseBean responseBean = new ResponseBean();
180
+        IPage<SysMenu> list = sysMenuMapper.selectSysMenu(pg);
181
+        responseBean.addSuccess(list);
182
+        return responseBean;
183
+    }
184
+
185
+    @Override
186
+    public ResponseBean sysmenuAdd(String menuId,String menuName,String code) {
187
+        ResponseBean responseBean= new ResponseBean<>();
188
+        QueryWrapper<SysMenu> sysMenuQuery= new QueryWrapper<>();
189
+        sysMenuQuery.eq("menu_id",menuId);
190
+        // sysMenu 不为空时是父节点信息
191
+        SysMenu sysMenu= sysMenuMapper.selectOne(sysMenuQuery);
192
+        if ("".equals(code)&& null!=code){
193
+            sysMenu.setMenuName(menuName);
194
+            responseBean.addSuccess("成功");
195
+            sysMenuMapper.updateSysMenu(menuId,menuName);
196
+            return responseBean;
197
+        }
198
+        SysMenu menu = new SysMenu();
199
+                menu.setMenuId(menuId+"")
200
+                        .setMenuName(menuName)
201
+                        .setMenuPid(sysMenu.getMenuId())
202
+                        .setMenuParents(menuId+","+sysMenu.getMenuId())
203
+                        .setStatus(1).setCreateDate(LocalDateTime.now());
204
+            sysMenuMapper.insert(menu);
205
+            responseBean.addSuccess("成功");
206
+            return responseBean;
207
+    }
208
+
209
+    @Override
210
+    public ResponseBean fireUser(Integer userId) {
211
+        ResponseBean responseBean= new ResponseBean<>();
212
+        sysUserMapper.fireUser(userId);
213
+        responseBean.addSuccess("成功");
214
+        return responseBean;
215
+    }
180 216
 }

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaCustomerTransferServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaCustomerTransferMapper;
6
+import com.huiju.welcome.model.TaCustomerTransfer;
7
+import com.huiju.welcome.service.ITaCustomerTransferService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaCustomerTransferServiceImpl extends ServiceImpl<TaCustomerTransferMapper, TaCustomerTransfer> implements ITaCustomerTransferService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsImgServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaGoodsImgMapper;
6
+import com.huiju.welcome.model.TaGoodsImg;
7
+import com.huiju.welcome.service.ITaGoodsImgService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaGoodsImgServiceImpl extends ServiceImpl<TaGoodsImgMapper, TaGoodsImg> implements ITaGoodsImgService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersDetailServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper;
6
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
7
+import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaGoodsOrdersDetailServiceImpl extends ServiceImpl<TaGoodsOrdersDetailMapper, TaGoodsOrdersDetail> implements ITaGoodsOrdersDetailService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaGoodsOrdersMapper;
6
+import com.huiju.welcome.model.TaGoodsOrders;
7
+import com.huiju.welcome.service.ITaGoodsOrdersService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaGoodsOrdersServiceImpl extends ServiceImpl<TaGoodsOrdersMapper, TaGoodsOrders> implements ITaGoodsOrdersService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaGoodsMapper;
6
+import com.huiju.welcome.model.TaGoods;
7
+import com.huiju.welcome.service.ITaGoodsService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> implements ITaGoodsService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaGoodsSpecServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaGoodsSpecMapper;
6
+import com.huiju.welcome.model.TaGoodsSpec;
7
+import com.huiju.welcome.service.ITaGoodsSpecService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaGoodsSpecServiceImpl extends ServiceImpl<TaGoodsSpecMapper, TaGoodsSpec> implements ITaGoodsSpecService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TdGoodsTypeServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TdGoodsTypeMapper;
6
+import com.huiju.welcome.model.TdGoodsType;
7
+import com.huiju.welcome.service.ITdGoodsTypeService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TdGoodsTypeServiceImpl extends ServiceImpl<TdGoodsTypeMapper, TdGoodsType> implements ITdGoodsTypeService {
20
+
21
+}

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TdSpecServiceImpl.java View File

@@ -0,0 +1,21 @@
1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TdSpecMapper;
6
+import com.huiju.welcome.model.TdSpec;
7
+import com.huiju.welcome.service.ITdSpecService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TdSpecServiceImpl extends ServiceImpl<TdSpecMapper, TdSpec> implements ITdSpecService {
20
+
21
+}

+ 16
- 0
src/main/java/com.huiju.welcome/utils/StringUtils.java View File

@@ -33,4 +33,20 @@ public class StringUtils {
33 33
         }
34 34
         return sb.toString();
35 35
     }
36
+    public static String getRandomCode(int number){
37
+        String codeNum = "";
38
+        int [] code = new int[3];
39
+        Random random = new Random();
40
+        for (int i = 0; i < number; i++) {
41
+            int num = random.nextInt(10) + 48;
42
+            int uppercase = random.nextInt(26) + 65;
43
+            int lowercase = random.nextInt(26) + 97;
44
+            code[0] = num;
45
+            code[1] = uppercase;
46
+            code[2] = lowercase;
47
+            codeNum+=(char)code[random.nextInt(3)];
48
+        }
49
+
50
+        return codeNum;
51
+    }
36 52
 }

+ 6
- 3
src/main/resources/application.yml View File

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

+ 8
- 0
src/main/resources/mapper/SysMenuMapper.xml View File

@@ -10,4 +10,12 @@
10 10
         GROUP BY
11 11
             menu_id
12 12
     </select>
13
+
14
+    <select id="selectSysMenu" resultType="com.huiju.welcome.model.SysMenu">
15
+        select * from sys_menu
16
+    </select>
17
+
18
+    <select id="updateSysMenu">
19
+        UPDATE sys_menu SET menu_name = #{menuName} WHERE menu_id = #{menuId}
20
+    </select>
13 21
 </mapper>

+ 5
- 0
src/main/resources/mapper/SysUserMapper.xml View File

@@ -12,4 +12,9 @@
12 12
         GROUP BY
13 13
             user_id
14 14
     </select>
15
+    <update id="fireUser">
16
+        update sys_user
17
+        set status = -1, in_service = 0
18
+        where user_id = #{userId}
19
+    </update>
15 20
 </mapper>