1.bug修改

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/AmosTcmApplication.java

@@ -37,6 +37,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.net.InetAddress;
@@ -107,7 +108,7 @@ public class AmosTcmApplication {
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");
         String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-
+        GlobalExceptionHandler.setAlwaysOk(true);
         logger.info("\n----------------------------------------------------------\n\t"
                 + "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
                 + path + "/doc.html\n" + "----------------------------------------------------------");

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

@@ -201,14 +201,7 @@ public class TzBaseEnterpriseInfoController {
     @ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
     public ResponseModel<Object> adminInfoUpdate(@RequestBody Map<String, Object> map) {
         Map<String, Object> result = iTzBaseEnterpriseInfoService.adminInfoUpdate(map);
-        if (result.containsKey("fail")) {
-            ResponseModel responseModel = new ResponseModel();
-            responseModel.setStatus(500);
-            responseModel.setDevMessage(result.get("fail").toString());
-            return responseModel;
-        } else {
-            return ResponseHelper.buildResponse(result.get("success"));
-        }
+        return ResponseHelper.buildResponse(result);
     }
 
     /**

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

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.module.tcm.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.mapper.RegUnitInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitIcServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -44,6 +45,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.*;
@@ -63,15 +65,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
     RedisUtil redisUtil;
 
-	@Value("${admin.product}")
-	String product;
-
-	@Value("${admin.product.web}")
-	String webProduct;
-
-	@Value("${admin.appkey}")
-	String appkey;
-
 	@Autowired
 	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
@@ -85,7 +78,7 @@ public class TzBaseEnterpriseInfoServiceImpl
     RegUnitInfoServiceImpl regUnitInfoService;
 
 	@Autowired
-	private IBaseUnitLicenceService iBaseUnitLicenceService;
+	private StartPlatformTokenService platformTokenService;
 
 	@Autowired
 	private SpeUseUnitServiceImpl speUseUnitService;
@@ -101,18 +94,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 	@Autowired
 	RegUnitInfoMapper regUnitInfoMapper;
 
-	@Value("${tzs.admin.name:tzs_admin}")
-	private String tzsAdminName;
-
-	@Value("${tzs.admin.pwd:a1234567}")
-	private String tzsAdminPwd;
-
-	@Value("${redis.cache.failure.time}")
-	private Long redisRegionTimeSecond;
-
-	/**机器人用户token缓存key */
-	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
-
 	/**
 	 * 企业管理员变更缓存key前缀
 	 */
@@ -313,10 +294,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public String syncEnterpriseInfo() {
-		RequestContext.setAppKey(appkey);
-		RequestContext.setProduct(product);
-		RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
-
+		platformTokenService.setRequestContext();
 		List<TzBaseEnterpriseInfo> baseEnterpriseInfoList = new ArrayList<>();
 
 		//获取平台企业表企业名称及sequence_code，并装入map中
@@ -536,54 +514,33 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return String.join(",", res);
 	}
 
+	@Override
 	public Map<String, Object> 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)));
+		//自己不能修改自己 所以需要设置为机器人
+		platformTokenService.setRequestContext();
 		Map<String, Object> resultMap = new HashMap<>();
-		if (!ObjectUtils.isEmpty(me)) {
-			RegUnitInfo regUnitInfo = new RegUnitInfo();
-			String unitCode = String.valueOf(map.get("unitCode"));
-			regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
-			regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
-			regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
-			regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
-			me.setMobile(String.valueOf(map.get("adminTel")));
-			me.setRealName(String.valueOf(map.get("adminName")));
-			FeignClientResult<AgencyUserModel> updateResult = Privilege.agencyUserClient.update(me, String.valueOf(map.get("adminUserId")));
-			if (200 == updateResult.getStatus()) {
-				regUnitInfoService.update(regUnitInfo, new QueryWrapper<RegUnitInfo>().eq("unit_code", unitCode));
-				resultMap.put("success", regUnitInfo);
-				redisUtil.del(adminChange + map.get("adminTel"));
-			} else {
-				resultMap.put("fail", "平台用户修改失败，请联系管理员");
-			}
-		} else {
-			resultMap.put("fail", "平台用户不存在");
+		RegUnitInfo regUnitInfo = new RegUnitInfo();
+		String unitCode = String.valueOf(map.get("unitCode"));
+		regUnitInfo.setAdminName(String.valueOf(map.get("adminName")));
+		regUnitInfo.setAdminIdNumber(String.valueOf(map.get("adminIdNumber")));
+		regUnitInfo.setAdminIdCardPhoto(JSON.toJSONString(map.get("adminIdCardPhoto")));
+		regUnitInfo.setAdminTel(String.valueOf(map.get("adminTel")));
+		me.setMobile(regUnitInfo.getAdminTel());
+		me.setRealName(String.valueOf(map.get("adminName")));
+		try {
+			Privilege.agencyUserClient.update(me, me.getUserId());
+			regUnitInfoService.update(regUnitInfo, new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, unitCode));
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			throw new BadRequest(e.getMessage());
 		}
+		resultMap.put("success", regUnitInfo);
+		redisUtil.del(adminChange + map.get("adminTel"));
 		return resultMap;
 	}
 
-	//机器人用户登录
-	private void loginCtiUser() {
-		String passwd = DesUtil.encode(tzsAdminPwd, "qaz");
-		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-		loninData.setLoginId(tzsAdminName);
-		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);