fix

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
             connection-init-sql: set names utf8mb4
         #动态数据源配置
         dynamic:
-            primary: master #设置默认的数据源或者数据源组,默认值即为master
+            primary: slave #设置默认的数据源或者数据源组,默认值即为master
             strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
             datasource:
                 #数据源

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityPosterController.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.controller.distribution;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.SellerTokenService;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
+import com.zhongzheng.modules.user.entity.ClientLoginSeller;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 分销海报Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-22
+ */
+@Api(value = "分销海报控制器", tags = {"分销海报管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/distribution/poster")
+public class DistributionActivityPosterController extends BaseController {
+
+    private final IDistributionActivityPosterService iDistributionActivityPosterService;
+
+    private final SellerTokenService sellerTokenService;
+
+
+
+    /**
+     * 获取分销海报详细信息
+     */
+    @ApiOperation("生成业务员海报")
+    @PreAuthorize("@ss.hasPermi('system:poster:query')")
+    @GetMapping("/makePoster")
+    public AjaxResult<DistributionActivityPosterVo> makePoster(DistributionActivityPosterQueryBo bo) {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setSellerId(loginUser.getSeller().getSellerId());
+        return AjaxResult.success(iDistributionActivityPosterService.makePoster(bo));
+    }
+
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -94,6 +94,8 @@ public class DistributionSellerController extends BaseController {
     @Log(title = "分销业务员", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionSellerEditBo bo) {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setSellerId(loginUser.getSeller().getSellerId());
         return toAjax(iDistributionSellerService.updateByEditBo(bo) ? 1 : 0);
     }
 

zhongzheng-generator/src/main/java/com/zhongzheng/generator/service/GenTableServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.constant.GenConstants;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.generator.domain.GenTable;
@@ -131,6 +132,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
                                 .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
                                 .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
                                 .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
+                                .set(GenTableColumn::getUpdateTime, DateUtils.getNowDate())
                                 .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
             }
         }
@@ -169,6 +171,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
                     List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
                     for (GenTableColumn column : genTableColumns) {
                         GenUtils.initColumnField(column, table);
+                        column.setCreateTime(DateUtils.getNowDate());
                         genTableColumnMapper.insert(column);
                     }
                 }
@@ -446,4 +449,4 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
         }
         return genPath + File.separator + VelocityUtils.getFileName(template, table);
     }
-}
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterQueryBo.java

@@ -42,4 +42,7 @@ public class DistributionActivityPosterQueryBo extends BaseEntity {
 	/** 状态：1有效，0无效 */
 	@ApiModelProperty("状态：1有效，-1无效")
 	private Integer status;
+
+	@ApiModelProperty("业务员ID")
+	private Long sellerId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityPosterService.java

@@ -23,6 +23,8 @@ public interface IDistributionActivityPosterService extends IService<Distributio
 	 */
 	DistributionActivityPosterVo queryById(Long posterId);
 
+	DistributionActivityPosterVo makePoster(DistributionActivityPosterQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -44,6 +44,11 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
         return BeanUtil.toBean(db, DistributionActivityPosterVo.class);
     }
 
+    @Override
+    public DistributionActivityPosterVo makePoster(DistributionActivityPosterQueryBo bo) {
+        return null;
+    }
+
     @Override
     public List<DistributionActivityPosterVo> queryList(DistributionActivityPosterQueryBo bo) {
         LambdaQueryWrapper<DistributionActivityPoster> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityPosterVo.java

@@ -42,4 +42,7 @@ public class DistributionActivityPosterVo {
 	/** 备注 */
 	@ApiModelProperty("备注")
 	private String remark;
+
+	@ApiModelProperty("业务员海报地址")
+	private String posterUrl;
 }