课程管理新增所属项目

fs-company/src/main/java/com/fs/FSCompanyApplication.java

@@ -21,7 +21,6 @@ public class FSCompanyApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(FSCompanyApplication.class, args);
-        String s = SecurityUtils.encryptPassword("123456");
-        System.out.println("销售公司PC端启动成功 \n"+s );
+        System.out.println("销售公司PC端启动成功 \n");
     }
 }

fs-company/src/main/java/com/fs/wxuser/CompanyWxUserController.java

@@ -0,0 +1,104 @@
+package com.fs.wxuser;
+
+import java.util.List;
+
+import com.fs.wxUser.domain.CompanyWxUser;
+import com.fs.wxUser.service.ICompanyWxUserService;
+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.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 【个微管理】Controller
+ *
+ * @author fs
+ * @date 2025-03-28
+ */
+@RestController
+@RequestMapping("/company/wxuser")
+public class CompanyWxUserController extends BaseController
+{
+    @Autowired
+    private ICompanyWxUserService companyWxUserService;
+
+    /**
+     * 查询【个微管理】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CompanyWxUser companyWxUser)
+    {
+        startPage();
+        List<CompanyWxUser> list = companyWxUserService.selectCompanyWxUserList(companyWxUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【个微管理】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @Log(title = "【个微管理】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(CompanyWxUser companyWxUser)
+    {
+        List<CompanyWxUser> list = companyWxUserService.selectCompanyWxUserList(companyWxUser);
+        ExcelUtil<CompanyWxUser> util = new ExcelUtil<CompanyWxUser>(CompanyWxUser.class);
+        return util.exportExcel(list, "user");
+    }
+
+    /**
+     * 获取【个微管理】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(companyWxUserService.selectCompanyWxUserByUserId(userId));
+    }
+
+    /**
+     * 新增【个微管理】
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "【个微管理】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CompanyWxUser companyWxUser)
+    {
+        return toAjax(companyWxUserService.insertCompanyWxUser(companyWxUser));
+    }
+
+    /**
+     * 修改【个微管理】
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "【个微管理】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CompanyWxUser companyWxUser)
+    {
+        return toAjax(companyWxUserService.updateCompanyWxUser(companyWxUser));
+    }
+
+    /**
+     * 删除【个微管理】
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "【个微管理】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(companyWxUserService.deleteCompanyWxUserByUserIds(userIds));
+    }
+}

fs-company/src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: pass4Redis
+        password:
         # 连接超时时间
         timeout: 10s
         lettuce:

fs-service-system/src/main/java/com/fs/company/cache/ICompanyUserCacheService.java

@@ -0,0 +1,33 @@
+package com.fs.company.cache;
+
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.param.CompanyUserQwParam;
+import com.fs.company.vo.CompanyQwUserByIdsVo;
+import com.fs.company.vo.CompanyUserQwListVO;
+import com.fs.company.vo.CompanyUserVO;
+import com.fs.company.vo.DocCompanyUserVO;
+import com.fs.his.vo.OptionsVO;
+import com.fs.qw.vo.CompanyUserQwVO;
+import com.fs.qw.vo.QwUserVO;
+
+import java.util.List;
+import java.util.Map;
+
+;
+
+/**
+ * 物业公司管理员信息Service接口
+ *
+ * @author fs
+ * @date 2021-05-25
+ */
+public interface ICompanyUserCacheService {
+    /**
+     * 查询物业公司管理员信息
+     *
+     * @param userId 物业公司管理员信息ID
+     * @return 物业公司管理员信息
+     */
+    public CompanyUser selectCompanyUserById(Long userId);
+
+}

fs-service-system/src/main/java/com/fs/company/cache/impl/CompanyUserCacheServiceImpl.java

@@ -0,0 +1,32 @@
+package com.fs.company.cache.impl;
+
+import com.fs.company.cache.ICompanyCacheService;
+import com.fs.company.cache.ICompanyUserCacheService;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyUserService;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class CompanyUserCacheServiceImpl implements ICompanyUserCacheService {
+
+    private final ICompanyUserService companyUserService;
+
+    private static final Cache<Long, CompanyUser> USER_CACHE = Caffeine.newBuilder()
+            .maximumSize(1000)
+            .expireAfterWrite(10, TimeUnit.SECONDS)
+            .build();
+    @Override
+    public CompanyUser selectCompanyUserById(Long userId) {
+        return USER_CACHE.get(userId,e-> companyUserService.selectCompanyUserById(userId));
+    }
+}

fs-service-system/src/main/java/com/fs/company/domain/CompanyUser.java

@@ -64,6 +64,7 @@ public class CompanyUser extends BaseEntity
     /** 帐号状态（0正常 1停用） */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
+    private String statusText;
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -1,8 +1,10 @@
 package com.fs.course.service.impl;
 
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.DictUtils;
 import com.fs.course.domain.FsUserCourse;
 import com.fs.course.domain.FsUserCourseStudy;
 import com.fs.course.domain.FsUserCourseStudyLog;
@@ -49,12 +51,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
     private FsUserCourseStudyMapper fsUserCourseStudyMapper;
     @Autowired
     private FsUserCourseStudyLogMapper fsUserCourseStudyLogMapper;
-    @Autowired
-    private FsUserIntegralLogsMapper fsUserIntegralLogsMapper;
-    @Autowired
-    private FsUserMapper fsUserMapper;
-    @Autowired
-    private ISysConfigService configService;
+
     /**
      * 查询课程
      *
@@ -199,7 +196,14 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
 
     @Override
     public List<FsUserCourseListPVO> selectFsUserCourseListPVO(FsUserCourse param) {
-        return fsUserCourseMapper.selectFsUserCourseListPVO(param);
+        List<FsUserCourseListPVO> fsUserCourseListPVOS = fsUserCourseMapper.selectFsUserCourseListPVO(param);
+        for (FsUserCourseListPVO fsUserCourseListPVO : fsUserCourseListPVOS){
+            if(ObjectUtils.isNotNull(fsUserCourseListPVO.getProject())){
+                String sysCourseProject = DictUtils.getDictLabel("sys_course_project", String.valueOf(fsUserCourseListPVO.getProject()));
+                fsUserCourseListPVO.setProjectName(sysCourseProject);
+            }
+        }
+        return fsUserCourseListPVOS;
     }
 
     @Override

fs-service-system/src/main/java/com/fs/course/vo/FsUserCourseListPVO.java

@@ -43,6 +43,9 @@ public class FsUserCourseListPVO extends BaseEntity
     private Integer isShow;
 
     private Integer isPrivate;
+    private Integer project;
+
+    private String projectName;
 
 
 }

fs-service-system/src/main/java/com/fs/wxUser/domain/CompanyWxUser.java

@@ -25,6 +25,7 @@ public class CompanyWxUser extends BaseEntity
     /** 所属销售ID */
     @Excel(name = "所属销售ID")
     private Long companyUserId;
+    private String companyUserName;
 
     /** 所属销售ID */
     @Excel(name = "账号ID")
@@ -41,6 +42,7 @@ public class CompanyWxUser extends BaseEntity
     /** 状态 1正常 0禁用 */
     @Excel(name = "状态 1正常 0禁用")
     private Integer status;
+    private String statusText;
 
     /** 头像 */
     @Excel(name = "头像")

fs-service-system/src/main/java/com/fs/wxUser/service/impl/CompanyWxUserServiceImpl.java

@@ -1,8 +1,12 @@
 package com.fs.wxUser.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.DictUtils;
+import com.fs.company.cache.ICompanyUserCacheService;
+import com.fs.company.domain.CompanyUser;
 import com.fs.qw.param.CompanyWxUserAddGroupParam;
 import com.fs.voice.utils.StringUtil;
 import com.fs.wxUser.domain.CompanyWxUser;
@@ -13,6 +17,7 @@ import com.fs.wxUser.param.CompanyWxUserBindFsUserParam;
 import com.fs.wxUser.param.CompanyWxUserParam;
 import com.fs.wxUser.service.ICompanyWxUserService;
 import com.fs.wxUser.vo.CompanyWxUserVO;
+import com.hc.openapi.tool.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +39,8 @@ public class CompanyWxUserServiceImpl implements ICompanyWxUserService
     private CompanyWxUserMapper companyWxUserMapper;
     @Autowired
     private CompanyWxUserGroupMapper companyWxUserGroupMapper;
-
+    @Autowired
+    private ICompanyUserCacheService companyUserCacheService;
     /**
      * 查询个微用户
      *
@@ -56,7 +62,18 @@ public class CompanyWxUserServiceImpl implements ICompanyWxUserService
     @Override
     public List<CompanyWxUser> selectCompanyWxUserList(CompanyWxUser companyWxUser)
     {
-        return companyWxUserMapper.selectCompanyWxUserList(companyWxUser);
+        List<CompanyWxUser> list = companyWxUserMapper.selectCompanyWxUserList(companyWxUser);
+        for (CompanyWxUser wxUser : list) {
+            CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(wxUser.getCompanyUserId());
+            if(ObjectUtil.isNotNull(companyUser)){
+                wxUser.setCompanyUserName(String.format("%s_%s",companyUser.getUserName(),companyUser.getUserId()));
+            }
+            String personalWechatStatus = DictUtils.getDictLabel("personal_wechat_status", String.valueOf(wxUser.getStatus()));
+            if(StringUtils.isNotBlank(personalWechatStatus)){
+                wxUser.setStatusText(personalWechatStatus);
+            }
+        }
+        return list;
     }
 
     @Override