Browse Source

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

seyason 2 years ago
parent
commit
b938a79fff

+ 70 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserConfigController.java

@@ -0,0 +1,70 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.UserConfig;
+import com.management.platform.mapper.UserConfigMapper;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-03-06
+ */
+@RestController
+@RequestMapping("/user-config")
+public class UserConfigController {
+    @Resource
+    private HttpServletRequest request;
+
+    @Resource
+    private UserConfigMapper userConfigMapper;
+
+    @Resource
+    private UserMapper userMapper;
+
+    /**
+     * 返回用户配置
+     * @return
+     */
+    @RequestMapping("/getUserConfig")
+    public HttpRespMsg getUserConfig(){
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        String token = request.getHeader("token");
+        UserConfig userConfig = userConfigMapper.selectOne(new QueryWrapper<UserConfig>().eq("user_id",token));
+        httpRespMsg.data = userConfig;
+        return httpRespMsg;
+    }
+
+    /**
+     * 更改用户配置
+     * @param userConfig
+     * @return
+     */
+    @RequestMapping("/editUserConfig")
+    public HttpRespMsg editUserConfig(UserConfig userConfig){
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        String token = request.getHeader("token");
+        Integer userCount = userConfigMapper.selectCount(new QueryWrapper<UserConfig>().eq("user_id", token));
+        if (userCount == 0){
+            userConfig.setUserId(token);
+            userConfigMapper.insert(userConfig);
+        }else {
+            userConfigMapper.update(userConfig,new QueryWrapper<UserConfig>().eq("user_id",token));
+        }
+        return httpRespMsg;
+    }
+
+
+}
+

+ 48 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserConfig.java

@@ -0,0 +1,48 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UserConfig extends Model<UserConfig> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    @TableField("user_id")
+    private String userId;
+
+    /**
+     * 隐藏已完成任务(0为不隐藏,1为隐藏,默认为0)
+     */
+    @TableField("hide_completed_task")
+    private Integer hideCompletedTask;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 16 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/UserConfigMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.UserConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-03-06
+ */
+public interface UserConfigMapper extends BaseMapper<UserConfig> {
+
+}

+ 16 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserConfigService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.UserConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-03-06
+ */
+public interface UserConfigService extends IService<UserConfig> {
+
+}

+ 22 - 15
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -7948,9 +7948,30 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Project> deleteProjectList=new ArrayList<>();
         if(changeType.equals("insert_project")){
             if(projectList!=null &&projectList.size()>0){
+                for (Project project : projectList) {
+                    if(timeType.getMainProjectState()==1){
+                        Optional<ProjectMain> mainOptional = projectMainList.stream().filter(pm -> pm.getName().equals(project.getProjectMainName())).findFirst();
+                        if(!mainOptional.isPresent()){
+                            ProjectMain projectMain=new ProjectMain();
+                            projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
+                            projectMain.setName(project.getProjectMainName());
+                            projectMainMapper.insert(projectMain);
+                            projectMainList.add(projectMain);
+                        }
+                    }
+                    Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
+                    if(!category.isPresent()){
+                        ProjectCategory projectCategory=new ProjectCategory();
+                        projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
+                        projectCategory.setName(project.getCategoryName());
+                        projectCategoryMapper.insert(projectCategory);
+                        projectCategoryList.add(projectCategory);
+                    }
+                }
                 for (Project project : projectList) {
                     Optional<Project> first = allProject.stream().filter(ap ->ap.getProjectCode()!=null&& ap.getProjectCode().equals(project.getProjectCode())).findFirst();
                     if(first.isPresent()){
+                        message+="已存在项目["+first.get().getProjectName()+"]";
                         continue;
                     }
                     if(timeType.getMainProjectState()==1){
@@ -7959,27 +7980,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             project.setProjectMainId(mainOptional.get().getId());
                             project.setCategoryName(mainOptional.get().getCategoryName());
                             project.setCategory(mainOptional.get().getCategoryId());
-                        }else {
-                            ProjectMain projectMain=new ProjectMain();
-                            projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
-                            projectMain.setName(project.getProjectMainName());
-                            projectMainMapper.insert(projectMain);
-                            project.setProjectMainId(projectMain.getId());
                         }
                     }else {
+                        project.setProjectMainName(null);
                         Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
                         if(category.isPresent()){
-                            project.setProjectMainId(null);
-                            project.setProjectMainName(null);
                             project.setCategoryName(category.get().getName());
                             project.setCategory(category.get().getId());
-                        }else {
-                            ProjectCategory projectCategory=new ProjectCategory();
-                            projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());
-                            projectCategory.setName(project.getCategoryName());
-                            projectCategoryMapper.insert(projectCategory);
-                            project.setCategoryName(projectCategory.getName());
-                            project.setCategory(projectCategory.getId());
                         }
                     }
                     if(timeType.getProjectLevelState()==1){

+ 20 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.UserConfig;
+import com.management.platform.mapper.UserConfigMapper;
+import com.management.platform.service.UserConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-03-06
+ */
+@Service
+public class UserConfigServiceImpl extends ServiceImpl<UserConfigMapper, UserConfig> implements UserConfigService {
+
+}

+ 17 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserConfigMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.UserConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.UserConfig">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="hide_completed_task" property="hideCompletedTask" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, hide_completed_task
+    </sql>
+
+</mapper>