Browse Source

首页推荐

魏超 5 years ago
parent
commit
7408e26dc0

+ 15
- 8
src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java View File

14
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.web.bind.annotation.*;
15
 import org.springframework.web.bind.annotation.*;
16
 
16
 
17
+import javax.servlet.http.HttpServletRequest;
17
 import java.time.LocalDateTime;
18
 import java.time.LocalDateTime;
18
 
19
 
19
 /**
20
 /**
42
      */
43
      */
43
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.GET)
44
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.GET)
44
     public ResponseBean taCustomImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
45
     public ResponseBean taCustomImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
45
-                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
46
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
46
         ResponseBean responseBean = new ResponseBean();
47
         ResponseBean responseBean = new ResponseBean();
47
         try {
48
         try {
48
             //使用分页插件
49
             //使用分页插件
66
      * @return
67
      * @return
67
      */
68
      */
68
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.POST)
69
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.POST)
69
-    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg){
70
+    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
70
         ResponseBean responseBean = new ResponseBean();
71
         ResponseBean responseBean = new ResponseBean();
71
         taCustomImg.setImgDesc(CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType()) ? "小程序首页分享配图" : "小程序首页推荐客户入口配图");
72
         taCustomImg.setImgDesc(CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType()) ? "小程序首页分享配图" : "小程序首页推荐客户入口配图");
72
         try {
73
         try {
73
             taCustomImg.setCreateTime(LocalDateTime.now());
74
             taCustomImg.setCreateTime(LocalDateTime.now());
74
             taCustomImg.setUpdateTime(LocalDateTime.now());
75
             taCustomImg.setUpdateTime(LocalDateTime.now());
75
-            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg);
76
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
76
             if (!countFlag){
77
             if (!countFlag){
77
                 responseBean.addError("您已新增首页分享或推荐客户图,请勿重复添加");
78
                 responseBean.addError("您已新增首页分享或推荐客户图,请勿重复添加");
78
                 return responseBean;
79
                 return responseBean;
79
             }
80
             }
80
 
81
 
82
+            taCustomImg.setOrgId(getOrgId(request));
81
             if (iTaCustomImgService.save(taCustomImg)){
83
             if (iTaCustomImgService.save(taCustomImg)){
82
                 responseBean.addSuccess(taCustomImg);
84
                 responseBean.addSuccess(taCustomImg);
83
             }else {
85
             }else {
115
 
117
 
116
     /**
118
     /**
117
      * 修改对象
119
      * 修改对象
118
-     * @param id  实体ID
119
      * @param taCustomImg 实体对象
120
      * @param taCustomImg 实体对象
120
      * @return
121
      * @return
121
      */
122
      */
122
-    @RequestMapping(value="/admin/taCustomImg/{id}",method= RequestMethod.PUT)
123
-    public ResponseBean taCustomImgUpdate(@PathVariable Integer id,
124
-                                        @RequestBody TaCustomImg taCustomImg){
123
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.PUT)
124
+    public ResponseBean taCustomImgUpdate(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
125
         ResponseBean responseBean = new ResponseBean();
125
         ResponseBean responseBean = new ResponseBean();
126
         try {
126
         try {
127
             taCustomImg.setUpdateTime(LocalDateTime.now());
127
             taCustomImg.setUpdateTime(LocalDateTime.now());
128
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
129
+            if (!countFlag){
130
+                responseBean.addError("您已新增首页分享或推荐客户图,请勿重复添加");
131
+                return responseBean;
132
+            }
133
+
128
             if (iTaCustomImgService.updateById(taCustomImg)){
134
             if (iTaCustomImgService.updateById(taCustomImg)){
129
                 responseBean.addSuccess(taCustomImg);
135
                 responseBean.addSuccess(taCustomImg);
130
             }else {
136
             }else {
160
      * @param imgType
166
      * @param imgType
161
      */
167
      */
162
     @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
168
     @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
163
-    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType){
169
+    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType,HttpServletRequest request){
164
         ResponseBean responseBean = new ResponseBean();
170
         ResponseBean responseBean = new ResponseBean();
165
         try {
171
         try {
166
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
172
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
167
             queryWrapper.eq("img_type", imgType);
173
             queryWrapper.eq("img_type", imgType);
174
+            queryWrapper.eq("org_id", getOrgId(request));
168
             TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
175
             TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
169
             responseBean.addSuccess(taCustomImg);
176
             responseBean.addSuccess(taCustomImg);
170
         }catch (Exception e){
177
         }catch (Exception e){

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaCustomImg.java View File

35
 
35
 
36
     private String imgDocument;
36
     private String imgDocument;
37
 
37
 
38
+    private Integer orgId;
39
+
38
     private Integer status;
40
     private Integer status;
39
 
41
 
40
     private LocalDateTime createTime;
42
     private LocalDateTime createTime;

+ 1
- 2
src/main/java/com/huiju/estateagents/service/ITaCustomImgService.java View File

1
 package com.huiju.estateagents.service;
1
 package com.huiju.estateagents.service;
2
 
2
 
3
 import com.baomidou.mybatisplus.extension.service.IService;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.entity.TaCustomImg;
4
 import com.huiju.estateagents.entity.TaCustomImg;
6
 
5
 
7
 /**
6
 /**
13
  * @since 2019-12-17
12
  * @since 2019-12-17
14
  */
13
  */
15
 public interface ITaCustomImgService extends IService<TaCustomImg> {
14
 public interface ITaCustomImgService extends IService<TaCustomImg> {
16
-    boolean countCustomImg(TaCustomImg taCustomImg);
15
+    boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId);
17
 }
16
 }

+ 5
- 1
src/main/java/com/huiju/estateagents/service/impl/TaCustomImgServiceImpl.java View File

25
     private TaCustomImgMapper taCustomImgMapper;
25
     private TaCustomImgMapper taCustomImgMapper;
26
 
26
 
27
     @Override
27
     @Override
28
-    public boolean countCustomImg(TaCustomImg taCustomImg) {
28
+    public boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId) {
29
         ResponseBean responseBean = new ResponseBean();
29
         ResponseBean responseBean = new ResponseBean();
30
         QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
30
         QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
31
         queryWrapper.eq("img_type", taCustomImg.getImgType());
31
         queryWrapper.eq("img_type", taCustomImg.getImgType());
32
+        queryWrapper.eq("org_id", orgId);
33
+        if (taCustomImg.getImgId() != null){
34
+            queryWrapper.ne("img_id", taCustomImg.getImgId());
35
+        }
32
         TaCustomImg indexTacustomImg = taCustomImgMapper.selectOne(queryWrapper);
36
         TaCustomImg indexTacustomImg = taCustomImgMapper.selectOne(queryWrapper);
33
         if (indexTacustomImg != null){
37
         if (indexTacustomImg != null){
34
             responseBean.addError("您已新增了推荐图,请勿重新添加");
38
             responseBean.addError("您已新增了推荐图,请勿重新添加");