From 1c232a645ea2d07925c553f483e7359452cf5329 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 29 May 2023 09:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8F=B0=E7=AB=99=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=8F=B0=E7=AB=99=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=86=85=E5=AE=B9=20=E5=88=A0=E9=99=A4=E5=8F=B0?= =?UTF-8?q?=E7=AB=99=E5=85=B3=E6=B3=A8=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=B0=E7=AB=99=E5=90=8D=E7=A7=B0=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysUserFocusStationController.java | 15 ++++++++++---- .../modules/entity/SysUserFocusStation.java | 6 +++--- .../service/ISysUserFocusStationService.java | 5 +++-- .../impl/SysUserFocusStationServiceImpl.java | 20 ++++++++++++++----- .../system/entity/vo/SysTaskExportVo.java | 2 +- .../impl/GardsDetectorsServiceImpl.java | 9 ++++++--- .../impl/GardsNuclearfacilityServiceImpl.java | 9 ++++++--- .../impl/GardsStationsServiceImpl.java | 9 ++++++--- .../service/impl/SysTaskServiceImpl.java | 18 +++++++++++++++-- 9 files changed, 67 insertions(+), 26 deletions(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java index c2c1af45..871c7653 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java @@ -1,5 +1,8 @@ package org.jeecg.modules.controller; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; import org.jeecg.config.valid.InsertGroup; import org.jeecg.modules.entity.SysUserFocusStation; import org.jeecg.modules.service.ISysUserFocusStationService; @@ -11,25 +14,29 @@ import java.util.List; @RestController @RequestMapping("sysUserFocusStation") +@Api(value = "关注台站管理", tags = "关注台站管理") public class SysUserFocusStationController { @Autowired private ISysUserFocusStationService sysUserFocusStationService; @GetMapping("findList") + @ApiOperation(value = "查询关注台站列表", notes = "查询关注台站列表") public List findList(){ List result = sysUserFocusStationService.findList(); return result; } @PostMapping("create") - public void create(@RequestBody @Validated(value = InsertGroup.class) SysUserFocusStation sysUserFocusStation){ - sysUserFocusStationService.create(sysUserFocusStation); + @ApiOperation(value = "新增关注", notes = "新增关注") + public Result create(@RequestBody @Validated(value = InsertGroup.class) SysUserFocusStation sysUserFocusStation){ + return sysUserFocusStationService.create(sysUserFocusStation); } @DeleteMapping("deleteById") - public void deleteById(String stationId){ - sysUserFocusStationService.deleteById(stationId); + @ApiOperation(value = "取消关注", notes = "取消关注") + public Result deleteById(String stationId){ + return sysUserFocusStationService.deleteById(stationId); } } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java index 76a1fe07..0b20e647 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java @@ -10,6 +10,7 @@ import org.jeecg.config.valid.UpdateGroup; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Null; import java.io.Serializable; import java.util.Date; @@ -18,11 +19,10 @@ import java.util.Date; public class SysUserFocusStation implements Serializable { @TableId(value = "id", type = IdType.ASSIGN_ID) - @NotNull(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class}) - private Integer id; + @NotBlank(message = "不能为空", groups = UpdateGroup.class) + private String id; @TableField(value = "user_id") - @NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class}) private String userId; @TableField(value = "station_id") diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java index 2dc91cc2..1d6a289c 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java @@ -1,6 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysUserFocusStation; import java.util.List; @@ -17,12 +18,12 @@ public interface ISysUserFocusStationService extends IService(); //获取request HttpServletRequest request = SpringContextUtils.getHttpServletRequest(); //获取当前操作人用户名 @@ -70,12 +77,15 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysUserFocusStation::getUserId, sysUser.getId()); queryWrapper.eq(SysUserFocusStation::getStationId, stationId); this.baseMapper.delete(queryWrapper); + result.success("删除成功"); + return result; } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskExportVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskExportVo.java index a1e158e9..fa1aeb9c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskExportVo.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/vo/SysTaskExportVo.java @@ -12,7 +12,7 @@ public class SysTaskExportVo { @ExcelField(title = "用户名称", width = 15, sort = 2) private String userName; - @ExcelField(title = "台站名称", width = 15, sort = 3) + @ExcelField(title = "台站名称", width = 90, sort = 3) private String stationName; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 5b6bec28..a104bdc1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -92,7 +92,8 @@ public class GardsDetectorsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(GardsDetectors::getDetectorCode, gardsDetectors.getDetectorCode()); GardsDetectors detectors = this.baseMapper.selectOne(queryWrapper); if (Objects.nonNull(detectors) && !detectors.getDetectorId().equals(gardsDetectors.getDetectorId())) { - throw new RuntimeException("当前数据"+gardsDetectors.getDetectorCode()+"已存在，修改失败！"); + result.error500("当前数据"+gardsDetectors.getDetectorCode()+"已存在，修改失败！"); + return result; } } LambdaQueryWrapper detectorsQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java index 335b82f3..ad191c68 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclearfacilityServiceImpl.java @@ -70,7 +70,8 @@ public class GardsNuclearfacilityServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(GardsNuclearfacility::getFacilityName, gardsNuclearfacility.getFacilityName()); GardsNuclearfacility nuclearfacility = this.baseMapper.selectOne(queryWrapper); if (Objects.nonNull(nuclearfacility) && !nuclearfacility.getFacilityId().equals(gardsNuclearfacility.getFacilityId())){ - throw new RuntimeException("当前核设施"+gardsNuclearfacility.getFacilityName()+"已存在，修改失败"); + result.error500("当前核设施"+gardsNuclearfacility.getFacilityName()+"已存在，修改失败"); + return result; } } LambdaQueryWrapper nuclearfacilityQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index 31c6d7ba..7d749187 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -93,7 +93,8 @@ public class GardsStationsServiceImpl extends ServiceImpl stationsQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java index 0e5474d9..88dacac8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java @@ -332,7 +332,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl String username = sysTaskVo.getUsername(); String stationNames = ""; for (SysTaskStation sysTaskStation:sysTaskVo.getStationList()) { - stationNames+=sysTaskStation.getStationName()+","; + stationNames+=sysTaskStation.getStationName()+StringPool.COMMA; } stationNames = stationNames.substring(0,stationNames.length()-1); if (StringUtils.isNotBlank(stationNames)){ @@ -355,6 +355,7 @@ public class SysTaskServiceImpl extends ServiceImpl impl @Override public void exportImportTemplate(HttpServletRequest request, HttpServletResponse response) { String fileName = "排班任务导入模板"; + List list = this.createList(); try { //处理需要导出的列 List annotationList = Lists.newArrayList(); @@ -365,13 +366,26 @@ public class SysTaskServiceImpl extends ServiceImpl impl annotationList.add(new Object[] {ef,field}); } } - new ExportExcel().createXlsxExcel("排班任务信息", annotationList, 2, false).writeToXlsx(request, response, fileName); + new ExportExcel().createXlsxExcel("排班任务信息", annotationList, 2, false) + .setDataList(list).writeToXlsx(request, response, fileName); } catch (IOException e) { e.printStackTrace(); throw new BusinessException("模板导出失败"); } } + private List createList(){ + List list = new ArrayList<>(); + for(int i=1;i<=2;i++){ + SysTaskExportVo vo = new SysTaskExportVo(); + vo.setSchedulingDate("1997-01-01"); + vo.setStationName("AAA"+StringPool.COMMA+"BBB"); + vo.setUserName("sample"+i); + list.add(vo); + } + return list; + } + @Override @Transactional public ImportViewVo importExcel(List dataList, int headRow) {