通过证件号码单点登录提交

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkPointlocation.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -72,11 +73,13 @@ public class SkPointlocation extends Model<SkPointlocation> {
      * 是否删除，0代表未删除，1代表删除
      */
     @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<ZdcsResult>  zdcsResultList;
     /**
      * 设备名称 前端树形结构字段对应
      */
     @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String  lable;
     /**
      * 获取主键值

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -56,15 +56,9 @@ public class SysUserController extends ApiController {
         String KEY = "maplogin" + today;
         String IV = "map_vues" + today;
 
-//        KEY="maplogin20200416";
-//        IV="map_vues20200416";
-
         String username = desEncrypt(user.getUsername(), KEY, IV).trim();
         String password = desEncrypt(user.getPassword(), KEY, IV).trim();
 
-//        System.out.println(username);
-//        System.out.println(password);
-
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("USERNAME", username);
         queryWrapper.eq("SCBZ", 0);
@@ -91,6 +85,30 @@ public class SysUserController extends ApiController {
 
     }
 
+    @ApiOperation(value = "单点登录")
+    @OperLog(message = "单点登录",operation = OperationType.DDLOGIN)
+    @PostMapping("/loginByZjhm")
+    public MapRestResult loginByZjhm(@RequestBody SysUser user, HttpServletRequest request) throws Exception {
+        String identityCard = user.getIdentitycard().trim();
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("IDENTITYCARD", identityCard);
+        queryWrapper.eq("SCBZ", 0);
+        SysUser one = sysUserService.getOne(queryWrapper);
+        if (one == null) {
+            return MapRestResult.build(500, "该用户不存在", null);
+        }
+        JwtUser util = new JwtUser();
+        String ip = request.getRemoteAddr();
+        Token tokenEntity=new Token(one.getUsername(),ip,one.getPassword());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
+        // 用户JWT生成token
+        String token = util.createJWT(jsonObject.toString());
+        Map<String,Object> map=new HashMap<>();
+        map.put("token",token);
+        map.put("user",one);
+        return new MapRestResult(map);
+    }
+
     @PostMapping("/test")
     public String test(String str) throws Exception {
         Date now = new Date();

common/service_base/src/main/java/com/founder/servicebase/logs/OperationType.java

@@ -27,6 +27,10 @@ public class OperationType {
      * 登录
      */
     public static final String LOGIN = "LOGIN";
+    /**
+     * 登录
+     */
+    public static final String DDLOGIN = "DDLOGIN";
 
     /**
      * 退出登录