admin-server/src/main/java/com/estate/expert/admin/controller/admin/AccidentBriefController.java
@@ -3,12 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.estate.expert.admin.domain.business.accidentbrief.AccidentBrief; import com.estate.expert.admin.domain.business.accidentclassification.AccidentClassification; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccount; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountAddDto; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountEditDto; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountEditPasswordDto; import com.estate.expert.admin.domain.common.request.PageReq; import com.estate.expert.admin.service.AccidentBriefService; import com.estate.expert.admin.service.AccidentClassificationService; import com.estate.expert.admin.service.ScreenAccountService; import com.estate.expert.admin.utils.MD5Utils; import com.estate.expert.common.rpc.Result; @@ -22,6 +24,7 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; @Slf4j @CrossOrigin @@ -33,6 +36,9 @@ @Resource private AccidentBriefService accidentBriefService; @Resource private AccidentClassificationService accidentClassificationService; @ApiOperation(value = "列表") @PostMapping("/list") @@ -51,6 +57,12 @@ wrapper.eq(AccidentBrief::getDeleted,false); wrapper.orderByDesc(AccidentBrief::getCreateTime); Page<AccidentBrief> res = accidentBriefService.page(page, wrapper); if(!res.getRecords().isEmpty()){ List<AccidentClassification> list = accidentClassificationService.list(new LambdaQueryWrapper<AccidentClassification>()); res.getRecords().forEach(item -> { item.setClassifyName(list.stream().filter(classify -> classify.getId().equals(item.getClassifyId())).findFirst().get().getName()); }); } return Result.success(res); } @@ -101,5 +113,16 @@ @ApiOperation(value = "开启/禁用故事简讯") @PostMapping("/enable/{id}") public Result enable(@PathVariable Integer id) { AccidentBrief accidentBrief = accidentBriefService.getById(id); if (accidentBrief == null) { return Result.error("故事简讯不存在"); } accidentBrief.setState(accidentBrief.getState()==1?2:1); return Result.success(accidentBriefService.updateById(accidentBrief)); } } admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java
@@ -4,6 +4,7 @@ import com.estate.expert.admin.domain.common.request.BatchReq; import com.estate.expert.admin.domain.common.request.ProjectPageRequest; import com.estate.expert.admin.domain.project.ProjectDto; import com.estate.expert.admin.domain.project.SetProjectStatusDto; import com.estate.expert.admin.domain.user.User; import com.estate.expert.admin.service.ClientParamService; import com.estate.expert.admin.service.ProjectService; @@ -81,6 +82,12 @@ clientParamService.setPermission(projectId,permission); return Result.success(); } @ApiOperation("项目设置状态") @PostMapping("/setProjectStatus") public Result setProjectStatus(@RequestBody SetProjectStatusDto dto) { clientParamService.setProjectStatus(dto); return Result.success(); }
@@ -82,4 +82,6 @@ .body(resource); } } admin-server/src/main/java/com/estate/expert/admin/domain/business/accidentbrief/AccidentBrief.java
@@ -76,7 +76,7 @@ * 发生时间 */ @ApiModelProperty("发生时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date time; /** * 详情 @@ -102,5 +102,9 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @TableField(exist = false) @ApiModelProperty("类型名称") private String classifyName; } admin-server/src/main/java/com/estate/expert/admin/domain/business/projectprogress/ProjectProgress.java
@@ -51,6 +51,7 @@ private Date time; @ApiModelProperty("进度url链接") @NotBlank(message = "进度url链接不能为空") @TableField("url") private String url; @TableField("create_time") private Date createTime; admin-server/src/main/java/com/estate/expert/admin/domain/project/SetProjectStatusDto.java
New file @@ -0,0 +1,18 @@ package com.estate.expert.admin.domain.project; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; @Data @ApiModel("设置项目状态") public class SetProjectStatusDto { @ApiModelProperty("项目ID") Integer projectId; @ApiModelProperty("项目状态 1在建 2完成") Integer status; @ApiModelProperty("完成时间") LocalDateTime successTime; } admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.estate.expert.admin.domain.business.client.clientparam.ClientParam; import com.estate.expert.admin.domain.project.SetProjectStatusDto; import com.estate.expert.admin.domain.report.ReportTemplate; import org.apache.ibatis.annotations.Param; @@ -23,4 +24,7 @@ void setPermission(@Param("projectId") Integer projectId, @Param("permission") String permission); void setProjectStatus(@Param("dto") SetProjectStatusDto dto); } admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.estate.expert.admin.domain.business.client.clientparam.ClientParam; import com.estate.expert.admin.domain.project.SetProjectStatusDto; import com.estate.expert.admin.domain.report.ReportTemplate; import java.util.List; @@ -22,4 +23,6 @@ void setPermission(Integer projectId, String permission); void setProjectStatus(SetProjectStatusDto dto); } admin-server/src/main/java/com/estate/expert/admin/service/UserFileService.java
@@ -9,6 +9,7 @@ import java.io.File; /** * 用户文件服务 */ admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.estate.expert.admin.domain.business.client.clientparam.ClientParam; import com.estate.expert.admin.domain.project.SetProjectStatusDto; import com.estate.expert.admin.domain.report.ReportTemplate; import com.estate.expert.admin.domain.repository.ClientParamMapper; import com.estate.expert.admin.service.ClientParamService; @@ -32,4 +33,9 @@ this.baseMapper.setPermission(projectId, permission); } @Override public void setProjectStatus(SetProjectStatusDto dto) { this.baseMapper.setProjectStatus(dto); } } admin-server/src/main/java/com/estate/expert/admin/utils/wordtopdf/WordToPdfTest.java
@@ -20,7 +20,7 @@ try { // 测试1：单文件转换 String s = testSingleFileConversion("1769582460614"); } catch (Exception e) { System.err.println("测试过程中发生错误: " + e.getMessage()); e.printStackTrace(); admin-server/src/main/resources/mapper/ClientParamMapper.xml
@@ -5,6 +5,9 @@ update project set permission = #{permission} where id = #{projectId} </update> <update id="setProjectStatus"> update project set status = #{dto.status} , success_time = #{dto.successTime} where id = #{dto.projectId} </update> <select id="getTemplate" resultType="com.estate.expert.admin.domain.report.ReportTemplate" admin-server/src/main/resources/mapper/ProjectProgressMapper.xml
@@ -4,7 +4,7 @@ <select id="pageList" resultType="com.estate.expert.admin.domain.business.projectprogress.ProjectProgress"> select t1.id,t1.detail,t1.time,t2.name as clientName,t3.name as projectName select t1.id,t1.detail,t1.time,t1.url,t2.name as clientName,t3.name as projectName from project_progress t1 left join client t2 on t1.client_id = t2.id left join project t3 on t1.project_id = t3.id @@ -21,7 +21,7 @@ order by t1.time desc </select> <select id="detail" resultType="com.estate.expert.admin.domain.business.projectprogress.ProjectProgress"> select t1.id,t1.detail,t1.time,t2.name as clientName,t3.name as projectName select t1.id,t1.detail,t1.time,t1.url,t1.client_id,t1.project_id,t2.name as clientName,t3.name as projectName from project_progress t1 left join client t2 on t1.client_id = t2.id left join project t3 on t1.project_id = t3.id
