警情处置过程添加备注

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RepairConsultController.java

@@ -61,7 +61,7 @@ public class RepairConsultController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据警情id 查找处置过程日志", notes = "根据警情id 查找处置过程日志")
     @GetMapping(value = "/list/alert/{alertId}")
     public ResponseModel<List<RepairConsult>> selectForListByAlertId(@PathVariable Long alertId) {
@@ -76,7 +76,7 @@ public class RepairConsultController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/update")
     @ApiOperation(httpMethod = "POST", value = "更新警情填报业务数据项", notes = "更新警情填报业务数据项")
     public ResponseModel<Object> update(@RequestBody RepairConsultDto model) {
@@ -103,4 +103,20 @@ public class RepairConsultController extends BaseController {
         repairConsultServiceImpl.update(wrapper);
         return ResponseHelper.buildResponse("ok");
     }
+
+    /**
+     * 根据sequenceNbr 查找处置过程日志备注
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr 查找处置过程备注", notes = "根据sequenceNbr 查找处置过程备注")
+    @GetMapping(value = "/alert/remarks/{sequenceNbr}")
+    public ResponseModel<Object> selectBy(@PathVariable Long sequenceNbr) {
+        LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(RepairConsult::getSequenceNbr, sequenceNbr).orderByDesc(RepairConsult::getRecDate);
+        RepairConsult consult = repairConsultServiceImpl.getOne(queryWrapper);
+        List<HashMap> list = JSONUtil.toList(consult.getRemarks(), HashMap.class);
+        return ResponseHelper.buildResponse(list);
+    }
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/AlertFormRecordServiceImpl.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.AlertFormRecordDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormRecord;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.AlertFormRecordMapper;
 import com.yeejoin.amos.boot.module.elevator.api.service.IAlertFormRecordService;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.AlertCalledServiceImpl;
@@ -27,6 +28,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 服务实现类
@@ -107,6 +109,9 @@ public class AlertFormRecordServiceImpl extends BaseService<AlertFormRecordDto,
                 field.setAccessible(true); // 设置为可访问，以访问私有属性
                 String fieldName = convertToUnderline(field.getName());
                 Object value = field.get(record);
+                if (fieldName.equals("is_light")){
+                    value = ("1".equals(value) ? "是" : "否");
+                }
                 try {
                     if (listMap.containsKey(fieldName)) {
                         LambdaUpdateWrapper<AlertFormValue> wrapper = new LambdaUpdateWrapper<>();
@@ -135,8 +140,13 @@ public class AlertFormRecordServiceImpl extends BaseService<AlertFormRecordDto,
      */
     @Override
     public List<AlertFormRecord> allAlertFormRecordByCalledId(Long alertCalledId) {
-
-
-        return alertFormRecordMapper.getRecordByCalledId(alertCalledId);
+        List<AlertFormRecord> list = alertFormRecordMapper.getRecordByCalledId(alertCalledId);
+        //匹配字典值
+        if (!list.isEmpty()){
+            String code = list.get(0).getAlertTypeCode();
+            AlertStageEnums dict = AlertStageEnums.getEnumById(code);
+            list.stream().map(x->x.setAlertTypeCode(dict.getValue())).collect(Collectors.toList());
+        }
+        return list;
     }
 }
\ No newline at end of file