diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java index 2a49f48..04b7013 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java @@ -4,7 +4,7 @@ import lombok.Getter; public class OperationalConstants { - public final static String APP_NAME = "hzims-operational"; + public final static String APP_NAME = "hzims-operational-ysj"; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/constants/FeedbackConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/constants/FeedbackConstant.java new file mode 100644 index 0000000..92b3c58 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/constants/FeedbackConstant.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.operational.feedback.constants; + +/** + * 应急抢修常量 + * @Author: ysj + */ +public interface FeedbackConstant { + + + /** + * 问题回复角色别名 + */ + String REPLY_ROLE_ALIAS = "feedback_reply"; + +} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/entity/UserFeedbackEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/entity/UserFeedbackEntity.java similarity index 52% rename from hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/entity/UserFeedbackEntity.java rename to hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/entity/UserFeedbackEntity.java index 4e4e4e3..18c022c 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/entity/UserFeedbackEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/entity/UserFeedbackEntity.java @@ -1,38 +1,56 @@ -package com.hnac.hzims.operational.main.entity; +package com.hnac.hzims.operational.feedback.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.io.Serializable; +import java.util.Date; + /** - * Created by Sam Huang 2022/5/24 11:03 + * @author ysj */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("hzims_user_feedback") -@ApiModel(value = "UserFeedbackEntity对象", description = "用户反馈表") -public class UserFeedbackEntity extends TenantEntity implements Serializable { - private static final long serialVersionUID = 1L; +@ApiModel(value = "用户反馈信息", description = "用户反馈记录表") +public class UserFeedbackEntity extends TenantEntity { - @ApiModelProperty(value = "联系电话") - private String phone; + private static final long serialVersionUID = 1L; @ApiModelProperty(value = "反馈内容") private String content; + @ApiModelProperty(value = "联系电话") + private String phone; + @ApiModelProperty(value = "附件名称") private String fileName; @ApiModelProperty(value = "附件地址") private String fileUrl; + @ApiModelProperty(value = "反馈人") + private Long feedbackUser; + + @ApiModelProperty(value = "反馈人姓名") + private String feedbackUserName; + + @ApiModelProperty(value = "反馈类型") + private String feedbackType; + @ApiModelProperty(value = "回复内容") private String replyContent; @ApiModelProperty(value = "回复人") private Long replyUser; + @ApiModelProperty(value = "回复时间") + private Date replyTime; + + @ApiModelProperty(value = "回复人姓名") + private String replyUserName; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/vo/FeedbackQueryVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/vo/FeedbackQueryVo.java new file mode 100644 index 0000000..a005165 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feedback/vo/FeedbackQueryVo.java @@ -0,0 +1,29 @@ +package com.hnac.hzims.operational.feedback.vo; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author ysj + */ +@Data +@ApiModel(value = "用户反馈查询对象") +public class FeedbackQueryVo { + + @ApiModelProperty(value = "反馈开始时间") + private String startTime; + + @ApiModelProperty(value = "反馈结束时间") + private String endTime; + + @ApiModelProperty(value = "反馈信息") + private String content; + + @ApiModelProperty(value = "反馈类型") + private String feedbackType; + + @ApiModelProperty(value = "问题状态: 1-未回复 2-已回复") + private Integer status; +} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java new file mode 100644 index 0000000..d5afdfd --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/controller/UserFeedbackController.java @@ -0,0 +1,72 @@ +package com.hnac.hzims.operational.feedback.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; +import com.hnac.hzims.operational.feedback.service.IUserFeedbackService; +import com.hnac.hzims.operational.feedback.vo.FeedbackQueryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; + +/** + * @author ysj + */ +@RestController +@RequestMapping("/feedback") +@AllArgsConstructor +@Api(value = "用户反馈", tags = "用户反馈管理") +public class UserFeedbackController extends BladeController { + + private final IUserFeedbackService service; + + @PostMapping("/save") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "保存反馈信息", notes = "传入用户反馈对象") + public R save(@RequestBody UserFeedbackEntity entity) { + BladeUser user = AuthUtil.getUser(); + entity.setFeedbackUser(user.getUserId()); + entity.setFeedbackUserName(user.getNickName()); + return R.status(service.save(entity)); + } + + @PostMapping("/update") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "修改反馈信息", notes = "传入用户反馈对象") + public R update(@RequestBody UserFeedbackEntity entity) { + BladeUser user = AuthUtil.getUser(); + entity.setFeedbackUser(user.getUserId()); + entity.setFeedbackUserName(user.getNickName()); + return R.status(service.updateById(entity)); + } + + @PostMapping("/remove") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "删除反馈信息", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + @PostMapping("/reply") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "回复反馈信息", notes = "传入用户反馈对象") + public R reply(@RequestBody UserFeedbackEntity entity) { + return R.status(service.reply(entity)); + } + + @PostMapping("/page") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "反馈列表查询", notes = "传入ids") + public R> pageCondition(FeedbackQueryVo param, Query query) { + return R.data(service.pageCondition(param, Condition.getPage(query))); + } +} \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.java new file mode 100644 index 0000000..0081b1a --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.operational.feedback.mapper; + +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @author ysj + */ +public interface UserFeedbackMapper extends UserDataScopeBaseMapper { + +} \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.xml new file mode 100644 index 0000000..31cee66 --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/mapper/UserFeedbackMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java new file mode 100644 index 0000000..75b854d --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/IUserFeedbackService.java @@ -0,0 +1,17 @@ +package com.hnac.hzims.operational.feedback.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; +import com.hnac.hzims.operational.feedback.vo.FeedbackQueryVo; +import org.springblade.core.mp.base.BaseService; + + +/** + * @author ysj + */ +public interface IUserFeedbackService extends BaseService { + + IPage pageCondition(FeedbackQueryVo query,IPage page); + + boolean reply(UserFeedbackEntity entity); +} \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java new file mode 100644 index 0000000..8424ddd --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/feedback/service/impl/UserFeedbackServiceImpl.java @@ -0,0 +1,107 @@ +package com.hnac.hzims.operational.feedback.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.operational.feedback.constants.FeedbackConstant; +import com.hnac.hzims.operational.feedback.mapper.UserFeedbackMapper; +import com.hnac.hzims.operational.feedback.service.IUserFeedbackService; +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; +import com.hnac.hzims.operational.feedback.vo.FeedbackQueryVo; +import com.hnac.hzims.operational.station.entity.StationEntity; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author ysj + */ +@Service +@Slf4j +@AllArgsConstructor +public class UserFeedbackServiceImpl extends BaseServiceImpl implements IUserFeedbackService { + + private final IUserClient userClient; + + /** + * 用户反馈列表查询 + * @param query + * @return + */ + @Override + public IPage pageCondition(FeedbackQueryVo query,IPage page) { + // 用户角色查询 + boolean isHaveReplyRole = this.isHaveReplyRole(); + + // 定义查询表达式 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.orderByDesc(UserFeedbackEntity::getCreateTime); + if(ObjectUtil.isNotEmpty(query)){ + if(StringUtil.isNotBlank(query.getStartTime())){ + wrapper.ge(UserFeedbackEntity::getCreateTime,query.getStartTime()); + } + if(StringUtil.isNotBlank(query.getEndTime())){ + wrapper.le(UserFeedbackEntity::getCreateTime,query.getEndTime()); + } + if(StringUtil.isNotBlank(query.getFeedbackType())){ + wrapper.eq(UserFeedbackEntity::getFeedbackType,query.getFeedbackType()); + } + if(ObjectUtil.isNotEmpty(query.getStatus())){ + wrapper.eq(UserFeedbackEntity::getStatus,query.getStatus()); + } + if(ObjectUtil.isNotEmpty(query.getContent())){ + wrapper.like(UserFeedbackEntity::getContent,query.getContent()); + } + } + if(isHaveReplyRole){ + wrapper.eq(UserFeedbackEntity::getFeedbackUser,AuthUtil.getUserId()); + } + + return this.page(page,wrapper); + } + + /** + * 反馈回复 + * @param entity + * @return + */ + @Override + public boolean reply(UserFeedbackEntity entity) { + // 更新保存回复内容 + BladeUser user = AuthUtil.getUser(); + entity.setReplyUser(user.getUserId()); + entity.setReplyUserName(user.getNickName()); + entity.setReplyTime(new Date()); + entity.setStatus(2); + this.updateById(entity); + // TODO 推送回复信息至提问人 + return true; + } + + /** + * 用户是否拥有问题回复角色 + * @return + */ + private boolean isHaveReplyRole() { + // 当前用户 + BladeUser user = AuthUtil.getUser(); + // 查询用户回复角色用户 + R> haveUsers = userClient.userListByRoleAlias(user.getTenantId(), FeedbackConstant.REPLY_ROLE_ALIAS); + if(!haveUsers.isSuccess() || CollectionUtil.isEmpty(haveUsers.getData())){ + return true; + } + return !haveUsers.getData().stream().map(User::getId).collect(Collectors.toList()).contains(user.getUserId()); + } +} \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java deleted file mode 100644 index 53f7f60..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/UserFeedbackController.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.hnac.hzims.operational.main.controller; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.hnac.hzims.operational.main.dto.UserFeedbackDTO; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; -import com.hnac.hzims.operational.main.service.IUserFeedbackService; -import com.hnac.hzims.operational.main.vo.UserFeedbackVo; -import com.hnac.hzims.operational.main.wrapper.UserFeedbackWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.log.annotation.ApiLog; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.core.tool.utils.StringUtil; -import org.springblade.system.user.feign.IUserClient; -import org.springframework.web.bind.annotation.*; - -/** - * Created by Sam Huang 2022/5/24 11:21 - */ -@RestController -@RequestMapping("/feedback") -@Api(value = "用户反馈", tags = "用户反馈管理") -@AllArgsConstructor -public class UserFeedbackController extends BladeController { - - private final IUserFeedbackService userFeedbackService; - - private final IUserClient userClient; - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 20) - @ApiOperation(value = "新增", notes = "传入UserFeedbackDTO") - public R save(@RequestBody UserFeedbackDTO req) { - /*R userR = userClient.userInfoById(AuthUtil.getUserId()); - if (userR.isSuccess()) { - req.setPhone(Optional.ofNullable(userR.getData()).map(User::getPhone).orElse(null)); - }*/ - return R.status(userFeedbackService.save(req)); - } - - /** - * 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 30) - @ApiOperation(value = "修改", notes = "传入UserFeedbackDTO") - public R update(@RequestBody UserFeedbackDTO req) { - return R.status(userFeedbackService.updateById(req)); - } - - - /** - * 回复 - */ - @PostMapping("/reply") - @ApiOperationSupport(order = 30) - @ApiOperation(value = "回复", notes = "传入UserFeedbackDTO") - public R reply(@RequestBody UserFeedbackDTO req) { - req.setReplyUser(AuthUtil.getUserId()); - //已回复 - req.setStatus(2); - return R.status(userFeedbackService.updateById(req)); - } - - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 10) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(userFeedbackService.deleteLogic(Func.toLongList(ids))); - } - - /** - * 详情 - */ - @ApiLog - @GetMapping("/detail") - @ApiOperationSupport(order = 40) - @ApiOperation(value = "详情", notes = "传入id") - public R detail(@RequestParam Long id) { - UserFeedbackVo vo = UserFeedbackWrapper.build().entityVO(userFeedbackService.getById(id)); - return R.data(vo); - } - - /** - * 分页 - */ - @ApiLog - @GetMapping("/list") - @ApiOperationSupport(order = 50) - @ApiOperation(value = "分页", notes = "查询条件：startTime,endTime,content,createUser,status") - public R> list(UserFeedbackDTO req, Query query) { - Wrapper queryWrapper = new LambdaQueryWrapper() {{ - orderByDesc(UserFeedbackEntity::getCreateTime); - if (ObjectUtil.isNotEmpty(req.getStartTime())) { - ge(UserFeedbackEntity::getCreateTime, req.getStartTime()); - } - if (StringUtil.isNotBlank(req.getEndTime())) { - le(UserFeedbackEntity::getCreateTime, req.getEndTime()); - } - if (ObjectUtil.isNotEmpty(req.getContent())) { - like(UserFeedbackEntity::getContent, req.getContent()); - } - if (ObjectUtil.isNotEmpty(req.getCreateUser())) { - eq(UserFeedbackEntity::getCreateUser, req.getCreateUser()); - } - if (ObjectUtil.isNotEmpty(req.getStatus())) { - eq(UserFeedbackEntity::getStatus, req.getStatus()); - } - }}; - IPage page = userFeedbackService.page(Condition.getPage(query), queryWrapper); - page.setRecords(UserFeedbackWrapper.build().listVO(page.getRecords())); - return R.data(page); - } - - /** - * 分页 - 无数据权限控制 - */ - @GetMapping("/listNotDataScope") - @ApiOperationSupport(order = 50) - @ApiOperation(value = "分页-无数据权限控制", notes = "查询条件：startTime,endTime,content,createUser,status") - public R> listNotDataScope(UserFeedbackDTO req, Query query) { - IPage iPage = userFeedbackService.pageNotDataScope(Condition.getPage(query), req); - iPage.setRecords(UserFeedbackWrapper.build().listVO(iPage.getRecords())); - return R.data(iPage); - } - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/dto/UserFeedbackDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/dto/UserFeedbackDTO.java deleted file mode 100644 index 1793ec5..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/dto/UserFeedbackDTO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hnac.hzims.operational.main.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * Created by Sam Huang 2022/5/24 11:09 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class UserFeedbackDTO extends UserFeedbackEntity { - - private static final long serialVersionUID = 1L; - - @DateTimeFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @ApiModelProperty("查询开始时间") - private String startTime; - - - @DateTimeFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @ApiModelProperty("查询结束时间") - private String endTime; - - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.java deleted file mode 100644 index 862dbca..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.operational.main.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.operational.main.dto.UserFeedbackDTO; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; -import org.apache.ibatis.annotations.Param; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -public interface UserFeedbackMapper extends UserDataScopeBaseMapper { - - IPage pageNotDataScope(IPage page, @Param("req") UserFeedbackDTO req); - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.xml deleted file mode 100644 index f37938e..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/UserFeedbackMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUserFeedbackService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUserFeedbackService.java deleted file mode 100644 index b2f0d7f..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IUserFeedbackService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.operational.main.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.operational.main.dto.UserFeedbackDTO; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * Created by Sam Huang 2022/5/24 11:18 - */ -public interface IUserFeedbackService extends BaseService { - - IPage pageNotDataScope(IPage page, UserFeedbackDTO req); - -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserFeedbackServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserFeedbackServiceImpl.java deleted file mode 100644 index 4eb8507..0000000 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UserFeedbackServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hnac.hzims.operational.main.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hnac.hzims.operational.main.dto.UserFeedbackDTO; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; -import com.hnac.hzims.operational.main.mapper.UserFeedbackMapper; -import com.hnac.hzims.operational.main.service.IUserFeedbackService; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * Created by Sam Huang 2022/5/24 11:19 - */ -@Service -@Slf4j -@AllArgsConstructor -public class UserFeedbackServiceImpl extends BaseServiceImpl implements IUserFeedbackService { - - - private final UserFeedbackMapper userFeedbackMapper; - - @Override - public IPage pageNotDataScope(IPage page, UserFeedbackDTO req) { - return userFeedbackMapper.pageNotDataScope(page, req); - } -} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/UserFeedbackVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/UserFeedbackVo.java index c594b34..2d8a986 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/UserFeedbackVo.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/vo/UserFeedbackVo.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.main.vo; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/wrapper/UserFeedbackWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/wrapper/UserFeedbackWrapper.java index 8282ab0..1588f88 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/wrapper/UserFeedbackWrapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/wrapper/UserFeedbackWrapper.java @@ -1,6 +1,6 @@ package com.hnac.hzims.operational.main.wrapper; -import com.hnac.hzims.operational.main.entity.UserFeedbackEntity; +import com.hnac.hzims.operational.feedback.entity.UserFeedbackEntity; import com.hnac.hzims.operational.main.vo.UserFeedbackVo; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil;