BJ_FS / urbanops

Commit e98378584cc88e9fcb864dced6c402497ab02271

Authored by wangqian
2 parents a56c5a25 a12e2f40

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 9 changed files with 40 additions and 35 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
  View file @e983785
... ... @@ -20,7 +20,6 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
20 20 import com.zteits.urbanops.framework.common.pojo.PageResult;
21 21 import com.zteits.urbanops.framework.common.pojo.CommonResult;
22 22  
23   -import static com.zteits.urbanops.framework.common.pojo.CommonResult.error;
24 23 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
25 24  
26 25 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
... ... @@ -44,7 +43,7 @@ public class EmergencyTaskController {
44 43 @Operation(summary = "创建抢险任务主")
45 44 @PreAuthorize("@ss.hasPermission('garden:emergency-task:create')")
46 45 public CommonResult<Long> createEmergencyTask(@Valid @RequestBody EmergencyTaskSaveReqVO createReqVO) {
47   - return success(emergencyTaskService.createEmergencyTask(createReqVO));
  46 + return success(emergencyTaskService.createEmergencyTask(createReqVO, true));
48 47 }
49 48  
50 49 @PutMapping("/update")
... ... @@ -91,7 +90,7 @@ public class EmergencyTaskController {
91 90  
92 91 @GetMapping("/page")
93 92 @Operation(summary = "获得抢险任务主分页")
94   - // @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
  93 + @PreAuthorize("@ss.hasPermission('garden:emergency-task:query')")
95 94 public CommonResult<PageResult<EmergencyTaskRespVO>> getEmergencyTaskPage(@Valid EmergencyTaskPageReqVO pageReqVO) {
96 95 PageResult<EmergencyTaskRespVO> pageResult = emergencyTaskService.getEmergencyTaskPage(pageReqVO);
97 96 return success(pageResult);
... ... @@ -141,23 +140,23 @@ public class EmergencyTaskController {
141 140 emergencyTaskExcleRespVO.setRemarks(emergencyTask.getRemarks());
142 141 emergencyTaskExcleRespVO.setBusiStatus(getLabel(rescueStatusList, emergencyTask.getBusiStatus()));
143 142 emergencyTaskExcleRespVO.setCompanyName(emergencyTask.getCompanyName());
144   - emergencyTaskExcleRespVO.setDeptName(emergencyTask.getDeptName());
145 143 emergencyTaskExcleRespVO.setApprovalUserName(emergencyTask.getApprovalUserName());
146 144 emergencyTaskExcleRespVO.setApprovalRemarks(emergencyTask.getApprovalRemarks());
147 145 emergencyTaskExcleRespVO.setCreatorName(emergencyTask.getCreatorName());
148 146 emergencyTaskExcleRespVO.setCreateTime(emergencyTask.getCreateTime());
  147 + emergencyTaskExcleRespVO.setUpdaterName(emergencyTask.getUpdaterName());
149 148 List<String> machineryList = new ArrayList<>();
150 149 if(CollectionUtils.isEmpty(emergencyTask.getEmergencyMachineryList())){
151   - emergencyTaskExcleRespVO.setMachineryInfo(Collections.EMPTY_LIST);
  150 + emergencyTaskExcleRespVO.setMachineryInfo(Collections.emptyList());
152 151 }else{
153 152 emergencyTask.getEmergencyMachineryList().forEach(emergencyMachinery -> {
154 153 String machineryName = getLabel(mechanicalTypeNameList, emergencyMachinery.getMachineryNameId());
155 154 Integer machineryCount = emergencyMachinery.getMachineryCount();
156 155 machineryList.add(machineryName + ":" + machineryCount);
157 156 });
158   - respList.add(emergencyTaskExcleRespVO);
159 157 emergencyTaskExcleRespVO.setMachineryInfo(machineryList);
160 158 }
  159 + respList.add(emergencyTaskExcleRespVO);
161 160 });
162 161  
163 162  
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskExcleRespVO.java
  View file @e983785
... ... @@ -16,7 +16,7 @@ import java.util.List;
16 16 public class EmergencyTaskExcleRespVO {
17 17  
18 18 @Schema(description = "任务编号（唯一标识，如生成规则：TASK+时间戳）", requiredMode = Schema.RequiredMode.REQUIRED)
19   - @ExcelProperty("任务编号")
  19 + @ExcelProperty("案件编号")
20 20 private String taskNo;
21 21  
22 22 @Schema(description = "发现险情时间", requiredMode = Schema.RequiredMode.REQUIRED)
... ... @@ -111,9 +111,4 @@ public class EmergencyTaskExcleRespVO {
111 111 @ExcelProperty("归属公司")
112 112 private String companyName;
113 113  
114   -
115   - @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055")
116   - @ExcelProperty("果蔬部门")
117   - private String deptName;
118   -
119 114 }
120 115 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java
  View file @e983785
... ... @@ -46,4 +46,7 @@ public class EmergencyTaskPageReqVO extends PageParam {
46 46 @Schema(description = "归属(一级部门id)", example = "6353")
47 47 private Long companyId;
48 48  
  49 +
  50 + private List<Integer> busiStatusList;
  51 +
49 52 }
50 53 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskRespVO.java
  View file @e983785
... ... @@ -132,7 +132,6 @@ public class EmergencyTaskRespVO {
132 132 @ExcelProperty("归属(一级部门id)")
133 133 private String companyName;
134 134  
135   -
136 135 @Schema(description = "部门(道路负责部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "12055")
137 136 @ExcelProperty("部门")
138 137 private String deptName;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskSaveReqVO.java
  View file @e983785
... ... @@ -36,7 +36,6 @@ public class EmergencyTaskSaveReqVO {
36 36 private String emergencyLocation;
37 37  
38 38 @Schema(description = "上报人", requiredMode = Schema.RequiredMode.REQUIRED)
39   - @NotEmpty(message = "上报人不能为空")
40 39 private String reporter;
41 40  
42 41 @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java
  View file @e983785
... ... @@ -12,6 +12,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyT
12 12 import org.apache.ibatis.annotations.Mapper;
13 13 import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*;
14 14 import org.apache.ibatis.annotations.Param;
  15 +import org.springframework.util.CollectionUtils;
15 16  
16 17 /**
17 18 * 抢险任务主 Mapper
... ... @@ -31,16 +32,20 @@ public interface EmergencyTaskMapper extends BaseMapperX&lt;EmergencyTaskDO&gt; {
31 32 if (reqVO.getEndTime() != null) {
32 33 endDateTime = reqVO.getEndTime().atTime(LocalTime.MAX);
33 34 }
34   - return selectPage(reqVO, new LambdaQueryWrapperX<EmergencyTaskDO>()
35   - .eqIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo())
  35 + LambdaQueryWrapperX<EmergencyTaskDO> sql = new LambdaQueryWrapperX<EmergencyTaskDO>()
  36 + .likeIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo())
36 37 .eqIfPresent(EmergencyTaskDO::getEmergencyTypeId, reqVO.getEmergencyTypeId())
37 38 .eqIfPresent(EmergencyTaskDO::getEmergencyHarmId, reqVO.getEmergencyHarmId())
38 39 .eqIfPresent(EmergencyTaskDO::getTreeOwnershipId, reqVO.getTreeOwnershipId())
39 40 .likeIfPresent(EmergencyTaskDO::getEmergencyLocation, reqVO.getEmergencyLocation())
40 41 .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus())
41 42 .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId())
42   - .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime)
43   - .orderByDesc(EmergencyTaskDO::getId));
  43 + .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime);
  44 + if(!CollectionUtils.isEmpty(reqVO.getBusiStatusList())){
  45 + sql.in(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList());
  46 + }
  47 + sql.orderByDesc(EmergencyTaskDO::getId);
  48 + return selectPage(reqVO, sql);
44 49 }
45 50  
46 51 int deleteByTaskNo(@Param("taskNo") String taskNo);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskService.java
  View file @e983785
... ... @@ -22,7 +22,7 @@ public interface EmergencyTaskService {
22 22 * @param createReqVO 创建信息
23 23 * @return 编号
24 24 */
25   - Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO);
  25 + Long createEmergencyTask(@Valid EmergencyTaskSaveReqVO createReqVO, boolean isSave);
26 26  
27 27 /**
28 28 * 集团审批
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
  View file @e983785
... ... @@ -58,7 +58,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
58 58  
59 59 @Transactional(rollbackFor = Exception.class)
60 60 @Override
61   - public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO) {
  61 + public Long createEmergencyTask(EmergencyTaskSaveReqVO createReqVO, boolean isSave) {
62 62 String userId = SecurityFrameworkUtils.getLoginUserId() + "";
63 63 String userName = SecurityFrameworkUtils.getLoginUserNickname();
64 64 String taskNo = createReqVO.getTaskNo();
... ... @@ -89,12 +89,16 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
89 89 emergencyTask.setStatus(createReqVO.getStatus());
90 90 emergencyTask.setCompanyId(companyId);
91 91 emergencyTask.setDeptId(deptId);
92   - emergencyTask.setCreator(userId);
93   - emergencyTask.setCreatorName(userName);
94 92 emergencyTask.setUpdater(userId);
95 93 emergencyTask.setUpdaterName(userName);
96 94 emergencyTask.setApprovalRemarks("");
97   - emergencyTaskMapper.insert(emergencyTask);
  95 + if(isSave){
  96 + emergencyTask.setCreator(userId);
  97 + emergencyTask.setCreatorName(userName);
  98 + emergencyTaskMapper.insert(emergencyTask);
  99 + }else{
  100 + emergencyTaskMapper.update(emergencyTask, new UpdateWrapper<EmergencyTaskDO>().eq("task_no", taskNo));
  101 + }
98 102  
99 103 List<EmergencyMachineryDO> list = new ArrayList<>();
100 104 String finalTaskNo = taskNo;
... ... @@ -124,7 +128,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
124 128 String userId = SecurityFrameworkUtils.getLoginUserId() + "";
125 129 String userName = SecurityFrameworkUtils.getLoginUserNickname();
126 130 UpdateWrapper<EmergencyTaskDO> sqlWrapper = new UpdateWrapper<>();
127   - sqlWrapper.lambda().set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks())
  131 + sqlWrapper.lambda()
  132 + .set(EmergencyTaskDO::getApprovalRemarks, createReqVO.getApprovalRemarks())
128 133 .set(EmergencyTaskDO::getApprovalUserId, userId)
129 134 .set(EmergencyTaskDO::getApprovalUserName, userName)
130 135 .set(EmergencyTaskDO::getBusiStatus, createReqVO.getBusiStatus())
... ... @@ -138,8 +143,8 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
138 143 public void updateEmergencyTask(EmergencyTaskSaveReqVO updateReqVO) {
139 144 // 校验存在
140 145 validateEmergencyTaskExists(updateReqVO.getTaskNo());
141   - this.deleteEmergencyTaskByTaskNo(updateReqVO.getTaskNo());
142   - this.createEmergencyTask(updateReqVO);
  146 + emergencyMachineryMapper.deleteByTaskNo(updateReqVO.getTaskNo());
  147 + this.createEmergencyTask(updateReqVO, false);
143 148 }
144 149  
145 150 @Override
... ... @@ -190,14 +195,13 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
190 195 return emergencyTaskRespVO;
191 196 }
192 197  
193   - @DataPermission(enable = true)
194 198 @Override
195 199 public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) {
196 200 Long companyId = SecurityFrameworkUtils.getCompanyId();
197 201 //超级管理员全返回
198   -// if(companyId != null && !companyId.equals(100L)){
199   -// pageReqVO.setCompanyId(companyId);
200   -// }
  202 + if(companyId != null && companyId.equals(100L)){
  203 + pageReqVO.setBusiStatusList(Arrays.asList(2,3,4,5));
  204 + }
201 205 PageResult<EmergencyTaskDO> page = emergencyTaskMapper.selectPage(pageReqVO);
202 206  
203 207 List<EmergencyTaskDO> list = page.getList();
... ... @@ -235,11 +239,11 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
235 239 Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
236 240  
237 241 list.forEach(plan -> {
238   - DeptRespDTO dept = deptMap.get(plan.getDeptId());
239   - if (dept != null) {
240   - plan.setDeptName(dept.getName());
241   -
242   - }
  242 +// DeptRespDTO dept = deptMap.get(plan.getDeptId());
  243 +// if (dept != null) {
  244 +// plan.setDeptName(dept.getName());
  245 +//
  246 +// }
243 247 DeptRespDTO company = deptMap.get(plan.getCompanyId());
244 248 if(company != null){
245 249 plan.setCompanyName(company.getName());
... ...
urbanops-server/src/main/resources/application.yaml
  View file @e983785
... ... @@ -5,6 +5,7 @@ spring:
5 5 profiles:
6 6 active: prod
7 7  
  8 +
8 9 main:
9 10 allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
10 11  
... ...