diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java index e547e16..d3bfc9a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java @@ -83,5 +83,7 @@ public class Tool implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + @TableField(exist = false) + private String checked; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 6979a41..60d7530 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run("yyhouc-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); // BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 524ec25..741fbe6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -249,10 +249,7 @@ public class DisasterInfoController { return R.data(callForHelp); } @PostMapping("review") - public R review( String id){ - DisasterInfo disasterInfo = new DisasterInfo(); - disasterInfo.setId(Long.valueOf(id)); - disasterInfo.setRespondStatus(2); + public R review( @RequestBody DisasterInfo disasterInfo){ Boolean flag=disasterInfoService.updateById(disasterInfo); return R.data(flag); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index c76bd67..f2efdf0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import com.kening.vordm.entity.Tool; import java.util.Arrays; +import java.util.Date; @RestController @AllArgsConstructor @@ -32,7 +34,18 @@ public class ToolController{ }) @GetMapping("/list") public R> list(Tool tool, Query query) { - IPage pages = toolService.page(Condition.getPage(query), Condition.getQueryWrapper(tool)); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(!StringUtils.isEmpty(tool.getToolName())){ + queryWrapper.like("tool_name", tool.getToolName()); + } + String checkd = tool.getChecked(); + if(checkd != null && checkd.equals("1")){ + queryWrapper.isNull("review_time"); + }else{ + queryWrapper.isNotNull("review_time"); + } + queryWrapper.orderByDesc("create_time"); + IPage pages = toolService.page(Condition.getPage(query),queryWrapper); return R.data(pages); } @ApiOperationSupport(order = 2) @@ -67,5 +80,12 @@ public class ToolController{ public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody Tool tool) { return R.status(toolService.saveOrUpdate(tool)); } + @ApiOperationSupport(order = 7 ) + @ApiOperation(value = "审核", notes = "传入Tool") + @PostMapping("/review") + public R review (@ApiParam(value = "Tool对象", required = true) @RequestBody Tool tool) { + tool.setReviewTime(new Date()); + return R.status(toolService.saveOrUpdate(tool)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index fa313e0..a3cbf0e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -137,21 +137,11 @@ guest_info u on u.id = ud.sponsor_id JOIN disaster_info d on d.id = ud.disaster_id - d.respond_status = #{callForHelpVo.respondStatus} - - d.disaster_type = #{callForHelpVo.disasterType} + + d.respond_status = 1 or d.respond_status = 0 - - and d.disaster_country = #{callForHelpVo.disasterCountry} - - - and d.disaster_time = #{callForHelpVo.disasterTime} - - - and d.disaster_keyword = #{callForHelpVo.disasterKeyword} - - - and d.upload_time = #{callForHelpVo.uploadTime} + + d.respond_status = 2 order by d.upload_time desc diff --git a/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml deleted file mode 100644 index 20eba77..0000000 --- a/kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,disaster_type,disaster_keyword, - disaster_time,upload_time,geometry, - disaster_level,disaster_country,respond_status, - visit_count,download_count,spider_type, - tempend_time,temp_start_time,create_time, - vordm_id,respond_time,sponsor_organization, - disaster_img,dict_value,size - -