From 44aa7338faf6ed45873c2d5f10cd9c81b403892e Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Sun, 9 Oct 2022 17:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=80=BB=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3-=E3=80=8B=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E8=81=8C=E8=B4=A3=EF=BC=8C=E5=BC=82=E5=B8=B8=E5=B1=A5=E8=81=8C?= =?UTF-8?q?=EF=BC=8C=E8=AF=81=E4=B9=A6=E8=AF=81=E4=BB=B6=20mybatis-plus=20?= =?UTF-8?q?tinyint=20=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=20datasource=E5=8A=A0=E5=85=A5=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=80=E4=B8=AA=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/config/CodeGenerator.java | 17 ++ .../com/rzyc/mapper/EntPostDutyMapper.java | 30 +++ .../com/rzyc/mapper/EntPostTaskMapper.java | 36 +++ .../rzyc/mapper/EntUserCredentialMapper.java | 55 ++++ .../main/java/com/rzyc/model/EntPostDuty.java | 139 ++++++++++ .../main/java/com/rzyc/model/EntPostTask.java | 247 ++++++++++++++++++ .../com/rzyc/model/EntUserCredential.java | 160 ++++++++++++ .../model/dto/EntUserCredentialUpdateDto.java | 140 ++++++++++ .../resources/mapper/EntPostDutyMapper.xml | 27 ++ .../resources/mapper/EntPostTaskMapper.xml | 45 ++++ .../mapper/EntUserCredentialMapper.xml | 44 ++++ .../com/rzyc/controller/BaseController.java | 13 + .../rzyc/controller/PersonalController.java | 101 ++++++- .../filter/JwtAuthenticationTokenFiler.java | 2 +- .../com/rzyc/service/PcBusinessService.java | 63 ++++- 15 files changed, 1109 insertions(+), 10 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/dto/EntUserCredentialUpdateDto.java create mode 100644 inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml create mode 100644 inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml create mode 100644 inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml diff --git a/inventory-dao/src/main/java/com/rzyc/config/CodeGenerator.java b/inventory-dao/src/main/java/com/rzyc/config/CodeGenerator.java index 864711e..4ffb2a7 100644 --- a/inventory-dao/src/main/java/com/rzyc/config/CodeGenerator.java +++ b/inventory-dao/src/main/java/com/rzyc/config/CodeGenerator.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.rules.DateType; +import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; +import com.baomidou.mybatisplus.generator.config.rules.IColumnType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import com.common.utils.StringUtils; @@ -89,6 +92,7 @@ public class CodeGenerator { dsc.setDriverName(DriverName); dsc.setUsername(Username); dsc.setPassword(Password); + dsc.setTypeConvert(new MySqlTypeConvertCustom()); mpg.setDataSource(dsc); // 包配置（生成的entity、controller、service等包名） @@ -162,5 +166,18 @@ public class CodeGenerator { mpg.execute(); } + /** + * 处理mybatis-plus 部分数据类型转换问题，这里重写typeConvert，加入判断 + * */ + static class MySqlTypeConvertCustom extends MySqlTypeConvert implements ITypeConvert { + @Override + public IColumnType processTypeConvert(GlobalConfig globalConfig, String fieldType) { + String t = fieldType.toLowerCase(); + if (t.contains("tinyint")) { + return DbColumnType.INTEGER; + } + return super.processTypeConvert(globalConfig, fieldType); + } + } } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java new file mode 100644 index 0000000..b52e32d --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostDutyMapper.java @@ -0,0 +1,30 @@ +package com.rzyc.mapper; + +import com.rzyc.model.EntPostDuty; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 岗位职责 Mapper 接口 + *

+ * + * @author + * @since 2022-10-09 + */ +@Repository +public interface EntPostDutyMapper extends BaseMapper { + + + /** + * 企业用户岗位职责 + * @param enterpriseId 企业id + * @param postId 岗位id + * @return EntPostTask 企业用户岗位职责 + * */ + ListselectEntUserPostDuty(@Param("enterpriseId") String enterpriseId, @Param("postId")String postId); + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java new file mode 100644 index 0000000..cf6e8da --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostTaskMapper.java @@ -0,0 +1,36 @@ +package com.rzyc.mapper; + +import com.rzyc.model.EntPostTask; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2022-10-09 + */ +@Repository +public interface EntPostTaskMapper extends BaseMapper { + + + /** + * 查询企业用户清单任务 + * @param enterpriseId 企业id + * @param entUserId 企业用户id + * @param postId 岗位id + * @param listId 清单id + * @param content 内容模糊搜索 + * @param taskState 任务状态 + * @return EntPostTask 企业用户清单任务 + * */ + ListselectEntUserPostTask(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId, + @Param("postId")String postId, @Param("listId")String listId, + @Param("content")String content,@Param("taskState") Integer taskState); + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java new file mode 100644 index 0000000..52ac254 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntUserCredentialMapper.java @@ -0,0 +1,55 @@ +package com.rzyc.mapper; + +import com.rzyc.model.EntUserCredential; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rzyc.model.dto.EntUserCredentialUpdateDto; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author + * @since 2022-10-09 + */ +@Repository +public interface EntUserCredentialMapper extends BaseMapper { + + + /** + * 企业用户岗位职责 + * @param enterpriseId 企业id + * @param entUserId 企业用户id + * @return EntUserCredential 企业用户证照 + * */ + ListselectEntUserCredential(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId); + + + /** + * 企业用户证件照修改 + * @param entUserCredentialUpdateDto 企业用户证件照对象 + * @return int + * */ + int updateEntUserCredential(@Param("data") EntUserCredentialUpdateDto entUserCredentialUpdateDto); + + + /** + * 企业用户证件照新增 + * @param entUserCredentialUpdateDto 企业用户证件照对象 + * @return int + * */ + int insertEntUserCredential(@Param("data") EntUserCredentialUpdateDto entUserCredentialUpdateDto); + + + /** + * 企业用户证件照删除 + * @param credentialId 企业用户证件照id + * @return int + * */ + int entUserCredentialDelete(@Param("credentialId") String credentialId); + +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java b/inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java new file mode 100644 index 0000000..1a064f7 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/EntPostDuty.java @@ -0,0 +1,139 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 岗位职责 + *

+ * + * @author + * @since 2022-10-09 + */ +@TableName("ent_post_duty") +@ApiModel(value="EntPostDuty对象", description="岗位职责") +public class EntPostDuty implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "岗位职责id") + @TableId("duty_id") + private String dutyId; + + @ApiModelProperty(value = "岗位id") + @TableField("post_id") + private String postId; + + @ApiModelProperty(value = "职责内容") + @TableField("duty_item") + private String dutyItem; + + @ApiModelProperty(value = "排序") + @TableField("sort_id") + private Integer sortId; + + @ApiModelProperty(value = "企业id") + @TableField("enterprise_id") + private String enterpriseId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getDutyId() { + return dutyId; + } + + public void setDutyId(String dutyId) { + this.dutyId = dutyId; + } + public String getPostId() { + return postId; + } + + public void setPostId(String postId) { + this.postId = postId; + } + public String getDutyItem() { + return dutyItem; + } + + public void setDutyItem(String dutyItem) { + this.dutyItem = dutyItem; + } + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + public String getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(String enterpriseId) { + this.enterpriseId = enterpriseId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "EntPostDuty{" + + "dutyId=" + dutyId + + ", postId=" + postId + + ", dutyItem=" + dutyItem + + ", sortId=" + sortId + + ", enterpriseId=" + enterpriseId + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java b/inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java new file mode 100644 index 0000000..c8fbc18 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/EntPostTask.java @@ -0,0 +1,247 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * + *

+ * + * @author + * @since 2022-10-09 + */ +@TableName("ent_post_task") +@ApiModel(value="EntPostTask对象", description="") +public class EntPostTask implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "任务id") + @TableId("task_id") + private String taskId; + + @ApiModelProperty(value = "岗位id") + @TableField("post_id") + private String postId; + + @ApiModelProperty(value = "企业用户id") + @TableField("ent_user_id") + private String entUserId; + + @ApiModelProperty(value = "企业id") + @TableField("enterprise_id") + private String enterpriseId; + + @ApiModelProperty(value = "企业清单项id") + @TableField("ent_list_id") + private String entListId; + + @ApiModelProperty(value = "清单id") + @TableField("list_id") + private String listId; + + @ApiModelProperty(value = "岗位清单id") + @TableField("post_list_id") + private String postListId; + + @ApiModelProperty(value = "任务标题") + @TableField("item_title") + private String itemTitle; + + @ApiModelProperty(value = "任务内容") + @TableField("item_content") + private String itemContent; + + @ApiModelProperty(value = "开始时间") + @TableField("start_time") + private Date startTime; + + @ApiModelProperty(value = "结束时间") + @TableField("ent_time") + private Date entTime; + + @ApiModelProperty(value = "任务状态 1、进行中 2、已完成 3、已超期") + @TableField("task_state") + private Integer taskState; + + @ApiModelProperty(value = "完成次数") + @TableField("frequency") + private Integer frequency; + + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + public String getPostId() { + return postId; + } + + public void setPostId(String postId) { + this.postId = postId; + } + public String getEntUserId() { + return entUserId; + } + + public void setEntUserId(String entUserId) { + this.entUserId = entUserId; + } + public String getEnterpriseId() { + return enterpriseId; + } + + public void setEnterpriseId(String enterpriseId) { + this.enterpriseId = enterpriseId; + } + public String getEntListId() { + return entListId; + } + + public void setEntListId(String entListId) { + this.entListId = entListId; + } + public String getListId() { + return listId; + } + + public void setListId(String listId) { + this.listId = listId; + } + public String getPostListId() { + return postListId; + } + + public void setPostListId(String postListId) { + this.postListId = postListId; + } + public String getItemTitle() { + return itemTitle; + } + + public void setItemTitle(String itemTitle) { + this.itemTitle = itemTitle; + } + public String getItemContent() { + return itemContent; + } + + public void setItemContent(String itemContent) { + this.itemContent = itemContent; + } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + public Date getEntTime() { + return entTime; + } + + public void setEntTime(Date entTime) { + this.entTime = entTime; + } + public Integer getTaskState() { + return taskState; + } + + public void setTaskState(Integer taskState) { + this.taskState = taskState; + } + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "EntPostTask{" + + "taskId=" + taskId + + ", postId=" + postId + + ", entUserId=" + entUserId + + ", enterpriseId=" + enterpriseId + + ", entListId=" + entListId + + ", listId=" + listId + + ", postListId=" + postListId + + ", itemTitle=" + itemTitle + + ", itemContent=" + itemContent + + ", startTime=" + startTime + + ", entTime=" + entTime + + ", taskState=" + taskState + + ", frequency=" + frequency + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java b/inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java new file mode 100644 index 0000000..f364fca --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/EntUserCredential.java @@ -0,0 +1,160 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * + *

+ * + * @author + * @since 2022-10-09 + */ +@TableName("ent_user_credential") +@ApiModel(value="EntUserCredential对象", description="") +public class EntUserCredential implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "企业用户证照表id") + @TableId("credential_id") + private String credentialId; + + @ApiModelProperty(value = "证照名") + @TableField("credential_name") + private String credentialName; + + @ApiModelProperty(value = "证照状态 1.未超时 2.已超时") + @TableField("credential_state") + private Integer credentialState; + + @ApiModelProperty(value = "证照地址") + @TableField("credential_image_address") + private String credentialImageAddress; + + @ApiModelProperty(value = "企业用户id") + @TableField("ent_user_id") + private String entUserId; + + @TableField("credential_start_time") + private Date credentialStartTime; + + @TableField("credential_end_time") + private Date credentialEndTime; + + @TableField("create_time") + private Date createTime; + + @TableField("modify_time") + private Date modifyTime; + + @TableField("create_by") + private String createBy; + + @TableField("modify_by") + private String modifyBy; + + public Date getCredentialStartTime() { + return credentialStartTime; + } + + public void setCredentialStartTime(Date credentialStartTime) { + this.credentialStartTime = credentialStartTime; + } + + public Date getCredentialEndTime() { + return credentialEndTime; + } + + public void setCredentialEndTime(Date credentialEndTime) { + this.credentialEndTime = credentialEndTime; + } + + public String getCredentialId() { + return credentialId; + } + + public void setCredentialId(String credentialId) { + this.credentialId = credentialId; + } + public String getCredentialName() { + return credentialName; + } + + public void setCredentialName(String credentialName) { + this.credentialName = credentialName; + } + public Integer getCredentialState() { + return credentialState; + } + + public void setCredentialState(Integer credentialState) { + this.credentialState = credentialState; + } + public String getCredentialImageAddress() { + return credentialImageAddress; + } + + public void setCredentialImageAddress(String credentialImageAddress) { + this.credentialImageAddress = credentialImageAddress; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + public String getEntUserId() { + return entUserId; + } + + public void setEntUserId(String entUserId) { + this.entUserId = entUserId; + } + + @Override + public String toString() { + return "EntUserCredential{" + + "credentialId='" + credentialId + '\'' + + ", credentialName='" + credentialName + '\'' + + ", credentialState=" + credentialState + + ", credentialImageAddress='" + credentialImageAddress + '\'' + + ", entUserId='" + entUserId + '\'' + + ", credentialStartTime=" + credentialStartTime + + ", credentialEndTime=" + credentialEndTime + + ", createTime=" + createTime + + ", modifyTime=" + modifyTime + + ", createBy='" + createBy + '\'' + + ", modifyBy='" + modifyBy + '\'' + + '}'; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/EntUserCredentialUpdateDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/EntUserCredentialUpdateDto.java new file mode 100644 index 0000000..52cec7e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/EntUserCredentialUpdateDto.java @@ -0,0 +1,140 @@ +package com.rzyc.model.dto; + + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +/** + * 企业用户证件照Dto + * @author Xuwanxin + * */ + + +@ApiModel(value="企业用户证件对象", description="企业用户证件对象") +public class EntUserCredentialUpdateDto { + + + @ApiModelProperty(value = "企业用户证照表id") + private String credentialId; + + @ApiModelProperty(value = "证照名") + private String credentialName; + + @ApiModelProperty(value = "证照状态 1.未超时 2.已超时") + private Integer credentialState; + + @ApiModelProperty(value = "证照地址") + private String credentialImageAddress; + + @ApiModelProperty(value = "企业用户id") + private String entUserId; + + @ApiModelProperty(value = "证照起始时间") + private Date credentialStartTime; + + @ApiModelProperty(value = "证照结束时间") + private Date credentialEndTime; + + + private Date createTime; + + + private Date modifyTime; + + + private String createBy; + + + private String modifyBy; + + public Date getCredentialStartTime() { + return credentialStartTime; + } + + public void setCredentialStartTime(Date credentialStartTime) { + this.credentialStartTime = credentialStartTime; + } + + public Date getCredentialEndTime() { + return credentialEndTime; + } + + public void setCredentialEndTime(Date credentialEndTime) { + this.credentialEndTime = credentialEndTime; + } + + public String getCredentialId() { + return credentialId; + } + + public void setCredentialId(String credentialId) { + this.credentialId = credentialId; + } + public String getCredentialName() { + return credentialName; + } + + public void setCredentialName(String credentialName) { + this.credentialName = credentialName; + } + public Integer getCredentialState() { + return credentialState; + } + + public void setCredentialState(Integer credentialState) { + this.credentialState = credentialState; + } + public String getCredentialImageAddress() { + return credentialImageAddress; + } + + public void setCredentialImageAddress(String credentialImageAddress) { + this.credentialImageAddress = credentialImageAddress; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + public String getEntUserId() { + return entUserId; + } + + public void setEntUserId(String entUserId) { + this.entUserId = entUserId; + } + + + + + +} diff --git a/inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml b/inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml new file mode 100644 index 0000000..3a6e1f3 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/EntPostDutyMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + duty_id, post_id, duty_item, sort_id, enterprise_id, create_time, create_by, modify_time, modify_by + + + + + diff --git a/inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml b/inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml new file mode 100644 index 0000000..bff8313 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/EntPostTaskMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + task_id, post_id, ent_user_id, enterprise_id, ent_list_id, list_id, post_list_id, item_title, item_content, start_time, ent_time, task_state, frequency, del_state, create_time, create_by, modify_time, modify_by + + + + + diff --git a/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml b/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml new file mode 100644 index 0000000..bea4e7b --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + credential_id, credential_name, credential_state, credential_image_address, create_time, modify_time, create_by, modify_by + + + + + + update ent_user_credential set credential_name= #{data.credentialName} ,credential_start_time = #{data.credentialStartTime}, + credential_end_time = #{data.credentialEndTime},credential_image_address = #{data.credentialImageAddress}, + modify_timne = #{data.modifyTime} , modify_by = #{data.modifyBy} + where ent_user_id = #{data.entUserId} + + + + insert into ent_user_credential (credential_name,credential_start_time,credential_end_time,credential_image_address,ent_user_id,create_by,create_time) values(#{data.credentialName},#{data.credentialStartTime},#{data.credentialEndTime},#{data.credentialImageAddress},#{data.entUserId},#{data.createBy},#{data.createTime}) + + + + delete from ent_user_credential where credential_id = #{credentialId} + + + diff --git a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java index 3bf1ced..196c1ad 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/BaseController.java @@ -462,6 +462,19 @@ public class BaseController { @Autowired protected EntPostListMapper entPostListMapper; + //企业用户清单任务 + @Autowired + protected EntPostTaskMapper entPostTaskMapper; + + @Autowired + protected EntPostDutyMapper entPostDutyMapper; + + @Autowired + protected EntUserCredentialMapper entUserCredentialMapper; + + + + /** * 新都文件地址处理 * @param url diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java index e737bc0..dfcdf98 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java @@ -8,6 +8,8 @@ import com.common.utils.encryption.PasswdFactory; import com.common.utils.jwt.JwtUtil; import com.common.utils.model.SingleResult; import com.rzyc.bean.user.dto.LoginDto; +import com.rzyc.model.EntUserCredential; +import com.rzyc.model.dto.EntUserCredentialUpdateDto; import com.rzyc.model.ent.EntUser; import com.rzyc.service.PcBusinessService; import com.rzyc.service.UserLoginService; @@ -200,18 +202,109 @@ public class PersonalController extends BaseController{ @ApiImplicitParams({ @ApiImplicitParam(name = "enterpriseId", value = "公司id", required = true, dataType = "string"), @ApiImplicitParam(name = "entUserId", value = "企业用户id", required = true, dataType = "string"), - @ApiImplicitParam(name = "listId", value = "清单类型Id", required = true, dataType = "string"), @ApiImplicitParam(name = "postId", value = "企业用户岗位id",required = false, dataType = "string"), + @ApiImplicitParam(name = "listId", value = "清单类型Id", required = false, dataType = "string"), + @ApiImplicitParam(name = "content", value = "内容模糊搜索", required = false, dataType = "string"), + @ApiImplicitParam(name = "taskState", value = "任务状态 1、进行中 2、已完成 3、已超期", required = false, dataType = "int"), }) - @GetMapping(value = "/entUserPostList") + + @GetMapping(value = "/entUserPostTask") @PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERPOSTTASK','PERSONAL:ENTUSERPOSTTASK:UPDATE')") @MethodAnnotation(authorizations = {"PERSONAL:ENTUSERPOSTTASK","PERSONAL:ENTUSERPOSTTASK:UPDATE"}) @ResponseBody - public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId)throws Exception{ - return pcBusinessService.entUserPostTask(enterpriseId,entUserId,postId,listId); + public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId,String content,Integer taskState)throws Exception{ + return pcBusinessService.entUserPostTask(enterpriseId,entUserId,postId,listId,content,taskState); } + /** + * 企业用户岗位职责 + * @param enterpriseId 企业id + * @param postId 岗位id + * @return 企业用户岗位职责 + * @throws Exception + */ + @ApiOperation(value = "企业用户岗位职责", notes = "企业用户岗位职责") + @ApiImplicitParams({ + @ApiImplicitParam(name = "enterpriseId", value = "公司id", required = true, dataType = "string"), + @ApiImplicitParam(name = "postId", value = "企业用户岗位id",required = true, dataType = "string"), + }) + + @GetMapping(value = "/entUserPostDuty") + @PreAuthorize("hasAnyAuthority('PERSONAL:POSTDUTY','PERSONAL:POSTDUTY:UPDATE')") + @MethodAnnotation(authorizations = {"PERSONAL:POSTDUTY","PERSONAL:POSTDUTY:UPDATE"}) + @ResponseBody + public SingleResult entUserPostDuty(String enterpriseId, String postId)throws Exception{ + return pcBusinessService.entUserPostDuty(enterpriseId,postId); + } + + /** + * 企业用户证照表 + * @param entUserId 企业用户id + * @return 企业用户证照表 + * @throws Exception + */ + @ApiOperation(value = "企业用户证照表", notes = "企业用户证照表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"), + }) + @GetMapping(value = "/entUserCredential") + @PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL','PERSONAL:ENTUSERCREDENTIAL:UPDATE')") + @MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL","PERSONAL:ENTUSERCREDENTIAL:UPDATE"}) + @ResponseBody + public SingleResult entUserCredential(String entUserId)throws Exception{ + return pcBusinessService.entUserCredential(null,entUserId); + } + + /** + * 企业用户证照表-新增,修改 + * @param entUserCredentialUpdateDto 企业用户证件对象 + * @return 成功或失败 + * @throws Exception + */ + @ApiOperation(value = "企业用户证照表-新增,修改", notes = "企业用户证照表-新增,修改") + @ApiImplicitParams({ + @ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"), + }) + @PostMapping(value = "/entUserCredentialUpdate") + @PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL:UPDATE')") + @MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL:UPDATE"}) + @ResponseBody + public SingleResult entUserCredentialUpdate(@RequestBody EntUserCredentialUpdateDto entUserCredentialUpdateDto)throws Exception{ + return pcBusinessService.entUserCredentialUpdate(entUserCredentialUpdateDto); + } + + + /** + * 企业用户证照表-删除 + * @param credentialId 企业用户证件表删除 + * @return 成功或失败 + * @throws Exception + */ + @ApiOperation(value = "企业用户证照表-删除", notes = "企业用户证照表-删除") + @ApiImplicitParams({ + @ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"), + }) + @PostMapping(value = "/entUserCredentialDelete") + @PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL:DELETE')") + @MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL:DELETE"}) + @ResponseBody + public SingleResult entUserCredentialDelete(String credentialId)throws Exception{ + return pcBusinessService.entUserCredentialDelete(credentialId); + } + + + /** + * 企业岗位总体信息 + * @param keyContent + * @return list + * @throws Exception + */ + + + + + } diff --git a/inventory-ent/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java b/inventory-ent/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java index 335f297..8acf85b 100644 --- a/inventory-ent/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java +++ b/inventory-ent/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java @@ -39,7 +39,7 @@ public class JwtAuthenticationTokenFiler extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { //获取token - String token = request.getHeader("token"); + String token = request.getHeader("userToken"); if (!StringUtils.hasText(token)) { //放行 filterChain.doFilter(request, response); diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java index ec2ddef..ab9f74a 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java @@ -1,23 +1,29 @@ package com.rzyc.service; +import cn.jiguang.common.TimeUnit; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.common.utils.DateUtils; import com.common.utils.StringUtils; import com.common.utils.TypeConversion; +import com.common.utils.model.Code; +import com.common.utils.model.Message; import com.common.utils.model.SingleResult; import com.rzyc.bean.emergency.PlanList; import com.rzyc.controller.BaseController; +import com.rzyc.mapper.EntPostTaskMapper; +import com.rzyc.model.EntPostDuty; import com.rzyc.model.EntPostList; +import com.rzyc.model.EntPostTask; +import com.rzyc.model.EntUserCredential; +import com.rzyc.model.dto.EntUserCredentialUpdateDto; import com.rzyc.model.ent.EntPost; import com.rzyc.model.ent.EntUser; import com.rzyc.model.ent.SysEnterprise; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 企业端pc业务 Service @@ -82,12 +88,59 @@ public class PcBusinessService extends BaseController { } - public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId){ + public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId,String content,Integer taskState){ SingleResult singleResult = new SingleResult(); //EntPostTask + Listlist = entPostTaskMapper.selectEntUserPostTask(enterpriseId,entUserId,postId,listId,content,taskState); + singleResult.setData(list); + return singleResult; + } + + public SingleResult entUserPostDuty(String enterpriseId, String postId){ + SingleResult singleResult = new SingleResult(); + //EntPostDuty + Listlist = entPostDutyMapper.selectEntUserPostDuty(enterpriseId,postId); + singleResult.setData(list); + return singleResult; + } + + + public SingleResult entUserCredential(String enterpriseId, String entUserId){ + SingleResult singleResult = new SingleResult(); + Listlist = entUserCredentialMapper.selectEntUserCredential(enterpriseId,entUserId); + return singleResult; + } + + public SingleResult entUserCredentialUpdate(EntUserCredentialUpdateDto entUserCredentialUpdateDto) throws Exception { + SingleResult singleResult = new SingleResult(); + Integer result = 0; + if (StringUtils.isNotBlank(entUserCredentialUpdateDto.getCredentialId())) { + entUserCredentialUpdateDto.setModifyBy(getUserId()); + entUserCredentialUpdateDto.setModifyTime(new Date()); + result = entUserCredentialMapper.updateEntUserCredential(entUserCredentialUpdateDto); + }else { + entUserCredentialUpdateDto.setCreateBy(getUserId()); + entUserCredentialUpdateDto.setCreateTime(new Date()); + result = entUserCredentialMapper.insertEntUserCredential(entUserCredentialUpdateDto); + } + if (result==1){ + singleResult.setCode(Code.SUCCESS.getCode()); + singleResult.setMessage(Message.SUCCESS); + } + return singleResult; + } + + public SingleResult entUserCredentialDelete(String credentialId){ + SingleResult singleResult = new SingleResult(); + int result = entUserCredentialMapper.entUserCredentialDelete(credentialId); + if (result==1){ + singleResult.setCode(Code.SUCCESS.getCode()); + singleResult.setMessage(Message.SUCCESS); + } return singleResult; } + }