springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -63,7 +63,11 @@ private TokenService tokenService; @Resource private CommunityService communityService; @ApiOperation(value = "登录获取token", response = LoginReturnVO.class) @PostMapping("login-token") public R loginToken(@RequestParam("openId") String openId,@RequestParam("appid")String appid) { return tokenService.loginApplets(openId,appid); } @ApiOperation(value = "登录", response = LoginReturnVO.class) @PostMapping("login") public R login(@RequestBody LoginRequest loginRequest) { springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -10,14 +10,19 @@ import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord; import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; import com.panzhihua.sangeshenbian.model.entity.ProblemType; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.model.vo.DispatchVO; import com.panzhihua.sangeshenbian.service.IComplaintService; import com.panzhihua.sangeshenbian.service.IProblemTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -40,13 +45,17 @@ @Validated @RestController @RequestMapping("/applet/complaint") @RequiredArgsConstructor @RequiredArgsConstructor(onConstructor_ = {@Lazy}) @Api(tags = "诉求管理") public class ComplaintController extends BaseController { private final IComplaintService complaintService; private final IProblemTypeService problemTypeService; @GetMapping("/problem-type/list") @ApiOperation("获取诉求问题类型列表") public R<List<ProblemType>> problemTypeList() { return R.ok(problemTypeService.list()); } /** * 录入诉求 */ @@ -70,6 +79,7 @@ } @GetMapping("/progress/{complaintId}") @ApiOperation("办理进度") public R<List<ComplaintProgress>> progress(@ApiParam(name = "complaintId", value = "诉求id", required = true) @PathVariable("complaintId") Long complaintId) { return R.ok(complaintService.progress(complaintId)); } @@ -149,7 +159,7 @@ */ @GetMapping("/getDispatchList") @ApiOperation(value = "获取下派单位列表") public R<?> getDispatchList() { public R<List<DispatchVO>> getDispatchList() { return R.ok(complaintService.getDispatchList(getLoginUserInfo())); }
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; import com.panzhihua.common.service.sangeshenbian.SystemUserService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.sangeshenbian.model.entity.Banner; import com.panzhihua.sangeshenbian.model.entity.SystemUser; import com.panzhihua.sangeshenbian.model.query.BasePage; @@ -40,6 +41,7 @@ private final IMessageNotificationService messageNotificationService; private final IComplaintService complaintService; private final ISystemUserService systemUserService; private final UserService userService; @ApiOperation("获取banner列表") @GetMapping("/banner-list") public R<List<Banner>> getBannerList() { @@ -68,6 +70,6 @@ @GetMapping("/current-user-info") @ApiOperation("获取三个身边当前用户信息 用于判断用户是否是上级") public R<SystemUser> getCurrentUserInfo() { return R.ok(systemUserService.getSystemUserByPhone(getLoginUserInfo().getPhone()).get()); return R.ok(systemUserService.getSystemUserByPhone(getLoginUserInfo().getPhone()).orElse(null)); } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintAuditRecord.java
@@ -6,6 +6,8 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import java.util.Date; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -75,7 +77,7 @@ @ApiModelProperty(value = "创建时间") @TableField("create_time") private LocalDateTime createTime; private Date createTime; @ApiModelProperty(value = "修改人") @TableField("update_by") @@ -83,7 +85,15 @@ @ApiModelProperty(value = "修改时间") @TableField("update_time") private LocalDateTime updateTime; private Date updateTime; @ApiModelProperty("上报人") private String reporter; @ApiModelProperty("所属部门") private String departmentName; @ApiModelProperty("部门id") private Integer departmentId; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintFlow.java
@@ -35,8 +35,8 @@ @TableId(value = "id",type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty(value = "主键ID") @TableId(value = "complaint_id") @ApiModelProperty(value = "诉求ID") @TableField(value = "complaint_id") private Long complaintId; @ApiModelProperty(value = "处理层级: 1-市级，2-区县，3-街道，4-社区") springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ProblemType.java
@@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; @@ -21,16 +23,19 @@ * 主键 */ @TableId(value = "id", type = IdType.AUTO) @ApiModelProperty("主键") private Integer id; /** * 名称 */ @TableField("name") @ApiModelProperty("名称") private String name; /** * 删除标识（0=否，1=是） */ @TableField("del") @TableLogic private Integer del; /** * 添加时间 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/scheduled/ComplaintTasks.java
@@ -15,6 +15,6 @@ */ @Scheduled(fixedRate = 60000) public void complaintTimeout() { complaintService.list() complaintService.list(); } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintAuditRecordServiceImpl.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.Date; /** * <p> * 诉求上报、延期申请审核表 服务实现类 @@ -27,9 +29,9 @@ auditRecord.setAuditStatus(0); auditRecord.setComment(comment); auditRecord.setCreateBy(userId); auditRecord.setCreateTime(DateUtils.getCurrentDate()); auditRecord.setCreateTime(new Date()); auditRecord.setUpdateBy(userId); auditRecord.setUpdateTime(DateUtils.getCurrentDate()); auditRecord.setUpdateTime(new Date()); save(auditRecord); } @@ -42,7 +44,7 @@ auditRecord.setAuditStatus(auditResult); auditRecord.setRejectReason(rejectReason); auditRecord.setUpdateBy(userId); auditRecord.setUpdateTime(DateUtils.getCurrentDate()); auditRecord.setUpdateTime(new Date()); save(auditRecord); } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintFlowServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.Date; @@ -22,7 +23,7 @@ * @since 2025-02-22 */ @Service @RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RequiredArgsConstructor(onConstructor_ = {@Lazy}) public class ComplaintFlowServiceImpl extends ServiceImpl<ComplaintFlowMapper, ComplaintFlow> implements IComplaintFlowService { private final IComplaintService complaintService; private final IBcRegionService bcRegionService; springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -29,6 +29,8 @@ import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.service.ISystemUserService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -48,7 +50,7 @@ * @since 2025-02-22 */ @Service @RequiredArgsConstructor @RequiredArgsConstructor(onConstructor_ = {@Lazy}) public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService { private final ISystemUserService systemUserService; private final IComplaintFlowService complaintFlowService; springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/MessageNotificationServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.sangeshenbian.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -31,7 +32,7 @@ @Override public Page<MessageNotificationVO> getMessageList(BasePage basePage, Long userId) { //TODO 待完善 Page<MessageNotificationVO> page = new Page<>(basePage.getPageNum(),basePage.getPageSize()); return page; Page<MessageNotification> page = lambdaQuery().page(new Page<>(basePage.getPageNum(),basePage.getPageSize())); return (Page<MessageNotificationVO>) page.convert(item-> BeanUtil.copyProperties(item, MessageNotificationVO.class)); } }
