opt: 删除无效代码；修复数据源；增加拜访模块

src/main/java/com/qs/serve/common/model/enums/SystemModule.java

@@ -11,21 +11,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum SystemModule {
 
-    QUESTION("qms","问卷"),
+    VISIT("visit","拜访"),
-    BAZ("baz","拜访"),
-    Policy("tzc","政策"),
-    Payment("pay","支付"),
-    Budget("budget","预算"),
-    Verification("verification","核算"),
-    BIZ("biz","业务"),
     BASE("bms","基础档案"),
     GOODS("goods","商品"),
-    SYSTEM("sys","系统"),
+    WECHAT("wechat","微信"),
-    UMS("ums","手机用户"),
+    SYSTEM("sys","系统");
-    DATA("data","数据"),
-    Excel("excel","excel数据"),
-    Tag("tag","标签"),
-    SALE("sale","销售");
 
     String code;
 

src/main/java/com/qs/serve/modules/portal/AdminPortalController.java

@@ -12,6 +12,7 @@ import com.qs.serve.common.model.consts.RedisCacheKeys;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.portal.dto.SysTenant;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.dto.SysLoginByPhoneParam;
 import com.qs.serve.modules.sys.entity.dto.SysLoginParam;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +47,18 @@ public class AdminPortalController {
     private SysUserService sysUserService;
     private ProjectProperties projectProperties;
 
+    /**
+     * 获取所有租户
+     * @return
+     */
+    @GetMapping("/listTenant")
+    public R<?> getList(){
+        SysTenant tenant = new SysTenant();
+        tenant.setId("001");
+        tenant.setName("001");
+        return R.ok(Arrays.asList(tenant));
+    }
+
     /**
      * 登录接口
      * @return

src/main/java/com/qs/serve/modules/portal/CommonApi.java

@@ -1,26 +0,0 @@
-package com.qs.serve.modules.portal;
-
-import com.qs.serve.common.model.dto.R;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 门户：API通用接口
- * @author YenHex
- * @since 2022/3/14
- */
-@Slf4j
-@AllArgsConstructor
-@RestController
-@RequestMapping("/api/common")
-public class CommonApi {
-
-
-
-}

src/main/java/com/qs/serve/modules/portal/dto/SysTenant.java

@@ -0,0 +1,59 @@
+package com.qs.serve.modules.portal.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 系统租户 实体类
+ * @author YenHex
+ * @since 2022-03-01
+ */
+@Data
+@TableName("sys_tenant")
+public class SysTenant implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 租户id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /** 租户名称 */
+    @TableField(condition = SqlCondition.LIKE)
+    private String name;
+
+    /** 校区电话 */
+    private String callNum;
+
+    /** 校区地址 */
+    private String address;
+
+    /** 创建时间 */
+    @JsonIgnore
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 创建人 */
+    @JsonIgnore
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 更新时间 */
+    @JsonIgnore
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /** 更新人 */
+    @JsonIgnore
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    /** 删除标识 */
+    @JsonIgnore
+    private Boolean delFlag;
+}
+

src/main/java/com/qs/serve/modules/sys/mapper/SysUserMapper.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.sys.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.sys.entity.SysUser;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author YenHex
  * @date 2022-03-01
  */
+@DS("crm")
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     /**

src/main/java/com/qs/serve/modules/visit/controller/VisitMainController.java

@@ -0,0 +1,100 @@
+package com.qs.serve.modules.visit.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import com.qs.serve.modules.visit.entity.VisitMain;
+import com.qs.serve.modules.visit.service.VisitMainService;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 系统 拜访
+ * @author YenHex
+ * @since 2024-09-11
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("visit/main")
+public class VisitMainController {
+
+    private VisitMainService visitMainService;
+
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/page")
+    public R<PageVo<VisitMain>> getPage(VisitMain param){
+        LambdaQueryWrapper<VisitMain> lqw = new LambdaQueryWrapper<>(param);
+        PageUtil.startPage();
+        List<VisitMain> list = visitMainService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
+    /**
+     * ID查询
+     * @param id
+     * @return
+     */
+    @GetMapping("/getById/{id}")
+    @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.QUERY)
+    public R<VisitMain> getById(@PathVariable("id") String id){
+        VisitMain visitMain = visitMainService.getById(id);
+        return R.ok(visitMain);
+    }
+
+    /**
+     * 更新
+     * @param param
+     * @return
+     */
+    @PostMapping("/updateById")
+    @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.UPDATE)
+    public R<?> updateById(@RequestBody @Valid VisitMain param){
+        param.setCheckState(null);
+        boolean result = visitMainService.updateById(param);
+        return R.isTrue(result);
+    }
+
+    /**
+    * 新增
+    * @param param
+    * @return
+    */
+    @PostMapping("/save")
+    @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.INSERT)
+    public R<?> save(@RequestBody @Valid VisitMain param){
+        boolean result = visitMainService.save(param);
+        return R.isTrue(result);
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/deleteById/{ids}")
+    @SysLog(module = SystemModule.VISIT, title = "拜访", biz = BizType.DELETE)
+    public R<?> deleteById(@PathVariable("ids") String ids){
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        boolean result = visitMainService.removeByIds(idsLong);
+        return R.isTrue(result);
+    }
+
+}
+

src/main/java/com/qs/serve/modules/visit/entity/VisitMain.java

@@ -0,0 +1,144 @@
+package com.qs.serve.modules.visit.entity;
+
+import java.time.LocalDate;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 拜访 实体类
+ * @author YenHex
+ * @since 2024-09-11
+ */
+@Data
+@TableName("visit_main")
+public class VisitMain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 审批状态 */
+    private Integer checkState;
+
+    /** 部门id */
+    @Length(max = 255,message = "部门id长度不能超过255字")
+    private String deptId;
+
+    /** 部门昵称 */
+    @Length(max = 255,message = "部门昵称长度不能超过255字")
+    private String deptName;
+
+    /** 用户id */
+    @Length(max = 255,message = "用户id长度不能超过255字")
+    private String userId;
+
+    /** 用户编码 */
+    @Length(max = 255,message = "用户编码长度不能超过255字")
+    private String userCode;
+
+    /** 用户名称 */
+    @Length(max = 255,message = "用户名称长度不能超过255字")
+    private String userName;
+
+    /** 预约拜访日期 */
+    @NotNull(message = "预约拜访日期不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate preVisitDate;
+
+    /** 实际来访时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime visitTime;
+
+    /** 来访公司 */
+    @Length(max = 255,message = "来访公司长度不能超过255字")
+    private String visitorCompany;
+
+    /** 来访人姓名 */
+    @Length(max = 255,message = "来访人姓名长度不能超过255字")
+    private String visitorName;
+
+    /** 来访人电话 */
+    @Length(max = 255,message = "来访人电话长度不能超过255字")
+    private String visitorMobile;
+
+    /** 来访人数合计 */
+    @Length(max = 255,message = "来访人数合计长度不能超过255字")
+    private String visitorSum;
+
+    /** 来访内容 */
+    @Length(max = 255,message = "来访内容长度不能超过255字")
+    private String visitorContext;
+
+    /** 备注 */
+    @Length(max = 255,message = "备注长度不能超过255字")
+    private String remark;
+
+    /** 创建时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 创建人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 更新时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /** 更新人 */
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    /** 删除标识 */
+    @JsonIgnore
+    @JsonProperty
+    private Boolean delFlag;
+
+
+	public static VisitMain toNewObject(VisitMain source){
+		VisitMain main = new VisitMain();
+		main.setId(source.getId());
+		main.setCheckState(source.getCheckState());
+		main.setDeptId(source.getDeptId());
+		main.setDeptName(source.getDeptName());
+		main.setUserId(source.getUserId());
+		main.setUserCode(source.getUserCode());
+		main.setUserName(source.getUserName());
+		main.setPreVisitDate(source.getPreVisitDate());
+		main.setVisitTime(source.getVisitTime());
+		main.setVisitorCompany(source.getVisitorCompany());
+		main.setVisitorName(source.getVisitorName());
+		main.setVisitorMobile(source.getVisitorMobile());
+		main.setVisitorSum(source.getVisitorSum());
+		main.setVisitorContext(source.getVisitorContext());
+		main.setRemark(source.getRemark());
+		main.setCreateTime(source.getCreateTime());
+		main.setCreateBy(source.getCreateBy());
+		main.setUpdateTime(source.getUpdateTime());
+		main.setUpdateBy(source.getUpdateBy());
+		main.setDelFlag(source.getDelFlag());
+		return main;
+	}
+
+}
+

src/main/java/com/qs/serve/modules/visit/mapper/VisitMainMapper.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.visit.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.visit.entity.VisitMain;
+
+/**
+ * 拜访 Mapper
+ * @author YenHex
+ * @date 2024-09-11
+ */
+public interface VisitMainMapper extends BaseMapper<VisitMain> {
+
+}
+

src/main/java/com/qs/serve/modules/visit/service/VisitMainService.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.visit.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.serve.modules.visit.entity.VisitMain;
+
+/**
+ * 拜访 服务接口
+ * @author YenHex
+ * @date 2024-09-11
+ */
+public interface VisitMainService extends IService<VisitMain> {
+
+}
+

src/main/java/com/qs/serve/modules/visit/service/impl/VisitMainServiceImpl.java

@@ -0,0 +1,22 @@
+package com.qs.serve.modules.visit.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.qs.serve.modules.visit.entity.VisitMain;
+import com.qs.serve.modules.visit.service.VisitMainService;
+import com.qs.serve.modules.visit.mapper.VisitMainMapper;
+
+/**
+ * 拜访 服务实现类
+ * @author YenHex
+ * @since 2024-09-11
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class VisitMainServiceImpl extends ServiceImpl<VisitMainMapper,VisitMain> implements VisitMainService {
+
+}
+

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java

@@ -74,7 +74,7 @@ public class WxFormPushController {
      * @return
      */
     @GetMapping("/getById/{id}")
-    @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.QUERY)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送", biz = BizType.QUERY)
     public R<WxFormPush> getById(@PathVariable("id") String id){
         WxFormPush wxFormPush = wxFormPushService.getById(id);
         LambdaQueryWrapper<WxFormPushUser> userlqw = new LambdaQueryWrapper<>();
@@ -104,7 +104,7 @@ public class WxFormPushController {
      * @return
      */
     @PostMapping("/publishById")
-    @SysLog(module = SystemModule.Verification, title = "表单推送发布", biz = BizType.UPDATE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送发布", biz = BizType.UPDATE)
     public R<?> publishById(@RequestBody WxFormPushBo param){
         String id = param.getId();
         WxFormPush entity = wxFormPushService.getById(id);
@@ -155,7 +155,7 @@ public class WxFormPushController {
      * @return
      */
     @PostMapping("/compensate")
-    @SysLog(module = SystemModule.Verification, title = "表单推送补偿通知", biz = BizType.UPDATE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送补偿通知", biz = BizType.UPDATE)
     public R<?> compensate(@RequestBody WxFormPushBo param){
         String id = param.getId();
         List<String> userIds = param.getUserIds();
@@ -219,7 +219,7 @@ public class WxFormPushController {
      * @return
      */
     @PostMapping("/unPublishById")
-    @SysLog(module = SystemModule.Verification, title = "撤消表单推送", biz = BizType.UPDATE)
+    @SysLog(module = SystemModule.WECHAT, title = "撤消表单推送", biz = BizType.UPDATE)
     public R<?> unPublishById(@RequestBody WxFormPushBo param){
         String id = param.getId();
         WxFormPush entity = wxFormPushService.getById(id);
@@ -234,7 +234,7 @@ public class WxFormPushController {
     * @return
     */
     @PostMapping("/save")
-    @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.INSERT)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送", biz = BizType.INSERT)
     public R<?> saveOrUpdate(@RequestBody @Valid WxFormPushBo param){
         WxFormPush entity = CopierUtil.copy(param,new WxFormPush());
         entity.setPreNotifyStatus(param.getPreNotifyTime()==null?0:1);
@@ -326,7 +326,7 @@ public class WxFormPushController {
      * @return
      */
     @DeleteMapping("/deleteById/{ids}")
-    @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.DELETE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送", biz = BizType.DELETE)
     public R<?> deleteById(@PathVariable("ids") String ids){
         List<String> idsLong = StringUtils.splitIdString(ids);
         List<WxFormPush> list = wxFormPushService.listByIds(idsLong);

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushTypeController.java

@@ -72,7 +72,7 @@ public class WxFormPushTypeController {
      * @return
      */
     @GetMapping("/getById/{id}")
-    @SysLog(module = SystemModule.Verification, title = "表单类型", biz = BizType.QUERY)
+    @SysLog(module = SystemModule.WECHAT, title = "表单类型", biz = BizType.QUERY)
     public R<WxFormPushType> getById(@PathVariable("id") String id){
         WxFormPushType wxFormPushType = wxFormPushTypeService.getById(id);
         return R.ok(wxFormPushType);
@@ -86,7 +86,7 @@ public class WxFormPushTypeController {
      * @return
      */
     @PostMapping("/updateById")
-    @SysLog(module = SystemModule.Verification, title = "表单类型", biz = BizType.UPDATE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单类型", biz = BizType.UPDATE)
     public R<?> updateById(@RequestBody @Valid WxFormPushTypeBo param){
         if(param.getId().equals("0")){
             return R.error("默认分类无法删除");
@@ -102,7 +102,7 @@ public class WxFormPushTypeController {
     * @return
     */
     @PostMapping("/save")
-    @SysLog(module = SystemModule.Verification, title = "表单类型", biz = BizType.INSERT)
+    @SysLog(module = SystemModule.WECHAT, title = "表单类型", biz = BizType.INSERT)
     public R<?> save(@RequestBody @Valid WxFormPushTypeBo param){
         WxFormPushType entity = CopierUtil.copy(param,new WxFormPushType());
         boolean result = wxFormPushTypeService.save(entity);
@@ -115,7 +115,7 @@ public class WxFormPushTypeController {
      * @return
      */
     @DeleteMapping("/deleteById/{ids}")
-    @SysLog(module = SystemModule.Verification, title = "表单类型", biz = BizType.DELETE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单类型", biz = BizType.DELETE)
     public R<?> deleteById(@PathVariable("ids") String ids){
         List<String> idsString = StringUtils.splitIdString(ids);
         for (String id : idsString) {

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java

@@ -68,7 +68,7 @@ public class WxFormPushUserController {
      * @return
      */
     //@GetMapping("/getById/{id}")
-    @SysLog(module = SystemModule.Verification, title = "表单推送用户", biz = BizType.QUERY)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送用户", biz = BizType.QUERY)
     public R<WxFormPushUser> getById(@PathVariable("id") String id){
         WxFormPushUser wxFormPushUser = wxFormPushUserService.getById(id);
         return R.ok(wxFormPushUser);
@@ -82,7 +82,7 @@ public class WxFormPushUserController {
      * @return
      */
     //@PostMapping("/updateById")
-    @SysLog(module = SystemModule.Verification, title = "表单推送用户", biz = BizType.UPDATE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送用户", biz = BizType.UPDATE)
     public R<?> updateById(@RequestBody @Valid WxFormPushUserBo param){
         WxFormPushUser entity = CopierUtil.copy(param,new WxFormPushUser());
         boolean result = wxFormPushUserService.updateById(entity);
@@ -95,7 +95,7 @@ public class WxFormPushUserController {
     * @return
     */
     //@PostMapping("/save")
-    @SysLog(module = SystemModule.Verification, title = "表单推送用户", biz = BizType.INSERT)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送用户", biz = BizType.INSERT)
     public R<?> save(@RequestBody @Valid WxFormPushUserBo param){
         WxFormPushUser entity = CopierUtil.copy(param,new WxFormPushUser());
         boolean result = wxFormPushUserService.save(entity);
@@ -108,7 +108,7 @@ public class WxFormPushUserController {
      * @return
      */
     @DeleteMapping("/deleteById/{ids}")
-    @SysLog(module = SystemModule.Verification, title = "表单推送用户", biz = BizType.DELETE)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送用户", biz = BizType.DELETE)
     public R<?> deleteById(@PathVariable("ids") String ids){
         List<Long> idsLong = StringUtils.splitIdLong(ids);
         boolean result = wxFormPushUserService.removeByIds(idsLong);

src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java

@@ -83,7 +83,7 @@ public class WxFormPushMyController {
      * @return
      */
     @GetMapping("/getById/{id}")
-    @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.QUERY)
+    @SysLog(module = SystemModule.WECHAT, title = "表单推送", biz = BizType.QUERY)
     public R<WxFormPush> getById(@PathVariable("id") String id){
         LambdaQueryWrapper<WxFormPushUser> lqw2 = new LambdaQueryWrapper<>();
         lqw2.eq(WxFormPushUser::getFormPushId,id);