Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -61,7 +61,7 @@ public class MetaHandler implements MetaObjectHandler {
             this.setFieldValByName("recUserId", agencyUserModel.getUserId(), metaObject);
         }
         if (isExistField("recUserName", entity)) {
-            this.setFieldValByName("recUserName", agencyUserModel.getUserName(), metaObject);
+            this.setFieldValByName("recUserName", agencyUserModel.getRealName(), metaObject);
         }
         if (isExistField("recDate", entity)) {
             Date currentDate = new Date();

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCallePowerTransferRo.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @version $Id: AlertCalledRo.java, v 0.1 2021年6月24日 下午3:31:14 gwb Exp $
  */
 @Data
-@RuleFact(value = "警情信息",project = "西咸机场119调派规则")
+@RuleFact(value = "调派信息",project = "西咸机场119调派规则")
 public class AlertCallePowerTransferRo implements Serializable{
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1366,7 +1366,7 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> adduserCar(@PathVariable String type, @RequestBody  UserCar userCar  ) {
         AgencyUserModel agencyUserModel= getUserInfo();
         userCar.setAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
-        userCar.setAmosUserName(agencyUserModel.getUserName());
+        userCar.setAmosUserName(agencyUserModel.getRealName());
         if("1".equals(type)){
             userCarService.add(userCar);
         }else{

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -143,7 +143,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             if (!result) {
                 return false;
             }
-            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
+            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
             failureMaintainDto.setMaintainTime(new Date());
             String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
             OrgUsr orgUsr = iOrgUsrService.getById(parentId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersContractServiceImpl.java

@@ -97,7 +97,7 @@ public class FirefightersContractServiceImpl extends BaseService<FirefightersCon
 		detail.setIsDelete(false);
 		detail.setRecDate(new Date());
 		detail.setRecUserId(userInfo.getUserId());
-		detail.setRecUserName(userInfo.getUserName());
+		detail.setRecUserName(userInfo.getRealName());
 		this.baseMapper.updateById(detail);
 		Map<String, List<AttachmentDto>> map = firefightersContract.getAttachments();
 		if (ObjectUtils.isNotEmpty(map)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -171,7 +171,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		entity.setIsDelete(false);
 		entity.setRecDate(new Date());
 		entity.setRecUserId(userInfo.getUserId());
-		entity.setRecUserName(userInfo.getUserName());
+		entity.setRecUserName(userInfo.getRealName());
 		int num = keySiteMapper.updateById(entity);
 		Map<String, List<AttachmentDto>> map = keySite.getAttachments();
 		if (ObjectUtils.isNotEmpty(map)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java

@@ -176,7 +176,7 @@ public class PowerTransferController extends BaseController {
     public ResponseModel<Boolean> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
         AgencyUserModel userInfo = getUserInfo();
         powerTransferDto.setTaskSenderId(Long.parseLong(userInfo.getUserId()));
-        powerTransferDto.setTaskSenderName(userInfo.getUserName());
+        powerTransferDto.setTaskSenderName(userInfo.getRealName());
 
         String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
         powerTransferDto.setCompanyName(companyName);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/MessageServiceImpl.java

@@ -188,7 +188,7 @@ public class MessageServiceImpl implements IMessageService {
 			 emailUser.forEach(s -> {
         	   for(AgencyUserModel agencyUserModel:agencyUserModelList){
         		   if(s.getUserId().equals(agencyUserModel.getUserId())){
-     	    			 s.setUsername(agencyUserModel.getUserName());
+     	    			 s.setUsername(agencyUserModel.getRealName());
      	    			 s.setEmail(agencyUserModel.getEmail());
      	    		}
         	   }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -551,7 +551,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         JSONObject respBody;
         Date startDate = new Date();
         if (latentDangerListParam.getIsHandle()) {
-            respBody = remoteWorkFlowService.completedPageTask(user.getUserName(),latentDangerListParam.getBelongType());
+            respBody = remoteWorkFlowService.completedPageTask(user.getRealName(),latentDangerListParam.getBelongType());
         } else {
             respBody = remoteWorkFlowService.pageTask(user.getUserId(),latentDangerListParam.getBelongType());
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

@@ -199,7 +199,7 @@ public class MessageServiceImpl implements IMessageService {
 			 emailUser.forEach(s -> {
         	   for(AgencyUserModel agencyUserModel:agencyUserModelList){
         		   if(s.getUserId().equals(agencyUserModel.getUserId())){
-     	    			 s.setUsername(agencyUserModel.getUserName());
+     	    			 s.setUsername(agencyUserModel.getRealName());
      	    			 s.setEmail(agencyUserModel.getEmail());
      	    		}
         	   }