1

src/main/java/com/fdkankan/manage/config/ManageConfig.java

@@ -19,6 +19,12 @@ public class ManageConfig {
     private String shareScenes;
     @Value("${fyun.host}")
     private String queryPath;
+    @Value("${manage.env}")
+    private String environment;
+    @Value("${manage.default.password:afdd0b4ad2ec172c586e2150770fbf9e}")
+    private String defaultPassword;
+
+
     public List<String> getNumList(){
         if(StringUtils.isNotBlank(this.shareScenes)){
             String[] split = shareScenes.split(",");

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.controller.inner;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dtflys.forest.annotation.Post;
 import com.fdkankan.manage.common.CameraTypeEnum;
@@ -20,6 +21,7 @@ import com.fdkankan.manage.vo.request.*;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.manage.vo.response.UserAuthSceneVo;
 import com.fdkankan.manage.vo.response.UserShareSceneVo;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +51,11 @@ public class InnerAPIController extends BaseController {
     ISysUserService sysUserService;
     @Autowired
     IJyPlatformService jyPlatformService;
+    @Autowired
+    ICaseService caseService;
+    @Autowired
+    ManageService manageService;
+
 
     @PostMapping("/getByRyId")
     public ResultData getByRyId(@RequestBody UserParam param){
@@ -396,8 +403,7 @@ public class InnerAPIController extends BaseController {
         return ResultData.ok(camera);
     }
 
-    @Autowired
-    ManageService manageService;
+
 
     @PostMapping("/getTokenByRyNo")
     public ResultData getTokenByRyNo(@RequestBody ManageLoginRequest param){
@@ -418,4 +424,97 @@ public class InnerAPIController extends BaseController {
         return ResultData.ok(jyPlatformService.pageList(param));
     }
 
+
+    @PostMapping("/getTokenByProjectId")
+    public ResultData getTokenByProjectId(@RequestBody ManageLoginRequest param){
+        if(StringUtils.isBlank(param.getProjectId())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaQueryWrapper<ScenePlus> sceneQw = new LambdaQueryWrapper<>();
+        sceneQw.eq(ScenePlus::getTaskId,param.getProjectId());
+        List<ScenePlus> list = scenePlusService.list(sceneQw);
+        if(list == null || list.isEmpty()){
+            throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
+        }
+        ScenePlus scenePlus = list.get(0);
+        User user = userService.getById(scenePlus.getUserId());
+        if(user == null){
+            throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+        }
+
+        param.setUserName(user.getUserName());
+        String clientIP = ServletUtil.getClientIP(request);
+        param.setNeedPassword(false);
+        param.setClientIp(clientIP);
+        ManageLoginResponse login = manageService.login(param);
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("token",login.getToken());
+        map.put("num",scenePlus.getNum());
+        return ResultData.ok(map);
+    }
+
+
+    @PostMapping("/getTokenByKno")
+    public ResultData getTokenByKno(@RequestBody ManageLoginRequest param){
+        if(StringUtils.isBlank(param.getKno())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaQueryWrapper<ScenePlus> sceneQw = new LambdaQueryWrapper<>();
+        sceneQw.eq(ScenePlus::getKNo,param.getKno());
+        List<ScenePlus> list = scenePlusService.list(sceneQw);
+        if(list == null || list.isEmpty()){
+            throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
+        }
+        ScenePlus scenePlus = list.get(0);
+        JyUser jyUser = jyUserService.getByUserId(scenePlus.getUserId());
+        Integer platformId = jyUser.getPlatformId();
+        List<JyUser> jyUserList = jyUserService.getAdminByPlatformId(platformId);
+        if(jyUserList == null || jyUserList.isEmpty()){
+            throw new BusinessException(ResultCode.NOT_ROLE);
+        }
+        Case caseEntity = caseService.getByKno(param.getKno());
+
+        param.setUserName(jyUserList.get(0).getRyNo());
+        String clientIP = ServletUtil.getClientIP(request);
+        param.setNeedPassword(false);
+        param.setClientIp(clientIP);
+        ManageLoginResponse login = manageService.login(param);
+
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("token",login.getToken());
+        map.put("numList",list.stream().map(ScenePlus::getNum).collect(Collectors.toList()));
+        if(caseEntity !=null){
+            map.put("caseId", caseEntity.getCaseId());
+        }
+        return ResultData.ok(map);
+    }
+
+    @Autowired
+    RabbitMqProducer rabbitMqProducer;
+
+    @PostMapping("/updateKno")
+    public ResultData updateKno(@RequestBody ManageLoginRequest param){
+        if(StringUtils.isBlank(param.getProjectId())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaQueryWrapper<ScenePlus> sceneQw = new LambdaQueryWrapper<>();
+        sceneQw.eq(ScenePlus::getTaskId,param.getProjectId());
+        List<ScenePlus> list = scenePlusService.list(sceneQw);
+        if(list == null || list.isEmpty()){
+            throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
+        }
+        ScenePlus scenePlus = list.get(0);
+
+
+        LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(ScenePlus::getTaskId,param.getProjectId());
+        wrapper.set(ScenePlus::getKNo,param.getKno());
+        scenePlusService.update(wrapper);
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("num",scenePlus.getNum());
+        map.put("kNo",param.getKno());
+        //rabbitMqProducer.sendByWorkQueue("queue-aj-add-scene",map);
+
+        return ResultData.ok();
+    }
 }

src/main/java/com/fdkankan/manage/entity/Case.java

@@ -119,6 +119,9 @@ public class Case implements Serializable {
     @TableField("criminal_case")
     private Integer criminalCase;
 
+    @TableField("k_number")
+    private String kNumber;
+
     @TableField(exist = false)
     private Boolean isOpen = false;
 

src/main/java/com/fdkankan/manage/entity/ScenePlus.java

@@ -118,4 +118,10 @@ public class ScenePlus implements Serializable {
 
     @TableField("build_fail_reason")
     private String buildFailReason;
+
+    @TableField("task_id")
+    private String taskId;
+
+    @TableField("k_no")
+    private String kNo;
 }

src/main/java/com/fdkankan/manage/mapper/IJyUserMapper.java

@@ -20,4 +20,6 @@ import java.util.List;
 public interface IJyUserMapper extends BaseMapper<JyUser> {
 
     List<JyUser> getByAddParam(@Param("param") UserParam param);
+
+    List<JyUser> getAdminByPlatformId(@Param("platformId")Integer platformId);
 }

src/main/java/com/fdkankan/manage/service/ICaseService.java

@@ -33,4 +33,6 @@ public interface ICaseService extends IService<Case> {
 
     void updatePlatformIdById(Integer caseId, Integer platformId);
 
+    Case getByKno(String kno);
+
 }

src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -53,4 +53,6 @@ public interface IJyUserService extends IService<JyUser> {
     List<JyUser> getByAddParam(UserParam param);
 
     Object getCaseNumByRyId(CaseParam param);
+
+    List<JyUser> getAdminByPlatformId(Integer platformId);
 }

src/main/java/com/fdkankan/manage/service/impl/CaseServiceImpl.java

@@ -97,6 +97,18 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
         }
     }
 
+
+    @Override
+    public Case getByKno(String kno) {
+        LambdaQueryWrapper<Case> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Case::getKNumber,kno);
+        List<Case> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+    }
+
     @Autowired
     FdKKClient fdKKClient;
 

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -284,4 +284,9 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
 
         return voList;
     }
+
+    @Override
+    public List<JyUser> getAdminByPlatformId(Integer platformId) {
+        return getBaseMapper().getAdminByPlatformId(platformId);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.*;
+import com.fdkankan.manage.config.ManageConfig;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.httpClient.service.LaserService;
@@ -50,17 +51,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Autowired
     private ICameraDetailService cameraDetailService;
     @Autowired
-    private ISceneService sceneService;
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private IScenePlusService scenePlusService;
-    @Autowired
-    private LaserService laserService;
-    @Autowired
     private ISysUserService sysUserService;
-    @Value("${fyun.host:https://4dkk.4dage.com/}")
-    private String host;
     @Autowired
     private IJyUserService jyUserService;
     @Autowired
@@ -71,6 +62,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     IJyPlatformService jyPlatformService;
     @Autowired
     IJyUserPlatformService jyUserPlatformService;
+    @Autowired
+    ManageConfig manageConfig;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -179,14 +172,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             || StringUtils.isBlank(param.getRyId()) || StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        String  password = AesUtil.desEncrypt(param.getPassword());
-        if(StringUtils.isBlank(password)){
-            throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
+        if("jm".equals(manageConfig.getEnvironment())){
+            String  password = AesUtil.desEncrypt(param.getPassword());
+            if(StringUtils.isBlank(password)){
+                throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
+            }
+            String passwordMd52 = SecurityUtil.MD52(password);
+            param.setPassword(passwordMd52);
         }
 
-        String passwordMd5 = SecurityUtil.MD5(password);
-        String passwordMd52 = SecurityUtil.MD52(password);
-
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
 
         List<JyUser> jyUserList = jyUserService.getByAddParam(param);
@@ -209,12 +203,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if(jyUser == null){
             jyUser = new JyUser();
             param.setIsJm(param.getIsJm() ==null?1:param.getIsJm());
+            param.setPassword(StringUtils.isBlank(param.getPassword()) ? manageConfig.getDefaultPassword() :param.getPassword());
+            param.setNickName(StringUtils.isBlank(param.getNickName())?param.getUserName():param.getNickName() );
         }
 
-        User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());
-        SysUser sysUser = this.addSysUser(jyUser.getSysUserId(),passwordMd52, param.getRyNo(), param.getNickName());
+        User user = this.addUser(jyUser.getUserId(),  param.getPassword(), param.getRyNo(), param.getNickName());
+        SysUser sysUser = this.addSysUser(jyUser.getSysUserId(),param.getPassword(), param.getRyNo(), param.getNickName());
         jyUser.setRyId(param.getRyId());
-        jyUser.setRyPassword(passwordMd52);
+        jyUser.setRyPassword(param.getPassword());
         jyUser.setRyNo(param.getRyNo());
         jyUser.setRyNickName(param.getNickName());
         jyUser.setUserId(user.getId());
@@ -271,8 +267,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private User addUser(Long userId, String passwordMd5, String userName, String nickName){
         User user = new User();
         user.setId(userId);
-        user.setHead(host + OssPath.default_head);
-        user.setPassword(passwordMd5);
+        user.setHead(manageConfig.getQueryPath() + OssPath.default_head);
+        user.setPassword(userId == null && StringUtils.isBlank(passwordMd5) ? manageConfig.getDefaultPassword() : passwordMd5);
         user.setStatus(1);
         user.setIsNotice(1);
         user.setUserName(userName);
@@ -292,7 +288,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         SysUser sysUser = new SysUser();
         sysUser.setId(sysUserId);
         sysUser.setUserName(ryNo);
-        sysUser.setPassword(passwordMd5);
+        sysUser.setPassword(sysUserId == null && StringUtils.isBlank(passwordMd5) ? manageConfig.getDefaultPassword() : passwordMd5);
         sysUser.setNickName(nickName);
         if(sysUserId == null){
             sysUser.setRoleId(47L);

src/main/java/com/fdkankan/manage/vo/request/ManageLoginRequest.java

@@ -12,4 +12,7 @@ public class ManageLoginRequest {
     private String clientIp;
     private Boolean needPassword = true;
     private Boolean mingwen = false;
+
+    private String projectId;
+    private String kno;
 }

src/main/resources/mapper/manage/JyUserMapper.xml

@@ -18,4 +18,8 @@
         </if>
         )
     </select>
+    <select id="getAdminByPlatformId" resultType="com.fdkankan.manage.entity.JyUser">
+        select jy.* from jy_user jy left join sys_user sy on jy.sys_user_id = sy.id where jy.platform_id = #{platformId}
+            and (sy.role_id =48 or sy.role_id = 45)
+    </select>
 </mapper>