diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java new file mode 100644 index 00000000..6c6cec75 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfig.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:34 + */ +@Data +@ApiModel(value = "模板 员工关联表", description = "模板 员工关联表") +@TableName("template_staff_config") +public class TemplateStaffConfig extends BaseEntity { + //模板sid + private String templateSid; + //员工sid + private String staffSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java new file mode 100644 index 00000000..c751038b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDetailsVo.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 视图数据详情", description = "模板 员工关联表 视图数据详情") +public class TemplateStaffConfigDetailsVo implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java new file mode 100644 index 00000000..66aa431d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigDto.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 数据传输对象", description = "模板 员工关联表 数据传输对象") +public class TemplateStaffConfigDto implements Dto { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java new file mode 100644 index 00000000..e241d577 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeign.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Api(tags = "模板 员工关联表") +@FeignClient( + contextId = "yxt-supervise-TemplateStaffConfig", + name = "yxt-supervise", + path = "v1/templatestaffconfig", + fallback = TemplateStaffConfigFeignFallback.class) +public interface TemplateStaffConfigFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java new file mode 100644 index 00000000..47f8b391 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Component +public class TemplateStaffConfigFeignFallback implements TemplateStaffConfigFeign{ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java new file mode 100644 index 00000000..1b4d15d3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigQuery.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 查询条件", description = "模板 员工关联表 查询条件") +public class TemplateStaffConfigQuery implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java new file mode 100644 index 00000000..0e7722d1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/templatestaffconfig/TemplateStaffConfigVo.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.api.templatestaffconfig; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 14:35 + */ +@Data +@ApiModel(value = "模板 员工关联表 视图数据对象", description = "模板 员工关联表 视图数据对象") +public class TemplateStaffConfigVo implements Vo { + private String id; + //模板sid + private String templateSid; + //员工sid + private String staffSid; + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java new file mode 100644 index 00000000..d0160fa9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplate.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:34 + */ +@Data +@ApiModel(value = "微信消息模版", description = "微信消息模版") +@TableName("wechat_template") +public class WechatTemplate extends BaseEntity { + //id + //private String id; + //模版id + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java new file mode 100644 index 00000000..bbab87c0 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDetailVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:34 + */ +@Data +@ApiModel(value = "微信消息模版 视图数据详情", description = "微信消息模版 视图数据详情") +public class WechatTemplateDetailVo implements Vo { + private String id; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java new file mode 100644 index 00000000..15dfa53e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateDto.java @@ -0,0 +1,32 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 数据传输对象", description = "微信消息模版 数据传输对象") +public class WechatTemplateDto implements Dto { + private String id; + private String sid; // sid + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; + private List templateStaffConfigs; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java new file mode 100644 index 00000000..eb229177 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeign.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.portal.api.wechattemplate; + + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Api(tags = "微信模版消息") +@FeignClient( + contextId = "com.supervise-WechatTemplate", + name = "com.supervise", + path = "v1/wechattemplate", + fallback = WechatTemplateFeignFallback.class) +public interface WechatTemplateFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java new file mode 100644 index 00000000..f1d35657 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateFeignFallback.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import org.springframework.stereotype.Component; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Component +public class WechatTemplateFeignFallback implements WechatTemplateFeign{ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java new file mode 100644 index 00000000..d891b613 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateQuery.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 查询条件", description = "微信消息模版 查询条件") +public class WechatTemplateQuery implements Query { + private String id; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java new file mode 100644 index 00000000..5643c9b8 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/wechattemplate/WechatTemplateVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.portal.api.wechattemplate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/4/10 11:35 + */ +@Data +@ApiModel(value = "微信消息模版 视图数据对象", description = "微信消息模版 视图数据对象") +public class WechatTemplateVo implements Vo { + private String id; + @ApiModelProperty("模版id") + private String templateId; + //标题 + @ApiModelProperty("标题") + private String title; + //格式 + @ApiModelProperty("格式") + private String json; + //行业 + @ApiModelProperty("行业") + private String trade; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java new file mode 100644 index 00000000..2580a774 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.portal.biz.templatestaffconfig; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/4/10 14:45 + */ +@Mapper +public interface TemplateStaffConfigMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml new file mode 100644 index 00000000..76598e64 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java new file mode 100644 index 00000000..2626c855 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigRest.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.portal.biz.templatestaffconfig; + +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfigFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/4/10 14:45 + */ +@Api(tags = "消息 员工关联表") +@RestController +@RequestMapping("v1/templatestaffconfig") +public class TemplateStaffConfigRest implements TemplateStaffConfigFeign { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java new file mode 100644 index 00000000..12b73b3a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/templatestaffconfig/TemplateStaffConfigService.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.portal.biz.templatestaffconfig; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/4/10 14:45 + */ +@Service +public class TemplateStaffConfigService extends MybatisBaseService { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java new file mode 100644 index 00000000..0fdb43b9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/4/10 10:34 + */ +@Mapper +public interface WechatTemplateMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml new file mode 100644 index 00000000..626fa3b3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java new file mode 100644 index 00000000..b83c85c6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateRest.java @@ -0,0 +1,54 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateFeign; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/10 10:35 + */ +@Api(tags = "微信消息模版") +@RestController +@RequestMapping("v1/wechattemplate") +public class WechatTemplateRest implements WechatTemplateFeign { + @Autowired + WechatTemplateService wechatTemplateService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wechatTemplateService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save(@RequestBody WechatTemplateDto dto){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.save(dto); + return rb.success().setMsg(rb.getMsg()); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody WechatTemplateDto dto){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.update(dto); + return rb.success().setMsg(rb.getMsg()); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + @ResponseBody + public ResultBean delete(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + wechatTemplateService.deleteById(sid); + return rb.success().setMsg(rb.getMsg()); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java new file mode 100644 index 00000000..222e857f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/wechattemplate/WechatTemplateService.java @@ -0,0 +1,88 @@ +package com.yxt.supervise.portal.biz.wechattemplate; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.templatestaffconfig.TemplateStaffConfig; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplate; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateDto; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateQuery; +import com.yxt.supervise.portal.api.wechattemplate.WechatTemplateVo; +import com.yxt.supervise.portal.biz.templatestaffconfig.TemplateStaffConfigService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/10 10:36 + */ +@Service +public class WechatTemplateService extends MybatisBaseService { + + @Autowired + private TemplateStaffConfigService templateStaffConfigService; + + + public PagerVo listPageVo(PagerQuery pq) { + WechatTemplateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean save(WechatTemplateDto dto) { + ResultBean rb = ResultBean.fireFail(); + + WechatTemplate entity=new WechatTemplate(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + List entitys=new ArrayList<>(); + if(dto.getTemplateStaffConfigs().size()>0){ + for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){ + BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid"); + templateStaffConfig.setTemplateSid(entity.getSid()); + entitys.add(templateStaffConfig); + } + + templateStaffConfigService.saveBatch(entitys); + } + return rb.success().setMsg("添加模板信息成功"); + } + public ResultBean update(WechatTemplateDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return rb.success().setMsg("添加模板信息成功"); + } + WechatTemplate entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + List entitys=new ArrayList<>(); + if(dto.getTemplateStaffConfigs().size()>0){ + templateStaffConfigService.deleteBySid(entity.getSid()); + for(TemplateStaffConfig templateStaffConfig:dto.getTemplateStaffConfigs()){ + BeanUtil.copyProperties(dto, templateStaffConfig, "id", "sid"); + templateStaffConfig.setTemplateSid(entity.getSid()); + entitys.add(templateStaffConfig); + } + templateStaffConfigService.saveBatch(entitys); + } + return rb.success().setMsg("添加模板信息成功"); + } + public ResultBean deleteById(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i=baseMapper.deleteById(sid); + templateStaffConfigService.deleteBySid(sid); + return rb.success().setMsg("添加模板信息成功"); + } +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java index 5e6714dd..c763452d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java @@ -7,6 +7,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; @@ -44,6 +45,9 @@ public interface SysStaffinfoFeign { @ApiOperation("员工管理分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("查询所有的员工") + @PostMapping("/getAllStaffinfo") + public ResultBean> getAllStaffinfo(); @ApiOperation("员工管理分页列表 新") @PostMapping("/listPageNew") public ResultBean> listPageNew(@RequestBody PagerQuery pq); @@ -82,6 +86,10 @@ public interface SysStaffinfoFeign { @ApiOperation("设置离职") @PostMapping("/del") public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery); + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySid/{sid}") + @ResponseBody + public ResultBean delBySid(@PathVariable("sid")String sid); /** * 员工信息编辑初始化及详情 diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java index ebc92b8c..9409fa2d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -31,6 +31,12 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问"); } + + @Override + public ResultBean> getAllStaffinfo() { + return null; + } + @Override public ResultBean> listPageNew(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -61,6 +67,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean delBySid(String sid) { + return null; + } + @Override public ResultBean fetchBySid(String sid) { diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java index a7ac5725..9e5de19d 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java @@ -24,15 +24,15 @@ import javax.validation.constraints.NotBlank; @ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象") @Data public class SysUserDto implements Dto { - @ApiModelProperty("手机号") + @ApiModelProperty("手机号") private String mobile; - @ApiModelProperty("用户类型:1员工、2客户、3供应商") + @ApiModelProperty("用户类型:1员工、2客户、3供应商") private Integer userType; @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message = "姓名不能为空") + //@NotBlank(message = "姓名不能为空") private String name; @ApiModelProperty(value = "验证码", required = true) - @NotBlank(message = "验证码不能为空") + //@NotBlank(message = "验证码不能为空") private String verificationCode; @ApiModelProperty(value = "部门sid") private String deptSid; diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java index 0292162f..5766ba04 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.java @@ -114,6 +114,8 @@ public interface SysStaffinfoMapper extends BaseMapper { int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey, @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason); + int deleteBySid(@Param("sid") String sid); + /** * 查询当前分公司下的员工信息 * @@ -122,6 +124,8 @@ public interface SysStaffinfoMapper extends BaseMapper { */ List selectStaffList(String orgSid); + List selectAllStaffinfo(); + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml index 123229ce..9f2b9c2c 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoMapper.xml @@ -9,21 +9,21 @@ SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -68,7 +68,7 @@ FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} @@ -76,7 +76,7 @@ select * from sys_staffinfo order by jobNumber desc - limit 1 + limit 1 select sso.staffSid, si.name staffName @@ -368,6 +375,10 @@ where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ',')) + select su.sid userSid, - si.name userName, - su.headImage, - si.mobile userMobile, - sso.orgName as department, - sp.name + si.name userName, + su.headImage, + si.mobile userMobile, + sso.orgName as department, + sp.name from sys_staff_org sso - left join sys_staffinfo si on sso.staffSid = si.sid - left join sys_user su on si.sid = su.staffSid - left join sys_staff_post ssp on si.sid = ssp.staffSid - left join sys_post sp on sp.sid = ssp.postSid + left join sys_staffinfo si on sso.staffSid = si.sid + left join sys_user su on si.sid = su.staffSid + left join sys_staff_post ssp on si.sid = ssp.staffSid + left join sys_post sp on sp.sid = ssp.postSid ${ew.sqlSegment} and find_in_set(#{orgSid} - , replace (sso.orgSidPath - , '/' - , ',')) + , replace (sso.orgSidPath + , '/' + , ',')) group by su.sid @@ -411,22 +422,22 @@ diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java index 2d446c9e..4953a174 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoRest.java @@ -1,8 +1,10 @@ package com.yxt.supervise.system.sysstaffinfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery; import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; @@ -64,6 +66,11 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); } + public ResultBean> getAllStaffinfo() { + ResultBean> rb = ResultBean.fireFail(); + List list = sysStaffinfoService.getAllStaffinfo(); + return rb.success().setData(list); + } @Override public ResultBean> listPageNew(@RequestBody PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); @@ -145,6 +152,22 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return rb.success().setMsg("成功"); } + @Override + public ResultBean delBySid(String sid) { + System.out.println(sid); + ResultBean rb = ResultBean.fireFail(); + //删除员工 + int i=sysStaffinfoService.delByIds(sid); + //删除用户 + SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("staffSid",sid)); + sysUserService.delBySid(sysUser.getSid()); + if(i>0){ + return rb.success().setMsg("成功"); + }else{ + return rb.success().setMsg("失败"); + } + } + @Override public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java index e0137724..8ab49de6 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java @@ -199,7 +199,10 @@ public class SysStaffinfoService extends MybatisBaseService getAllStaffinfo() { + List sysStaffinfoVoList=baseMapper.selectAllStaffinfo(); + return sysStaffinfoVoList; + } public IPage lpagerListNew(PagerQuery pagerQuery) { // mybits所用的分页对对象 IPage page = PagerUtil.queryToPage(pagerQuery); @@ -217,12 +220,12 @@ public class SysStaffinfoService extends MybatisBaseService sysStaffinfoVoIPage = baseMapper.pagerListNew(page, qw); List records = sysStaffinfoVoIPage.getRecords(); for (SysStaffinfoVo record : records) { @@ -459,10 +462,10 @@ public class SysStaffinfoService extends MybatisBaseService sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid); List orgList1 = new ArrayList<>(); if (sysStaffOrgVos1.size() > 0) { @@ -940,12 +944,12 @@ public class SysStaffinfoService extends MybatisBaseService reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList()); - if (reduce1.size() > 0) { - //根据staffSid查询token - String token = sysUserService.selectByStaffsid(sid).getToken(); - //清空该token - redisUtil.remove(token); - } +// if (reduce1.size() > 0) { +// //根据staffSid查询token +// String token = sysUserService.selectByStaffsid(sid).getToken(); +// //清空该token +// redisUtil.remove(token); +// } return rb.success().setMsg("更新员工信息成功"); } /** @@ -1025,7 +1029,12 @@ public class SysStaffinfoService extends MybatisBaseService> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { ResultBean> rb = ResultBean.fireFail(); //根据当前staffSid查询分公司sid diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java index 54ed2755..1de41e18 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java @@ -44,6 +44,7 @@ public interface SysUserMapper extends BaseMapper { List selectListVo(); public int updatePassword(String sid, String password); + public int deleteBySid(String sid); public int updatePasswordApp(String sid, String password); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml index 99bfd770..d94f7935 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml @@ -5,59 +5,59 @@ @@ -271,12 +275,12 @@ select su.*, ss.name from sys_user su - left join sys_staffinfo ss on su.staffSid = ss.sid + left join sys_staffinfo ss on su.staffSid = ss.sid where su.sid in #{item} @@ -340,12 +344,12 @@