skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
New file @@ -0,0 +1,55 @@ package cn.gistack.sm.jcsb.controller; import cn.gistack.sm.jcsb.entity.DangerReport; import cn.gistack.sm.jcsb.entity.DeviceReport; import cn.gistack.sm.jcsb.service.IDangerReportService; import cn.gistack.sm.jcsb.vo.DeviceReportVO; import cn.gistack.system.user.entity.User; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Map; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: 监测上报Controller * @USER: aix * @DATE: 2023/5/18 17:51 */ @RestController @RequestMapping("dangerReport") @AllArgsConstructor @Api(value = "监测上报", tags = "监测上报") public class DangerReportController extends BladeController { private final IDangerReportService dangerReportService; @GetMapping("/page") @ApiOperation(value = "列表", notes = "传入实体类参数") public R<IPage<DangerReport>> pageList(@RequestParam Map<String, Object> dr, Query query) { QueryWrapper<DangerReport> queryWrapper = Condition.getQueryWrapper(dr,DangerReport.class); IPage<DangerReport> pagelist = dangerReportService.page(Condition.getPage(query),queryWrapper); return R.data(pagelist); } /** * 详情 */ @GetMapping("/detail") @ApiOperation(value = "详情", notes = "传入notice") public R<DangerReport> detail(@RequestParam(name="id",required=true) String id) { return R.data(dangerReportService.getById(id)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DangerReport.java
New file @@ -0,0 +1,62 @@ package cn.gistack.sm.jcsb.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: 监测上报 * @USER: aix * @DATE: 2023/5/18 17:39 */ @Data @TableName( value = "SM_DANGER_REPORT",autoResultMap = true) @EqualsAndHashCode(callSuper = true) public class DangerReport extends TenantEntity { private static final long serialVersionUID = 1L; /** * 图片数组 */ @TableField(value = "images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty("图片数组") private Object[] images; /** * 描述信息 */ @ApiModelProperty("描述信息") private String desinfo; /** * 接收人 */ @ApiModelProperty("接收人") private String toUser; /** * 图片数组 */ @TableField(value = "to_images",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED) @ApiModelProperty("处理图片") private Object[] toImages; /** * 描述信息 */ @ApiModelProperty("处理描述") private String toDesinfo; /** * 类型（0：险情上报） */ @ApiModelProperty("类型（0：险情上报）") private String type; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java
New file @@ -0,0 +1,13 @@ package cn.gistack.sm.jcsb.mapper; import cn.gistack.sm.jcsb.entity.DangerReport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2023/5/18 17:45 */ public interface DangerReportMapper extends BaseMapper<DangerReport> { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
New file @@ -0,0 +1,5 @@ <?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="cn.gistack.sm.jcsb.mapper.DangerReportMapper"> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java
New file @@ -0,0 +1,13 @@ package cn.gistack.sm.jcsb.service; import cn.gistack.sm.jcsb.entity.DangerReport; import org.springblade.core.mp.base.BaseService; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2023/5/18 17:47 */ public interface IDangerReportService extends BaseService<DangerReport> { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
New file @@ -0,0 +1,18 @@ package cn.gistack.sm.jcsb.service.impl; import cn.gistack.sm.jcsb.entity.DangerReport; import cn.gistack.sm.jcsb.mapper.DangerReportMapper; import cn.gistack.sm.jcsb.service.IDangerReportService; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2023/5/18 17:47 */ @Service public class DangerReportServiceImpl extends BaseServiceImpl<DangerReportMapper, DangerReport> implements IDangerReportService { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
@@ -2,6 +2,9 @@ import cn.gistack.sm.sjztmd.entity.AttResManagePerson; import cn.gistack.sm.sjztmd.service.IAttResManagePersonService; import cn.gistack.system.user.entity.User; import cn.gistack.system.user.feign.IUserClient; import com.alibaba.nacos.client.utils.TenantUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +20,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @ClassName AttResManagePersonController @@ -33,6 +38,8 @@ @AllArgsConstructor public class AttResManagePersonController extends BladeController { private final IAttResManagePersonService attResManagePersonService; private final IUserClient userClient; @ApiOperation(value = "中台责任人水库列表-分页列表查询", notes = "中台责任人水库列表-分页列表查询") @GetMapping(value = "/list") @@ -53,6 +60,28 @@ } @ApiOperation(value = "根据水库id获取中台责任人数据返回系统存在的用户列表", notes = "根据水库id获取中台责任人列表") @GetMapping(value = "/findResManagePersonByResIdReturnSys") public R findResManagePersonByResIdReturnSys(AttResManagePerson attResManagePerson) { if (StringUtil.isEmpty(attResManagePerson.getResGuid())) return R.fail("resGuid不能为空"); List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson)); List<Object> resList = new ArrayList<>(); for (AttResManagePerson person : list) { List<User> userList = userClient.userInfoByPhone("000000", person.getUserPhone()).getData(); if (userList.size() > 0) { Map<Object, Object> map = new HashMap<>(); map.put("value", userList.get(0).getId()); map.put("name", userList.get(0).getName()); resList.add(map); } } return R.data(resList); } @ApiOperation(value = "根据水库id获取中台责任人列表", notes = "根据水库id获取中台责任人列表") @GetMapping(value = "/findResManagePersonByResIds") public R findResManagePersonByResId(String resIds) { @@ -70,10 +99,10 @@ public R queryListByPhone(AttResManagePerson attResManagePerson) { List<AttResManagePerson> list = attResManagePersonService.list(Condition.getQueryWrapper(attResManagePerson)); List<String> reslist = new ArrayList<>(); list.forEach(item->{ list.forEach(item -> { reslist.add(item.getResGuid()); }); return R.data(StringUtil.join(reslist,",")); return R.data(StringUtil.join(reslist, ",")); } }
