第三方接口添加UserID

business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java

@@ -31,4 +31,6 @@ public interface BaseUserMapper extends BaseMapper<BaseUser> {
     Set<String> getUserIdList6();
 
     BaseUser getUser(@Param("userId") String userId);
+    
+    BaseUser getUserName(@Param("userName") String userName);
 }

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

@@ -3,6 +3,7 @@ package com.ozs.service.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseUser;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Set;
 
@@ -14,4 +15,6 @@ public interface BaseUserService extends IService<BaseUser> {
     Set<String> getUserIdList(String createBy, Long deptId);
 
     BaseUser getUser(String userId);
+
+    BaseUser getUserName(@Param("userName") String userName);;
 }

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

@@ -58,4 +58,9 @@ public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> i
     public BaseUser getUser(String userId) {
         return baseUserMapper.getUser(userId);
     }
+
+    @Override
+    public BaseUser getUserName(String userName) {
+        return baseUserMapper.getUserName(userName);
+    }
 }

business-service/src/main/resources/mapper/service/BaseUserMapper.xml

@@ -64,4 +64,7 @@
     <select id="getUser" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
         select user_id userId, dept_id deptId, data_permission dataPermission from sys_user where user_id = #{userId}
     </select>
+    <select id="getUserName" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
+        select user_id userId, dept_id deptId, data_permission dataPermission from sys_user where user_name = #{userName}
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
+import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.SvcAddress;
@@ -55,6 +56,8 @@ public class GeoHazardMonitorTokenController {
     BaseCameraManagementService baseCameraManagementService;
     @Value("${sdk.publish:http://47.106.159.135:18819/hazard/sdk/publish}")
     private String sdkUrl;
+    @Autowired
+    private BaseUserService baseUserService;
 
     /**
      * 获取web访问令牌
@@ -133,6 +136,7 @@ public class GeoHazardMonitorTokenController {
             }
             MsgAlarm alarm = msgAlarmService.getOne(lw);
             log.info("alarm:{}", alarm);
+            BaseUser admin = baseUserService.getUserName("admin");
             if (ObjectUtils.isEmpty(alarm)) {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
@@ -144,8 +148,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarm.setImageUrl(buffer.toString());
-                msgAlarm.setCreateBy("admin");
-                msgAlarm.setUpdateBy("admin");
+                msgAlarm.setCreateBy(admin.getUserId());
+                msgAlarm.setUpdateBy(admin.getUserId());
                 msgAlarm.setAlarmMile(baseCameraManagement.getInstallMile());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
@@ -163,8 +167,8 @@ public class GeoHazardMonitorTokenController {
                     buffer.append(";");
                 }
                 msgAlarmVice.setImageUrl(buffer.toString());
-                msgAlarmVice.setCreateBy("admin");
-                msgAlarmVice.setUpdateBy("admin");
+                msgAlarmVice.setCreateBy(admin.getUserId());
+                msgAlarmVice.setUpdateBy(admin.getUserId());
                 msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
@@ -212,11 +216,12 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("message", "信息编码为空！");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
+            BaseUser admin = baseUserService.getUserName("admin");
             lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-            baseDynamicManagement.setUpdateBy("admin");
+            baseDynamicManagement.setUpdateBy(admin.getUserId());
             log.info("reqDeviceVo:{}", baseDynamicManagement);
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);