yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突解决

This commit is contained in:
glj 2023-04-12 11:14:30 +08:00
parent 623ffe1a49 fda7574e46
commit 439432516f
4 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
View File

@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
@SpringCloudApplication @SpringCloudApplication
public class VoRdmApplication { public class VoRdmApplication {
public static void main(String[] args) { public static void main(String[] args) {
BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); BladeApplication.run("glj-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
// BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); // BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
} }
} }

6
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
View File

@ -307,7 +307,7 @@ public class DisasterInfoController {
* call for help * call for help
*/ */
@PostMapping("Call-for-help") @PostMapping("Call-for-help")
public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { public R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo ){
GuestInfo guestInfo = new GuestInfo(); GuestInfo guestInfo = new GuestInfo();
BeanUtil.copyProperties(callForHelpVo, guestInfo); BeanUtil.copyProperties(callForHelpVo, guestInfo);
guestInfo.setId(IdWorker.getId()); guestInfo.setId(IdWorker.getId());
@ -331,8 +331,8 @@ public class DisasterInfoController {
public R<Boolean> review(String id) { public R<Boolean> review(String id) {
DisasterInfo disasterInfo = new DisasterInfo(); DisasterInfo disasterInfo = new DisasterInfo();
disasterInfo.setId(Long.valueOf(id)); disasterInfo.setId(Long.valueOf(id));
disasterInfo.setRespondStatus(1); disasterInfo.setRespondStatus(2);
Boolean flag = disasterInfoService.updateById(disasterInfo); Boolean flag=disasterInfoService.updateById(disasterInfo);
return R.data(flag); return R.data(flag);
} }
} }

6
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
View File

@ -129,6 +129,7 @@
group by t.disaster_country group by t.disaster_country
order by cnt desc limit 7) b on c.flagname = b.`name` order by cnt desc limit 7) b on c.flagname = b.`name`
</select> </select>
<select id="page" parameterType="com.kening.vordm.vo.CallForHelpVo" resultType="com.kening.vordm.vo.CallForHelpVo"> <select id="page" parameterType="com.kening.vordm.vo.CallForHelpVo" resultType="com.kening.vordm.vo.CallForHelpVo">
SELECT SELECT
u.username , u.username ,
@ -148,6 +149,7 @@
guest_info u on u.id = ud.sponsor_id JOIN guest_info u on u.id = ud.sponsor_id JOIN
disaster_info d on d.id = ud.disaster_id disaster_info d on d.id = ud.disaster_id
<where> <where>
d.respond_status = #{callForHelpVo.respondStatus}
<if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''"> <if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
d.disaster_type = #{callForHelpVo.disasterType} d.disaster_type = #{callForHelpVo.disasterType}
</if> </if>
@ -163,9 +165,7 @@
<if test="callForHelpVo.uploadTime != null and callForHelpVo.uploadTime != ''"> <if test="callForHelpVo.uploadTime != null and callForHelpVo.uploadTime != ''">
and d.upload_time = #{callForHelpVo.uploadTime} and d.upload_time = #{callForHelpVo.uploadTime}
</if> </if>
<if test="callForHelpVo.geometry != null and callForHelpVo.geometry != ''">
and d.geometry = #{callForHelpVo.geometry}
</if>
</where> </where>
order by d.upload_time desc
</select> </select>
</mapper> </mapper>

42
kn-service/biz-vordm/src/main/java/mapper/DisasterInfoVoMapper.xml
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kening.vordm.mapper.DisasterInfoVoMapper">
<resultMap id="BaseResultMap" type="com.kening.vordm.vo.DisasterInfoVo">
<result property="id" column="id" jdbcType="BIGINT"/>
<result property="disasterType" column="disaster_type" jdbcType="VARCHAR"/>
<result property="disasterKeyword" column="disaster_keyword" jdbcType="VARCHAR"/>
<result property="disasterTime" column="disaster_time" jdbcType="DATE"/>
<result property="uploadTime" column="upload_time" jdbcType="TIMESTAMP"/>
<result property="geometry" column="geometry" jdbcType="VARCHAR"/>
<result property="disasterLevel" column="disaster_level" jdbcType="VARCHAR"/>
<result property="disasterCountry" column="disaster_country" jdbcType="VARCHAR"/>
<result property="respondStatus" column="respond_status" jdbcType="SMALLINT"/>
<result property="visitCount" column="visit_count" jdbcType="INTEGER"/>
<result property="downloadCount" column="download_count" jdbcType="INTEGER"/>
<result property="spiderType" column="spider_type" jdbcType="INTEGER"/>
<result property="tempendTime" column="tempend_time" jdbcType="TIMESTAMP"/>
<result property="tempStartTime" column="temp_start_time" jdbcType="TIMESTAMP"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="vordmId" column="vordm_id" jdbcType="VARCHAR"/>
<result property="respondTime" column="respond_time" jdbcType="TIMESTAMP"/>
<result property="sponsorOrganization" column="sponsor_organization" jdbcType="VARCHAR"/>
<result property="disasterImg" column="disaster_img" jdbcType="VARCHAR"/>
<result property="dictValue" column="dict_value" jdbcType="VARCHAR"/>
<result property="size" column="size" jdbcType="DECIMAL"/>
<result property="news" column="news" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
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,
news
</sql>
</mapper>