首页推荐

src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -42,7 +43,7 @@ public class TaCustomImgController extends BaseController {
      */
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.GET)
     public ResponseBean taCustomImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -66,18 +67,19 @@ public class TaCustomImgController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.POST)
-    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg){
+    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         taCustomImg.setImgDesc(CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType()) ? "小程序首页分享配图" : "小程序首页推荐客户入口配图");
         try {
             taCustomImg.setCreateTime(LocalDateTime.now());
             taCustomImg.setUpdateTime(LocalDateTime.now());
-            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg);
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
             if (!countFlag){
                 responseBean.addError("您已新增首页分享或推荐客户图，请勿重复添加");
                 return responseBean;
             }
 
+            taCustomImg.setOrgId(getOrgId(request));
             if (iTaCustomImgService.save(taCustomImg)){
                 responseBean.addSuccess(taCustomImg);
             }else {
@@ -115,16 +117,20 @@ public class TaCustomImgController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param taCustomImg 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taCustomImg/{id}",method= RequestMethod.PUT)
-    public ResponseBean taCustomImgUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomImg taCustomImg){
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.PUT)
+    public ResponseBean taCustomImgUpdate(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             taCustomImg.setUpdateTime(LocalDateTime.now());
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
+            if (!countFlag){
+                responseBean.addError("您已新增首页分享或推荐客户图，请勿重复添加");
+                return responseBean;
+            }
+
             if (iTaCustomImgService.updateById(taCustomImg)){
                 responseBean.addSuccess(taCustomImg);
             }else {
@@ -160,11 +166,12 @@ public class TaCustomImgController extends BaseController {
      * @param imgType
      */
     @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
-    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType){
+    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("img_type", imgType);
+            queryWrapper.eq("org_id", getOrgId(request));
             TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
             responseBean.addSuccess(taCustomImg);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/entity/TaCustomImg.java

@@ -35,6 +35,8 @@ public class TaCustomImg implements Serializable {
 
     private String imgDocument;
 
+    private Integer orgId;
+
     private Integer status;
 
     private LocalDateTime createTime;

src/main/java/com/huiju/estateagents/service/ITaCustomImgService.java

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

src/main/java/com/huiju/estateagents/service/impl/TaCustomImgServiceImpl.java

@@ -25,10 +25,14 @@ public class TaCustomImgServiceImpl extends ServiceImpl<TaCustomImgMapper, TaCus
     private TaCustomImgMapper taCustomImgMapper;
 
     @Override
-    public boolean countCustomImg(TaCustomImg taCustomImg) {
+    public boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("img_type", taCustomImg.getImgType());
+        queryWrapper.eq("org_id", orgId);
+        if (taCustomImg.getImgId() != null){
+            queryWrapper.ne("img_id", taCustomImg.getImgId());
+        }
         TaCustomImg indexTacustomImg = taCustomImgMapper.selectOne(queryWrapper);
         if (indexTacustomImg != null){
             responseBean.addError("您已新增了推荐图，请勿重新添加");