优化代码

service-community/src/main/java/com/java110/community/api/RepairApi.java

@@ -8,6 +8,8 @@ import com.java110.community.bmo.repairReturnVisit.ISaveRepairReturnVisitBMO;
 import com.java110.community.bmo.repairReturnVisit.IUpdateRepairReturnVisitBMO;
 import com.java110.dto.appraise.AppraiseDto;
 import com.java110.dto.repairReturnVisit.RepairReturnVisitDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.repairReturnVisit.RepairReturnVisitPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 报修 控制类
  */
@@ -37,6 +41,9 @@ public class RepairApi {
     @Autowired
     private IGetRepairReturnVisitBMO getRepairReturnVisitBMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
 
     /**
      * 报修评价
@@ -61,7 +68,7 @@ public class RepairApi {
      */
     @RequestMapping(value = "/saveRepairReturnVisit", method = RequestMethod.POST)
     public ResponseEntity<String> saveRepairReturnVisit(@RequestHeader(value = "user-id") String userId,
-                                                        @RequestHeader(value = "user-name") String userName,
+
                                                         @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "repairId", "请求报文中未包含repairId");
@@ -69,6 +76,15 @@ public class RepairApi {
         Assert.hasKeyAndValue(reqJson, "visitType", "请求报文中未包含满意度");
         Assert.hasKeyAndValue(reqJson, "context", "请求报文中未包含context");
 
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
+
+        String userName  = userDtos.get(0).getName();
+
         RepairReturnVisitPo repairReturnVisitPo = BeanConvertUtil.covertBean(reqJson, RepairReturnVisitPo.class);
         repairReturnVisitPo.setVisitPersonId(userId);
         repairReturnVisitPo.setVisitPersonName(userName);

service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java

@@ -562,7 +562,6 @@ public class RoomRenovationApi {
     @RequestMapping(value = "/saveRoomRenovationDetail", method = RequestMethod.POST)
     @Java110Transactional
     public ResponseEntity<String> saveRoomRenovationDetail(@RequestHeader(value = "user-id") String userId,
-                                                           @RequestHeader(value = "user-name") String userName,
                                                            @RequestBody JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "rId", "请求报文中未包含rId");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");

service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java

@@ -2,10 +2,12 @@ package com.java110.fee.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.dto.user.UserDto;
 import com.java110.fee.bmo.payFeeAudit.IDeletePayFeeAuditBMO;
 import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
 import com.java110.fee.bmo.payFeeAudit.ISavePayFeeAuditBMO;
 import com.java110.fee.bmo.payFeeAudit.IUpdatePayFeeAuditBMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.payFeeAudit.PayFeeAuditPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -13,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 @RestController
 @RequestMapping(value = "/payFeeAudit")
@@ -28,6 +32,9 @@ public class PayFeeAuditApi {
     @Autowired
     private IGetPayFeeAuditBMO getPayFeeAuditBMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -38,14 +45,21 @@ public class PayFeeAuditApi {
      */
     @RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
     public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson,
-                                                  @RequestHeader(value = "user-id") String userId,
-                                                  @RequestHeader(value = "user-name") String userName) {
+                                                  @RequestHeader(value = "user-id") String userId){
+
 
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
         Assert.hasKeyAndValue(reqJson, "feeDetailId", "请求报文中未包含缴费ID");
         Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
 
+        String userName  = userDtos.get(0).getName();
 
         PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
         payFeeAuditPo.setAuditUserId(userId);

service-store/src/main/java/com/java110/store/api/CollectionApi.java

@@ -5,10 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.dto.user.UserDto;
 import com.java110.dto.userStorehouse.UserStorehouseDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.intf.store.IResourceStoreInnerServiceSMO;
 import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.purchase.PurchaseApplyDetailPo;
 import com.java110.po.purchase.PurchaseApplyPo;
 import com.java110.po.purchase.ResourceStorePo;
@@ -51,13 +53,15 @@ public class CollectionApi {
     @Autowired
     private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
 
     /**
      * 物品领用 接口类
      *
      * @param reqJson
      * @param userId
-     * @param userName
      * @param storeId
      * @return {"resourceStores":[{"resId":"852020070239060001","resName":"水性笔","resCode":"002","price":"2.00","stock":"2",
      * "description":"黑色","quantity":"1"}],"description":"123123","endUserName":"1","endUserTel":"17797173942","file":"",
@@ -66,8 +70,17 @@ public class CollectionApi {
     @RequestMapping(value = "/goodsCollection", method = RequestMethod.POST)
     public ResponseEntity<String> goodsCollection(@RequestBody JSONObject reqJson,
                                                   @RequestHeader(value = "user-id") String userId,
-                                                  @RequestHeader(value = "user-name") String userName,
                                                   @RequestHeader(value = "store-id") String storeId) {
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
+
+        String userName  = userDtos.get(0).getName();
+
         Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写物品领用的物资");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");
         PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
@@ -153,10 +166,19 @@ public class CollectionApi {
     @RequestMapping(value = "/goodsDelivery", method = RequestMethod.POST)
     public ResponseEntity<String> goodsDelivery(@RequestBody JSONObject reqJson,
                                                 @RequestHeader(value = "user-id") String userId,
-                                                @RequestHeader(value = "user-name") String userName,
                                                 @RequestHeader(value = "store-id") String storeId) {
         Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写物品领用的物资");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
+
+        String userName  = userDtos.get(0).getName();
+
         PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
         purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
         purchaseApplyPo.setDescription(reqJson.getString("description"));

service-store/src/main/java/com/java110/store/api/PurchaseApi.java

@@ -8,7 +8,9 @@ import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
 import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.dto.resourceStore.ResourceStoreDto;
 import com.java110.dto.storehouse.StorehouseDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.store.*;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.purchase.PurchaseApplyDetailPo;
 import com.java110.po.purchase.PurchaseApplyPo;
 import com.java110.po.purchase.ResourceStorePo;
@@ -51,6 +53,9 @@ public class PurchaseApi {
     @Autowired
     private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     //域
     public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
 
@@ -70,11 +75,18 @@ public class PurchaseApi {
     @RequestMapping(value = "/purchaseApply", method = RequestMethod.POST)
     public ResponseEntity<String> purchaseApply(@RequestBody JSONObject reqJson,
                                                 @RequestHeader(value = "user-id") String userId,
-                                                @RequestHeader(value = "user-name") String userName,
                                                 @RequestHeader(value = "store-id") String storeId) {
         Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写申请采购的物资");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");
         Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写申请类型");
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
+
+        String userName  = userDtos.get(0).getName();
         PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
         purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
         purchaseApplyPo.setDescription(reqJson.getString("description"));
@@ -144,11 +156,19 @@ public class PurchaseApi {
     @RequestMapping(value = "/purchaseStorage", method = RequestMethod.POST)
     public ResponseEntity<String> purchaseStorage(@RequestBody JSONObject reqJson,
                                                   @RequestHeader(value = "user-id") String userId,
-                                                  @RequestHeader(value = "user-name") String userName,
+
                                                   @RequestHeader(value = "store-id") String storeId) {
         Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写申请采购的物资");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");
         Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写申请类型");
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含用户");
+
+
+        String userName  = userDtos.get(0).getName();
         PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
         purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
         purchaseApplyPo.setDescription(reqJson.getString("description"));