模块修改

business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java

@@ -18,12 +18,12 @@ import java.util.List;
 public interface BaseCameraManagementService extends IService<BaseCameraManagement> {
     /**
      * 相机台账管理表导入
-     *
      * @param accountManageList
      * @param updateSupport
+     * @param userId
      * @return
      */
-    String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport);
+    String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport,String userId);
 
     List<BaseCameraManagementHomeVo> selectCameraAll(String userId);
 

business-service/src/main/java/com/ozs/service/service/BaseRailwayManagementService.java

@@ -17,12 +17,12 @@ import java.util.List;
 public interface BaseRailwayManagementService extends IService<BaseRailwayManagement> {
     /**
      * 线路管理表导入
-     *
      * @param accountManageList
      * @param updateSupport
+     * @param userId
      * @return
      */
-    String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport);
+    String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport,String userId);
 
     String getCameraNameByCameraCode(String cameraCode);
 }

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

@@ -58,7 +58,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
      * @return
      */
     @Override
-    public String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport) {
+    public String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport,String userId) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入相机台账列表信息不能为空！");
         }
@@ -76,14 +76,19 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
                 if (ObjectUtils.isEmpty(baseAccountManagement)) {
                     BeanValidators.validateWithException(validator, accountManagement);
+                    accountManagement.setUpdateBy(userId);
+                    accountManagement.setCreateBy(userId);
                     baseCameraManagementMapper.insert(accountManagement);
                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagement.setUpdateBy(userId);
+                    baseDeviceDynamicManagement.setCreateBy(userId);
                     baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
+                    accountManagement.setUpdateBy(userId);
                     baseCameraManagementMapper.update(accountManagement, lw);
                     LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
                     if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
@@ -91,6 +96,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     }
                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagement.setUpdateBy(userId);
                     baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");

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

@@ -38,7 +38,7 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
      * @return
      */
     @Override
-    public String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport) {
+    public String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport,String userId) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入线路管理信息不能为空！");
         }
@@ -56,11 +56,14 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
                 BaseRailwayManagement baseLineManagement = baseRailwayManagementMapper.selectOne(lw);
                 if (ObjectUtils.isEmpty(baseLineManagement)) {
                     BeanValidators.validateWithException(validator, railwayManagement);
+                    railwayManagement.setUpdateBy(userId);
+                    railwayManagement.setCreateBy(userId);
                     baseRailwayManagementMapper.insert(railwayManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, railwayManagement);
+                    railwayManagement.setUpdateBy(userId);
                     baseRailwayManagementMapper.update(railwayManagement,lw);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode()  + " 更新成功");

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

@@ -365,7 +365,7 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<BaseCameraManagement>(BaseCameraManagement.class);
         List<BaseCameraManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport);
+        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport,getUserId());
         return AjaxResult.success(message);
     }
 

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

@@ -203,7 +203,7 @@ public class BaseRailwayManagementController extends BaseController {
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
         List<BaseRailwayManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseRailwayManagementService.importBaseLineManagement(AccountManageList, updateSupport);
+        String message = baseRailwayManagementService.importBaseLineManagement(AccountManageList, updateSupport,getUserId());
         return AjaxResult.success(message);
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.constant.CacheConstants;
 import com.ozs.common.core.domain.entity.SysUserUpdate;
+import com.ozs.common.core.domain.entity.SysUsers;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.core.domain.vo.SysUserVo;
 import com.ozs.common.utils.AppendUtils;
@@ -139,8 +140,8 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        List<SysUser> userList = util.importExcel(file.getInputStream());
+        ExcelUtil<SysUsers> util = new ExcelUtil<SysUsers>(SysUsers.class);
+        List<SysUsers> userList = util.importExcel(file.getInputStream());
         String userId = getUserId();
         String message = userService.importUser(userList, updateSupport, userId);
         return success(message);

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -137,6 +137,7 @@ public class GeoHazardMonitorTokenController {
             MsgAlarm alarm = msgAlarmService.getOne(lw);
             log.info("alarm:{}", alarm);
             BaseUser admin = baseUserService.getUserName("admin");
+            MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
             if (ObjectUtils.isEmpty(alarm)) {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
@@ -153,12 +154,15 @@ public class GeoHazardMonitorTokenController {
                 msgAlarm.setAlarmMile(baseCameraManagement.getInstallMile());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
+                msgAlarmVice.setImageUrl(buffer.toString());
+                msgAlarmVice.setCreateBy(admin.getUserId());
+                msgAlarmVice.setUpdateBy(admin.getUserId());
+                msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
                 respMsgAlarmVo.setIsCancel(2);
                 respMsgAlarmVo.setCancelTime(null);
             } else {
-                MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
                 String[] imageUrl = reqMsgAlarmVo.getImageUrls();
                 StringBuffer buffer = new StringBuffer();

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -37,7 +37,7 @@ public class UploadController {
     MinioUtils minioUtils;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
-    @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
+    @Value("${base.imgUrl}")
     private String imgUrl;
 
 

hazard-sdk/src/main/resources/application.yml

@@ -14,6 +14,8 @@ base:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  #图片路径前缀
+  imgUrl: http://124.71.171.71:18801/picbucket
 
 # 开发环境配置
 server: