1

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

@@ -290,19 +290,23 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public PageInfo pageList(SceneParam param) {
-        if(param.getType() == 2){  //深时
-            return laserService.pageList(param);
-        }
-        if(param.getType() == 3){ //双目lite
-           return sceneService.pageList(param);
+//        if(param.getType() == 2){  //深时
+//            return laserService.pageList(param);
+//        }
+//        if(param.getType() == 3){ //双目lite
+//           return sceneService.pageList(param);
+//        }
+        JyUser jyUser = jyUserService.getBySysId(StpUtil.getLoginId());
+        if(jyUser == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+
+        param.setUserId(jyUser.getUserId());
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<SceneVo> records = page.getRecords();
         List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
         HashMap<String,SceneCopyLog> map =  copyLogService.getByNewNumList(numList);
 
-        JyUser jyUser = jyUserService.getBySysId(StpUtil.getLoginId());
-
 
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));

src/main/java/com/fdkankan/manage/util/AesUtil.java

@@ -17,13 +17,9 @@ import org.apache.commons.codec.binary.Base64;
 public class AesUtil {
     //使用AES-128-CBC加密模式，key需要为16位,key和iv可以相同！
 
-    public static String key = "0000001210830863";
+    public static String key = "0000000856753656";
 
-    public static String iv = "1xo1ub7m2rsz92ev";
-
-    public static String pwKey = "0000000856753656";
-
-    public static String pwIv = "pwel781esd6wglxm";
+    public static String iv = "pwel781esd6wglxm";
     /**
      * 加密方法
      * @param data  要加密的数据
@@ -53,7 +49,7 @@ public class AesUtil {
             cipher.init(Cipher.ENCRYPT_MODE, keyspec, ivspec);
             byte[] encrypted = cipher.doFinal(plaintext);	// 加密
 
-            return new Base64().encodeToString(encrypted); 	//通过Base64转码返回
+            return new Base64().encodeToString(encrypted).trim(); 	//通过Base64转码返回
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -84,8 +80,7 @@ public class AesUtil {
             cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec); //使用密钥初始化，设置为解密模式
 
             byte[] original = cipher.doFinal(encrypted1);	//执行操作
-            String originalString = new String(original);
-            return originalString;
+            return new String(original).trim();
         } catch (Exception e) {
             e.printStackTrace();
             throw new BusinessException(ResultCode.AES_DESENCRYPT_ERROR);
@@ -127,9 +122,7 @@ public class AesUtil {
      * 测试
      */
     public static void main(String args[]) throws Exception {
-        String data = "  {\n" +
-                "        \"ryId\": \"123\"   " +
-                "   }";
+        String data = "123456";
         //String key = getRandomStringKey();  //0000001210830863
         //String iv = getRandomStringIv();    //1xo1ub7m2rsz92ev
 

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

@@ -13,6 +13,7 @@ public class SceneParam extends RequestBase {
     private String userName;    //绑定账号
     private Integer type = 0;   //0 看看，1看见，2深时
     private Integer companyId;
+    private Long userId;
 
     private List<String> snCodes;
 }

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

@@ -73,5 +73,8 @@
         <if test="param.companyId !=null ">
             and co.id = #{param.companyId}
         </if>
+        <if test="param.userId !=null ">
+            and u.id = #{param.userId}
+        </if>
     </sql>
 </mapper>