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

glj-最近代码提交5.12

This commit is contained in:
glj 2023-05-12 16:03:58 +08:00
parent 525346db87
commit a10d4e09b0
10 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
View File

@ -17,4 +17,8 @@ public class HotspotArea {
* 频次
*/
private Integer value;
/**
* 名称
*/
private String nameNew;
}

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
View File

@ -49,7 +49,7 @@ public class Websites implements Serializable {
/**
* 网站灾害对应id
*/
private Long websiteId;
private String websiteId;
/**
* 上传的管理人员

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

@ -2,7 +2,6 @@ package com.kening.vordm.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;

48
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WebsitesController.java Normal file
View File

@ -0,0 +1,48 @@
package com.kening.vordm.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kening.vordm.entity.Websites;
import com.kening.vordm.service.WebsitesService;
import lombok.RequiredArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
@RestController
@RequiredArgsConstructor
@RequestMapping("/ui/websites")
public class WebsitesController {
private final WebsitesService websitesService;
@GetMapping("/websitesPage")
public R<IPage<Websites>> websitesPage(Query query, Websites websites){
return R.data(websitesService.websitesPage(Condition.getPage(query),websites));
}
@PostMapping("/saveWebsites")
public R saveWebsites(@RequestBody Websites websites){
websites.setCreateTime(new Date());
return R.status(websitesService.save(websites));
}
@DeleteMapping("/remove")
public R remove(@RequestParam String id){
return R.status(websitesService.removeByIds(Func.toLongList(id)));
}
@PostMapping("/updateWebsites")
public R updateWebsites(@RequestBody Websites websites){
return R.status(websitesService.updateById(websites));
}
@GetMapping("/getWebsitesById")
public R<Websites> getWebsitesById(Long id){
return R.data(websitesService.getById(id));
}
}

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

@ -25,6 +25,7 @@
<select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
select
concat(area_cn,"(",area_en,")") as name,
area_en AS nameNew,
frequency as value
from hotspot
<where>

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.java
View File

@ -2,7 +2,9 @@ package com.kening.vordm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.kening.vordm.entity.Websites;
import org.apache.ibatis.annotations.Param;
/**
* @author G1393
@ -13,4 +15,5 @@ import com.kening.vordm.entity.Websites;
public interface WebsitesMapper extends BaseMapper<Websites> {
IPage<Websites> websitesPage(IPage<Object> page,@Param("websites") Websites websites);
}

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

@ -20,4 +20,14 @@
provider,disaster_id,create_time,
website_id,upload_id
</sql>
<select id="websitesPage" resultType="com.kening.vordm.entity.Websites">
SELECT id,title,link,provider,disaster_id,create_time,website_id,upload_id
FROM websites
<where>
<if test="websites.disasterId!=null">
and disaster_id = #{websites.disasterId}
</if>
</where>
</select>
</mapper>

3
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java
View File

@ -1,8 +1,10 @@
package com.kening.vordm.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.kening.vordm.entity.Websites;
import com.kening.vordm.vo.CallForHelpVo;
/**
* @author G1393
@ -11,4 +13,5 @@ import com.kening.vordm.entity.Websites;
*/
public interface WebsitesService extends IService<Websites> {
IPage<Websites> websitesPage(IPage<Object> page, Websites websites);
}

5
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
View File

@ -52,11 +52,16 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
*/
@Override
public boolean saveChiefAdmin(Administrator administrator) {
Administrator adminNew = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getEmail,administrator.getEmail()));
if(adminNew!=null){
throw new RuntimeException("The email has been registered");
}
//校验账号是否存在
Administrator admin = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getAccount,administrator.getAccount()));
if(admin!=null){
throw new RuntimeException("The account has been registered");
}
String tenantId = baseMapper.getChiefTenant("VORDM");
administrator.setTenantId(tenantId);
administrator.setUserType(1);

6
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java
View File

@ -1,5 +1,7 @@
package com.kening.vordm.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kening.vordm.entity.Websites;
import com.kening.vordm.mapper.WebsitesMapper;
@ -15,4 +17,8 @@ import org.springframework.stereotype.Service;
public class WebsitesServiceImpl extends ServiceImpl<WebsitesMapper, Websites>
implements WebsitesService {
@Override
public IPage<Websites> websitesPage(IPage<Object> page, Websites websites) {
return this.baseMapper.websitesPage(page, websites);
}
}