glj-最近代码提交5.12
This commit is contained in:
parent
525346db87
commit
a10d4e09b0
|
@ -17,4 +17,8 @@ public class HotspotArea {
|
||||||
* 频次
|
* 频次
|
||||||
*/
|
*/
|
||||||
private Integer value;
|
private Integer value;
|
||||||
|
/**
|
||||||
|
* 名称
|
||||||
|
*/
|
||||||
|
private String nameNew;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class Websites implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 网站灾害对应id
|
* 网站灾害对应id
|
||||||
*/
|
*/
|
||||||
private Long websiteId;
|
private String websiteId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传的管理人员
|
* 上传的管理人员
|
||||||
|
|
|
@ -2,7 +2,6 @@ package com.kening.vordm.controller;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
|
|
|
@ -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));
|
||||||
|
}
|
||||||
|
}
|
|
@ -25,6 +25,7 @@
|
||||||
<select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
|
<select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
|
||||||
select
|
select
|
||||||
concat(area_cn,"(",area_en,")") as name,
|
concat(area_cn,"(",area_en,")") as name,
|
||||||
|
area_en AS nameNew,
|
||||||
frequency as value
|
frequency as value
|
||||||
from hotspot
|
from hotspot
|
||||||
<where>
|
<where>
|
||||||
|
|
|
@ -2,7 +2,9 @@ package com.kening.vordm.mapper;
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.kening.vordm.entity.Websites;
|
import com.kening.vordm.entity.Websites;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
|
@ -13,4 +15,5 @@ import com.kening.vordm.entity.Websites;
|
||||||
public interface WebsitesMapper extends BaseMapper<Websites> {
|
public interface WebsitesMapper extends BaseMapper<Websites> {
|
||||||
|
|
||||||
|
|
||||||
|
IPage<Websites> websitesPage(IPage<Object> page,@Param("websites") Websites websites);
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,4 +20,14 @@
|
||||||
provider,disaster_id,create_time,
|
provider,disaster_id,create_time,
|
||||||
website_id,upload_id
|
website_id,upload_id
|
||||||
</sql>
|
</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>
|
</mapper>
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
package com.kening.vordm.service;
|
package com.kening.vordm.service;
|
||||||
|
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.kening.vordm.entity.Websites;
|
import com.kening.vordm.entity.Websites;
|
||||||
|
import com.kening.vordm.vo.CallForHelpVo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
|
@ -11,4 +13,5 @@ import com.kening.vordm.entity.Websites;
|
||||||
*/
|
*/
|
||||||
public interface WebsitesService extends IService<Websites> {
|
public interface WebsitesService extends IService<Websites> {
|
||||||
|
|
||||||
|
IPage<Websites> websitesPage(IPage<Object> page, Websites websites);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,11 +52,16 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean saveChiefAdmin(Administrator administrator) {
|
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()));
|
Administrator admin = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getAccount,administrator.getAccount()));
|
||||||
if(admin!=null){
|
if(admin!=null){
|
||||||
throw new RuntimeException("The account has been registered");
|
throw new RuntimeException("The account has been registered");
|
||||||
}
|
}
|
||||||
|
|
||||||
String tenantId = baseMapper.getChiefTenant("VORDM");
|
String tenantId = baseMapper.getChiefTenant("VORDM");
|
||||||
administrator.setTenantId(tenantId);
|
administrator.setTenantId(tenantId);
|
||||||
administrator.setUserType(1);
|
administrator.setUserType(1);
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.kening.vordm.service.impl;
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.kening.vordm.entity.Websites;
|
import com.kening.vordm.entity.Websites;
|
||||||
import com.kening.vordm.mapper.WebsitesMapper;
|
import com.kening.vordm.mapper.WebsitesMapper;
|
||||||
|
@ -15,4 +17,8 @@ import org.springframework.stereotype.Service;
|
||||||
public class WebsitesServiceImpl extends ServiceImpl<WebsitesMapper, Websites>
|
public class WebsitesServiceImpl extends ServiceImpl<WebsitesMapper, Websites>
|
||||||
implements WebsitesService {
|
implements WebsitesService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPage<Websites> websitesPage(IPage<Object> page, Websites websites) {
|
||||||
|
return this.baseMapper.websitesPage(page, websites);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue