Merge branch 'hrx_permission' into hrx_dev

hcp-core/src/main/java/com/yingyangfly/core/domain/EaDetectInfo.java

@@ -0,0 +1,28 @@
+package com.yingyangfly.core.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EaDetectInfo {
+
+    private Long id;
+
+    private String phone;
+
+    private String sourceCode;
+
+    private Integer score;
+
+    private Float aveTime;
+
+    private String createBy;
+    private Date createTime;
+    private String remark;
+
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer page;
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer limit;
+}

hcp-core/src/main/java/com/yingyangfly/core/domain/EaUser.java

@@ -0,0 +1,31 @@
+package com.yingyangfly.core.domain;
+
+import com.yingyangfly.common.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EaUser{
+
+    private Long id;
+
+    private String name;
+
+    private String password;
+
+    private String phone;
+
+    private Integer age;
+
+    private Integer sex;
+
+    private String createBy;
+    private Date createTime;
+    private String remark;
+
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer page;
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer limit;
+}

hcp-core/src/main/java/com/yingyangfly/core/mapper/EaDetectInfoMapper.java

@@ -0,0 +1,9 @@
+package com.yingyangfly.core.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yingyangfly.core.domain.EaDetectInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EaDetectInfoMapper extends BaseMapper<EaDetectInfo> {
+}

hcp-core/src/main/java/com/yingyangfly/core/mapper/EaUserMapper.java

@@ -0,0 +1,9 @@
+package com.yingyangfly.core.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yingyangfly.core.domain.EaUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EaUserMapper extends BaseMapper<EaUser> {
+}

hcp-core/src/main/java/com/yingyangfly/core/service/EaDetectInfoService.java

@@ -0,0 +1,12 @@
+package com.yingyangfly.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yingyangfly.core.domain.EaDetectInfo;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface EaDetectInfoService extends IService<EaDetectInfo> {
+
+    IPage<EaDetectInfo> selectByPage(EaDetectInfo eaDetectInfo);
+}

hcp-core/src/main/java/com/yingyangfly/core/service/EaUserService.java

@@ -0,0 +1,12 @@
+package com.yingyangfly.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yingyangfly.core.domain.EaUser;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface EaUserService extends IService<EaUser> {
+
+    IPage<EaUser> selectByPage(EaUser eaUser);
+}

hcp-core/src/main/java/com/yingyangfly/core/service/impl/EaDetectInfoServiceImpl.java

@@ -0,0 +1,33 @@
+package com.yingyangfly.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yingyangfly.core.domain.EaDetectInfo;
+import com.yingyangfly.core.mapper.EaDetectInfoMapper;
+import com.yingyangfly.core.service.EaDetectInfoService;
+import com.yingyangfly.core.util.Sm4Util;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+@Slf4j
+@Service
+public class EaDetectInfoServiceImpl extends ServiceImpl<EaDetectInfoMapper, EaDetectInfo> implements EaDetectInfoService {
+
+
+    @Override
+    public IPage<EaDetectInfo> selectByPage(EaDetectInfo eaDetectInfo) {
+        LambdaQueryWrapper<EaDetectInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtils.isNotEmpty(eaDetectInfo.getPhone())) {
+            lambdaQueryWrapper.eq(EaDetectInfo::getPhone, eaDetectInfo.getPhone());
+        }
+        lambdaQueryWrapper.orderByDesc(EaDetectInfo::getCreateTime);
+        Page<EaDetectInfo> eaDetectInfoPage = new Page<>(eaDetectInfo.getPage(), eaDetectInfo.getLimit());
+        return baseMapper.selectPage(eaDetectInfoPage,lambdaQueryWrapper);
+    }
+}

hcp-core/src/main/java/com/yingyangfly/core/service/impl/EaUserServiceImpl.java

@@ -0,0 +1,33 @@
+package com.yingyangfly.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yingyangfly.core.domain.EaUser;
+import com.yingyangfly.core.mapper.EaUserMapper;
+import com.yingyangfly.core.service.EaUserService;
+import com.yingyangfly.core.util.Sm4Util;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+@Slf4j
+@Service
+public class EaUserServiceImpl extends ServiceImpl<EaUserMapper, EaUser> implements EaUserService {
+
+
+    @Override
+    public IPage<EaUser> selectByPage(EaUser eaUser) {
+        LambdaQueryWrapper<EaUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtils.isNotEmpty(eaUser.getPhone())) {
+            lambdaQueryWrapper.eq(EaUser::getPhone, Base64.getEncoder().encodeToString(eaUser.getPhone().getBytes(StandardCharsets.UTF_8)));
+        }
+        lambdaQueryWrapper.orderByDesc(EaUser::getCreateTime);
+        Page<EaUser> eaUserPage = new Page<>(eaUser.getPage(), eaUser.getLimit());
+        return baseMapper.selectPage(eaUserPage,lambdaQueryWrapper);
+    }
+}

hcp-core/src/main/java/com/yingyangfly/core/util/Sm4Util.java

@@ -49,9 +49,4 @@ public class Sm4Util {
     public static String decrypt(String data){
         return sm4.decryptStr(data);
     }
-
-    public static void main(String[] args) {
-        String s = "P6oSWBvZzEdvduYee8VWeA==";
-         System.out.print(decrypt(s));
-    }
 }

hcp-platform/src/main/java/com/yingyangfly/platform/controller/EaDetectInfoController.java

@@ -0,0 +1,28 @@
+package com.yingyangfly.platform.controller;
+
+import com.yingyangfly.common.dto.ResultResponse;
+import com.yingyangfly.common.log.annotation.TraceLog;
+import com.yingyangfly.core.domain.EaDetectInfo;
+import com.yingyangfly.core.service.EaDetectInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/ea/detectInfo")
+public class EaDetectInfoController {
+
+    @Resource
+    private EaDetectInfoService eaDetectInfoService;
+
+    @PostMapping("/list")
+    @TraceLog
+    public ResultResponse list(@RequestBody EaDetectInfo eaDetectInfo){
+        return ResultResponse.success(eaDetectInfoService.selectByPage(eaDetectInfo));
+    }
+}

hcp-platform/src/main/java/com/yingyangfly/platform/controller/EaUserController.java

@@ -0,0 +1,28 @@
+package com.yingyangfly.platform.controller;
+
+import com.yingyangfly.common.dto.ResultResponse;
+import com.yingyangfly.common.log.annotation.TraceLog;
+import com.yingyangfly.core.domain.EaUser;
+import com.yingyangfly.core.service.EaUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/ea/user")
+public class EaUserController {
+
+    @Resource
+    private EaUserService eaUserService;
+
+    @PostMapping("/list")
+    @TraceLog
+    public ResultResponse list(@RequestBody EaUser eaUser){
+        return ResultResponse.success(eaUserService.selectByPage(eaUser));
+    }
+}