Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/CameraUpdateLog.java

@@ -56,6 +56,12 @@ public class CameraUpdateLog implements Serializable {
      */
     private String upgradeType;
 
+    /**
+     * 升级类型字符串
+     */
+    @TableField(exist = false)
+    private String upgradeTypeName;
+
     /**
      * 升级状态
      */

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraVersionServiceImpl.java

@@ -112,6 +112,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());
             cameraUpdateLog.setVersionName(baseCameraVersion.getVersionName());
             cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
+            cameraUpdateLog.setStatus(2);
             cameraUpdateLog.setCreateBy(userId);
             cameraUpdateLog.setCreateTime(new Date());
             int insert = cameraUpdateLogMapper.insert(cameraUpdateLog);

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraVersionController.java

@@ -65,7 +65,7 @@ public class BaseCameraVersionController extends BaseController {
      * @return
      */
     @ApiOperation(value = "相机列表")
-    @GetMapping("/cameraAllList")
+    @PostMapping("/cameraAllList")
     @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
     public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.cameraAllList(baseCameraManagement);

hazard-admin/src/main/java/com/ozs/web/controller/monitor/CameraUpdateLogController.java

@@ -11,6 +11,7 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
 import com.ozs.service.service.CameraUpdateLogService;
+import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wyy
@@ -36,6 +38,8 @@ public class CameraUpdateLogController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(CameraUpdateLogController.class);
     @Autowired
     private CameraUpdateLogService cameraUpdateLogService;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     /**
      * 获取相机升级日志分页列表
@@ -55,6 +59,18 @@ public class CameraUpdateLogController extends BaseController {
         }
         wrapper.orderByDesc(CameraUpdateLog::getCreateTime);
         IPage<CameraUpdateLog> page = cameraUpdateLogService.page(new Page<>(cameraUpdateLogResp.getPageNum(), cameraUpdateLogResp.getPageSize()), wrapper);
+        List<CameraUpdateLog> list = cameraUpdateLogService.list();
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+            List<CameraUpdateLog> dto = page.getRecords().stream().map(o -> {
+                for (CameraUpdateLog li : list) {
+                    if (li.getUpgradeType().equals(o.getUpgradeType())) {
+                        o.setUpgradeTypeName(dictDataService.selectDictLabel("upgrade_type", String.valueOf(li.getUpgradeType())));
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto);
+        }
         return AjaxResult.success(page);
     }