优化认证功能

java110-bean/src/main/java/com/java110/dto/staffAppAuth/StaffAppAuthDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.staffAppAuth;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,14 @@ import java.util.Date;
 public class StaffAppAuthDto extends PageDto implements Serializable {
 
     private String auId;
-private String appType;
-private String openId;
-private String state;
-private String storeId;
-private String openName;
-private String staffId;
+    private String appType;
+    private String openId;
+    private String state;
+    private String stateName;
+    private String storeId;
+    private String openName;
+    private String staffId;
+    private String staffName;
 
 
     private Date createTime;
@@ -31,43 +34,54 @@ private String staffId;
     public String getAuId() {
         return auId;
     }
-public void setAuId(String auId) {
+
+    public void setAuId(String auId) {
         this.auId = auId;
     }
-public String getAppType() {
+
+    public String getAppType() {
         return appType;
     }
-public void setAppType(String appType) {
+
+    public void setAppType(String appType) {
         this.appType = appType;
     }
-public String getOpenId() {
+
+    public String getOpenId() {
         return openId;
     }
-public void setOpenId(String openId) {
+
+    public void setOpenId(String openId) {
         this.openId = openId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getOpenName() {
+
+    public String getOpenName() {
         return openName;
     }
-public void setOpenName(String openName) {
-        this.openName = openName;
-    }
-public String getStaffId() {
+
+
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
@@ -87,4 +101,24 @@ public void setStaffId(String staffId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public void setOpenName(String openName) {
+        this.openName = openName;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-generator/src/main/resources/web/template_1.json

@@ -1,66 +1,32 @@
 {
-  "templateName": "databus",
-  "directories": "dev",
-  "templateCode": "businessDatabus",
-  "templateKey": "databusId",
-  "templateKeyName": "Databus ID",
-  "searchCode": "databusId",
-  "searchName": "Databus ID",
+  "templateName": "staffAppAuth",
+  "directories": "property",
+  "templateCode": "staffAppAuth",
+  "templateKey": "auId",
+  "templateKeyName": "认证ID",
+  "searchCode": "auId",
+  "searchName": "认证ID",
   "conditions": [
     {
       "name": "业务类型",
       "inputType": "input",
       "code": "businessTypeCd",
       "whereCondition": "equal"
-    },
-    {
-      "name": "适配器",
-      "inputType": "input",
-      "code": "beanName",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "ID",
-      "inputType": "input",
-      "code": "databusId",
-      "whereCondition": "equal"
     }
   ],
   "columns": [
     {
-      "code": "businessTypeCd",
-      "cnCode": "业务类型",
-      "desc": "必填，请输入业务类型",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "业务类型格式错误",
-      "show": true
-    },
-    {
-      "code": "beanName",
-      "cnCode": "适配器",
-      "desc": "必填，请输入适配器",
+      "code": "appType",
+      "cnCode": "认证方式",
+      "desc": "必填，请选择认证方式",
       "required": true,
       "hasDefaultValue": false,
-      "inputType": "input",
+      "inputType": "select",
+      "selectValue": "WECHAT",
+      "selectValueName": "微信",
       "limit": "maxLength",
-      "limitParam": "256",
-      "limitErrInfo": "适配器名称太长",
-      "show": true
-    },
-    {
-      "code": "seq",
-      "cnCode": "顺序",
-      "desc": "必填，请输入顺序",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "input",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "顺序格式错误",
+      "limitParam": "12",
+      "limitErrInfo": "认证方式错误",
       "show": true
     }
   ]

service-user/src/main/java/com/java110/user/api/StaffApi.java

@@ -37,8 +37,8 @@ public class StaffApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /staffAppAuth/saveStaffAppAuth
-     * @path /app/staffAppAuth/saveStaffAppAuth
+     * @serviceCode /staff/saveStaffAppAuth
+     * @path /app/staff/saveStaffAppAuth
      */
     @RequestMapping(value = "/saveStaffAppAuth", method = RequestMethod.POST)
     public ResponseEntity<String> saveStaffAppAuth(@RequestBody JSONObject reqJson) {
@@ -56,8 +56,8 @@ public class StaffApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /staffAppAuth/updateStaffAppAuth
-     * @path /app/staffAppAuth/updateStaffAppAuth
+     * @serviceCode /staff/updateStaffAppAuth
+     * @path /app/staff/updateStaffAppAuth
      */
     @RequestMapping(value = "/updateStaffAppAuth", method = RequestMethod.POST)
     public ResponseEntity<String> updateStaffAppAuth(@RequestBody JSONObject reqJson) {
@@ -76,8 +76,8 @@ public class StaffApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /staffAppAuth/deleteStaffAppAuth
-     * @path /app/staffAppAuth/deleteStaffAppAuth
+     * @serviceCode /staff/deleteStaffAppAuth
+     * @path /app/staff/deleteStaffAppAuth
      */
     @RequestMapping(value = "/deleteStaffAppAuth", method = RequestMethod.POST)
     public ResponseEntity<String> deleteStaffAppAuth(@RequestBody JSONObject reqJson) {
@@ -95,8 +95,8 @@ public class StaffApi {
      *
      * @param storeId 小区ID
      * @return
-     * @serviceCode /staffAppAuth/queryStaffAppAuth
-     * @path /app/staffAppAuth/queryStaffAppAuth
+     * @serviceCode /staff/queryStaffAppAuth
+     * @path /app/staff/queryStaffAppAuth
      */
     @RequestMapping(value = "/queryStaffAppAuth", method = RequestMethod.GET)
     public ResponseEntity<String> queryStaffAppAuth(@RequestParam(value = "store-id") String storeId,

service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java

@@ -1,15 +1,16 @@
 package com.java110.user.bmo.staffAppAuth.impl;
 
 import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service("getStaffAppAuthBMOImpl")
@@ -18,27 +19,37 @@ public class GetStaffAppAuthBMOImpl implements IGetStaffAppAuthBMO {
     @Autowired
     private IStaffAppAuthInnerServiceSMO staffAppAuthInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
     /**
      * @param staffAppAuthDto
      * @return 订单服务能够接受的报文
      */
     public ResponseEntity<String> get(StaffAppAuthDto staffAppAuthDto) {
+        UserDto userDto = new UserDto();
+        userDto.setUserId(staffAppAuthDto.getStaffId());
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
 
+        Assert.listOnlyOne(userDtos, "用户不存在");
+        staffAppAuthDto.setStaffName(userDtos.get(0).getStaffName());
 
-        int count = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuthsCount(staffAppAuthDto);
+        List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
 
-        List<StaffAppAuthDto> staffAppAuthDtos = null;
-        if (count > 0) {
-            staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
+        if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
+            staffAppAuthDto.setStateName("未认证");
+            staffAppAuthDto.setState("1001");
+            staffAppAuthDto.setOpenId("-");
+            staffAppAuthDto.setAppType("-");
+            staffAppAuthDto.setOpenName("-");
         } else {
-            staffAppAuthDtos = new ArrayList<>();
+            staffAppAuthDto.setStateName("已认证");
+            staffAppAuthDto.setState("2002");
+            staffAppAuthDto.setOpenId(staffAppAuthDtos.get(0).getOpenId());
+            staffAppAuthDto.setAppType(staffAppAuthDtos.get(0).getAppType());
+            staffAppAuthDto.setOpenName(staffAppAuthDtos.get(0).getOpenName());
         }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) staffAppAuthDto.getRow()), count, staffAppAuthDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        return responseEntity;
+        return ResultVo.createResponseEntity(staffAppAuthDto);
     }
 
 }