springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/MgtComplaintController.java
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo; import com.panzhihua.sangeshenbian.annotation.SysLog; import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessUpdateDto; import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; import com.panzhihua.sangeshenbian.service.IComplaintService; import com.panzhihua.sangeshenbian.warpper.MgtComplaintQuery; @@ -15,6 +16,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.io.IOException; /** @@ -50,6 +52,24 @@ } } @PostMapping("/update-progress") @ApiOperation("办理进度修改2.0.1") public R<?> updateProgress(@Valid @RequestBody ComplaintProcessUpdateDto dto) { complaintService.updateProgress(dto); return R.ok(); } @DeleteMapping("del-progress/{id}") @ApiOperation("办理进度删除2.0.1") public R<?> delProgress(@ApiParam(name = "id", value = "办理进度id", required = true) @PathVariable("id") Long id) { complaintService.delProgress(id); return R.ok(); } @ApiOperation("社区问题单、问题处理单、协调通知单 下载") @GetMapping("/download-file/{id}/{type}") @SysLog(operatorCategory = "单导出",operId = 10) springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/ComplaintController.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.sangeshenbian.annotation.DistributedLock; import com.panzhihua.sangeshenbian.model.dto.*; @@ -18,16 +17,9 @@ 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; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -118,6 +110,8 @@ return R.ok(complaintService.progress(complaintId)); } @PostMapping("/save-process") @ApiOperation("办理进度录入") public R<?> saveProcess(@Valid @RequestBody ComplaintProcessDTO dto){ springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/dto/ComplaintProcessUpdateDto.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.sangeshenbian.model.dto; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data @AllArgsConstructor @NoArgsConstructor public class ComplaintProcessUpdateDto { @ApiModelProperty("诉求办理进度的id") @NotNull(message = "诉求办理进度id不能为空") private Long id; @ApiModelProperty("描述") @NotBlank(message = "描述不能为空") private String describe; @ApiModelProperty("图片url") private String imgUrl; @ApiModelProperty("视频url") private String video; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java
@@ -1,19 +1,20 @@ package com.panzhihua.sangeshenbian.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; /** * <p> @@ -28,6 +29,8 @@ @Accessors(chain = true) @TableName("sgsb_complaint_progress") @ApiModel(value="ComplaintProgress对象", description="") @AllArgsConstructor @NoArgsConstructor public class ComplaintProgress implements Serializable { private static final long serialVersionUID = 1L; springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintService.java
@@ -163,4 +163,17 @@ List<Complaint> getTimeoutAndNotComment(); /** * 修改办理进度 * @param dto */ void updateProgress(ComplaintProcessUpdateDto dto); /** * 删除办理进度 * @param id */ void delProgress(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -1365,5 +1365,25 @@ return this.baseMapper.getTimeoutAndNotComment(); } /** * 修改办理进度 * @param dto */ @Override public void updateProgress(ComplaintProcessUpdateDto dto) { complaintProgressService.update(new LambdaUpdateWrapper<ComplaintProgress>().eq(ComplaintProgress::getId, dto.getId()) .set(ComplaintProgress::getDescribe, dto.getDescribe()).set(ComplaintProgress::getImgUrl, dto.getImgUrl()) .set(ComplaintProgress::getVideo, dto.getVideo()) ) ; } /** * 删除办理进度 * @param */ @Override public void delProgress(Long id) { complaintProgressService.removeById(id); } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/utils/WechatMsgUtil.java
@@ -3,17 +3,17 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.context.annotation.Configuration; import java.util.Map; @Component @Configuration @Slf4j public class WechatMsgUtil { private String appId; private String appSecret; private String templateId=""; // 获取access_token private String getAccessToken() { @@ -23,7 +23,7 @@ } // 发送模板消息 public void sendTemplateMsg(String openId, String templateId, public void sendTemplateMsg(String openId, Map<String, String> content) { try { String accessToken = getAccessToken();