品牌商管理

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -19,6 +19,8 @@ import com.yunzhi.marketing.common.MD5Utils;
 import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +44,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "用户登录相关", tags = "用户登录相关")
 public class TaUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
@@ -328,6 +331,7 @@ public class TaUserController extends BaseController {
      * @return
      */
     @PostMapping("/admin/taUser/signin")
+    @ApiOperation(value = "admin端登录", notes = "admin端登录")
     public ResponseBean signin(@RequestBody String paramStr) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (params == null) {

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -179,14 +179,14 @@ public class AccessInterceptor implements HandlerInterceptor {
         }
 
 //        按钮权限校验
-        boolean state = checkButtonRole(request);
-        if (!state){
-            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
-
-            response.addHeader("Content-type", "application/json");
-            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
-            return false;
-        }
+//        boolean state = checkButtonRole(request);
+//        if (!state){
+//            ResponseBean resp = ResponseBean.error("权限验证非法" , ResponseBean.ERROR_AUTH_FAIL);
+//
+//            response.addHeader("Content-type", "application/json");
+//            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+//            return false;
+//        }
         
         return true;
     }

src/main/java/com/yunzhi/marketing/xlk/controller/BrandController.java

@@ -1,15 +1,23 @@
 package com.yunzhi.marketing.xlk.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.service.ITaBuildingService;
+import com.yunzhi.marketing.xlk.dto.BrandDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -18,6 +26,10 @@ import com.yunzhi.marketing.xlk.service.IBrandService;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 品牌开发商表  前端控制器
@@ -27,7 +39,8 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-05-13
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
+@Api(value = "品牌开发商表", tags = "xlk-品牌开发商表")
 public class BrandController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(BrandController.class);
@@ -35,6 +48,9 @@ public class BrandController extends BaseController {
     @Autowired
     public IBrandService iBrandService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
 
     /**
      * 分页查询列表
@@ -42,15 +58,17 @@ public class BrandController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/brand",method= RequestMethod.GET)
+    @ApiOperation(value = "品牌开发商表列表", notes = "品牌开发商表列表")
+    @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
     public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, @RequestHeader("authorization") String token,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<Brand> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            LambdaQueryWrapper<Brand> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Brand::getOrgId,getOrgId(request));
+            queryWrapper.orderByDesc(Brand::getCreatedTime);
 
             IPage<Brand> result = iBrandService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -64,13 +82,19 @@ public class BrandController extends BaseController {
 
     /**
      * 保存对象
-     * @param brand 实体对象
+     * @param brandDTO 实体对象
      * @return
      */
-    @RequestMapping(value="/brand",method= RequestMethod.POST)
-    public ResponseBean brandAdd(@RequestBody Brand brand){
+    @ApiOperation(value = "添加品牌开发商表", notes = "添加品牌开发商表")
+    @RequestMapping(value="/admin/brand",method= RequestMethod.POST)
+    public ResponseBean brandAdd(@RequestBody BrandDTO brandDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Brand brand = new Brand();
+            BeanUtils.copyProperties(brandDTO,brand);
+            brand.setCreatedTime(LocalDateTime.now());
+            brand.setCreatedBy(getUserId(request));
+            brand.setOrgId(getOrgId(request));
             if (iBrandService.save(brand)){
                 responseBean.addSuccess(brand);
             }else {
@@ -88,12 +112,21 @@ public class BrandController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ResponseBody
-    @RequestMapping(value="/brand/{id}", method= RequestMethod.DELETE)
-    public ResponseBean brandDelete(@PathVariable Integer id){
+    @ApiOperation(value = "删除品牌开发商表", notes = "删除品牌开发商表")
+    @RequestMapping(value="/admin/brand/{id}", method= RequestMethod.DELETE)
+    public ResponseBean brandDelete(@PathVariable String id, @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(iBrandService.removeById(id)){
+                // 同时更新项目里面的品牌商id和name为空
+                LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(TaBuilding::getBrandId,id);
+                List<TaBuilding> list = taBuildingService.list(queryWrapper);
+                list.forEach(e -> {
+                    e.setBrandId(null);
+                    e.setBrandName(null);
+                    taBuildingService.updateById(e);
+                });
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -108,16 +141,28 @@ public class BrandController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
-     * @param brand 实体对象
+     * @param brandDTO 实体对象
      * @return
      */
-    @RequestMapping(value="/brand/{id}",method= RequestMethod.PUT)
-    public ResponseBean brandUpdate(@PathVariable Integer id,
-                                        @RequestBody Brand brand){
+    @ApiOperation(value = "修改品牌开发商表", notes = "修改品牌开发商表")
+    @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.PUT)
+    public ResponseBean brandUpdate(@PathVariable("id") String id,@RequestBody BrandDTO brandDTO,@RequestHeader("authorization") String token,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Brand brand = new Brand();
+            BeanUtils.copyProperties(brandDTO,brand);
+            brand.setBrandId(id);
+            brand.setUpdatedBy(getUserId(request));
+            brand.setUpdatedTime(LocalDateTime.now());
             if (iBrandService.updateById(brand)){
+                // 同时更新项目里面的品牌商id和name为更新后的名称
+                LambdaQueryWrapper<TaBuilding> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(TaBuilding::getBrandId,brand.getBrandId());
+                List<TaBuilding> list = taBuildingService.list(queryWrapper);
+                list.forEach(e -> {
+                    e.setBrandName(brand.getBrandName());
+                    taBuildingService.updateById(e);
+                });
                 responseBean.addSuccess(brand);
             }else {
                 responseBean.addError("fail");
@@ -134,8 +179,9 @@ public class BrandController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/brand/{id}",method= RequestMethod.GET)
-    public ResponseBean brandGet(@PathVariable Integer id){
+    @ApiOperation(value = "获取品牌开发商表详情数据", notes = "获取品牌开发商表详情数据")
+    @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.GET)
+    public ResponseBean brandGet(@PathVariable String id, @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iBrandService.getById(id));

src/main/java/com/yunzhi/marketing/xlk/dto/BrandDTO.java

@@ -0,0 +1,45 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 品牌开发商表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-13
+ */
+@Data
+public class BrandDTO implements Serializable {
+
+    /**
+     * 索引字母
+     */
+    @TableField("Index_letter")
+    private String indexLetter;
+
+    /**
+     * 品牌商名称
+     */
+    private String brandName;
+
+    /**
+     * 品牌商宣传图
+     */
+    private String brandImg;
+
+    /**
+     * 品牌商简介
+     */
+    private String brandRemark;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Brand.java

@@ -57,7 +57,7 @@ public class Brand implements Serializable {
      * 创建人
      */
     @TableField("CREATED_BY")
-    private String createdBy;
+    private Integer createdBy;
 
     /**
      * 创建时间
@@ -69,7 +69,7 @@ public class Brand implements Serializable {
      * 更新人
      */
     @TableField("UPDATED_BY")
-    private String updatedBy;
+    private Integer updatedBy;
 
     /**
      * 更新时间
@@ -77,5 +77,8 @@ public class Brand implements Serializable {
     @TableField("UPDATED_TIME")
     private LocalDateTime updatedTime;
 
-
+    /**
+     * 公司id
+     */
+    private Integer orgId;
 }

src/main/resources/db/marketing.pdman.json

@@ -19173,7 +19173,7 @@
             },
             {
               "name": "CREATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "创建人"
             },
@@ -19185,7 +19185,7 @@
             },
             {
               "name": "UPDATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "更新人"
             },
@@ -19194,6 +19194,12 @@
               "type": "DateTime",
               "remark": "",
               "chnname": "更新时间"
+            },
+            {
+              "name": "ORG_ID",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "公司id"
             }
           ],
           "indexs": [],
@@ -20009,6 +20015,12 @@
         "type": "DateTime",
         "remark": "",
         "chnname": "更新时间"
+      },
+      {
+        "name": "ORG_ID",
+        "type": "Integer",
+        "remark": "",
+        "chnname": "公司id"
       }
     ],
     "defaultFieldsType": "1",