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

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -38,4 +39,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	String syncEnterpriseInfo();
 
 	TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map);
+
+	RegUnitInfo adminInfoUpdate(Map<String, Object> map);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/RegUnitInfo.java

@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.List;
-
 /**
  * 单位注册信息表
  *
@@ -204,6 +202,6 @@ public class RegUnitInfo extends BaseEntity {
     /**
      * 身份证照片（正反面）
      */
-    private List adminIdCardPhoto;
+    private String adminIdCardPhoto;
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IRegUnitInfoService.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 import java.util.Collection;
 import java.util.List;
@@ -64,4 +64,6 @@ public interface IRegUnitInfoService {
      * @return true 已存在不能注册 false 不存在可以注册
      */
     Boolean checkRepeatPhone(String phoneNo);
+
+    void updateAdminInfo(JSONObject dataResult);
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
@@ -188,6 +189,13 @@ public class TzBaseEnterpriseInfoController {
 		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.companyInfoUpdate(map));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/adminInfoUpdate", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
+	public ResponseModel<RegUnitInfo> adminInfoUpdate(@RequestBody Map<String,Object> map) {
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.adminInfoUpdate(map));
+	}
+
 	/**
 	 * 根据企业名称查询企业详情
 	 *

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PlatformUserTopicMessage.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.IRegUnitInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +49,9 @@ public class PlatformUserTopicMessage extends EmqxListener {
     @Autowired
     IEquipmentCategoryService equipmentCategoryService;
 
+    @Autowired
+    IRegUnitInfoService regUnitInfoService;
+
     @Override
     public void processMessage(String topic, MqttMessage message) {
         RequestContext.setAppKey(appKey);
@@ -65,6 +69,8 @@ public class PlatformUserTopicMessage extends EmqxListener {
             if (StringUtils.isNotEmpty(path)) {
                 if (path.contains("company") && !"company".equals(dataResult.get("level"))) {
                     equipmentCategoryService.creatTree();
+                } else if (path.contains("agencyuser")) {
+                    regUnitInfoService.updateAdminInfo(dataResult);
                 }
             }
         } catch (Exception e) {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -25,12 +25,15 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,6 +42,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.ParseException;
 import java.util.*;
@@ -60,6 +64,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Value("${admin.product}")
 	String product;
 
+	@Value("${admin.product.web}")
+	String webProduct;
+
 	@Value("${admin.appkey}")
 	String appkey;
 
@@ -89,6 +96,21 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 
+	@Autowired
+	RegUnitInfoMapper regUnitInfoMapper;
+
+	@Value("${tzs.admin.name}")
+	private String ctiUserName;
+
+	@Value("${cti.user.pwd}")
+	private String ctiUserPwd;
+
+	@Value("${redis.cache.failure.time}")
+	private Long redisRegionTimeSecond;
+
+	/**机器人用户token缓存key */
+	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
+
 	@Override
 	public List<EquEnterDto> getInfo(String sequenceNbr) {
 		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
@@ -136,8 +158,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		if (regUnitInfo != null) {
 			BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
 		}
-		List list = ObjectUtils.isEmpty(regUnitInfoDto.getAdminIdCardPhoto()) ? new ArrayList() : regUnitInfoDto.getAdminIdCardPhoto();
-		regUnitInfoDto.setAdminIdCardPhoto(list);
+		regUnitInfoDto.setAdminIdCardPhoto(ObjectUtils.isEmpty(regUnitInfo.getAdminIdCardPhoto()) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
 		tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
 
 		// 工商信息
@@ -420,6 +441,58 @@ public class TzBaseEnterpriseInfoServiceImpl
     }
 
 
+	public RegUnitInfo adminInfoUpdate(Map<String, Object> map) {
+		//每一个企业只有一个管理员，所以当前登录用户即管理员用户
+		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+		RequestContext.setAppKey(appkey);
+		RequestContext.setProduct(webProduct);
+		//获取机器人的token，获取不到则去登录
+		if(ObjectUtils.isEmpty(redisUtil.get(TZS_USER_TOKEN))){
+			loginCtiUser();
+		}
+		RequestContext.setToken(String.valueOf(redisUtil.get(TZS_USER_TOKEN)));
+		if (me.getMobile().equals(String.valueOf(map.get("adminTel")))) {
+			RegUnitInfo regUnitInfo = new RegUnitInfo();
+			String useCode = String.valueOf(map.get("useCode"));
+			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+			regUnitInfo.setAdminTel(ObjectUtils.isEmpty(map.get("adminNewTel")) ? me.getMobile() : String.valueOf(map.get("adminNewTel")));
+			boolean b;
+			if (ObjectUtils.isEmpty(me)) {
+				throw new BadRequest("平台用户不存在");
+			} else {
+				me.setMobile(ObjectUtils.isEmpty(map.get("adminNewTel")) ? me.getMobile() : String.valueOf(map.get("adminNewTel")));
+				me.setRealName(String.valueOf(map.get("adminName")));
+				FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
+				b = 200 == updateResult.getStatus();
+				if (b) {
+					b = regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", useCode));
+				} else {
+					throw new BadRequest("平台用户修改失败，请联系管理员");
+				}
+			}
+			return b ? regUnitInfo : null;
+		} else {
+			throw new BadRequest("请输入正确的原始手机号！");
+		}
+	}
+
+	//机器人用户登录
+	private void loginCtiUser() {
+		String passwd = DesUtil.encode(ctiUserPwd, "qaz");
+		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
+		loninData.setLoginId(ctiUserName);
+		loninData.setPassword(passwd);
+		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
+		if(loginResult.getStatus() == 200) {
+			HashMap resultMap = (HashMap) loginResult.getResult();
+			redisUtil.set(TZS_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
+		}
+	}
+
+
+
 	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
 		speUseUnit.setSyncState(state);
 		speUseUnitService.updateById(speUseUnit);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
-import com.yeejoin.amos.boot.module.tzs.flc.api.feign.UgpServiceFeignClient;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
@@ -51,6 +22,8 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
+import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
+import com.yeejoin.amos.boot.module.tzs.flc.api.feign.UgpServiceFeignClient;
 import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.IRegUnitInfoService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -58,8 +31,26 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.ParseException;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+import java.util.stream.Collectors;
+
 /**
  * 单位注册信息表服务实现类
  *
@@ -96,6 +87,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
 	@Autowired
 	UgpServiceFeignClient ugpServiceFeignClient;
+
+	@Autowired
+	RegUnitInfoMapper regUnitInfoMapper;
     
     @Autowired
     StartPlatformTokenService startPlatformTokenService;
@@ -454,6 +448,16 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 		return this.count(new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getAdminTel, phoneNo)) > 0;
 	}
 
+	@Override
+	public void updateAdminInfo(JSONObject dataResult) {
+		RegUnitInfo regUnitInfo = regUnitInfoMapper.selectOne(new QueryWrapper<RegUnitInfo>().eq("admin_user_id", dataResult.get("userId")));
+		if(!ObjectUtils.isEmpty(regUnitInfo)){
+			regUnitInfo.setAdminTel(String.valueOf(dataResult.get("mobile")));
+			regUnitInfo.setAdminName(String.valueOf(dataResult.get("realName")));
+			regUnitInfoMapper.updateById(regUnitInfo);
+		}
+	}
+
 	private CompanyModel dealChildCompany(CompanyModel cm) {
 		cm.setChildren(this.getFilterChild(cm.getChildren() != null ? cm.getChildren() : new ArrayList()));
 		cm.getChildren().stream().filter(n -> {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

@@ -53,9 +53,9 @@ security.systemctl.name=AMOS-API-SYSTEMCTL
 
 jcs.company.topic.add=jcs/company/topic/add
 jcs.company.topic.delete=jcs/company/topic/delete
-## �豸�������񣨳����š��㲥�����壩
+## \uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uD94E\uDE33\uFFFD\uFFFD\uFFFD\uFFFD\u0161\uFFFD\uFFFD\u3CA5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u58E9
 control.fegin.name=JCS-API-CONTROL
-## redis��ʱʱ��
+## redis\uFFFD\uFFFD\u02B1\u02B1\uFFFD\uFFFD
 redis.cache.failure.time=10800
 failure.work.flow.processDefinitionKey=malfunction_repair
 video.fegin.name=video
@@ -63,10 +63,10 @@ latentDanger.feign.name=AMOS-LATENT-DANGER
 Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
 
 
-## �豸��֪����v1
+## \uFFFD\u8C78\uFFFD\uFFFD\u05AA\uFFFD\uFFFD\uFFFD\uFFFDv1
 inform.work.flow.processDefinitionKey=equipment_inform_process_v1
 
-## ������Ԯ���ϲ�ID
+## \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u052E\uFFFD\uFFFD\uFFFD\u03F2\uFFFDID
 fire-rescue=1432549862557130753
 
 
@@ -116,13 +116,15 @@ cti.user.name=tzs_cti
 cti.user.pwd=a1234567
 
 flc.sms.tempCode=SMS_TZS_0001
+## \u7BA1\u7406\u5458\u53D8\u66F4\u673A\u5668\u4EBA\u8D26\u53F7
+tzs.admin.name=tzs_admin
 
-## Ԥ��֪ͨģ��id
+## \u0524\uFFFD\uFFFD\u0368\u05AA\u0123\uFFFD\uFFFDid
 tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
-##��������֪ͨ
+##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
 tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
 
-## ���ںŲ����û�id��ƽ̨userId��
+## \uFFFD\uFFFD\uFFFD\u06BA\u0172\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFDid\uFFFD\uFFFD\u01BD\u0328userId\uFFFD\uFFFD
 tzs.wechat.test.userId=3393279
 
 admin.product=AMOS-SERVICE-ADMIN
@@ -142,7 +144,7 @@ spring.security.user.name=admin
 spring.security.user.password=a1234560
 spring.security.user.roles=SBA_ADMIN
 
-## 后台执行机器人账号配置
+## \u540E\u53F0\u6267\u884C\u673A\u5668\u4EBA\u8D26\u53F7\u914D\u7F6E
 amos.system.user.user-name=robot_admin
 amos.system.user.password=a1234567
 amos.system.user.app-key=AMOS_STUDIO
@@ -157,8 +159,8 @@ regulator.unit.code=50
 
 spring.main.allow-bean-definition-overriding=true
 
-# 若tzs和ugp一起，则true
+# \u82E5tzs\u548Cugp\u4E00\u8D77\uFF0C\u5219true
 is.ugp=false
 
-#工作台用户统一显示头像
+#\u5DE5\u4F5C\u53F0\u7528\u6237\u7EDF\u4E00\u663E\u793A\u5934\u50CF
 tzs.auth.user.photo=/public/common/userPic.png
\ No newline at end of file